Skip to content

Commit 1596b7c

Browse files
authored
[ci] Always install the universal iOS simulators. (#32003)
Otherwise: 1. The arm64 iOS simulator isn't able to run x64 apps. 2. We run x64 apps in the iOS simulator in dotnet/macios (even on arm64 bots). 3. If MAUI installs the arm64 iOS simulator, it'll make our x64 tests apps fail to launch. So fix this by installing the universal iOS simulator when using Xcode 26+ (earlier versions of Xcode doesn't support the '-architectureVariant' argument).
1 parent b1f5361 commit 1596b7c

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

eng/pipelines/arcade/setup-test-env.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@ steps:
2828
xcrun xcode-select --print-path
2929
xcodebuild -version
3030
sudo xcodebuild -license accept
31-
sudo xcodebuild -downloadPlatform iOS
31+
if [[ ${XCODE_VERSION/\.*/} -ge 26 ]]; then
32+
sudo xcodebuild -downloadPlatform iOS -architectureVariant universal
33+
else
34+
sudo xcodebuild -downloadPlatform iOS
35+
fi
3236
sudo xcodebuild -runFirstLaunch
3337
displayName: Select Xcode Version
3438
condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin'))

eng/pipelines/common/provision.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,11 @@ steps:
8686
xcrun xcode-select --print-path
8787
xcodebuild -version
8888
sudo xcodebuild -license accept
89-
sudo xcodebuild -downloadPlatform iOS
89+
if [[ ${XCODE_VERSION/\.*/} -ge 26 ]]; then
90+
sudo xcodebuild -downloadPlatform iOS -architectureVariant universal
91+
else
92+
sudo xcodebuild -downloadPlatform iOS
93+
fi
9094
sudo xcodebuild -runFirstLaunch
9195
displayName: Select Xcode Version
9296
condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin'))

0 commit comments

Comments
 (0)