From e10ffb4ad2b5c7cabdd3839878d4bfac53cb174d Mon Sep 17 00:00:00 2001 From: Matt Galbraith Date: Wed, 24 Mar 2021 09:09:47 -0700 Subject: [PATCH] Revert "Provide flags to POSIX and non-POSIX scripts to prevent CDN usage from eng/common .NET Core Install script usages (#7144)" (#7147) This reverts commit 106356deb708eba131128997142f91dc330dffd2. --- eng/common/tools.ps1 | 1 - eng/common/tools.sh | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index ef7a5a258c64..d52467eea11d 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -244,7 +244,6 @@ function InstallDotNet([string] $dotnetRoot, $installParameters = @{ Version = $version InstallDir = $dotnetRoot - NoCdn = $True } if ($architecture) { $installParameters.Architecture = $architecture } diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 53b8e1ec3af3..5fad1846e5a5 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -200,7 +200,7 @@ function InstallDotNet { if [[ "$#" -ge "5" ]] && [[ "$5" != 'false' ]]; then skipNonVersionedFilesArg="--skip-non-versioned-files" fi - bash "$install_script" --no-cdn --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg || { + bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg || { local exit_code=$? echo "Failed to install dotnet SDK from public location (exit code '$exit_code')." @@ -223,7 +223,7 @@ function InstallDotNet { fi if [[ -n "$runtimeSourceFeed" || -n "$runtimeSourceFeedKey" ]]; then - bash "$install_script" --no-cdn --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg $runtimeSourceFeed $runtimeSourceFeedKey || { + bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg $runtimeSourceFeed $runtimeSourceFeedKey || { local exit_code=$? Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from custom location '$runtimeSourceFeed' (exit code '$exit_code')." ExitWithExitCode $exit_code