diff --git a/images/macos/provision/core/xcode.ps1 b/images/macos/provision/core/xcode.ps1 index a5609e819..634526bc5 100644 --- a/images/macos/provision/core/xcode.ps1 +++ b/images/macos/provision/core/xcode.ps1 @@ -7,8 +7,7 @@ Import-Module "$env:HOME/image-generation/helpers/Xcode.Installer.psm1" -Disable # https://github.com/fastlane/fastlane/pull/18116 $env:SPACESHIP_SKIP_2FA_UPGRADE = 1 -$ARCH = arch -if ($ARCH -ne "arm64") { $ARCH = "x64" } +$ARCH = Get-Architecture [Array]$xcodeVersions = Get-ToolsetValue "xcode.$ARCH.versions" write-host $xcodeVersions $defaultXcode = Get-ToolsetValue "xcode.default" diff --git a/images/macos/tests/Xcode.Tests.ps1 b/images/macos/tests/Xcode.Tests.ps1 index a38a996d5..5eb49fdb5 100644 --- a/images/macos/tests/Xcode.Tests.ps1 +++ b/images/macos/tests/Xcode.Tests.ps1 @@ -2,8 +2,7 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" Import-Module "$PSScriptRoot/../helpers/Xcode.Helpers.psm1" Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking -$ARCH = arch -if ($ARCH -ne "arm64") { $ARCH = "x64" } +$ARCH = Get-Architecture $xcodeVersions = Get-ToolsetValue "xcode.$ARCH.versions" $defaultXcode = Get-ToolsetValue "xcode.default" $latestXcodeVersion = $xcodeVersions | Select-Object -First 1