From cd59a956b5f585c2aceab9664ba60690676abe52 Mon Sep 17 00:00:00 2001
From: "Matt Mitchell (.NET)" <mmitche@microsoft.com>
Date: Mon, 23 Dec 2024 06:57:49 -0800
Subject: [PATCH] Switch to proper CDN URIs

---
 src/dotnet-install.ps1                                    | 6 ++----
 src/dotnet-install.sh                                     | 6 ++----
 ...PassedToBash_version=1.0.5_runtime=dotnet.verified.txt | 8 ++++----
 ...edToBash_version=2.1.0_runtime=aspnetcore.verified.txt | 4 ++--
 ...PassedToBash_version=6.0.100_runtime=null.verified.txt | 8 ++++----
 ...PassedToBash_version=8.0.303_runtime=null.verified.txt | 8 ++++----
 ...PassedToBash_version=9.0.100_runtime=null.verified.txt | 8 ++++----
 ...ToPowershell_version=1.0.5_runtime=dotnet.verified.txt | 8 ++++----
 ...wershell_version=2.1.0_runtime=aspnetcore.verified.txt | 4 ++--
 ...ToPowershell_version=6.0.100_runtime=null.verified.txt | 8 ++++----
 ...ToPowershell_version=8.0.303_runtime=null.verified.txt | 8 ++++----
 ...ToPowershell_version=9.0.100_runtime=null.verified.txt | 8 ++++----
 ...kLinksFromAScript.WhenMacosIsPassedToBash.verified.txt | 2 +-
 13 files changed, 41 insertions(+), 45 deletions(-)

