diff --git a/build.cmd b/build.cmd
index ba25d18b578..b1054cb3fff 100644
--- a/build.cmd
+++ b/build.cmd
@@ -1,4 +1,4 @@
-@if "%_echo%"=="" echo off
+@if "%_echo%"=="" echo off 
 
 setlocal enableDelayedExpansion
 
@@ -478,12 +478,11 @@ if '%BUILD_PROTO_WITH_CORECLR_LKG%' == '0' (
 rem Build Proto
 if '%BUILD_PROTO%' == '1' (
   if '%BUILD_PROTO_WITH_CORECLR_LKG%' == '1' (
-
-    pushd .\lkg & %_dotnetexe% restore &popd
-    @if ERRORLEVEL 1 echo Error: dotnet restore failed  && goto :failure
-
-    pushd .\lkg & %_dotnetexe% publish project.json -o %~dp0\Tools\lkg -r win7-x64 &popd
-    @if ERRORLEVEL 1 echo Error: dotnet publish failed  && goto :failure
+echo on
+    pushd .\lkg\fsc & %_dotnetexe% restore & popd & if ERRORLEVEL 1 echo Error:%errorlevel% dotnet restore failed & goto :failure
+    pushd .\lkg\fsi & %_dotnetexe% restore & popd & if ERRORLEVEL 1 echo Error:%errorlevel% dotnet restore failed & goto :failure
+    pushd .\lkg\fsc & %_dotnetexe% publish project.json --no-build -o %~dp0\Tools\lkg -r win7-x64 & popd & if ERRORLEVEL 1 echo Error: dotnet publish failed  & goto :failure
+    pushd .\lkg\fsi & %_dotnetexe% publish project.json --no-build -o %~dp0\Tools\lkg -r win7-x64 & popd & if ERRORLEVEL 1 echo Error: dotnet publish failed  & goto :failure
 
     echo %_msbuildexe% %msbuildflags% src\fsharp-proto-build.proj
          %_msbuildexe% %msbuildflags% src\fsharp-proto-build.proj
@@ -512,7 +511,6 @@ if '%BUILD_PROTO%' == '1' (
 )
 
 
-
 echo ---------------- Done with proto, starting build ------------------------
 
 if '%BUILD_PHASE%' == '1' (
@@ -573,15 +571,15 @@ setlocal disableDelayedExpansion
 if "%INCLUDE_TEST_SPEC_NUNIT%" == "" (
     if NOT "%EXCLUDE_TEST_SPEC_NUNIT%" == "" (
         set WHERE_ARG_NUNIT=--where "!(%EXCLUDE_TEST_SPEC_NUNIT%)"
-	)
+    )
 )
 if NOT "%INCLUDE_TEST_SPEC_NUNIT%" == "" (
     if "%EXCLUDE_TEST_SPEC_NUNIT%" == "" (
         set WHERE_ARG_NUNIT=--where "%INCLUDE_TEST_SPEC_NUNIT%"
-	)
+    )
     if NOT "%EXCLUDE_TEST_SPEC_NUNIT%" == "" (
-		set WHERE_ARG_NUNIT=--where "%INCLUDE_TEST_SPEC_NUNIT% and !(%EXCLUDE_TEST_SPEC_NUNIT%)"
-	)
+        set WHERE_ARG_NUNIT=--where "%INCLUDE_TEST_SPEC_NUNIT% and !(%EXCLUDE_TEST_SPEC_NUNIT%)"
+    )
 )
 if NOT "%INCLUDE_TEST_TAGS%" == "" (
     set INCLUDE_ARG_RUNALL=-ttags:%INCLUDE_TEST_TAGS%
diff --git a/lkg/NuGet.Config b/lkg/fsc/NuGet.Config
similarity index 100%
rename from lkg/NuGet.Config
rename to lkg/fsc/NuGet.Config
diff --git a/lkg/fsc/project.json b/lkg/fsc/project.json
new file mode 100644
index 00000000000..ab155d1ac06
--- /dev/null
+++ b/lkg/fsc/project.json
@@ -0,0 +1,31 @@
+{
+  "version": "1.0.0-*",
+  "name": "fsc",
+  "buildOptions": {
+    "debugType": "portable",
+    "emitEntryPoint": true
+  },
+  "dependencies": {
+    "Microsoft.FSharp.Compiler.netcore": "1.0.0-alpha-161102",
+  },
+  "runtimes": {
+    "win7-x86": { },
+    "win7-x64": { },
+    "osx.10.10-x64": { },
+    "ubuntu.14.04-x64": { }
+  },
+  "frameworks": {
+    "netcoreapp1.0": {
+      "dependencies": {
+        "Microsoft.NETCore.App": {
+          "type": "platform",
+          "version": "1.0.1"
+        }
+      },
+      "imports": "dnxcore50"
+    }
+  },
+  "scripts": {
+    "postpublish": [ "cmd /c copy %publish:OutputPath%\\runtimes\\any\\native\\* %publish:OutputPath%" ] 
+  }
+}
\ No newline at end of file
diff --git a/lkg/fsi/NuGet.Config b/lkg/fsi/NuGet.Config
new file mode 100644
index 00000000000..5f26bdd4195
--- /dev/null
+++ b/lkg/fsi/NuGet.Config
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+
+    <!--To inherit the global NuGet package sources remove the <clear/> line below -->
+    <clear />
+    <add key="myget.org fsharp-daily" value="https://www.myget.org/F/fsharp-daily/api/v3/index.json" />  
+    <add key="dotnet-core" value="https://www.myget.org/F/dotnet-core/api/v3/index.json" />
+    <add key="myget.org dotnet-buildtools" value="https://www.myget.org/F/dotnet-buildtools/api/v3/index.json" />  
+    <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
+
+  </packageSources>  
+</configuration>
diff --git a/lkg/fsi/project.json b/lkg/fsi/project.json
new file mode 100644
index 00000000000..85caf443c5e
--- /dev/null
+++ b/lkg/fsi/project.json
@@ -0,0 +1,31 @@
+{
+  "version": "1.0.0-*",
+  "name": "fsi",
+  "buildOptions": {
+    "debugType": "portable",
+    "emitEntryPoint": true
+  },
+  "dependencies": {
+    "Microsoft.FSharp.Compiler.netcore": "1.0.0-alpha-161102",
+  },
+  "runtimes": {
+    "win7-x86": { },
+    "win7-x64": { },
+    "osx.10.10-x64": { },
+    "ubuntu.14.04-x64": { }
+  },
+  "frameworks": {
+    "netcoreapp1.0": {
+      "dependencies": {
+        "Microsoft.NETCore.App": {
+          "type": "platform",
+          "version": "1.0.1"
+        }
+      },
+      "imports": "dnxcore50"
+    }
+  },
+  "scripts": {
+    "postpublish": [ "cmd /c copy %publish:OutputPath%\\runtimes\\any\\native\\* %publish:OutputPath%" ] 
+  }
+}
\ No newline at end of file
diff --git a/lkg/project.json b/lkg/project.json
deleted file mode 100644
index 3a197eed86e..00000000000
--- a/lkg/project.json
+++ /dev/null
@@ -1,20 +0,0 @@
-
-{
-  "dependencies": {
-    "Microsoft.FSharp.Compiler.Host.netcore": "1.0.0-alpha-161102",
-     "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2",
-     "Microsoft.NETCore.DotNetHostPolicy":  "1.0.1",
-     "Microsoft.NETCore.DotNetHost": "1.0.1"
-  },
-  "runtimes": {
-    "win7-x86": { },
-    "win7-x64": { },
-    "osx.10.10-x64": { },
-    "ubuntu.14.04-x64": { }
-  },
-  "frameworks": {
-    "netstandard1.6": {
-      "imports": "portable-net45+win8"
-    }
-  }
-}
\ No newline at end of file