Fixed common.lib.ps1 use correct dotnet on ARM64 devices. (#3986)

Build script updated to work on ARM64 devices natively.
microsoft · Sep 1, 2022 · 2372631 · 2372631
1 parent 75eabdc
commit 2372631
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/scripts/common.lib.ps1 b/scripts/common.lib.ps1
@@ -105,12 +105,18 @@ function Install-DotNetCli
     $dotnetInstallPath = Join-Path $env:TP_TOOLS_DIR "dotnet"
     New-Item -ItemType directory -Path $dotnetInstallPath -Force | Out-Null
 
+    $x64Architecture = "x64"
+    if ($env:PROCESSOR_ARCHITECTURE -eq "ARM64")
+    {
+        $x64Architecture = "arm64"
+    }
+
     # Runtime versions installed usually need to be kept in sync with the ones installed in build.sh
-    & $dotnetInstallScript -InstallDir "$dotnetInstallPath" -Runtime 'dotnet' -Channel '2.1' -Architecture x64 -NoPath # Install the latest patch
-    & $dotnetInstallScript -InstallDir "$dotnetInstallPath" -Runtime 'dotnet' -Channel '3.1' -Architecture x64 -NoPath # Install the latest patch
-    & $dotnetInstallScript -InstallDir "$dotnetInstallPath" -Runtime 'dotnet' -Channel '5.0' -Architecture x64 -NoPath # Install the latest patch
-    & $dotnetInstallScript -InstallDir "$dotnetInstallPath" -Runtime 'dotnet' -Channel '6.0' -Architecture x64 -NoPath # Install the latest patch
-    & $dotnetInstallScript -InstallDir "$dotnetInstallPath" -Channel '7.0' -Architecture x64 -NoPath -Version $env:DOTNET_CLI_VERSION
+    & $dotnetInstallScript -InstallDir "$dotnetInstallPath" -Runtime 'dotnet' -Channel '2.1' -Architecture $x64Architecture -NoPath # Install the latest patch
+    & $dotnetInstallScript -InstallDir "$dotnetInstallPath" -Runtime 'dotnet' -Channel '3.1' -Architecture $x64Architecture -NoPath # Install the latest patch
+    & $dotnetInstallScript -InstallDir "$dotnetInstallPath" -Runtime 'dotnet' -Channel '5.0' -Architecture $x64Architecture -NoPath # Install the latest patch
+    & $dotnetInstallScript -InstallDir "$dotnetInstallPath" -Runtime 'dotnet' -Channel '6.0' -Architecture $x64Architecture -NoPath # Install the latest patch
+    & $dotnetInstallScript -InstallDir "$dotnetInstallPath" -Channel '7.0' -Architecture $x64Architecture -NoPath -Version $env:DOTNET_CLI_VERSION
 
     & $dotnetInstallScript -InstallDir "${dotnetInstallPath}_x86" -Runtime 'dotnet' -Channel '2.1' -Architecture x86 -NoPath # Install the latest patch
     & $dotnetInstallScript -InstallDir "${dotnetInstallPath}_x86" -Runtime 'dotnet' -Channel '3.1' -Architecture x86 -NoPath # Install the latest patch
@@ -126,7 +132,7 @@ function Install-DotNetCli
     "---- dotnet environment variables"
     Get-ChildItem "Env:\dotnet_*"
 
-    "`n`n---- x64 dotnet"
+    "`n`n---- $x64Architecture dotnet"
     Invoke-Exe "$env:DOTNET_ROOT\dotnet.exe" -Arguments "--info"
 
     "`n`n---- x86 dotnet"