diff --git a/src/dotnet-install.ps1 b/src/dotnet-install.ps1
index bbb6ea1e4..70c8128f8 100644
--- a/src/dotnet-install.ps1
+++ b/src/dotnet-install.ps1
@@ -1136,11 +1136,9 @@ function Get-AkaMsLink-And-Version([string] $NormalizedChannel, [string] $Normal
 
 function Get-Feeds-To-Use() {
     $feeds = @(
-        "https://dotnetcli-f0e9dzh5e5eze7cd.b02.azurefd.net/dotnet" # direct-access alias for builds.dotnet.microsoft.com until certs are ready for that alias
-        #"https://builds.dotnet.microsoft.com/dotnet"
+        "https://builds.dotnet.microsoft.com/dotnet"
         "https://dotnetcli.azureedge.net/dotnet"
-        "https://dotnetbuilds-bgf9bthjbvdca2ar.b02.azurefd.net/public" # direct-access alias for ci.dot.net until certs are ready for that alias
-        #"https://ci.dot.net/public"
+        "https://ci.dot.net/public"
         "https://dotnetbuilds.azureedge.net/public"
     )
 
diff --git a/src/dotnet-install.sh b/src/dotnet-install.sh
index 975d97179..9f7912eab 100644
--- a/src/dotnet-install.sh
+++ b/src/dotnet-install.sh
@@ -1395,11 +1395,9 @@ get_download_link_from_aka_ms() {
 get_feeds_to_use()
 {
     feeds=(
-    "https://dotnetcli-f0e9dzh5e5eze7cd.b02.azurefd.net/dotnet" # direct-access alias for builds.dotnet.microsoft.com until certs are ready for that alias
-    #"https://builds.dotnet.microsoft.com/dotnet"
+    "https://builds.dotnet.microsoft.com/dotnet"
     "https://dotnetcli.azureedge.net/dotnet"
-    "https://dotnetbuilds-bgf9bthjbvdca2ar.b02.azurefd.net/public" # direct-access alias for ci.dot.net until certs are ready for that alias
-    #"https://ci.dot.net/public"
+    "https://ci.dot.net/public"
     "https://dotnetbuilds.azureedge.net/public"
     )
 
diff --git a/tests/Install-Scripts.Test/Assets/GivenThatIWantToGetTheSdkLinksFromAScript.WhenAnExactVersionIsPassedToBash_version=1.0.5_runtime=dotnet.verified.txt b/tests/Install-Scripts.Test/Assets/GivenThatIWantToGetTheSdkLinksFromAScript.WhenAnExactVersionIsPassedToBash_version=1.0.5_runtime=dotnet.verified.txt
index e42fc467f..a5d68ff2e 100644
--- a/tests/Install-Scripts.Test/Assets/GivenThatIWantToGetTheSdkLinksFromAScript.WhenAnExactVersionIsPassedToBash_version=1.0.5_runtime=dotnet.verified.txt
+++ b/tests/Install-Scripts.Test/Assets/GivenThatIWantToGetTheSdkLinksFromAScript.WhenAnExactVersionIsPassedToBash_version=1.0.5_runtime=dotnet.verified.txt
@@ -1,11 +1,11 @@
 dotnet_install: Warning: Use of --runtime-id is obsolete and should be limited to the versions below 2.1. To override architecture, use --architecture option instead. To override OS, use --os option instead.
 dotnet-install: Payload URLs:
-dotnet-install: URL #0 - primary: https://dotnetcli-f0e9dzh5e5eze7cd.b02.azurefd.net/dotnet/Runtime/1.0.5/dotnet-runtime-1.0.5-osx-x64.tar.gz
-dotnet-install: URL #1 - legacy: https://dotnetcli-f0e9dzh5e5eze7cd.b02.azurefd.net/dotnet/Runtime/1.0.5/dotnet-osx-x64.1.0.5.tar.gz
+dotnet-install: URL #0 - primary: https://builds.dotnet.microsoft.com/dotnet/Runtime/1.0.5/dotnet-runtime-1.0.5-osx-x64.tar.gz
+dotnet-install: URL #1 - legacy: https://builds.dotnet.microsoft.com/dotnet/Runtime/1.0.5/dotnet-osx-x64.1.0.5.tar.gz
 dotnet-install: URL #2 - primary: https://dotnetcli.azureedge.net/dotnet/Runtime/1.0.5/dotnet-runtime-1.0.5-osx-x64.tar.gz
 dotnet-install: URL #3 - legacy: https://dotnetcli.azureedge.net/dotnet/Runtime/1.0.5/dotnet-osx-x64.1.0.5.tar.gz
-dotnet-install: URL #4 - primary: https://dotnetbuilds-bgf9bthjbvdca2ar.b02.azurefd.net/public/Runtime/1.0.5/dotnet-runtime-1.0.5-osx-x64.tar.gz
-dotnet-install: URL #5 - legacy: https://dotnetbuilds-bgf9bthjbvdca2ar.b02.azurefd.net/public/Runtime/1.0.5/dotnet-osx-x64.1.0.5.tar.gz
+dotnet-install: URL #4 - primary: https://ci.dot.net/public/Runtime/1.0.5/dotnet-runtime-1.0.5-osx-x64.tar.gz
+dotnet-install: URL #5 - legacy: https://ci.dot.net/public/Runtime/1.0.5/dotnet-osx-x64.1.0.5.tar.gz
 dotnet-install: URL #6 - primary: https://dotnetbuilds.azureedge.net/public/Runtime/1.0.5/dotnet-runtime-1.0.5-osx-x64.tar.gz
 dotnet-install: URL #7 - legacy: https://dotnetbuilds.azureedge.net/public/Runtime/1.0.5/dotnet-osx-x64.1.0.5.tar.gz
 dotnet-install: Repeatable invocation: ./dotnet-install.sh --version "1.0.5" --install-dir "dotnet-sdk" --architecture "x64" --os "osx" --runtime "dotnet" -runtimeid "osx"
diff --git a/tests/Install-Scripts.Test/Assets/GivenThatIWantToGetTheSdkLinksFromAScript.WhenAnExactVersionIsPassedToBash_version=2.1.0_runtime=aspnetcore.verified.txt b/tests/Install-Scripts.Test/Assets/GivenThatIWantToGetTheSdkLinksFromAScript.WhenAnExactVersionIsPassedToBash_version=2.1.0_runtime=aspnetcore.verified.txt
index b62282542..f5a597095 100644
--- a/tests/Install-Scripts.Test/Assets/GivenThatIWantToGetTheSdkLinksFromAScript.WhenAnExactVersionIsPassedToBash_version=2.1.0_runtime=aspnetcore.verified.txt
+++ b/tests/Install-Scripts.Test/Assets/GivenThatIWantToGetTheSdkLinksFromAScript.WhenAnExactVersionIsPassedToBash_version=2.1.0_runtime=aspnetcore.verified.txt
@@ -1,7 +1,7 @@
 dotnet_install: Warning: Use of --runtime-id is obsolete and should be limited to the versions below 2.1. To override architecture, use --architecture option instead. To override OS, use --os option instead.
 dotnet-install: Payload URLs:
-dotnet-install: URL #0 - primary: https://dotnetcli-f0e9dzh5e5eze7cd.b02.azurefd.net/dotnet/aspnetcore/Runtime/2.1.0/aspnetcore-runtime-2.1.0-osx-x64.tar.gz
+dotnet-install: URL #0 - primary: https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/2.1.0/aspnetcore-runtime-2.1.0-osx-x64.tar.gz
 dotnet-install: URL #1 - primary: https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/2.1.0/aspnetcore-runtime-2.1.0-osx-x64.tar.gz
-dotnet-install: URL #2 - primary: https://dotnetbuilds-bgf9bthjbvdca2ar.b02.azurefd.net/public/aspnetcore/Runtime/2.1.0/aspnetcore-runtime-2.1.0-osx-x64.tar.gz
+dotnet-install: URL #2 - primary: https://ci.dot.net/public/aspnetcore/Runtime/2.1.0/aspnetcore-runtime-2.1.0-osx-x64.tar.gz
 dotnet-install: URL #3 - primary: https://dotnetbuilds.azureedge.net/public/aspnetcore/Runtime/2.1.0/aspnetcore-runtime-2.1.0-osx-x64.tar.gz
 dotnet-install: Repeatable invocation: ./dotnet-install.sh --version "2.1.0" --install-dir "dotnet-sdk" --architecture "x64" --os "osx" --runtime "aspnetcore" -runtimeid "osx"
diff --git a/tests/Install-Scripts.Test/Assets/GivenThatIWantToGetTheSdkLinksFromAScript.WhenAnExactVersionIsPassedToBash_version=6.0.100_runtime=null.verified.txt b/tests/Install-Scripts.Test/Assets/GivenThatIWantToGetTheSdkLinksFromAScript.WhenAnExactVersionIsPassedToBash_version=6.0.100_runtime=null.verified.txt
index 4d289dffa..c757fdc5e 100644
--- a/tests/Install-Scripts.Test/Assets/GivenThatIWantToGetTheSdkLinksFromAScript.WhenAnExactVersionIsPassedToBash_version=6.0.100_runtime=null.verified.txt
+++ b/tests/Install-Scripts.Test/Assets/GivenThatIWantToGetTheSdkLinksFromAScript.WhenAnExactVersionIsPassedToBash_version=6.0.100_runtime=null.verified.txt
@@ -1,11 +1,11 @@
 dotnet_install: Warning: Use of --runtime-id is obsolete and should be limited to the versions below 2.1. To override architecture, use --architecture option instead. To override OS, use --os option instead.
 dotnet-install: Payload URLs:
-dotnet-install: URL #0 - primary: https://dotnetcli-f0e9dzh5e5eze7cd.b02.azurefd.net/dotnet/Sdk/6.0.100/dotnet-sdk-6.0.100-osx-x64.tar.gz
-dotnet-install: URL #1 - legacy: https://dotnetcli-f0e9dzh5e5eze7cd.b02.azurefd.net/dotnet/Sdk/6.0.100/dotnet-dev-osx-x64.6.0.100.tar.gz
+dotnet-install: URL #0 - primary: https://builds.dotnet.microsoft.com/dotnet/Sdk/6.0.100/dotnet-sdk-6.0.100-osx-x64.tar.gz
+dotnet-install: URL #1 - legacy: https://builds.dotnet.microsoft.com/dotnet/Sdk/6.0.100/dotnet-dev-osx-x64.6.0.100.tar.gz
 dotnet-install: URL #2 - primary: https://dotnetcli.azureedge.net/dotnet/Sdk/6.0.100/dotnet-sdk-6.0.100-osx-x64.tar.gz
 dotnet-install: URL #3 - legacy: https://dotnetcli.azureedge.net/dotnet/Sdk/6.0.100/dotnet-dev-osx-x64.6.0.100.tar.gz
-dotnet-install: URL #4 - primary: https://dotnetbuilds-bgf9bthjbvdca2ar.b02.azurefd.net/public/Sdk/6.0.100/dotnet-sdk-6.0.100-osx-x64.tar.gz
-dotnet-install: URL #5 - legacy: https://dotnetbuilds-bgf9bthjbvdca2ar.b02.azurefd.net/public/Sdk/6.0.100/dotnet-dev-osx-x64.6.0.100.tar.gz
+dotnet-install: URL #4 - primary: https://ci.dot.net/public/Sdk/6.0.100/dotnet-sdk-6.0.100-osx-x64.tar.gz
+dotnet-install: URL #5 - legacy: https://ci.dot.net/public/Sdk/6.0.100/dotnet-dev-osx-x64.6.0.100.tar.gz
 dotnet-install: URL #6 - primary: https://dotnetbuilds.azureedge.net/public/Sdk/6.0.100/dotnet-sdk-6.0.100-osx-x64.tar.gz
 dotnet-install: URL #7 - legacy: https://dotnetbuilds.azureedge.net/public/Sdk/6.0.100/dotnet-dev-osx-x64.6.0.100.tar.gz
 dotnet-install: Repeatable invocation: ./dotnet-install.sh --version "6.0.100" --install-dir "dotnet-sdk" --architecture "x64" --os "osx" -runtimeid "osx"
diff --git a/tests/Install-Scripts.Test/Assets/GivenThatIWantToGetTheSdkLinksFromAScript.WhenAnExactVersionIsPassedToBash_version=8.0.303_runtime=null.verified.txt b/tests/Install-Scripts.Test/Assets/GivenThatIWantToGetTheSdkLinksFromAScript.WhenAnExactVersionIsPassedToBash_version=8.0.303_runtime=null.verified.txt
index b43228cb4..f11520e5e 100644
--- a/tests/Install-Scripts.Test/Assets/GivenThatIWantToGetTheSdkLinksFromAScript.WhenAnExactVersionIsPassedToBash_version=8.0.303_runtime=null.verified.txt
+++ b/tests/Install-Scripts.Test/Assets/GivenThatIWantToGetTheSdkLinksFromAScript.WhenAnExactVersionIsPassedToBash_version=8.0.303_runtime=null.verified.txt
@@ -1,11 +1,11 @@
 dotnet_install: Warning: Use of --runtime-id is obsolete and should be limited to the versions below 2.1. To override architecture, use --architecture option instead. To override OS, use --os option instead.
 dotnet-install: Payload URLs:
-dotnet-install: URL #0 - primary: https://dotnetcli-f0e9dzh5e5eze7cd.b02.azurefd.net/dotnet/Sdk/8.0.303/dotnet-sdk-8.0.303-osx-x64.tar.gz
-dotnet-install: URL #1 - legacy: https://dotnetcli-f0e9dzh5e5eze7cd.b02.azurefd.net/dotnet/Sdk/8.0.303/dotnet-dev-osx-x64.8.0.303.tar.gz
+dotnet-install: URL #0 - primary: https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.303/dotnet-sdk-8.0.303-osx-x64.tar.gz
+dotnet-install: URL #1 - legacy: https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.303/dotnet-dev-osx-x64.8.0.303.tar.gz
 dotnet-install: URL #2 - primary: https://dotnetcli.azureedge.net/dotnet/Sdk/8.0.303/dotnet-sdk-8.0.303-osx-x64.tar.gz
 dotnet-install: URL #3 - legacy: https://dotnetcli.azureedge.net/dotnet/Sdk/8.0.303/dotnet-dev-osx-x64.8.0.303.tar.gz
-dotnet-install: URL #4 - primary: https://dotnetbuilds-bgf9bthjbvdca2ar.b02.azurefd.net/public/Sdk/8.0.303/dotnet-sdk-8.0.303-osx-x64.tar.gz
-dotnet-install: URL #5 - legacy: https://dotnetbuilds-bgf9bthjbvdca2ar.b02.azurefd.net/public/Sdk/8.0.303/dotnet-dev-osx-x64.8.0.303.tar.gz
+dotnet-install: URL #4 - primary: https://ci.dot.net/public/Sdk/8.0.303/dotnet-sdk-8.0.303-osx-x64.tar.gz
+dotnet-install: URL #5 - legacy: https://ci.dot.net/public/Sdk/8.0.303/dotnet-dev-osx-x64.8.0.303.tar.gz
 dotnet-install: URL #6 - primary: https://dotnetbuilds.azureedge.net/public/Sdk/8.0.303/dotnet-sdk-8.0.303-osx-x64.tar.gz
 dotnet-install: URL #7 - legacy: https://dotnetbuilds.azureedge.net/public/Sdk/8.0.303/dotnet-dev-osx-x64.8.0.303.tar.gz
 dotnet-install: Repeatable invocation: ./dotnet-install.sh --version "8.0.303" --install-dir "dotnet-sdk" --architecture "x64" --os "osx" -runtimeid "osx"
diff --git a/tests/Install-Scripts.Test/Assets/GivenThatIWantToGetTheSdkLinksFromAScript.WhenAnExactVersionIsPassedToBash_version=9.0.100_runtime=null.verified.txt b/tests/Install-Scripts.Test/Assets/GivenThatIWantToGetTheSdkLinksFromAScript.WhenAnExactVersionIsPassedToBash_version=9.0.100_runtime=null.verified.txt
index 2c92b6745..7e4d14130 100644
--- a/tests/Install-Scripts.Test/Assets/GivenThatIWantToGetTheSdkLinksFromAScript.WhenAnExactVersionIsPassedToBash_version=9.0.100_runtime=null.verified.txt
+++ b/tests/Install-Scripts.Test/Assets/GivenThatIWantToGetTheSdkLinksFromAScript.WhenAnExactVersionIsPassedToBash_version=9.0.100_runtime=null.verified.txt
@@ -1,11 +1,11 @@
 dotnet_install: Warning: Use of --runtime-id is obsolete and should be limited to the versions below 2.1. To override architecture, use --architecture option instead. To override OS, use --os option instead.
 dotnet-install: Payload URLs:
-dotnet-install: URL #0 - primary: https://dotnetcli-f0e9dzh5e5eze7cd.b02.azurefd.net/dotnet/Sdk/9.0.100/dotnet-sdk-9.0.100-osx-x64.tar.gz
-dotnet-install: URL #1 - legacy: https://dotnetcli-f0e9dzh5e5eze7cd.b02.azurefd.net/dotnet/Sdk/9.0.100/dotnet-dev-osx-x64.9.0.100.tar.gz
+dotnet-install: URL #0 - primary: https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.100/dotnet-sdk-9.0.100-osx-x64.tar.gz
+dotnet-install: URL #1 - legacy: https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.100/dotnet-dev-osx-x64.9.0.100.tar.gz
 dotnet-install: URL #2 - primary: https://dotnetcli.azureedge.net/dotnet/Sdk/9.0.100/dotnet-sdk-9.0.100-osx-x64.tar.gz
 dotnet-install: URL #3 - legacy: https://dotnetcli.azureedge.net/dotnet/Sdk/9.0.100/dotnet-dev-osx-x64.9.0.100.tar.gz
-dotnet-install: URL #4 - primary: https://dotnetbuilds-bgf9bthjbvdca2ar.b02.azurefd.net/public/Sdk/9.0.100/dotnet-sdk-9.0.100-osx-x64.tar.gz
-dotnet-install: URL #5 - legacy: https://dotnetbuilds-bgf9bthjbvdca2ar.b02.azurefd.net/public/Sdk/9.0.100/dotnet-dev-osx-x64.9.0.100.tar.gz
+dotnet-install: URL #4 - primary: https://ci.dot.net/public/Sdk/9.0.100/dotnet-sdk-9.0.100-osx-x64.tar.gz
+dotnet-install: URL #5 - legacy: https://ci.dot.net/public/Sdk/9.0.100/dotnet-dev-osx-x64.9.0.100.tar.gz
 dotnet-install: URL #6 - primary: https://dotnetbuilds.azureedge.net/public/Sdk/9.0.100/dotnet-sdk-9.0.100-osx-x64.tar.gz
 dotnet-install: URL #7 - legacy: https://dotnetbuilds.azureedge.net/public/Sdk/9.0.100/dotnet-dev-osx-x64.9.0.100.tar.gz
 dotnet-install: Repeatable invocation: ./dotnet-install.sh --version "9.0.100" --install-dir "dotnet-sdk" --architecture "x64" --os "osx" -runtimeid "osx"
diff --git a/tests/Install-Scripts.Test/Assets/GivenThatIWantToGetTheSdkLinksFromAScript.WhenAnExactVersionIsPassedToPowershell_version=1.0.5_runtime=dotnet.verified.txt b/tests/Install-Scripts.Test/Assets/GivenThatIWantToGetTheSdkLinksFromAScript.WhenAnExactVersionIsPassedToPowershell_version=1.0.5_runtime=dotnet.verified.txt
index 0b2ee90d8..ff9838236 100644
--- a/tests/Install-Scripts.Test/Assets/GivenThatIWantToGetTheSdkLinksFromAScript.WhenAnExactVersionIsPassedToPowershell_version=1.0.5_runtime=dotnet.verified.txt
+++ b/tests/Install-Scripts.Test/Assets/GivenThatIWantToGetTheSdkLinksFromAScript.WhenAnExactVersionIsPassedToPowershell_version=1.0.5_runtime=dotnet.verified.txt
@@ -1,10 +1,10 @@
 dotnet-install: Payload URLs:
-dotnet-install: URL #0 - primary: https://dotnetcli-f0e9dzh5e5eze7cd.b02.azurefd.net/dotnet/Runtime/1.0.5/dotnet-runtime-1.0.5-win-x64.zip
-dotnet-install: URL #1 - legacy: https://dotnetcli-f0e9dzh5e5eze7cd.b02.azurefd.net/dotnet/Runtime/1.0.5/dotnet-win-x64.1.0.5.zip
+dotnet-install: URL #0 - primary: https://builds.dotnet.microsoft.com/dotnet/Runtime/1.0.5/dotnet-runtime-1.0.5-win-x64.zip
+dotnet-install: URL #1 - legacy: https://builds.dotnet.microsoft.com/dotnet/Runtime/1.0.5/dotnet-win-x64.1.0.5.zip
 dotnet-install: URL #2 - primary: https://dotnetcli.azureedge.net/dotnet/Runtime/1.0.5/dotnet-runtime-1.0.5-win-x64.zip
 dotnet-install: URL #3 - legacy: https://dotnetcli.azureedge.net/dotnet/Runtime/1.0.5/dotnet-win-x64.1.0.5.zip
-dotnet-install: URL #4 - primary: https://dotnetbuilds-bgf9bthjbvdca2ar.b02.azurefd.net/public/Runtime/1.0.5/dotnet-runtime-1.0.5-win-x64.zip
-dotnet-install: URL #5 - legacy: https://dotnetbuilds-bgf9bthjbvdca2ar.b02.azurefd.net/public/Runtime/1.0.5/dotnet-win-x64.1.0.5.zip
+dotnet-install: URL #4 - primary: https://ci.dot.net/public/Runtime/1.0.5/dotnet-runtime-1.0.5-win-x64.zip
+dotnet-install: URL #5 - legacy: https://ci.dot.net/public/Runtime/1.0.5/dotnet-win-x64.1.0.5.zip
 dotnet-install: URL #6 - primary: https://dotnetbuilds.azureedge.net/public/Runtime/1.0.5/dotnet-runtime-1.0.5-win-x64.zip
 dotnet-install: URL #7 - legacy: https://dotnetbuilds.azureedge.net/public/Runtime/1.0.5/dotnet-win-x64.1.0.5.zip
 dotnet-install: Repeatable invocation: .\dotnet-install.ps1 -Version "1.0.5" -InstallDir "dotnet-sdk" -Architecture "x64" -Runtime "dotnet"
diff --git a/tests/Install-Scripts.Test/Assets/GivenThatIWantToGetTheSdkLinksFromAScript.WhenAnExactVersionIsPassedToPowershell_version=2.1.0_runtime=aspnetcore.verified.txt b/tests/Install-Scripts.Test/Assets/GivenThatIWantToGetTheSdkLinksFromAScript.WhenAnExactVersionIsPassedToPowershell_version=2.1.0_runtime=aspnetcore.verified.txt
index dd1c63ba6..44975d9b7 100644
--- a/tests/Install-Scripts.Test/Assets/GivenThatIWantToGetTheSdkLinksFromAScript.WhenAnExactVersionIsPassedToPowershell_version=2.1.0_runtime=aspnetcore.verified.txt
+++ b/tests/Install-Scripts.Test/Assets/GivenThatIWantToGetTheSdkLinksFromAScript.WhenAnExactVersionIsPassedToPowershell_version=2.1.0_runtime=aspnetcore.verified.txt
@@ -1,6 +1,6 @@
 dotnet-install: Payload URLs:
-dotnet-install: URL #0 - primary: https://dotnetcli-f0e9dzh5e5eze7cd.b02.azurefd.net/dotnet/aspnetcore/Runtime/2.1.0/aspnetcore-runtime-2.1.0-win-x64.zip
+dotnet-install: URL #0 - primary: https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/2.1.0/aspnetcore-runtime-2.1.0-win-x64.zip
 dotnet-install: URL #1 - primary: https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/2.1.0/aspnetcore-runtime-2.1.0-win-x64.zip
-dotnet-install: URL #2 - primary: https://dotnetbuilds-bgf9bthjbvdca2ar.b02.azurefd.net/public/aspnetcore/Runtime/2.1.0/aspnetcore-runtime-2.1.0-win-x64.zip
+dotnet-install: URL #2 - primary: https://ci.dot.net/public/aspnetcore/Runtime/2.1.0/aspnetcore-runtime-2.1.0-win-x64.zip
 dotnet-install: URL #3 - primary: https://dotnetbuilds.azureedge.net/public/aspnetcore/Runtime/2.1.0/aspnetcore-runtime-2.1.0-win-x64.zip
 dotnet-install: Repeatable invocation: .\dotnet-install.ps1 -Version "2.1.0" -InstallDir "dotnet-sdk" -Architecture "x64" -Runtime "aspnetcore"
diff --git a/tests/Install-Scripts.Test/Assets/GivenThatIWantToGetTheSdkLinksFromAScript.WhenAnExactVersionIsPassedToPowershell_version=6.0.100_runtime=null.verified.txt b/tests/Install-Scripts.Test/Assets/GivenThatIWantToGetTheSdkLinksFromAScript.WhenAnExactVersionIsPassedToPowershell_version=6.0.100_runtime=null.verified.txt
index ead625cac..d8c236d4e 100644
--- a/tests/Install-Scripts.Test/Assets/GivenThatIWantToGetTheSdkLinksFromAScript.WhenAnExactVersionIsPassedToPowershell_version=6.0.100_runtime=null.verified.txt
+++ b/tests/Install-Scripts.Test/Assets/GivenThatIWantToGetTheSdkLinksFromAScript.WhenAnExactVersionIsPassedToPowershell_version=6.0.100_runtime=null.verified.txt
@@ -1,10 +1,10 @@
 dotnet-install: Payload URLs:
-dotnet-install: URL #0 - primary: https://dotnetcli-f0e9dzh5e5eze7cd.b02.azurefd.net/dotnet/Sdk/6.0.100/dotnet-sdk-6.0.100-win-x64.zip
-dotnet-install: URL #1 - legacy: https://dotnetcli-f0e9dzh5e5eze7cd.b02.azurefd.net/dotnet/Sdk/6.0.100/dotnet-dev-win-x64.6.0.100.zip
+dotnet-install: URL #0 - primary: https://builds.dotnet.microsoft.com/dotnet/Sdk/6.0.100/dotnet-sdk-6.0.100-win-x64.zip
+dotnet-install: URL #1 - legacy: https://builds.dotnet.microsoft.com/dotnet/Sdk/6.0.100/dotnet-dev-win-x64.6.0.100.zip
 dotnet-install: URL #2 - primary: https://dotnetcli.azureedge.net/dotnet/Sdk/6.0.100/dotnet-sdk-6.0.100-win-x64.zip
 dotnet-install: URL #3 - legacy: https://dotnetcli.azureedge.net/dotnet/Sdk/6.0.100/dotnet-dev-win-x64.6.0.100.zip
-dotnet-install: URL #4 - primary: https://dotnetbuilds-bgf9bthjbvdca2ar.b02.azurefd.net/public/Sdk/6.0.100/dotnet-sdk-6.0.100-win-x64.zip
-dotnet-install: URL #5 - legacy: https://dotnetbuilds-bgf9bthjbvdca2ar.b02.azurefd.net/public/Sdk/6.0.100/dotnet-dev-win-x64.6.0.100.zip
+dotnet-install: URL #4 - primary: https://ci.dot.net/public/Sdk/6.0.100/dotnet-sdk-6.0.100-win-x64.zip
+dotnet-install: URL #5 - legacy: https://ci.dot.net/public/Sdk/6.0.100/dotnet-dev-win-x64.6.0.100.zip
 dotnet-install: URL #6 - primary: https://dotnetbuilds.azureedge.net/public/Sdk/6.0.100/dotnet-sdk-6.0.100-win-x64.zip
 dotnet-install: URL #7 - legacy: https://dotnetbuilds.azureedge.net/public/Sdk/6.0.100/dotnet-dev-win-x64.6.0.100.zip
 dotnet-install: Repeatable invocation: .\dotnet-install.ps1 -Version "6.0.100" -InstallDir "dotnet-sdk" -Architecture "x64"
diff --git a/tests/Install-Scripts.Test/Assets/GivenThatIWantToGetTheSdkLinksFromAScript.WhenAnExactVersionIsPassedToPowershell_version=8.0.303_runtime=null.verified.txt b/tests/Install-Scripts.Test/Assets/GivenThatIWantToGetTheSdkLinksFromAScript.WhenAnExactVersionIsPassedToPowershell_version=8.0.303_runtime=null.verified.txt
index 4825754ef..1a7359e18 100644
--- a/tests/Install-Scripts.Test/Assets/GivenThatIWantToGetTheSdkLinksFromAScript.WhenAnExactVersionIsPassedToPowershell_version=8.0.303_runtime=null.verified.txt
+++ b/tests/Install-Scripts.Test/Assets/GivenThatIWantToGetTheSdkLinksFromAScript.WhenAnExactVersionIsPassedToPowershell_version=8.0.303_runtime=null.verified.txt
@@ -1,10 +1,10 @@
 dotnet-install: Payload URLs:
-dotnet-install: URL #0 - primary: https://dotnetcli-f0e9dzh5e5eze7cd.b02.azurefd.net/dotnet/Sdk/8.0.303/dotnet-sdk-8.0.303-win-x64.zip
-dotnet-install: URL #1 - legacy: https://dotnetcli-f0e9dzh5e5eze7cd.b02.azurefd.net/dotnet/Sdk/8.0.303/dotnet-dev-win-x64.8.0.303.zip
+dotnet-install: URL #0 - primary: https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.303/dotnet-sdk-8.0.303-win-x64.zip
+dotnet-install: URL #1 - legacy: https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.303/dotnet-dev-win-x64.8.0.303.zip
 dotnet-install: URL #2 - primary: https://dotnetcli.azureedge.net/dotnet/Sdk/8.0.303/dotnet-sdk-8.0.303-win-x64.zip
 dotnet-install: URL #3 - legacy: https://dotnetcli.azureedge.net/dotnet/Sdk/8.0.303/dotnet-dev-win-x64.8.0.303.zip
-dotnet-install: URL #4 - primary: https://dotnetbuilds-bgf9bthjbvdca2ar.b02.azurefd.net/public/Sdk/8.0.303/dotnet-sdk-8.0.303-win-x64.zip
-dotnet-install: URL #5 - legacy: https://dotnetbuilds-bgf9bthjbvdca2ar.b02.azurefd.net/public/Sdk/8.0.303/dotnet-dev-win-x64.8.0.303.zip
+dotnet-install: URL #4 - primary: https://ci.dot.net/public/Sdk/8.0.303/dotnet-sdk-8.0.303-win-x64.zip
+dotnet-install: URL #5 - legacy: https://ci.dot.net/public/Sdk/8.0.303/dotnet-dev-win-x64.8.0.303.zip
 dotnet-install: URL #6 - primary: https://dotnetbuilds.azureedge.net/public/Sdk/8.0.303/dotnet-sdk-8.0.303-win-x64.zip
 dotnet-install: URL #7 - legacy: https://dotnetbuilds.azureedge.net/public/Sdk/8.0.303/dotnet-dev-win-x64.8.0.303.zip
 dotnet-install: Repeatable invocation: .\dotnet-install.ps1 -Version "8.0.303" -InstallDir "dotnet-sdk" -Architecture "x64"
diff --git a/tests/Install-Scripts.Test/Assets/GivenThatIWantToGetTheSdkLinksFromAScript.WhenAnExactVersionIsPassedToPowershell_version=9.0.100_runtime=null.verified.txt b/tests/Install-Scripts.Test/Assets/GivenThatIWantToGetTheSdkLinksFromAScript.WhenAnExactVersionIsPassedToPowershell_version=9.0.100_runtime=null.verified.txt
index 143e5e155..e404a4b16 100644
--- a/tests/Install-Scripts.Test/Assets/GivenThatIWantToGetTheSdkLinksFromAScript.WhenAnExactVersionIsPassedToPowershell_version=9.0.100_runtime=null.verified.txt
+++ b/tests/Install-Scripts.Test/Assets/GivenThatIWantToGetTheSdkLinksFromAScript.WhenAnExactVersionIsPassedToPowershell_version=9.0.100_runtime=null.verified.txt
@@ -1,10 +1,10 @@
 dotnet-install: Payload URLs:
-dotnet-install: URL #0 - primary: https://dotnetcli-f0e9dzh5e5eze7cd.b02.azurefd.net/dotnet/Sdk/9.0.100/dotnet-sdk-9.0.100-win-x64.zip
-dotnet-install: URL #1 - legacy: https://dotnetcli-f0e9dzh5e5eze7cd.b02.azurefd.net/dotnet/Sdk/9.0.100/dotnet-dev-win-x64.9.0.100.zip
+dotnet-install: URL #0 - primary: https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.100/dotnet-sdk-9.0.100-win-x64.zip
+dotnet-install: URL #1 - legacy: https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.100/dotnet-dev-win-x64.9.0.100.zip
 dotnet-install: URL #2 - primary: https://dotnetcli.azureedge.net/dotnet/Sdk/9.0.100/dotnet-sdk-9.0.100-win-x64.zip
 dotnet-install: URL #3 - legacy: https://dotnetcli.azureedge.net/dotnet/Sdk/9.0.100/dotnet-dev-win-x64.9.0.100.zip
-dotnet-install: URL #4 - primary: https://dotnetbuilds-bgf9bthjbvdca2ar.b02.azurefd.net/public/Sdk/9.0.100/dotnet-sdk-9.0.100-win-x64.zip
-dotnet-install: URL #5 - legacy: https://dotnetbuilds-bgf9bthjbvdca2ar.b02.azurefd.net/public/Sdk/9.0.100/dotnet-dev-win-x64.9.0.100.zip
+dotnet-install: URL #4 - primary: https://ci.dot.net/public/Sdk/9.0.100/dotnet-sdk-9.0.100-win-x64.zip
+dotnet-install: URL #5 - legacy: https://ci.dot.net/public/Sdk/9.0.100/dotnet-dev-win-x64.9.0.100.zip
 dotnet-install: URL #6 - primary: https://dotnetbuilds.azureedge.net/public/Sdk/9.0.100/dotnet-sdk-9.0.100-win-x64.zip
 dotnet-install: URL #7 - legacy: https://dotnetbuilds.azureedge.net/public/Sdk/9.0.100/dotnet-dev-win-x64.9.0.100.zip
 dotnet-install: Repeatable invocation: .\dotnet-install.ps1 -Version "9.0.100" -InstallDir "dotnet-sdk" -Architecture "x64"
diff --git a/tests/Install-Scripts.Test/Assets/GivenThatIWantToGetTheSdkLinksFromAScript.WhenMacosIsPassedToBash.verified.txt b/tests/Install-Scripts.Test/Assets/GivenThatIWantToGetTheSdkLinksFromAScript.WhenMacosIsPassedToBash.verified.txt
index dbe169cbd..7ecb5f0b7 100644
--- a/tests/Install-Scripts.Test/Assets/GivenThatIWantToGetTheSdkLinksFromAScript.WhenMacosIsPassedToBash.verified.txt
+++ b/tests/Install-Scripts.Test/Assets/GivenThatIWantToGetTheSdkLinksFromAScript.WhenMacosIsPassedToBash.verified.txt
@@ -1,3 +1,3 @@
 dotnet-install: Payload URLs:
-dotnet-install: URL #0 - aka.ms: https://dotnetcli-f0e9dzh5e5eze7cd.b02.azurefd.net/dotnet/Sdk/%VERSION%/dotnet-sdk-%VERSION%-osx-x64.tar.gz
+dotnet-install: URL #0 - aka.ms: https://builds.dotnet.microsoft.com/dotnet/Sdk/%VERSION%/dotnet-sdk-%VERSION%-osx-x64.tar.gz
 dotnet-install: Repeatable invocation: ./dotnet-install.sh --version "%VERSION%" --install-dir "dotnet-sdk" --architecture "x64" --os "osx"