Revert "Provide flags to POSIX and non-POSIX scripts to prevent CDN u…

…sage from eng/common .NET Core Install script usages (dotnet#7144)" (dotnet#7147) This reverts commit 106356d.
akoeplinger · Apr 12, 2021 · e10ffb4 · e10ffb4
1 parent 9927e44
commit e10ffb4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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