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

Commit fce3363

Browse files
authored
Stablizing on a 1.1.9-servicing-005253 SDK 'build-engine' (#9345)
1 parent 90503f7 commit fce3363

File tree

2 files changed

+4
-23
lines changed

2 files changed

+4
-23
lines changed

run-build.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ if ($LastExitCode -ne 0)
8989
}
9090

9191
# install the post-PJnistic stage0
92-
Write-Host "$dotnetInstallPath -Version ""1.0.4"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
93-
Invoke-Expression "$dotnetInstallPath -Version ""1.0.4"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
92+
Write-Host "$dotnetInstallPath -Version ""1.1.9-servicing-005253"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
93+
Invoke-Expression "$dotnetInstallPath -Version ""1.1.9-servicing-005253"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
9494
if ($LastExitCode -ne 0)
9595
{
9696
Write-Output "The .NET CLI stage0 installation failed with exit code $LastExitCode"

run-build.sh

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -142,25 +142,6 @@ export VSTEST_TRACE_BUILD=1
142142

143143
dotnetInstallPath="$REPOROOT/scripts/obtain/dotnet-install.sh"
144144

145-
################ Remove this section when the stage0 SDK stablizes on 1.1.9* for release/1.1.0 ################
146-
# Use bootstrap CLI '1.0.4-btstrp' for Fedora 27, Fedora 28, openSUSE 42.3, and Ubuntu 18.04
147-
stage0CLIVersion="1.0.4"
148-
149-
uname=$(uname)
150-
if [[ "$uname" != "Darwin" ]]; then
151-
. /etc/os-release
152-
distro_specific_osname="$ID.$VERSION_ID"
153-
echo "OS Name = $distro_specific_osname"
154-
155-
if [[ "$distro_specific_osname" == "fedora.27" ]] ||
156-
[[ "$distro_specific_osname" == "fedora.28" ]] ||
157-
[[ "$distro_specific_osname" == "opensuse.42.3" ]] ||
158-
[[ "$distro_specific_osname" == "ubuntu.18.04" ]]; then
159-
stage0CLIVersion="1.0.4-btstrp"
160-
fi
161-
fi
162-
################ Remove this section when the stage0 SDK stablizes on 1.1.9* for release/1.1.0 ################
163-
164145
# install the stage0PJ
165146
echo "installing CLI: $dotnetInstallPath --version \"1.0.0-preview3-003223\" --install-dir $DOTNET_INSTALL_DIR_PJ --architecture \"$ARCHITECTURE\""
166147
$dotnetInstallPath --version "1.0.0-preview3-003223" --install-dir $DOTNET_INSTALL_DIR_PJ --architecture "$ARCHITECTURE"
@@ -170,8 +151,8 @@ if [ $? != 0 ]; then
170151
fi
171152

172153
# install the post-PJnistic stage0
173-
echo "installing CLI: $dotnetInstallPath --version \"$stage0CLIVersion\" --install-dir $DOTNET_INSTALL_DIR --architecture \"$ARCHITECTURE\""
174-
$dotnetInstallPath --version "$stage0CLIVersion" --install-dir $DOTNET_INSTALL_DIR --architecture "$ARCHITECTURE"
154+
echo "installing CLI: $dotnetInstallPath --version \"1.1.9-servicing-005253\" --install-dir $DOTNET_INSTALL_DIR --architecture \"$ARCHITECTURE\""
155+
$dotnetInstallPath --version "1.1.9-servicing-005253" --install-dir $DOTNET_INSTALL_DIR --architecture "$ARCHITECTURE"
175156
if [ $? != 0 ]; then
176157
echo "run-build: Error: The .NET CLI stage0 installation failed with exit code $?." >&2
177158
exit $?

0 commit comments

Comments
 (0)