From a03eac7e1b043a1202ede635662c17bc7029004d Mon Sep 17 00:00:00 2001
From: Livar Cunha <licavalc@microsoft.com>
Date: Thu, 3 Nov 2016 16:28:21 -0700
Subject: [PATCH 1/2] Switching the archiver to be a portable app to get around
 runtime specific issues with having two stage0.

---
 build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets b/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets
index 6ee62455a..04620d875 100644
--- a/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets
+++ b/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets
@@ -28,10 +28,9 @@
       <DotNetPublish ToolPath="$(Stage0Directory)"
                      WorkingDirectory="$(RepoRoot)/tools/Archiver"
                      Output="$(ToolsOutputDirectory)"
-                     Configuration="$(Configuration)"
-                     Runtime="$(CoreCLRRid)" />
+                     Configuration="$(Configuration)" />
 
-      <Exec Command="$(ArchiverExe) -a $(IntermediateArchive) $(NuGetPackagesArchiveFolder)" />
+      <Exec Command="$(DotnetStage0) $(ArchiverDll) -a $(IntermediateArchive) $(NuGetPackagesArchiveFolder)" />
 
       <Copy SourceFiles="$(IntermediateArchive)" DestinationFiles="$(FinalArchive)" />
     </Target>
@@ -41,7 +40,7 @@
       <PropertyGroup>
         <NuGetPackagesArchiveProject>$(IntermediateDirectory)/NuGetPackagesArchiveProject</NuGetPackagesArchiveProject>
         <NuGetPackagesArchiveFolder>$(IntermediateDirectory)/NuGetPackagesArchiveFolder</NuGetPackagesArchiveFolder>
-        <ArchiverExe>$(ToolsOutputDirectory)/Archiver</ArchiverExe>
+        <ArchiverDll>$(ToolsOutputDirectory)/Archiver.dll</ArchiverDll>
         <IntermediateArchive>$(IntermediateDirectory)/nuGetPackagesArchive.lzma</IntermediateArchive>
         <FinalArchive>$(Stage2Directory)/sdk/$(SdkVersion)/nuGetPackagesArchive.lzma</FinalArchive>
       </PropertyGroup>

From 336e29075ffe8adb0f01cec1c64eaaf9b05ec746 Mon Sep 17 00:00:00 2001
From: Livar Cunha <licavalc@microsoft.com>
Date: Thu, 3 Nov 2016 17:05:20 -0700
Subject: [PATCH 2/2] Adding MSTest to the exclusion list of project.json
 because some test projects still depend on it and they are build with pj
 stage0.

---
 src/dotnet/project.json | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/dotnet/project.json b/src/dotnet/project.json
index 114bbfd32..7e96851b5 100644
--- a/src/dotnet/project.json
+++ b/src/dotnet/project.json
@@ -12,7 +12,8 @@
         "commands/dotnet-new/CSharp_Web.zip",
         "commands/dotnet-new/CSharp_nunittest.zip",
         "commands/dotnet-new/FSharp_Console.zip",
-        "commands/dotnet-new/FSharp_Lib.zip"
+        "commands/dotnet-new/FSharp_Lib.zip",
+        "commands/dotnet-new/CSharp_Mstest.zip"
       ]
     },
     "compile": {
@@ -24,7 +25,8 @@
         "commands/dotnet-new/CSharp_MSBuild/**",
         "commands/dotnet-new/FSharp_Lib/**",
         "commands/dotnet-new/CSharp_xunittest/**",
-        "commands/dotnet-new/CSharp_nunittest/**"
+        "commands/dotnet-new/CSharp_nunittest/**",
+        "commands/dotnet-new/CSharp_Mstest/**",
       ]
     }
   },