From f31a1352648191c8d6fcb03f5cce85d69e7736a3 Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Wed, 27 Jul 2016 15:18:59 -0700
Subject: [PATCH 1/2] Loading Build.Common.targets, a common targets for
 BuildTools. We need it to fix the Publish failures we have been hitting.

---
 build.proj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.proj b/build.proj
index 100ef7695..5170a42f7 100644
--- a/build.proj
+++ b/build.proj
@@ -81,6 +81,7 @@
 
   <Target DependsOnTargets="$(CLITargets)" Name="BuildTheWholeCli"></Target>
 
+  <Import Project="$(BuildToolsDir)/Build.Common.targets" />
   <Import Project="build/Microsoft.DotNet.Cli.Prepare.targets" />
   <Import Project="build/Microsoft.DotNet.Cli.Compile.targets" />
   <Import Project="build/Microsoft.DotNet.Cli.Package.targets" />

From 567cd8e1b5d7c23fca4dada7d0bbdad22b73ae5d Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Wed, 27 Jul 2016 15:59:55 -0700
Subject: [PATCH 2/2] Adding the trailing slash in the directory property.
 BuildTools needs it like that and that is the pattern in MSBuild.

---
 build.proj                                 | 4 ++--
 build/Microsoft.DotNet.Cli.Publish.targets | 4 ++--
 build/Microsoft.DotNet.Cli.tasks           | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build.proj b/build.proj
index 5170a42f7..a421f10e9 100644
--- a/build.proj
+++ b/build.proj
@@ -18,8 +18,8 @@
     <RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
     <CLIBuildFileName>$(RepoRoot)/build_projects/dotnet-cli-build/bin/dotnet-cli-build</CLIBuildFileName>
     <CLIBuildDll>$(CLIBuildFileName).dll</CLIBuildDll>
-    <BuildToolsDir>$(RepoRoot)/build_tools</BuildToolsDir>
-    <ToolsDir>$(BuildToolsDir)</ToolsDir>
+    <BuildToolsDir>$(RepoRoot)/build_tools/</BuildToolsDir>
+    <ToolsDir>$(BuildToolsDir)/</ToolsDir>
 
     <CoreSetupChannel>preview</CoreSetupChannel>
     <SharedFrameworkName>Microsoft.NETCore.App</SharedFrameworkName>
diff --git a/build/Microsoft.DotNet.Cli.Publish.targets b/build/Microsoft.DotNet.Cli.Publish.targets
index 653a3b223..6d35e94f7 100644
--- a/build/Microsoft.DotNet.Cli.Publish.targets
+++ b/build/Microsoft.DotNet.Cli.Publish.targets
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(BuildToolsDir)/PublishContent.targets" />
+  <Import Project="$(BuildToolsDir)PublishContent.targets" />
   <Import Project="$(MSBuildThisFileDirectory)/publish/Microsoft.DotNet.Cli.Badge.targets" />
 
-  <UsingTask TaskName="UploadToAzure" AssemblyFile="$(BuildToolsTaskDir)/Microsoft.DotNet.Build.CloudTestTasks.dll"/>
+  <UsingTask TaskName="UploadToAzure" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.CloudTestTasks.dll"/>
   <UsingTask TaskName="FinalizeBuild" AssemblyFile="$(CLIBuildDll)" />
   <UsingTask TaskName="SetBlobPropertiesBasedOnFileType" AssemblyFile="$(CLIBuildDll)" />
 
diff --git a/build/Microsoft.DotNet.Cli.tasks b/build/Microsoft.DotNet.Cli.tasks
index d54ec51e2..3ce5553b6 100644
--- a/build/Microsoft.DotNet.Cli.tasks
+++ b/build/Microsoft.DotNet.Cli.tasks
@@ -23,7 +23,7 @@
   <UsingTask TaskName="SetEnvVar" AssemblyFile="$(CLIBuildDll)" />
   <UsingTask TaskName="TarGzFileCreateFromDirectory" AssemblyFile="$(CLIBuildDll)" />
   <UsingTask TaskName="TarGzFileExtractToDirectory" AssemblyFile="$(CLIBuildDll)" />
-  <UsingTask TaskName="UploadToAzure" AssemblyFile="$(BuildToolsTaskDir)/Microsoft.DotNet.Build.CloudTestTasks.dll"/>
-  <UsingTask TaskName="ZipFileCreateFromDirectory" AssemblyFile="$(BuildToolsDir)/Microsoft.DotNet.Build.Tasks.dll"/>
-  <UsingTask TaskName="ZipFileExtractToDirectory" AssemblyFile="$(BuildToolsDir)/Microsoft.DotNet.Build.Tasks.dll"/>
+  <UsingTask TaskName="UploadToAzure" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.CloudTestTasks.dll"/>
+  <UsingTask TaskName="ZipFileCreateFromDirectory" AssemblyFile="$(BuildToolsDir)Microsoft.DotNet.Build.Tasks.dll"/>
+  <UsingTask TaskName="ZipFileExtractToDirectory" AssemblyFile="$(BuildToolsDir)Microsoft.DotNet.Build.Tasks.dll"/>
 </Project>