From d999f22788a9b8d04dd658e4924a25756d30995e Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Mon, 13 Feb 2017 14:12:19 -0500 Subject: [PATCH] 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