Skip to content

Commit d9f7cd1

Browse files
dsymedsyme
committed
Merge branch 'master' of https://github.com/Microsoft/visualfsharp into fix-627
2 parents 6c0a36e + 47dd515 commit d9f7cd1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1784
-1350
lines changed

‎DEVGUIDE.md‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,8 @@ There are various qualifiers:
5151
build.cmd test-vs -- build, run Visual F# IDE Tools unit tests
5252

5353
**Notes**
54-
To build and test Visual F# IDE Tools, you must install Visual Studio SDK (also called _Visual Studio Extensibility SDK_ on the Visual Studio installer) before building Visual F# IDE Tools.
55-
Please ensure that the Visual Studio SDK version is matched with your current Visual Studio to ensure successful builds. For example: Visual Studio 2015 Update 1 requires Visual Studio 2015 SDK Update 1.
56-
Beginning with Visual Studio 2015, Visual Studio 2015 SDK is not available for separate download. Any installation of Visual Studio 2015 and its updates provides Visual Studio SDK as part of the installation of Visual Studio 2015 as feature installation.
54+
To build and test Visual F# IDE Tools, you must use [Visual Studio "vNext" (aka "Dev15")](https://www.visualstudio.com/en-us/downloads/visual-studio-next-downloads-vs.aspx). This is the one after Visual Studio 2015 (aka "Dev 14"). You must also install Visual Studio SDK (also called _Visual Studio Extensibility SDK_ on the Visual Studio installer) before building Visual F# IDE Tools.
55+
Please ensure that the Visual Studio SDK version is matched with your current Visual Studio to ensure successful builds. For example: Visual Studio 2015 Update 1 requires Visual Studio 2015 SDK Update 1. Any installation of Visual Studio 2015 and later provides Visual Studio SDK as part of the installation of Visual Studio 2015 as feature installation.
5756

5857
Combinations are also allowed:
5958

@@ -152,8 +151,13 @@ For **Release** this corresponds to these steps, which you can run individually
152151

153152
### 4. [Optional] Install the Visual F# IDE Tools
154153

155-
**Note:** This step will install a VSIX extension into Visual Studio 15 that changes the Visual F# IDE Tools
156-
components installed into Visual Studio 15. You can revert this step by disabling or uninstalling the addin.
154+
At time of writing, the Visual F# IDE Tools can only be installed into Visual Studio "Next" (aka "Dev15") releases.
155+
The new builds of the Visual F# IDE Tools can no longer be installed into Visual Studio 2015.
156+
157+
You can install VIsual Studio "Next (aka "Dev15") from https://www.visualstudio.com/en-us/downloads/visual-studio-next-downloads-vs.aspx.
158+
159+
**Note:** This step will install a VSIX extension into Visual Studio "Next" (aka "Dev15") that changes the Visual F# IDE Tools
160+
components installed in that VS installation. You can revert this step by disabling or uninstalling the addin.
157161

158162
For **Debug**:
159163

‎build.cmd‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -339,20 +339,20 @@ pushd .\lkg & %_dotnetexe% publish project.json &popd
339339
@if ERRORLEVEL 1 echo Error: dotnet publish failed && goto :failure
340340

341341
rem rename fsc and coreconsole to allow fsc.exe to to start compiler
342-
pushd .\lkg\bin\debug\dnxcore50\win7-x64\publish
343-
fc fsc.exe corehost.exe >nul
342+
pushd .\lkg\bin\debug\netstandard1.6\win7-x64\publish
343+
fc fsc.exe dotnet.exe >nul
344344
@if ERRORLEVEL 1 (
345345
copy fsc.exe fsc.dll
346-
copy corehost.exe fsc.exe
346+
copy dotnet.exe fsc.exe
347347
)
348348
popd
349349

350350
rem rename fsc and coreconsole to allow fsc.exe to to start compiler
351-
pushd .\lkg\bin\debug\dnxcore50\win7-x64\publish
352-
fc fsi.exe corehost.exe >nul
351+
pushd .\lkg\bin\debug\netstandard1.6\win7-x64\publish
352+
fc fsi.exe dotnet.exe >nul
353353
@if ERRORLEVEL 1 (
354354
copy fsi.exe fsi.dll
355-
copy corehost.exe fsi.exe
355+
copy dotnet.exe fsi.exe
356356
)
357357
popd
358358

