From 745a7df15f2cb2a40f7f2a1764e55386fec5f7d3 Mon Sep 17 00:00:00 2001
From: Davis Goodin <dagood@microsoft.com>
Date: Fri, 6 Jan 2017 18:25:02 -0600
Subject: [PATCH 1/3] Uptake the latest buildtools package, and new CLI

The buildtools package uses shared framework 1.1.0 instead of 1.0.0, so switch to a matching CLI package. This is the same CLI version as CoreFX and CoreCLR use.
---
 .cliversion   | 2 +-
 .toolversions | 2 +-
 run.ps1       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.cliversion b/.cliversion
index 7a77ed32ab..6748a10930 100644
--- a/.cliversion
+++ b/.cliversion
@@ -1 +1 @@
-1.0.0-preview3-003223
+1.0.0-preview2-1-003182
diff --git a/.toolversions b/.toolversions
index a78583c02b..fc60ca1363 100644
--- a/.toolversions
+++ b/.toolversions
@@ -1,3 +1,3 @@
-Microsoft.DotNet.BuildTools=1.0.26-prerelease-00802-01
+Microsoft.DotNet.BuildTools=1.0.27-prerelease-01205-03
 Microsoft.DotNet.BuildTools.Run=1.0.0-prerelease-00807-04
 NuGet.CommandLine=3.4.3
diff --git a/run.ps1 b/run.ps1
index bbf17d6526..0eb4c11e1a 100644
--- a/run.ps1
+++ b/run.ps1
@@ -15,7 +15,7 @@ if ((Test-Path $bootStrapperPath) -eq 0)
 }
 
 # now execute it
-& $bootStrapperPath (Get-Location) $toolsLocalPath | Out-File (Join-Path (Get-Location) "bootstrap.log")
+& $bootStrapperPath (Get-Location) $toolsLocalPath -DotNetInstallBranch "rel/1.0.0-preview2.1" | Out-File (Join-Path (Get-Location) "bootstrap.log")
 if ($LastExitCode -ne 0)
 {
     Write-Output "Boot-strapping failed with exit code $LastExitCode, see bootstrap.log for more information."

From d003d41638b2b8ef4c79837e6f9f491f6e83c4bb Mon Sep 17 00:00:00 2001
From: Davis Goodin <dagood@microsoft.com>
Date: Mon, 9 Jan 2017 19:32:08 -0600
Subject: [PATCH 2/3] Fix packaging tests: BuildTools TestPath change

Now more is expected in TestPath that determines the test root. TFM is not added by testing targets anymore. See CoreFX PR 12634.
---
 dir.props                                                     | 4 +++-
 .../test/Microsoft.DotNet.Build.Tasks.Packaging.Tests.csproj  | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dir.props b/dir.props
index 419b438100..6c123b4dad 100644
--- a/dir.props
+++ b/dir.props
@@ -228,6 +228,8 @@
   <!-- Set up the default output and intermediate paths -->
   <PropertyGroup>
     <OSPlatformConfig>$(OSGroup).$(Platform).$(ConfigurationGroup)</OSPlatformConfig>
+    <TestTargetOutputRelPath Condition="'$(TestTargetOutputRelPath)'=='' And '$(TargetGroup)'!='' And '$(TestTFM)'!=''">$(TargetGroup).$(TestTFM)/</TestTargetOutputRelPath>
+    <TestTargetOutputRelPath Condition="'$(TestTargetOutputRelPath)'=='' And '$(TargetGroup)'=='' And '$(TestTFM)'!=''">default.$(TestTFM)/</TestTargetOutputRelPath>
 
     <BaseOutputPath Condition="'$(BaseOutputPath)'==''">$(BinDir)</BaseOutputPath>
     <OutputPath Condition="'$(OutputPath)'==''">$(BaseOutputPath)$(OSPlatformConfig)\$(MSBuildProjectName)\</OutputPath>
@@ -235,7 +237,7 @@
     <IntermediateOutputRootPath Condition="'$(IntermediateOutputRootPath)' == ''">$(BaseIntermediateOutputPath)$(OSPlatformConfig)\</IntermediateOutputRootPath>
     <IntermediateOutputPath Condition="'$(IntermediateOutputPath)' == ''">$(IntermediateOutputRootPath)$(MSBuildProjectName)\</IntermediateOutputPath>
 
-    <TestPath Condition="'$(TestPath)'==''">$(TestWorkingDir)$(OSPlatformConfig)\$(MSBuildProjectName)\</TestPath>
+    <TestPath Condition="'$(TestPath)'==''">$(TestWorkingDir)$(OSPlatformConfig)\$(MSBuildProjectName)\$(TestTargetOutputRelPath)</TestPath>
 
     <PackagesBasePath Condition="'$(PackagesBasePath)'==''">$(BinDir)$(OSPlatformConfig)</PackagesBasePath>
   </PropertyGroup>
diff --git a/src/Microsoft.DotNet.Build.Tasks.Packaging/test/Microsoft.DotNet.Build.Tasks.Packaging.Tests.csproj b/src/Microsoft.DotNet.Build.Tasks.Packaging/test/Microsoft.DotNet.Build.Tasks.Packaging.Tests.csproj
index 2ae1e0797a..e7a0b1b801 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Packaging/test/Microsoft.DotNet.Build.Tasks.Packaging.Tests.csproj
+++ b/src/Microsoft.DotNet.Build.Tasks.Packaging/test/Microsoft.DotNet.Build.Tasks.Packaging.Tests.csproj
@@ -45,7 +45,7 @@
        https://github.com/dotnet/buildtools/issues/343 -->
   <Target Name="CopyFrameworkLists" AfterTargets="CopyTestToTestDirectory" Inputs="%(TestTargetFramework.Folder)$(TestTFM)" Outputs="none">
     <PropertyGroup>
-      <_testDirectory>$(TestPath)%(TestTargetFramework.Folder)$(TestTFM)</_testDirectory>
+      <_testDirectory>$(TestPath)</_testDirectory>
     </PropertyGroup>
     <ItemGroup>
       <_frameworkList Include="..\src\FrameworkLists\**\*.xml">

From ca9a54a59917f1a1731f02929b15f3103218cf5c Mon Sep 17 00:00:00 2001
From: Davis Goodin <dagood@microsoft.com>
Date: Tue, 10 Jan 2017 10:40:05 -0600
Subject: [PATCH 3/3] Upgrade Run tool, ensure ConfigurationGroup passed

Without the entry in defaultValues, no ConfigurationGroup was passed to the msbuild command. This caused bin clashes due to a projects not having ConfigurationGroup passed, but the ProjectReferences did have it set due to dir.props.
---
 .toolversions | 2 +-
 config.json   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.toolversions b/.toolversions
index fc60ca1363..478abb42d9 100644
--- a/.toolversions
+++ b/.toolversions
@@ -1,3 +1,3 @@
 Microsoft.DotNet.BuildTools=1.0.27-prerelease-01205-03
-Microsoft.DotNet.BuildTools.Run=1.0.0-prerelease-00807-04
+Microsoft.DotNet.BuildTools.Run=1.0.1-prerelease-01205-03
 NuGet.CommandLine=3.4.3
diff --git a/config.json b/config.json
index 84e2fd2390..57dfd33cd1 100644
--- a/config.json
+++ b/config.json
@@ -133,6 +133,7 @@
       "defaultValues":{
         "toolName": "msbuild",
         "settings": {
+          "ConfigurationGroup": "default",
           "MsBuildLogging":"default"
         }
       }