Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove no-cdn concept, remove azureedge links #564

Merged
merged 1 commit into from
Jan 9, 2025
Merged

remove no-cdn concept, remove azureedge links #564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 1 addition & 15 deletions src/dotnet-install.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,9 @@
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
Expand All @@ -90,8 +88,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'
Expand Down Expand Up @@ -130,7 +126,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()),
Expand Down Expand Up @@ -1137,24 +1132,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"
Expand Down
21 changes: 2 additions & 19 deletions src/dotnet-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1396,24 +1396,15 @@ 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 [[ -n "$azure_feed" ]]; then
feeds=("$azure_feed")
fi

if [[ "$no_cdn" == "true" ]]; then
feeds=(
"https://dotnetcli.blob.core.windows.net/dotnet"
"https://dotnetbuilds.blob.core.windows.net/public"
)

if [[ -n "$uncached_feed" ]]; then
feeds=("$uncached_feed")
fi
if [[ -n "$uncached_feed" ]]; then
feeds=("$uncached_feed")
fi
}

Expand Down Expand Up @@ -1709,7 +1700,6 @@ install_dir="<auto>"
architecture="<auto>"
dry_run=false
no_path=false
no_cdn=false
azure_feed=""
uncached_feed=""
feed_credential=""
Expand Down Expand Up @@ -1782,10 +1772,6 @@ do
verbose=true
non_dynamic_parameters+=" $name"
;;
--no-cdn|-[Nn]o[Cc]dn)
no_cdn=true
non_dynamic_parameters+=" $name"
;;
--azure-feed|-[Aa]zure[Ff]eed)
shift
azure_feed="$1"
Expand Down Expand Up @@ -1890,13 +1876,10 @@ do
echo " --verbose,-Verbose Display diagnostics information."
echo " --azure-feed,-AzureFeed For internal use only."
echo " Allows using a different storage to download SDK archives from."
echo " This parameter is only used if --no-cdn is false."
echo " --uncached-feed,-UncachedFeed For internal use only."
echo " Allows using a different storage to download SDK archives from."
echo " This parameter is only used if --no-cdn is true."
echo " --skip-non-versioned-files Skips non-versioned files if they already exist, such as the dotnet executable."
echo " -SkipNonVersionedFiles"
echo " --no-cdn,-NoCdn Disable downloading from the Azure CDN, and use the uncached feed directly."
echo " --jsonfile <JSONFILE> Determines the SDK version from a user specified global.json file."
echo " Note: global.json must have a value for 'SDK:Version'"
echo " --keep-zip,-KeepZip If set, downloaded file is kept."
Expand Down
8 changes: 2 additions & 6 deletions ...nksFromAScript.WhenAnExactVersionIsPassedToBash_version=1.0.5_runtime=dotnet.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
dotnet-install: Payload URLs:
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://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: URL #2 - primary: https://ci.dot.net/public/Runtime/1.0.5/dotnet-runtime-1.0.5-osx-x64.tar.gz
dotnet-install: URL #3 - legacy: https://ci.dot.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"
4 changes: 1 addition & 3 deletions ...romAScript.WhenAnExactVersionIsPassedToBash_version=2.1.0_runtime=aspnetcore.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
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://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://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: URL #1 - primary: https://ci.dot.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"
8 changes: 2 additions & 6 deletions ...nksFromAScript.WhenAnExactVersionIsPassedToBash_version=6.0.100_runtime=null.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
dotnet-install: Payload URLs:
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://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: URL #2 - primary: https://ci.dot.net/public/Sdk/6.0.100/dotnet-sdk-6.0.100-osx-x64.tar.gz
dotnet-install: URL #3 - legacy: https://ci.dot.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"
8 changes: 2 additions & 6 deletions ...nksFromAScript.WhenAnExactVersionIsPassedToBash_version=8.0.303_runtime=null.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
dotnet-install: Payload URLs:
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://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: URL #2 - primary: https://ci.dot.net/public/Sdk/8.0.303/dotnet-sdk-8.0.303-osx-x64.tar.gz
dotnet-install: URL #3 - legacy: https://ci.dot.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"
8 changes: 2 additions & 6 deletions ...nksFromAScript.WhenAnExactVersionIsPassedToBash_version=9.0.100_runtime=null.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
dotnet-install: Payload URLs:
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://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: URL #2 - primary: https://ci.dot.net/public/Sdk/9.0.100/dotnet-sdk-9.0.100-osx-x64.tar.gz
dotnet-install: URL #3 - legacy: https://ci.dot.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"
8 changes: 2 additions & 6 deletions ...mAScript.WhenAnExactVersionIsPassedToPowershell_version=1.0.5_runtime=dotnet.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
dotnet-install: Payload URLs:
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://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: URL #2 - primary: https://ci.dot.net/public/Runtime/1.0.5/dotnet-runtime-1.0.5-win-x64.zip
dotnet-install: URL #3 - legacy: https://ci.dot.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"
4 changes: 1 addition & 3 deletions ...ript.WhenAnExactVersionIsPassedToPowershell_version=2.1.0_runtime=aspnetcore.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
dotnet-install: Payload URLs:
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://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: URL #1 - primary: https://ci.dot.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"
8 changes: 2 additions & 6 deletions ...mAScript.WhenAnExactVersionIsPassedToPowershell_version=6.0.100_runtime=null.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
dotnet-install: Payload URLs:
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://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: URL #2 - primary: https://ci.dot.net/public/Sdk/6.0.100/dotnet-sdk-6.0.100-win-x64.zip
dotnet-install: URL #3 - legacy: https://ci.dot.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"
8 changes: 2 additions & 6 deletions ...mAScript.WhenAnExactVersionIsPassedToPowershell_version=8.0.303_runtime=null.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
dotnet-install: Payload URLs:
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://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: URL #2 - primary: https://ci.dot.net/public/Sdk/8.0.303/dotnet-sdk-8.0.303-win-x64.zip
dotnet-install: URL #3 - legacy: https://ci.dot.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"
8 changes: 2 additions & 6 deletions ...mAScript.WhenAnExactVersionIsPassedToPowershell_version=9.0.100_runtime=null.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
dotnet-install: Payload URLs:
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://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: URL #2 - primary: https://ci.dot.net/public/Sdk/9.0.100/dotnet-sdk-9.0.100-win-x64.zip
dotnet-install: URL #3 - legacy: https://ci.dot.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"
5 changes: 2 additions & 3 deletions tests/Install-Scripts.Test/GivenThatIWantToGetTheSdkLinksFromAScript.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ public void WhenJsonFileIsPassedToInstallScripts(string filename)
[Theory]
[InlineData("-nopath", "")]
[InlineData("-verbose", "")]
[InlineData("-nocdn", "")]
[InlineData("-azurefeed", "https://dotnetcli.azureedge.net/dotnet")]
[InlineData("-azurefeed", "https://builds.dotnet.microsoft.com/dotnet")]
[InlineData("-uncachedfeed", "https://dotnetcli.blob.core.windows.net/dotnet")]
public void WhenVariousParametersArePassedToInstallScripts(string parameter, string value)
{
Expand Down Expand Up @@ -281,7 +280,7 @@ public void CanResolveCorrectLocationBasedOnVersion(string version, string locat
//do not run windowsdesktop test on Linux environment
return;
}
string expectedLinkLog = $"Constructed primary named payload URL: {Environment.NewLine}https://dotnetcli.azureedge.net/dotnet/{location}/{version}";
string expectedLinkLog = $"Constructed primary named payload URL: {Environment.NewLine}https://builds.dotnet.microsoft.com/dotnet/{location}/{version}";
var args = new string[] { "-version", version, "-runtime", "windowsdesktop", "-verbose", "-dryrun" };
var commandResult = TestUtils.CreateInstallCommand(args).ExecuteInstallation();

Expand Down