From d999f22788a9b8d04dd658e4924a25756d30995e Mon Sep 17 00:00:00 2001
From: Omair Majid <omajid@redhat.com>
Date: Mon, 13 Feb 2017 14:12:19 -0500
Subject: [PATCH 1/2] Use dotnet-install from the cli master branch

During the cli build, the cli downloads and executes the bootstrap
script from buildtools. The bootstrap script then downloads and executes
the dotnet-install script from cli, but in the 'rel/1.0.0' branch, not
the master branch.

This means that someone building cli's master branch will end up using
the dotnet-install.sh or dotnet-install.ps1 script from cli's rel/1.0.0
branch.

Fix that by telling the bootstrap script to download and use the version
of dotnet-install script from the master branch (which is the current
branch the user is building).

Ideally, we would just call the dotnet-install script in the current
repo/branch, but because the bootstrap script sits in the middle and is
part of a different repository, we can't.

This is a workaround for #5410.
---
 run-build.ps1 | 2 +-
 run-build.sh  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/run-build.ps1 b/run-build.ps1
index 632bbe286..30e46789b 100644
--- a/run-build.ps1
+++ b/run-build.ps1
@@ -85,7 +85,7 @@ if ((Test-Path $bootStrapperPath) -eq 0)
 }
 
 # now execute it
-& $bootStrapperPath -RepositoryRoot (Get-Location) -ToolsLocalPath $toolsLocalPath -CliLocalPath $env:DOTNET_INSTALL_DIR_PJ -Architecture $Architecture | Out-File (Join-Path (Get-Location) "bootstrap.log")
+& $bootStrapperPath -DotNetInstallBranch master -RepositoryRoot (Get-Location) -ToolsLocalPath $toolsLocalPath -CliLocalPath $env:DOTNET_INSTALL_DIR_PJ -Architecture $Architecture | 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."
diff --git a/run-build.sh b/run-build.sh
index 877c5b547..3d2bd6c59 100755
--- a/run-build.sh
+++ b/run-build.sh
@@ -147,7 +147,7 @@ if [ ! -f $bootStrapperPath ]; then
     chmod u+x $bootStrapperPath
 fi
 
-$bootStrapperPath --repositoryRoot "$REPOROOT" --toolsLocalPath "$toolsLocalPath" --cliInstallPath $DOTNET_INSTALL_DIR_PJ --architecture $ARCHITECTURE > bootstrap.log
+$bootStrapperPath --dotNetInstallBranch master --repositoryRoot "$REPOROOT" --toolsLocalPath "$toolsLocalPath" --cliInstallPath $DOTNET_INSTALL_DIR_PJ --architecture $ARCHITECTURE > bootstrap.log
 
 if [ $? != 0 ]; then
     echo "run-build: Error: Boot-strapping failed with exit code $?, see bootstrap.log for more information." >&2

From 73d59c423d775381b96821f1069fc16bde2ec470 Mon Sep 17 00:00:00 2001
From: Nate Amundson <naamunds@microsoft.com>
Date: Tue, 14 Feb 2017 16:33:32 -0800
Subject: [PATCH 2/2] Remove import of dir.props from Signing.proj

The build agents in our VSTS pool don't yet have MSBuild 15, so the
signing project can't import any MSBuild 15 projects. (The signing
project is built with the desktop MSBuild because MicroBuild depends on
it.)  Once the agents have MSBuild 15, this import can be added back.
---
 build/Microsoft.DotNet.Cli.Signing.proj | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/build/Microsoft.DotNet.Cli.Signing.proj b/build/Microsoft.DotNet.Cli.Signing.proj
index b7a0e6092..06581504a 100644
--- a/build/Microsoft.DotNet.Cli.Signing.proj
+++ b/build/Microsoft.DotNet.Cli.Signing.proj
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project InitialTargets="SetSigningProperties" DefaultTargets="SignFiles" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))/dir.props" />
+  <PropertyGroup>
+    <RepoRoot>$(MSBuildThisFileDirectory)/..</RepoRoot>
+  </PropertyGroup>
+  
   <Import Project="$(RepoRoot)/build_tools/MicroBuild.Core.props" />
 
   <!-- This will be overridden if we're building with MicroBuild. -->