From 5a4afaf1ec90576487d8ccb91947cdc8801c3964 Mon Sep 17 00:00:00 2001
From: Kevin Ransom <kevinr@microsoft.com>
Date: Thu, 3 Nov 2016 15:17:39 -0700
Subject: [PATCH 1/5] Add tuple tests to profile47 fsharp core unit tests

---
 .../FSharp.Core.Unittests.fsproj              |  24 +++++++++---------
 .../4.4.0-beta-24631-01/TupleSample.dll       | Bin 8192 -> 8192 bytes
 .../SampleTuples/TupleSample.csproj           |   7 ++---
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj b/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
index 2bc2c853b1c..89b54953498 100644
--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
@@ -15,7 +15,6 @@
     <OutputType Condition="'$(TargetFramework)' == 'coreclr'">Exe</OutputType>
     <OutputType Condition="'$(TargetFramework)' != 'coreclr'">Library</OutputType>
     <AssemblyName>FSharp.Core.Unittests</AssemblyName>
-    <TargetFrameworkVersion Condition=" '$(TargetFramework)' == 'net20' ">v3.5</TargetFrameworkVersion>
     <!-- Prevent compiler from inlining calls to FSharp.Core to improve code coverage accuracy -->
     <Optimize>false</Optimize>
     <Tailcalls>false</Tailcalls>
@@ -60,12 +59,13 @@
       <Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
       <Name>FSharp.Core</Name>
     </ProjectReference>
-    <Reference Include="System.ValueTuple" Condition="'$(TargetFramework)' != 'portable47'">
+    <Reference Include="System.ValueTuple">
         <HintPath Condition=" '$(TargetFramework)' == 'coreclr' ">..\..\..\packages\System.ValueTuple.4.0.0-rc3-24212-01\lib\netstandard1.1\System.ValueTuple.dll</HintPath>
-        <HintPath Condition=" '$(TargetFramework)' != 'coreclr' ">..\..\..\packages\System.ValueTuple.4.4.0-beta-24631-01\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
+        <HintPath Condition=" '$(TargetFramework)' == 'profile47' ">..\..\..\packages\System.ValueTuple.4.4.0-beta-24631-01\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
+        <HintPath Condition=" '$(TargetFramework)' != 'coreclr'  and  '$(TargetFramework)' != 'profile47' ">..\..\..\packages\System.ValueTuple.4.4.0-beta-24631-01\lib\portable-net40+sl4+win8+wp8\System.ValueTuple.dll</HintPath>
         <Private>True</Private>
     </Reference>
-    <Reference Include="TupleSample" Condition="'$(TargetFramework)' != 'portable47'">
+    <Reference Include="TupleSample">
         <HintPath Condition=" '$(TargetFramework)' == 'coreclr' ">FSharp.Core\SampleTuples\4.0.0-rc3-24212-01\TupleSample.dll</HintPath>
         <HintPath Condition=" '$(TargetFramework)' != 'coreclr' ">FSharp.Core\SampleTuples\4.4.0-beta-24631-01\TupleSample.dll</HintPath>
         <Private>True</Private>
@@ -94,20 +94,20 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="LibraryTestFx.fs" />
-    <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\Utils.fs" Condition="'$(TargetFramework)' != 'portable47' AND '$(TargetFramework)' != 'net20'" />
+    <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\Utils.fs" Condition=" '$(TargetFramework)' != 'portable47' " />
     <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ArrayModule.fs" />
     <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ArrayModule2.fs" />
     <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\Array2Module.fs" />
     <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\Array3Module.fs" />
     <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\Array4Module.fs" />
-    <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ArrayProperties.fs" Condition="'$(TargetFramework)' != 'portable47' AND '$(TargetFramework)' != 'net20'" />
+    <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ArrayProperties.fs" Condition=" '$(TargetFramework)' != 'portable47' " />
     <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ComparisonIdentityModule.fs" />
     <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\HashIdentityModule.fs" />
     <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ListModule.fs" />
     <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ListModule2.fs" />
     <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ObsoleteListFunctions.fs" />
     <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ListType.fs" />
-    <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ListProperties.fs" Condition="'$(TargetFramework)' != 'portable47' AND '$(TargetFramework)' != 'net20'" />
+    <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ListProperties.fs" Condition=" '$(TargetFramework)' != 'portable47' " />
     <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\MapModule.fs" />
     <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\MapType.fs" />
     <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\SetModule.fs" />
