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

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/FSharp.Build/project.json

@@ -1,22 +1,22 @@
-{ 
-    "dependencies": { 
-        "Microsoft.Build": "0.1.0-preview-00022", 
-        "Microsoft.Build.Framework": "0.1.0-preview-00022", 
-        "Microsoft.Build.Tasks.Core": "0.1.0-preview-00022", 
-        "Microsoft.Build.Utilities.Core": "0.1.0-preview-00022", 
-        "Microsoft.NETCore.Platforms": "1.0.1-rc2-24027", 
-        "Microsoft.Win32.Registry": { 
-             "version": "4.0.0-rc2-24027", 
-             "exclude": "Compile" 
-        }, 
-        "System.AppContext": "4.1.0-rc2-24027",
-        "System.Diagnostics.Tools": "4.0.1-rc2-24027",
-        "System.Reflection.Primitives": "4.0.1-rc2-24027",
-        "System.Resources.ResourceManager": "4.0.1-rc2-24027"
-    }, 
-    "frameworks": { 
-        "dnxcore50": {
+{
+    "dependencies": {
+        "Microsoft.Build": "0.1.0-preview-00028-160627",
+        "Microsoft.Build.Framework": "0.1.0-preview-00028-160627",
+        "Microsoft.Build.Tasks.Core": "0.1.0-preview-00028-160627",
+        "Microsoft.Build.Utilities.Core": "0.1.0-preview-00028-160627",
+        "Microsoft.NETCore.Platforms": "1.0.1",
+        "Microsoft.Win32.Registry": {
+            "version": "4.0.0",
+            "exclude": "Compile"
+        },
+        "System.AppContext": "4.1.0",
+        "System.Diagnostics.Tools": "4.0.1",
+        "System.Reflection.Primitives": "4.0.1",
+        "System.Resources.ResourceManager": "4.0.1"
+    },
+    "frameworks": {
+        "netstandard1.6": {
             "imports": "portable-net45+win8"
-        } 
-    } 
-} 
+        }
+    }
+}

src/fsharp/FSharp.Core.Unittests/project.json

@@ -8,7 +8,7 @@
     "System.Reflection.Emit": "4.0.1",
     "System.Runtime.Loader": "4.0.0",
     "System.Text.RegularExpressions": "4.1.0",
-    "System.Threading.Tasks.Parallel": "4.0.1-rc2-24027",
+    "System.Threading.Tasks.Parallel": "4.0.1",
     "System.Threading.Thread": "4.0.0",
     "System.Threading.ThreadPool": "4.0.10"
   },