‎lkg/project.json‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1+
12
{
23
"dependencies": {
3-
"Microsoft.FSharp.Compiler.Host.netcore": "1.0.0-alpha-160406",
4+
"Microsoft.FSharp.Compiler.Host.netcore": "1.0.0-alpha-160629",
5+
"Microsoft.NETCore.Runtime.CoreCLR": "1.0.2",
6+
"Microsoft.NETCore.DotNetHostPolicy": "1.0.1",
7+
"Microsoft.NETCore.DotNetHost": "1.0.1"
48
},
59
"runtimes": {
610
"win7-x86": { },
@@ -9,7 +13,7 @@
913
"ubuntu.14.04-x64": { }
1014
},
1115
"frameworks": {
12-
"dnxcore50": {
16+
"netstandard1.6": {
1317
"imports": "portable-net45+win8"
1418
}
1519
}

‎src/FSharpSource.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -742,7 +742,7 @@
742742
<When Condition="'$(BuildWith)' == 'LKG'">
743743
<PropertyGroup>
744744
<FSharpTargetsPath>..\lkg\FSharp-$(LkgVersion)\bin\Microsoft.FSharp.Targets</FSharpTargetsPath>
745-
<FscToolPath>$(FSharpSourcesRoot)\..\lkg\bin\Debug\dnxcore50\win7-x64\publish</FscToolPath>
745+
<FscToolPath>$(FSharpSourcesRoot)\..\lkg\bin\Debug\netstandard1.6\win7-x64\publish</FscToolPath>
746746
<FSLKGPath>$(FSharpSourcesRoot)\..\lkg\FSharp-$(LkgVersion)\bin</FSLKGPath>
747747
<FSCoreLKGPath>$(FSLKGPath)\FSharp.Core.dll</FSCoreLKGPath>
748748
</PropertyGroup>

‎src/absil/il.fsi‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2092,9 +2092,7 @@ type ILPropertyRef =
20922092
member Name: string
20932093
interface System.IComparable
20942094

2095-
#if ENABLE_MONO_SUPPORT
20962095
val runningOnMono: bool
2097-
#endif
20982096

20992097
type ILReferences =
21002098
{ AssemblyReferences: ILAssemblyRef list;

‎src/absil/ilread.fs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3807,11 +3807,9 @@ let rec genOpenBinaryReader infile is opts =
38073807
let pdb = None
38083808
#else
38093809
let pdb =
3810-
#if ENABLE_MONO_SUPPORT
38113810
if runningOnMono then
38123811
None
38133812
else
3814-
#endif
38153813
getPdbReader opts infile
38163814
#endif
38173815

‎src/fsharp/AugmentWithHashCompare.fs‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -850,24 +850,24 @@ let TyconIsCandidateForAugmentationWithHash g tycon = TyconIsCandidateForAugment
850850
//-------------------------------------------------------------------------
851851

852852
let slotImplMethod (final,c,slotsig) : ValMemberInfo =
853-
{ ImplementedSlotSigs=[slotsig];
853+
{ ImplementedSlotSigs=[slotsig]
854854
MemberFlags=
855-
{ IsInstance=true;
856-
IsDispatchSlot=false;
857-
IsFinal=final;
858-
IsOverrideOrExplicitImpl=true;
859-
MemberKind=MemberKind.Member};
860-
IsImplemented=false;
855+
{ IsInstance=true
856+
IsDispatchSlot=false
857+
IsFinal=final
858+
IsOverrideOrExplicitImpl=true
859+
MemberKind=MemberKind.Member}
860+
IsImplemented=false
861861
ApparentParent=c}
862862

863863
let nonVirtualMethod c : ValMemberInfo =
864-
{ ImplementedSlotSigs=[];
865-
MemberFlags={ IsInstance=true;
866-
IsDispatchSlot=false;
867-
IsFinal=false;
868-
IsOverrideOrExplicitImpl=false;
869-
MemberKind=MemberKind.Member};
870-
IsImplemented=false;
864+
{ ImplementedSlotSigs=[]
865+
MemberFlags={ IsInstance=true
866+
IsDispatchSlot=false
867+
IsFinal=false
868+
IsOverrideOrExplicitImpl=false
869+
MemberKind=MemberKind.Member}
870+
IsImplemented=false
871871
ApparentParent=c}
872872

873873
let unitArg = ValReprInfo.unitArgData
@@ -945,7 +945,7 @@ let MakeBindingsForCompareAugmentation g (tycon:Tycon) =
945945
let thisv,thatv,comparee = comparef g tcref tycon
946946
mkLambdas m tps [thisv;thatv] (comparee,g.int_ty)
947947
[ // This one must come first because it may be inlined into the second
948-
mkCompGenBind vspec2 rhs2;
948+
mkCompGenBind vspec2 rhs2
949949
mkCompGenBind vspec1 rhs1; ]
950950
if tycon.IsUnionTycon then mkCompare mkUnionCompare
951951
elif tycon.IsRecordTycon || tycon.IsStructOrEnumTycon then mkCompare mkRecdCompare
@@ -1016,8 +1016,8 @@ let MakeBindingsForEqualityWithComparerAugmentation g (tycon:Tycon) =
10161016

10171017
mkLambdas m tps [thisv; unitv] (hashe,g.int_ty)
10181018

1019-
[(mkCompGenBind withcGetHashCodeVal.Deref withcGetHashCodeExpr) ;
1020-
(mkCompGenBind objGetHashCodeVal.Deref objGetHashCodeExpr) ;
1019+
[(mkCompGenBind withcGetHashCodeVal.Deref withcGetHashCodeExpr)
1020+
(mkCompGenBind objGetHashCodeVal.Deref objGetHashCodeExpr)
10211021
(mkCompGenBind withcEqualsVal.Deref withcEqualsExpr)]
10221022
if tycon.IsUnionTycon then mkStructuralEquatable mkUnionHashWithComparer mkUnionEqualityWithComparer
10231023
elif (tycon.IsRecordTycon || tycon.IsStructOrEnumTycon) then mkStructuralEquatable mkRecdHashWithComparer mkRecdEqualityWithComparer
@@ -1054,8 +1054,8 @@ let MakeBindingsForEqualsAugmentation g (tycon:Tycon) =
10541054
mkLambdas m tps [thisv;thatobjv] (equalse,g.bool_ty)
10551055

10561056

1057-
[ mkCompGenBind nocEqualsVal.Deref nocEqualsExpr;
1058-
mkCompGenBind objEqualsVal.Deref objEqualsExpr; ]
1057+
[ mkCompGenBind nocEqualsVal.Deref nocEqualsExpr
1058+
mkCompGenBind objEqualsVal.Deref objEqualsExpr ]
10591059
if tycon.IsExceptionDecl then mkEquals mkExnEquality
10601060
elif tycon.IsUnionTycon then mkEquals mkUnionEquality
10611061
elif tycon.IsRecordTycon || tycon.IsStructOrEnumTycon then mkEquals mkRecdEquality

0 commit comments

Comments
 (0)