@@ -115,13 +115,13 @@
     <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\SeqModule.fs" />
     <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\SeqModule2.fs" />
     <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ObsoleteSeqFunctions.fs" />
-    <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\SeqProperties.fs" Condition="'$(TargetFramework)' != 'portable47' AND '$(TargetFramework)' != 'net20'" />
-    <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\CollectionModulesConsistency.fs" Condition="'$(TargetFramework)' != 'portable47' AND '$(TargetFramework)' != 'net20'" />
+    <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\SeqProperties.fs" Condition=" '$(TargetFramework)' != 'portable47' " />
+    <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\CollectionModulesConsistency.fs" Condition=" '$(TargetFramework)' != 'portable47' " />
     <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\StringModule.fs" />
     <Compile Include="FSharp.Core\PrimTypes.fs" />
     <Compile Include="FSharp.Core\ComparersRegression.fs" />
-    <Compile Include="FSharp.Core\DiscrimantedUnionType.fs"  Condition="'$(TargetFramework)' != 'portable47' AND '$(TargetFramework)' != 'net20' AND '$(TargetFramework)' != 'portable78' AND '$(TargetFramework)' != 'portable259'  AND '$(TargetFramework)' != 'portable7'"/>
-    <Compile Include="FSharp.Core\RecordTypes.fs" Condition="'$(TargetFramework)' != 'portable47' AND '$(TargetFramework)' != 'net20' AND '$(TargetFramework)' != 'portable78' AND '$(TargetFramework)' != 'portable259'  AND '$(TargetFramework)' != 'portable7'"/>
+    <Compile Include="FSharp.Core\DiscrimantedUnionType.fs"  Condition="'$(TargetFramework)' != 'portable47' AND '$(TargetFramework)' != 'portable78' AND '$(TargetFramework)' != 'portable259'  AND '$(TargetFramework)' != 'portable7'"/>
+    <Compile Include="FSharp.Core\RecordTypes.fs" Condition="'$(TargetFramework)' != 'portable47' AND '$(TargetFramework)' != 'portable78' AND '$(TargetFramework)' != 'portable259'  AND '$(TargetFramework)' != 'portable7'"/>
     <Compile Include="FSharp.Core\Microsoft.FSharp.Core\BigIntType.fs" />
     <Compile Include="FSharp.Core\Microsoft.FSharp.Core\IntConversions.fs" />
     <Compile Include="FSharp.Core\Microsoft.FSharp.Core\IntConversionsGenerated.fs" />
@@ -139,7 +139,7 @@
     <Compile Include="FSharp.Core\Microsoft.FSharp.Reflection\FSharpReflection.fs" />
     <Compile Include="FSharp.Core\Microsoft.FSharp.Quotations\FSharpQuotations.fs" />
     <Compile Include="TypeForwarding.fs" />
-    <Compile Include="StructTuples.fs" Condition="'$(TargetFramework)' != 'portable47'" />
+    <Compile Include="StructTuples.fs" />
     <Compile Include="SurfaceArea.$(TargetFramework).fs" />
     <Compile Include="Program.fs" Condition="'$(TargetFramework)' == 'coreclr'" />
     <CustomCopyLocal Include="FSharp.Core.Unittests.dll.config">
