From 967fa9dd5075212d2126ed3c01351be4589a9af2 Mon Sep 17 00:00:00 2001
From: Enrico Sada <enrico@sada.io>
Date: Thu, 7 Jul 2016 15:17:47 +0200
Subject: [PATCH 1/3] fix deps, use .net core 1.0 rtm

---
 src/fsharp/FSharp.Build/project.json          | 34 +++++++++----------
 src/fsharp/FSharp.Core.Unittests/project.json |  2 +-
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/fsharp/FSharp.Build/project.json b/src/fsharp/FSharp.Build/project.json
index 571ae7040e4..cdec2ffe079 100644
--- a/src/fsharp/FSharp.Build/project.json
+++ b/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"
+{
+    "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"
         }
-    } 
-} 
\ No newline at end of file
+    }
+}
\ No newline at end of file
diff --git a/src/fsharp/FSharp.Core.Unittests/project.json b/src/fsharp/FSharp.Core.Unittests/project.json
index 44d2d09b071..79647ccbf80 100644
--- a/src/fsharp/FSharp.Core.Unittests/project.json
+++ b/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"
   },

From 41039afbd29c01b62468e55d8573393b26330e88 Mon Sep 17 00:00:00 2001
From: Enrico Sada <enrico@sada.io>
Date: Thu, 7 Jul 2016 16:00:43 +0200
Subject: [PATCH 2/3] fix `Microsoft.NETCore.ConsoleHost` is replaced by
 `Microsoft.NETCore.DotNetHost`

---
 build.cmd        | 4 ++--
 lkg/project.json | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/build.cmd b/build.cmd
index 8316d3d95ab..2e97c1ceccb 100644
--- a/build.cmd
+++ b/build.cmd
@@ -340,10 +340,10 @@ pushd .\lkg & %_dotnetexe% publish project.json &popd
 
 rem rename fsc and coreconsole to allow fsc.exe to to start compiler
 pushd .\lkg\bin\debug\netstandard1.6\win7-x64\publish
-fc fsc.exe corehost.exe >nul
+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
 
diff --git a/lkg/project.json b/lkg/project.json
index f60a3a2513d..9d27bf4a78e 100644
--- a/lkg/project.json
+++ b/lkg/project.json
@@ -2,6 +2,9 @@
 {
   "dependencies": {
     "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": { },

From d20d21df2a4f7f93bb451ddb385bd4e4c84872c8 Mon Sep 17 00:00:00 2001
From: Enrico Sada <enrico@sada.io>
Date: Thu, 7 Jul 2016 16:03:12 +0200
Subject: [PATCH 3/3] fix `Microsoft.NETCore.ConsoleHost` is replaced by
 `Microsoft.NETCore.DotNetHost`

---
 build.cmd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.cmd b/build.cmd
index 2e97c1ceccb..26434b5ad34 100644
--- a/build.cmd
+++ b/build.cmd
@@ -349,10 +349,10 @@ popd
 
 rem rename fsc and coreconsole to allow fsc.exe to to start compiler
 pushd .\lkg\bin\debug\netstandard1.6\win7-x64\publish
-fc fsi.exe corehost.exe >nul
+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