Changelkg (#1694)

* Fix typeforward resolutions * Update lkg * Name TupleSample correctly * Get paths to references right
dotnet · Nov 3, 2016 · 1fbb065 · 1fbb065
1 parent e9b724f
commit 1fbb065
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 5 deletions.
diff --git a/build.cmd b/build.cmd
@@ -479,7 +479,7 @@ rem Build Proto
 if '%BUILD_PROTO%' == '1' (
   if '%BUILD_PROTO_WITH_CORECLR_LKG%' == '1' (
 
-    pushd .\lkg & %_dotnetexe% restore --packages %~dp0\packages &popd
+    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

diff --git a/lkg/project.json b/lkg/project.json
@@ -1,7 +1,7 @@
 
 {
   "dependencies": {
-    "Microsoft.FSharp.Compiler.Host.netcore": "1.0.0-alpha-160807",
+    "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"

diff --git a/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj b/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
@@ -61,11 +61,14 @@
       <Name>FSharp.Core</Name>
     </ProjectReference>
     <Reference Include="System.ValueTuple" Condition="'$(TargetFramework)' != 'portable47'">
-        <HintPath>..\..\..\packages\System.ValueTuple.4.4.0-beta-24631-01\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
+        <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>
+        <Private>True</Private>
     </Reference>
     <Reference Include="TupleSample" Condition="'$(TargetFramework)' != 'portable47'">
+        <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>
-        <HintPath>..\..\..\src\fsharp\FSharp.Core.Unittests\FSharp.Core\SampleTuples\TupleSample.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'coreclr'">

diff --git a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/SampleTuples/4.0.0-rc3-24212-01/TupleSample.dll b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/SampleTuples/4.0.0-rc3-24212-01/TupleSample.dll
diff --git a/.../FSharp.Core/SampleTuples/TupleSample.dll → ...uples/4.4.0-beta-24631-01/TupleSample.dll b/.../FSharp.Core/SampleTuples/TupleSample.dll → ...uples/4.4.0-beta-24631-01/TupleSample.dll
diff --git a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/SampleTuples/TupleSample.csproj b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/SampleTuples/TupleSample.csproj
@@ -24,7 +24,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System.ValueTuple">
-      <HintPath>..\..\..\..\..\packages\System.ValueTuple.4.4.0-beta-24631-01\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
+      <HintPath>..\..\..\..\..\packages\System.ValueTuple.4.0.0-rc3-24212-01\lib\netstandard1.1\System.ValueTuple.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>