diff --git a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/SampleTuples/4.4.0-beta-24631-01/TupleSample.dll b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/SampleTuples/4.4.0-beta-24631-01/TupleSample.dll
index fd8870f3c4ed289b3a0ea3669c7beb4cf51f3b1b..17e6c1678f61dff4b86effa64c6ab57f74648f84 100644
GIT binary patch
delta 1720
zcma)-ZETEL6vzMPKGW&zytGP-LAx_i%Xo{o=+^FtE+N|}eKBQFs_euV(U$B68O<VI
zlBUf~e6f*TMg$3(r%CyMM0}C>fQUxcCz1Hlq<o|z&b?3F6xHpW<ah7?o^$Rw_dd_u
z=Sbv8r1OMT)IGWD^c1?*b$J8DBvDyLXb}*Qr6MdFsEm4KJEf>ok{Fi}@dG3u7cH@?
z#eLWOkOc&5+FIhtU9I32%>`WC2kUAO<1u?9xT<b-CHD!|Pvx(fRjEortN}M9-4kv=
zDE^1*!iSea%@3f1XAY3!2F=%+w&p`kw`RF!Da~Y0k5wyjPzc2`&2r5u%|^{u)TY>c
zTnl2VLZkvn|NM9>u41WCABU6|)g{X73?3j(ga)J9$U>7*?c_$%s7}hkL8Ja9A5N8|
zz)daFL*sGQ7#~moJx0Bv5MCHXVm4f*9H!$+#1d2(RV7xU&8S179)D?dyg1Eg62oa@
z>k=`XD}~Ch(*Gkiqt_U_#TGm>>b}^DL8G3FMoj<VbNV-88=^*KTicN~Dr`03gHh|O
z9cT=Gj{C!EhARY>U#0K1cA}T1qx!8~U)23O&lCEXf(!j}Y~kWpR%gbAD<gV3^BI`x
zSk?ZWMTdtuW;dqsD?L2%_k1#O;(wDlt2v%oC>&au^N*f>ctAFujI!6^MSmNWgTo`0
znBu>vI;gP(=c1iG^AKcu(8Tm2!SrDhbL{8j?B3Z-%BgGgrTy4H#sq{Z`e4V*)QADu
zNb|Ln&vauVGY3C1{g|)0RCBrJYRz?;4Vv3D<C=NQ0AE6B5k`Rd3qs5~gqcY!WX?T>
z3hvIMl6eciY1V4SG<Rqwm`UtITK48Wrb+UoXA$$RXD)L<bDCF;*Lu&EUDdC&dZhYg
z;XCthHPUx6AER!K)GPCS7qa%WHtlUm#J5Y^H^+YCs~7%)S+yHqi3=-lug{(HZcYE7
z9W97b)}j7meRnSX*<s%tS7^Cngjw>@gyMpE;p&#XJL8GwWkdZ!`EJ633Qob_k*La~
z5(Wr}@K+>K1gx*Atm(Tr<8FQQ=jC@w@;d6<e)6&zE6QWLn-9d3EwZ_2&~tRLignsK
fxu<wCb=oJ3k5Sh=m+hVO-V!$!+xb%mSZ96$Ijb3#

delta 1743
zcma)-ZD><h7{~w5xoK)+oAgE7PU4m>otY!8imlS3*llq`XI*SsZC#y-Ho8DfSsG=c
z5XJd21u@(rh(%mC2Ihm*-HzH1x`BSMpfCp$#}pC#;6SMeGMM|Y=bUQ~b#`4(;CIgd
zc{$H>4mbDiYueXz;)v1qM`iZdT>3tHZUaS4qCno;^?=u`5<#<r0(8;bPZ{bnNtES<
ziUBfjRxGu`;;Lg&&;b0AbSjbD-U}YlnSg_5e_I4yyyj^5KWtkS;yKOwXLDtKb7r+5
z)_@bI=$dfCDJ1XX2jRg(A??r5$CkY$xk>S{;)voeiiL_ziUC^4k!8k4;leCP1{50=
zn-!yqz1Wyx_aP;SDH|~*K<ZbFKg9qVv~n1>awF`MQ77>e5=7|GDoqBqYPFx7NNRP0
zT-c-4*W|%bUj{tnHbXQUr?qpGycp8z0afFURwQcRsNyu0=Mzh@Osi(`0n%FS73*<8
zsY8`HzLQQI)4r_e#F;9{`m+34u?fT4c|m-NTUuQeoAF$$-$WGi-W)IgM8wdpRe`Yu
z-)a>!w&HKC))`%h`p5IWFye4jL)Mq&FBsb}%+gkmjO{P={TbT{cbNj;iI>*~`v2v%
zEe;G$8fn|}P;GnV`Rz?7rrB;M-r`4kV&VUa$;a{kEoSd#N6x^U7dvzPsmo7HD8TJ0
z&N{K_SF>C=Fj<Qk{)@_snojae9OlSE%x4xM!E__V^dQEZ{yo{Jw-1xC`<i;|V(gh_
z0fJv$?6jGgG@$@Fel3+Sop_Du!hB{i7AZC;zN@%Oah+m^VoWiiSjhD9ODHFT@G@7R
zn%RaRGl@Fpf}>c*(*Q!u5v);cRqRykQtW0X@i}tlaN$kznO_yvGk+{vz#LP2!!6ez
zyH5uO_!*J!-SM%3M%7Z<_!`xS(s{GQ^No4QQ&SY#-J6c@sBPJqOec0&4?XRo6j*KD
zwFXa>hc2J%|9vd^-fk;g+D<bDS8UFd{OW472Fqp{HJ=dPsa?CWHQbX*$F_9GgX`m|
z-b7Dw`L4R!`d~QKvn|mbU;bh?pO!Cf;IB)&tS{T}5)k5VOQ-^9iG(6M@AZ!!uWNn(
z%Ny6jYjY!4*o{zQ=ST5fiDZizt9V{|WQokR$ADb>vQ_2OXC16ONS1rfUxpZ3VwJo;
JM%jh={{XqRCUXD)

diff --git a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/SampleTuples/TupleSample.csproj b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/SampleTuples/TupleSample.csproj
index 29b42c8a75c..386f4d407e3 100644
--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/SampleTuples/TupleSample.csproj
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/SampleTuples/TupleSample.csproj
@@ -10,9 +10,10 @@
     <RootNamespace>TupleSample</RootNamespace>
     <AssemblyName>TupleSample</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
-    <TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Profile47</TargetFrameworkProfile>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <ProjectGuid>{224C7102-CD32-4B92-AEA7-9147F8E70E44}</ProjectGuid>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>pdbonly</DebugType>
@@ -24,7 +25,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System.ValueTuple">
-      <HintPath>..\..\..\..\..\packages\System.ValueTuple.4.0.0-rc3-24212-01\lib\netstandard1.1\System.ValueTuple.dll</HintPath>
+      <HintPath>..\..\..\..\..\packages\System.ValueTuple.4.4.0-beta-24631-01\lib\portable-net40+sl4+win8+wp8\System.ValueTuple.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

From e8da0303d7295faa6ed1bd9ac086087f32277042 Mon Sep 17 00:00:00 2001
From: Kevin Ransom <kevinr@microsoft.com>
Date: Thu, 3 Nov 2016 16:33:34 -0700
Subject: [PATCH 2/5] remove duplicated line

---
 src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj b/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
index c411226a80c..21725b08865 100644
--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
@@ -95,7 +95,6 @@
   <ItemGroup>
     <Compile Include="LibraryTestFx.fs" />
     <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\Utils.fs" Condition=" '$(TargetFramework)' != 'portable47' " />
-    <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\Utils.fs" Condition="'$(TargetFramework)' != 'portable47'" />
     <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ArrayModule.fs" />
     <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ArrayModule2.fs" />
     <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\Array2Module.fs" />

From bf80d4e41c376c6672f0312f8fe9e5f2325ee77d Mon Sep 17 00:00:00 2001
From: Kevin Ransom <kevinr@microsoft.com>
Date: Fri, 4 Nov 2016 00:14:04 -0700
Subject: [PATCH 3/5] Use publish to deploy lkg

---
 build.cmd            |  9 ++++-----
 lkg/fsc/project.json | 31 +++++++++++++++++++++++++++++++
 lkg/fsi/project.json | 31 +++++++++++++++++++++++++++++++
 lkg/project.json     | 20 --------------------
 4 files changed, 66 insertions(+), 25 deletions(-)
 create mode 100644 lkg/fsc/project.json
 create mode 100644 lkg/fsi/project.json
 delete mode 100644 lkg/project.json

diff --git a/build.cmd b/build.cmd
index ba25d18b578..ec6fa253803 100644
--- a/build.cmd
+++ b/build.cmd
@@ -479,11 +479,10 @@ 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
+    pushd .\lkg\fsc & %_dotnetexe% restore & popd & @if ERRORLEVEL 1 echo Error: dotnet restore failed  && goto :failure
+    pushd .\lkg\fsi & %_dotnetexe% restore & popd & @if ERRORLEVEL 1 echo Error: dotnet restore failed  && goto :failure
+    pushd .\lkg\fsc & %_dotnetexe% publish project.json -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 -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
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/project.json b/lkg/fsi/project.json
new file mode 100644
index 00000000000..0dd87c337f2
--- /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%\\runtime\\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

From d69fd0391e65a6fb35587dea5e6b88b72a3d1c8f Mon Sep 17 00:00:00 2001
From: Kevin Ransom <kevinr@microsoft.com>
Date: Fri, 4 Nov 2016 00:15:49 -0700
Subject: [PATCH 4/5] Revert "Use publish to deploy lkg"

This reverts commit bf80d4e41c376c6672f0312f8fe9e5f2325ee77d.
---
 build.cmd            |  9 +++++----
 lkg/fsc/project.json | 31 -------------------------------
 lkg/fsi/project.json | 31 -------------------------------
 lkg/project.json     | 20 ++++++++++++++++++++
 4 files changed, 25 insertions(+), 66 deletions(-)
 delete mode 100644 lkg/fsc/project.json
 delete mode 100644 lkg/fsi/project.json
 create mode 100644 lkg/project.json

diff --git a/build.cmd b/build.cmd
index ec6fa253803..ba25d18b578 100644
--- a/build.cmd
+++ b/build.cmd
@@ -479,10 +479,11 @@ rem Build Proto
 if '%BUILD_PROTO%' == '1' (
   if '%BUILD_PROTO_WITH_CORECLR_LKG%' == '1' (
 
-    pushd .\lkg\fsc & %_dotnetexe% restore & popd & @if ERRORLEVEL 1 echo Error: dotnet restore failed  && goto :failure
-    pushd .\lkg\fsi & %_dotnetexe% restore & popd & @if ERRORLEVEL 1 echo Error: dotnet restore failed  && goto :failure
-    pushd .\lkg\fsc & %_dotnetexe% publish project.json -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 -o %~dp0\Tools\lkg -r win7-x64 &popd & @if ERRORLEVEL 1 echo Error: dotnet publish failed  && goto :failure
+    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 %_msbuildexe% %msbuildflags% src\fsharp-proto-build.proj
          %_msbuildexe% %msbuildflags% src\fsharp-proto-build.proj
diff --git a/lkg/fsc/project.json b/lkg/fsc/project.json
deleted file mode 100644
index ab155d1ac06..00000000000
--- a/lkg/fsc/project.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "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/project.json b/lkg/fsi/project.json
deleted file mode 100644
index 0dd87c337f2..00000000000
--- a/lkg/fsi/project.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "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%\\runtime\\any\\native\\* %publish:OutputPath%" ] 
-  }
-}
\ No newline at end of file
diff --git a/lkg/project.json b/lkg/project.json
new file mode 100644
index 00000000000..3a197eed86e
--- /dev/null
+++ b/lkg/project.json
@@ -0,0 +1,20 @@
+
+{
+  "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

From 5232f8f4be64801fdbd0e8f195dbb9df7701d9f6 Mon Sep 17 00:00:00 2001
From: Kevin Ransom <kevinr@microsoft.com>
Date: Fri, 4 Nov 2016 00:26:31 -0700
Subject: [PATCH 5/5] Remove dup lines

---
 src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj b/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
index 21725b08865..89b54953498 100644
--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
@@ -101,7 +101,6 @@
     <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\Array3Module.fs" />
     <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\Array4Module.fs" />
     <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ArrayProperties.fs" Condition=" '$(TargetFramework)' != 'portable47' " />
-    <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ArrayProperties.fs" Condition="'$(TargetFramework)' != 'portable47'" />
     <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ComparisonIdentityModule.fs" />
     <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\HashIdentityModule.fs" />
     <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ListModule.fs" />
@@ -109,7 +108,6 @@
     <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ObsoleteListFunctions.fs" />
     <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ListType.fs" />
     <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ListProperties.fs" Condition=" '$(TargetFramework)' != 'portable47' " />
-    <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ListProperties.fs" Condition="'$(TargetFramework)' != 'portable47'" />
     <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\MapModule.fs" />
     <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\MapType.fs" />
     <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\SetModule.fs" />
@@ -119,8 +117,6 @@
     <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ObsoleteSeqFunctions.fs" />
     <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\SeqProperties.fs" Condition=" '$(TargetFramework)' != 'portable47' " />
     <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\CollectionModulesConsistency.fs" Condition=" '$(TargetFramework)' != 'portable47' " />
-    <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\SeqProperties.fs" Condition="'$(TargetFramework)' != 'portable47'" />
-    <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\CollectionModulesConsistency.fs" Condition="'$(TargetFramework)' != 'portable47'" />
     <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\StringModule.fs" />
     <Compile Include="FSharp.Core\PrimTypes.fs" />
     <Compile Include="FSharp.Core\ComparersRegression.fs" />