From 1bf77524805ac5bcc891aa3411350abe7a672579 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Mon, 5 Jun 2017 09:54:28 -0700 Subject: [PATCH] Renaming "dotnet-dev" to "dotnet-sdk"; therefore: renaming "dotnet-sdk" to "dotnet-sdk -internal". Pinning the install scripts to a unrenamed version so the build will not break on the 'latest'. Note: This is part 1 of a 2 part change --- build/Branding.props | 4 ++-- run-build.ps1 | 4 ++-- run-build.sh | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build/Branding.props b/build/Branding.props index e7f4ce95d..fba4e341a 100644 --- a/build/Branding.props +++ b/build/Branding.props @@ -14,9 +14,9 @@ '$(Rid)' == 'opensuse.42.1-x64' ">$(Rid) $(OSName)-$(Architecture) - dotnet-sdk + dotnet-sdk-internal dotnet-sdk-debug - dotnet-dev + dotnet-sdk dotnet-runtime-sdk $(ArtifactNameSdk)-$(SdkVersion)-$(ProductMonikerRid) diff --git a/run-build.ps1 b/run-build.ps1 index d3bb1152b..82b44bad5 100644 --- a/run-build.ps1 +++ b/run-build.ps1 @@ -80,8 +80,8 @@ $env:VSTEST_TRACE_BUILD=1 # install a stage0 $dotnetInstallPath = Join-Path $RepoRoot "scripts\obtain\dotnet-install.ps1" -Write-Output "$dotnetInstallPath -Channel ""release/2.0.0"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture""" -Invoke-Expression "$dotnetInstallPath -Channel ""release/2.0.0"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture""" +Write-Output "$dotnetInstallPath -Channel ""release/2.0.0"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"" -Version 2.0.0-preview2-006341" +Invoke-Expression "$dotnetInstallPath -Channel ""release/2.0.0"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"" -Version 2.0.0-preview2-006341" if ($LastExitCode -ne 0) { Write-Output "The .NET CLI installation failed with exit code $LastExitCode" diff --git a/run-build.sh b/run-build.sh index a7ce1daad..7670df98a 100755 --- a/run-build.sh +++ b/run-build.sh @@ -155,7 +155,8 @@ export VSTEST_TRACE_BUILD=1 DOTNET_MULTILEVEL_LOOKUP=0 # Install a stage 0 -(set -x ; "$REPOROOT/scripts/obtain/dotnet-install.sh" --channel "release/2.0.0" --install-dir "$DOTNET_INSTALL_DIR" --architecture "$ARCHITECTURE" $LINUX_PORTABLE_INSTALL_ARGS) +(set -x ; "$REPOROOT/scripts/obtain/dotnet-install.sh" --channel "release/2.0.0" --version "2.0.0-preview2-006341" --install-dir "$DOTNET_INSTALL_DIR" --architecture "$ARCHITECTURE" $LINUX_PORTABLE_INSTALL_ARGS) + EXIT_CODE=$? if [ $EXIT_CODE != 0 ]; then echo "run-build: Error: installing stage0 with exit code $EXIT_CODE." >&2