ci: run iOS device tests on arm64 (#4961)

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>

Author: jpnurmi

.github/workflows/device-tests-ios.yml

@@ -78,12 +78,12 @@ jobs:
         id: first-test-run
         continue-on-error: true
         timeout-minutes: 40
-        run: pwsh scripts/device-test.ps1 ios -Run
+        run: pwsh scripts/device-test.ps1 ios -Run -Verbose
 
       - name: Retry Tests (if previous failed to run)
         if: steps.first-test-run.outcome == 'failure'
         timeout-minutes: 40
-        run: pwsh scripts/device-test.ps1 ios -Run
+        run: pwsh scripts/device-test.ps1 ios -Run -Verbose
 
       - name: Run Integration Tests
         id: first-integration-test-run

scripts/device-test-utils.ps1

@@ -4,7 +4,7 @@ function Install-XHarness
     {
         $CI = Test-Path env:CI
         Push-Location ($CI ? $env:RUNNER_TEMP : $IsWindows ? $env:TMP : $IsMacos ? $env:TMPDIR : '/tmp')
-        dotnet tool install Microsoft.DotNet.XHarness.CLI --global --version '10.0.0-prerelease.25466.1' `
+        dotnet tool install Microsoft.DotNet.XHarness.CLI --global --version '11.0.0-prerelease.26117.1' `
             --add-source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json
         Pop-Location
     }

scripts/device-test.ps1

@@ -52,8 +52,6 @@ try
     {
         $Tfm += '-ios'
         $group = 'apple'
-        # Always use x64 on iOS, since arm64 doesn't support JIT, which is required for tests using NSubstitute
-        $arch = 'x64'
         $buildDir = "test/Sentry.Maui.Device.TestApp/bin/Release/$Tfm/iossimulator-$arch"
         $envValue = $CI ? 'true' : 'false'
         $arguments = @(

test/Sentry.Extensions.Logging.Tests/SentryHttpMessageHandlerBuilderFilterTests.cs

@@ -7,8 +7,8 @@ public class SentryHttpMessageHandlerBuilderFilterTests
     [SkippableFact]
     public void Configure_HandlerEnabled_ShouldAddSentryHttpMessageHandler()
     {
-#if __ANDROID__
-        Skip.If(true, "Can't create proxies for classes without parameterless constructors on Android");
+#if __MOBILE__
+        Skip.If(true, "Can't create proxies for classes without parameterless constructors on mobile");
 #endif
 
         // Arrange
@@ -31,8 +31,8 @@ public void Configure_HandlerEnabled_ShouldAddSentryHttpMessageHandler()
     [SkippableFact]
     public void Configure_HandlerDisabled_ShouldNotAddSentryHttpMessageHandler()
     {
-#if __ANDROID__
-        Skip.If(true, "Can't create proxies for classes without parameterless constructors on Android");
+#if __MOBILE__
+        Skip.If(true, "Can't create proxies for classes without parameterless constructors on mobile");
 #endif
 
         // Arrange

test/Sentry.Maui.Device.TestApp/Sentry.Maui.Device.TestApp.csproj

@@ -65,8 +65,8 @@
     <RuntimeIdentifier Condition="'$(TargetPlatformIdentifier)' == 'android'      And '$(OSArchitecture)' == 'Arm64'">android-arm64</RuntimeIdentifier>
     <RuntimeIdentifier Condition="'$(TargetPlatformIdentifier)' == 'android'      And '$(OSArchitecture)' == 'x64'">android-x64</RuntimeIdentifier>
 
-    <!-- On iOS we always target x64 since Arm64 doesn't support JIT, which is required by tests using NSubstitute   -->
-    <RuntimeIdentifier Condition="'$(TargetPlatformIdentifier)' == 'ios'">iossimulator-x64</RuntimeIdentifier>
+    <RuntimeIdentifier Condition="'$(TargetPlatformIdentifier)' == 'ios'          And '$(OSArchitecture)' == 'Arm64'">iossimulator-arm64</RuntimeIdentifier>
+    <RuntimeIdentifier Condition="'$(TargetPlatformIdentifier)' == 'ios'          And '$(OSArchitecture)' == 'x64'">iossimulator-x64</RuntimeIdentifier>
 
     <RuntimeIdentifier Condition="'$(TargetPlatformIdentifier)' == 'maccatalyst'  And '$(OSArchitecture)' == 'Arm64'">maccatalyst-arm64</RuntimeIdentifier>
     <RuntimeIdentifier Condition="'$(TargetPlatformIdentifier)' == 'maccatalyst'  And '$(OSArchitecture)' == 'x64'">maccatalyst-x64</RuntimeIdentifier>