mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix dotnet-install for the new Azure Publish layout.

Browse source
This commit is contained in:
Eric Erhardt 2016-06-21 18:36:43 -05:00
parent 63846c5751
commit ba1715b8a6
4 changed files with 16 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

3
build_projects/dotnet-cli-build/build.ps1
View file

@ -73,8 +73,7 @@ if (!(Test-Path $env:DOTNET_INSTALL_DIR))
# Install a stage 0
Write-Host "Installing .NET Core CLI Stage 0 from branchinfo channel"
#TODO change 'preview' channel back to $env:CHANNEL when we have a first build in the current channel
& "$RepoRoot\scripts\obtain\dotnet-install.ps1" -Channel preview -Architecture $Architecture -Verbose
& "$RepoRoot\scripts\obtain\dotnet-install.ps1" -Channel $env:CHANNEL -Architecture $Architecture -Verbose
if($LASTEXITCODE -ne 0) { throw "Failed to install stage0" }
# Put the stage0 on the path

3
build_projects/dotnet-cli-build/build.sh
View file

@ -87,8 +87,7 @@ done < "$REPOROOT/branchinfo.txt"
[ -z "$DOTNET_INSTALL_DIR" ] && export DOTNET_INSTALL_DIR=$REPOROOT/.dotnet_stage0/$(uname)
[ -d "$DOTNET_INSTALL_DIR" ] || mkdir -p $DOTNET_INSTALL_DIR
#TODO change 'preview' channel back to $env:CHANNEL when we have a first build in the current channel
$REPOROOT/scripts/obtain/dotnet-install.sh --channel preview --verbose
$REPOROOT/scripts/obtain/dotnet-install.sh --channel $CHANNEL --verbose
# Put stage 0 on the PATH (for this shell only)
PATH="$DOTNET_INSTALL_DIR:$PATH"