Skip to content

Commit b2210f6

Browse files
authored
Merge pull request #22504 from unoplatform/dev/agzi/ios-sim-runtime-fix
2 parents cb8513c + 2dd140a commit b2210f6

File tree

4 files changed

+13
-3
lines changed

4 files changed

+13
-3
lines changed

.vsts-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ variables:
5858
linuxScaledPool: 'Ubuntu2404-20251016'
5959
macOSVMImage: 'macOS-15'
6060
macOSVMImage_UITests: 'macOS-14'
61-
xCodeRoot: '/Applications/Xcode_26.0.1.app'
61+
xCodeRoot: '/Applications/Xcode_26.2.app'
6262
xCodeRoot_iOS_UITests: '/Applications/Xcode_15.3.app'
6363

6464
# Offline validation to improve build performance

build/ci/tests/.azure-devops-tests-templates.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,16 @@ jobs:
105105
parameters:
106106
xCodeRoot: ${{ parameters.xCodeRoot }}
107107

108+
- bash: |
109+
set -euo pipefail
110+
if xcrun simctl list runtimes | grep -q "iOS 26.2"; then
111+
echo "iOS 26.2 runtime already installed"
112+
exit 0
113+
fi
114+
echo "Downloading iOS 26.2 simulator runtime"
115+
sudo xcodebuild -downloadPlatform iOS -buildVersion 26.2
116+
displayName: Ensure iOS 26.2 simulator runtime
117+
108118
- template: ../templates/dotnet-mobile-install-mac.yml
109119
- template: ../templates/dotnet-install-previous-wasmtools.yml
110120
- template: ../templates/uno-dev-feed.yml

build/test-scripts/ios-uitest-run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ export UNO_TESTS_LOCAL_TESTS_FILE=$BUILD_SOURCESDIRECTORY/src/SamplesApp/Samples
110110
export UNO_UITEST_BENCHMARKS_PATH=$BUILD_ARTIFACTSTAGINGDIRECTORY/benchmarks/ios-automated
111111
export UNO_UITEST_RUNTIMETESTS_RESULTS_FILE_PATH=$BUILD_SOURCESDIRECTORY/build/RuntimeTestResults-ios-automated.xml
112112

113-
export UNO_UITEST_SIMULATOR_VERSION="com.apple.CoreSimulator.SimRuntime.iOS-17-5"
113+
export UNO_UITEST_SIMULATOR_VERSION="com.apple.CoreSimulator.SimRuntime.iOS-18-5"
114114
export UNO_UITEST_SIMULATOR_NAME="iPad Pro (12.9-inch) (6th generation)"
115115

116116
export UnoTargetFrameworkOverride="net9.0-ios18.0"

build/test-scripts/run-netcore-mobile-template-tests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ if ($IsWindows)
167167
}
168168
else
169169
{
170-
$default = @('-v:m', '-p:AotAssemblies=false')
170+
$default = @('-v:m', '-p:AotAssemblies=false', '-p:ValidateXcodeVersion=false')
171171
}
172172

173173
$debug = $default + '-p:Configuration=Debug'

0 commit comments

Comments
 (0)