Merge branch 'master' of https://github.com/Microsoft/visualfsharp into fix-1332

Author: dsyme

build.cmd

@@ -339,20 +339,20 @@ pushd .\lkg & %_dotnetexe% publish project.json &popd
 @if ERRORLEVEL 1 echo Error: dotnet publish failed  && goto :failure
 
 rem rename fsc and coreconsole to allow fsc.exe to to start compiler
-pushd .\lkg\bin\debug\dnxcore50\win7-x64\publish
-fc fsc.exe corehost.exe >nul
+pushd .\lkg\bin\debug\netstandard1.6\win7-x64\publish
+fc fsc.exe dotnet.exe >nul
 @if ERRORLEVEL 1 (
   copy fsc.exe fsc.dll
-  copy corehost.exe fsc.exe
+  copy dotnet.exe fsc.exe
 )
 popd
 
 rem rename fsc and coreconsole to allow fsc.exe to to start compiler
-pushd .\lkg\bin\debug\dnxcore50\win7-x64\publish
-fc fsi.exe corehost.exe >nul
+pushd .\lkg\bin\debug\netstandard1.6\win7-x64\publish
+fc fsi.exe dotnet.exe >nul
 @if ERRORLEVEL 1 (
   copy fsi.exe fsi.dll
-  copy corehost.exe fsi.exe
+  copy dotnet.exe fsi.exe
 )
 popd
 

lkg/project.json

@@ -1,6 +1,10 @@
+
 {
   "dependencies": {
-    "Microsoft.FSharp.Compiler.Host.netcore": "1.0.0-alpha-160406",
+    "Microsoft.FSharp.Compiler.Host.netcore": "1.0.0-alpha-160629",
+     "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2",
+     "Microsoft.NETCore.DotNetHostPolicy":  "1.0.1",
+     "Microsoft.NETCore.DotNetHost": "1.0.1"
   },
   "runtimes": {
     "win7-x86": { },
@@ -9,7 +13,7 @@
     "ubuntu.14.04-x64": { }
   },
   "frameworks": {
-    "dnxcore50": {
+    "netstandard1.6": {
       "imports": "portable-net45+win8"
     }
   }

src/FSharpSource.targets

@@ -742,7 +742,7 @@
     <When Condition="'$(BuildWith)' == 'LKG'">
       <PropertyGroup>
          <FSharpTargetsPath>..\lkg\FSharp-$(LkgVersion)\bin\Microsoft.FSharp.Targets</FSharpTargetsPath>
-         <FscToolPath>$(FSharpSourcesRoot)\..\lkg\bin\Debug\dnxcore50\win7-x64\publish</FscToolPath>
+         <FscToolPath>$(FSharpSourcesRoot)\..\lkg\bin\Debug\netstandard1.6\win7-x64\publish</FscToolPath>
          <FSLKGPath>$(FSharpSourcesRoot)\..\lkg\FSharp-$(LkgVersion)\bin</FSLKGPath>
          <FSCoreLKGPath>$(FSLKGPath)\FSharp.Core.dll</FSCoreLKGPath>
       </PropertyGroup>

src/fsharp/AugmentWithHashCompare.fs

@@ -850,24 +850,24 @@ let TyconIsCandidateForAugmentationWithHash g tycon = TyconIsCandidateForAugment
 //------------------------------------------------------------------------- 
 
 let slotImplMethod (final,c,slotsig) : ValMemberInfo = 
-  { ImplementedSlotSigs=[slotsig];
+  { ImplementedSlotSigs=[slotsig]
     MemberFlags=
-        { IsInstance=true; 
-          IsDispatchSlot=false;
-          IsFinal=final;
-          IsOverrideOrExplicitImpl=true;
-          MemberKind=MemberKind.Member};
-    IsImplemented=false;
+        { IsInstance=true 
+          IsDispatchSlot=false
+          IsFinal=final
+          IsOverrideOrExplicitImpl=true
+          MemberKind=MemberKind.Member}
+    IsImplemented=false
     ApparentParent=c} 
 
 let nonVirtualMethod c : ValMemberInfo = 
-  { ImplementedSlotSigs=[];
-    MemberFlags={ IsInstance=true; 
-                  IsDispatchSlot=false;
-                  IsFinal=false;
-                  IsOverrideOrExplicitImpl=false;
-                  MemberKind=MemberKind.Member};
-    IsImplemented=false;
+  { ImplementedSlotSigs=[]
+    MemberFlags={ IsInstance=true 
+                  IsDispatchSlot=false
+                  IsFinal=false
+                  IsOverrideOrExplicitImpl=false
+                  MemberKind=MemberKind.Member}
+    IsImplemented=false
     ApparentParent=c} 
 
 let unitArg = ValReprInfo.unitArgData
@@ -945,7 +945,7 @@ let MakeBindingsForCompareAugmentation g (tycon:Tycon) =
               let thisv,thatv,comparee = comparef g tcref tycon 
               mkLambdas m tps [thisv;thatv] (comparee,g.int_ty)  
             [ // This one must come first because it may be inlined into the second
-              mkCompGenBind vspec2 rhs2;
+              mkCompGenBind vspec2 rhs2
               mkCompGenBind vspec1 rhs1; ] 
     if tycon.IsUnionTycon then mkCompare mkUnionCompare 
     elif tycon.IsRecordTycon || tycon.IsStructOrEnumTycon then mkCompare mkRecdCompare 
@@ -1016,8 +1016,8 @@ let MakeBindingsForEqualityWithComparerAugmentation g (tycon:Tycon) =
 
                 mkLambdas m tps [thisv; unitv] (hashe,g.int_ty)  
 
-            [(mkCompGenBind withcGetHashCodeVal.Deref withcGetHashCodeExpr) ; 
-             (mkCompGenBind objGetHashCodeVal.Deref objGetHashCodeExpr) ; 
+            [(mkCompGenBind withcGetHashCodeVal.Deref withcGetHashCodeExpr)  
+             (mkCompGenBind objGetHashCodeVal.Deref objGetHashCodeExpr)  
              (mkCompGenBind withcEqualsVal.Deref withcEqualsExpr)] 
     if tycon.IsUnionTycon then mkStructuralEquatable mkUnionHashWithComparer mkUnionEqualityWithComparer
     elif (tycon.IsRecordTycon || tycon.IsStructOrEnumTycon) then mkStructuralEquatable mkRecdHashWithComparer mkRecdEqualityWithComparer
@@ -1054,8 +1054,8 @@ let MakeBindingsForEqualsAugmentation g (tycon:Tycon) =
             mkLambdas m tps [thisv;thatobjv] (equalse,g.bool_ty)  
 
 
-          [ mkCompGenBind nocEqualsVal.Deref nocEqualsExpr;
-            mkCompGenBind objEqualsVal.Deref objEqualsExpr;   ] 
+          [ mkCompGenBind nocEqualsVal.Deref nocEqualsExpr
+            mkCompGenBind objEqualsVal.Deref objEqualsExpr   ] 
     if tycon.IsExceptionDecl then mkEquals mkExnEquality 
     elif tycon.IsUnionTycon then mkEquals mkUnionEquality 
     elif tycon.IsRecordTycon || tycon.IsStructOrEnumTycon then mkEquals mkRecdEquality