diff --git a/.github/workflows/device-tests-ios.yml b/.github/workflows/device-tests-ios.yml index c4f191a8a6..c966f658ca 100644 --- a/.github/workflows/device-tests-ios.yml +++ b/.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 diff --git a/scripts/device-test-utils.ps1 b/scripts/device-test-utils.ps1 index 455e85e4e8..4a492592df 100644 --- a/scripts/device-test-utils.ps1 +++ b/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 } diff --git a/scripts/device-test.ps1 b/scripts/device-test.ps1 index dc896e2280..60a2c82644 100644 --- a/scripts/device-test.ps1 +++ b/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 = @( diff --git a/test/Sentry.Extensions.Logging.Tests/SentryHttpMessageHandlerBuilderFilterTests.cs b/test/Sentry.Extensions.Logging.Tests/SentryHttpMessageHandlerBuilderFilterTests.cs index ee3e59fff6..49349a8b5a 100644 --- a/test/Sentry.Extensions.Logging.Tests/SentryHttpMessageHandlerBuilderFilterTests.cs +++ b/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 diff --git a/test/Sentry.Maui.Device.TestApp/Sentry.Maui.Device.TestApp.csproj b/test/Sentry.Maui.Device.TestApp/Sentry.Maui.Device.TestApp.csproj index 602e09d06b..64d296477a 100644 --- a/test/Sentry.Maui.Device.TestApp/Sentry.Maui.Device.TestApp.csproj +++ b/test/Sentry.Maui.Device.TestApp/Sentry.Maui.Device.TestApp.csproj @@ -65,8 +65,8 @@ android-arm64 android-x64 - - iossimulator-x64 + iossimulator-arm64 + iossimulator-x64 maccatalyst-arm64 maccatalyst-x64