Skip to content

Commit 4a6f641

Browse files
committed
Fix ARM64 detection on macOS
1 parent adb7870 commit 4a6f641

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

tools/Install-DotNetSdk.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ if ($InstallLocality -eq 'machine') {
197197
$restartRequired = $false
198198
$sdks |% {
199199
if ($_.Version) { $version = $_.Version } else { $version = $_.Channel }
200-
if ($PSCmdlet.ShouldProcess(".NET SDK $_", "Install")) {
200+
if ($PSCmdlet.ShouldProcess(".NET SDK $version ($arch)", "Install")) {
201201
Install-DotNet -Version $version -Architecture $arch
202202
$restartRequired = $restartRequired -or ($LASTEXITCODE -eq 3010)
203203

@@ -281,10 +281,10 @@ if ($IncludeX86) {
281281
}
282282

283283
if ($IsMacOS -or $IsLinux) {
284-
$DownloadUri = "https://raw.githubusercontent.com/dotnet/install-scripts/0b09de9bc136cacb5f849a6957ebd4062173c148/src/dotnet-install.sh"
284+
$DownloadUri = "https://raw.githubusercontent.com/dotnet/install-scripts/a3fbd0fd625032bac207f1f590e5353fe26faa59/src/dotnet-install.sh"
285285
$DotNetInstallScriptPath = "$DotNetInstallScriptRoot/dotnet-install.sh"
286286
} else {
287-
$DownloadUri = "https://raw.githubusercontent.com/dotnet/install-scripts/0b09de9bc136cacb5f849a6957ebd4062173c148/src/dotnet-install.ps1"
287+
$DownloadUri = "https://raw.githubusercontent.com/dotnet/install-scripts/a3fbd0fd625032bac207f1f590e5353fe26faa59/src/dotnet-install.ps1"
288288
$DotNetInstallScriptPath = "$DotNetInstallScriptRoot/dotnet-install.ps1"
289289
}
290290

@@ -306,7 +306,7 @@ $global:LASTEXITCODE = 0
306306
$sdks |% {
307307
if ($_.Version) { $parameters = '-Version', $_.Version } else { $parameters = '-Channel', $_.Channel }
308308

309-
if ($PSCmdlet.ShouldProcess(".NET SDK $_", "Install")) {
309+
if ($PSCmdlet.ShouldProcess(".NET SDK $_ ($arch)", "Install")) {
310310
$anythingInstalled = $true
311311
Invoke-Expression -Command "$DotNetInstallScriptPathExpression $parameters -Architecture $arch -InstallDir $DotNetInstallDir $switches"
312312

0 commit comments

Comments
 (0)