From d801072b4fbcc02881a7c05358784cfccd08643b Mon Sep 17 00:00:00 2001
From: Rhys Parry <rhys.parry@octopus.com>
Date: Thu, 16 Jan 2025 12:46:53 +1000
Subject: [PATCH] Re-sync dotnet-install.ps1 to remove azureedge.net

---
 dotnet-install.ps1 | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/dotnet-install.ps1 b/dotnet-install.ps1
index 45abca60b..2e7d0eff3 100644
--- a/dotnet-install.ps1
+++ b/dotnet-install.ps1
@@ -75,14 +75,12 @@
 .PARAMETER Verbose
     Displays diagnostics information.
 .PARAMETER AzureFeed
-    Default: https://dotnetcli.azureedge.net/dotnet
+    Default: https://builds.dotnet.microsoft.com/dotnet
     For internal use only.
     Allows using a different storage to download SDK archives from.
-    This parameter is only used if $NoCdn is false.
 .PARAMETER UncachedFeed
     For internal use only.
     Allows using a different storage to download SDK archives from.
-    This parameter is only used if $NoCdn is true.
 .PARAMETER ProxyAddress
     If set, the installer will use the proxy when making web requests
 .PARAMETER ProxyUseDefaultCredentials
@@ -93,8 +91,6 @@
 .PARAMETER SkipNonVersionedFiles
     Default: false
     Skips installing non-versioned files if they already exist, such as dotnet.exe.
-.PARAMETER NoCdn
-    Disable downloading from the Azure CDN, and use the uncached feed directly.
 .PARAMETER JSonFile
     Determines the SDK version from a user specified global.json file
     Note: global.json must have a value for 'SDK:Version'
@@ -133,7 +129,6 @@ param(
     [switch]$ProxyUseDefaultCredentials,
     [string[]]$ProxyBypassList = @(),
     [switch]$SkipNonVersionedFiles,
-    [switch]$NoCdn,
     [int]$DownloadTimeout = 1200,
     [switch]$KeepZip,
     [string]$ZipPath = [System.IO.Path]::combine([System.IO.Path]::GetTempPath(), [System.IO.Path]::GetRandomFileName()),
@@ -1148,24 +1143,15 @@ function Get-AkaMsLink-And-Version([string] $NormalizedChannel, [string] $Normal
 function Get-Feeds-To-Use() {
     $feeds = @(
         "https://builds.dotnet.microsoft.com/dotnet"
-        "https://dotnetcli.azureedge.net/dotnet"
         "https://ci.dot.net/public"
-        "https://dotnetbuilds.azureedge.net/public"
     )
 
     if (-not [string]::IsNullOrEmpty($AzureFeed)) {
         $feeds = @($AzureFeed)
     }
 
-    if ($NoCdn) {
-        $feeds = @(
-            "https://dotnetcli.blob.core.windows.net/dotnet",
-            "https://dotnetbuilds.blob.core.windows.net/public"
-        )
-
-        if (-not [string]::IsNullOrEmpty($UncachedFeed)) {
+    if (-not [string]::IsNullOrEmpty($UncachedFeed)) {
             $feeds = @($UncachedFeed)
-        }
     }
 
     Write-Verbose "Initialized feeds: $feeds"