Skip to content
This repository has been archived by the owner on Apr 20, 2023. It is now read-only.

Conditionally install the 1.1.2 runtime when building from source #9654

Merged
merged 1 commit into from
Jul 12, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion run-build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,11 @@ if ($LastExitCode -ne 0)
Copy-Item -Recurse -Force $env:DOTNET_TOOL_DIR $env:DOTNET_INSTALL_DIR
}

Invoke-Expression "$dotnetInstallPath -Version ""1.1.2"" -Runtime ""dotnet"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
# This install is used to test 1.x scenarios
# Don't install in source build.
if ($env:DotNetBuildFromSource -ne "true") {
Invoke-Expression "$dotnetInstallPath -Version ""1.1.2"" -Runtime ""dotnet"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
}

# Put the stage0 on the path
$env:PATH = "$env:DOTNET_INSTALL_DIR;$env:PATH"
Expand Down
8 changes: 6 additions & 2 deletions run-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,12 @@ if [ $EXIT_CODE != 0 ]; then
exit $EXIT_CODE
fi

#ignore 1.1.2 install failure, as it is not present on all platforms
(set -x ; "$REPOROOT/scripts/obtain/dotnet-install.sh" --version "1.1.2" --runtime "dotnet" --install-dir "$DOTNET_INSTALL_DIR" --architecture "$ARCHITECTURE" || true)
# This install is used to test 1.x scenarios
# Don't install in source build.
if [[ "$DotNetBuildFromSource" != "true" ]]; then
#ignore 1.1.2 install failure, as it is not present on all platforms
(set -x ; "$REPOROOT/scripts/obtain/dotnet-install.sh" --version "1.1.2" --runtime "dotnet" --install-dir "$DOTNET_INSTALL_DIR" --architecture "$ARCHITECTURE" || true)
fi

# Put stage 0 on the PATH (for this shell only)
PATH="$DOTNET_INSTALL_DIR:$PATH"
Expand Down