From 65821dae1056dcb8c7f4f7314f72e3a0e4631179 Mon Sep 17 00:00:00 2001 From: Ricardo Colombo Oliveira Date: Fri, 30 Oct 2026 08:14:11 +0100 Subject: [PATCH 1/3] test: pin Pkcs for the net11.0 EF Core integration tests EF Core 11 RC 3 brings in Microsoft.Data.SqlClient 7.1.0, which resolves System.Security.Cryptography.Pkcs 9.0.18, and GHSA-846f-f764-76mx and GHSA-2fmv-rv2c-59x7 cover that version. #5771 pinned it for net10.0. The weekly vulnerability scan only runs on main, so net11.0 would only show up once version7 merges into main. Co-Authored-By: Claude Opus 5.5 --- .../Sentry.DiagnosticSource.IntegrationTests.csproj | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/Sentry.DiagnosticSource.IntegrationTests/Sentry.DiagnosticSource.IntegrationTests.csproj b/test/Sentry.DiagnosticSource.IntegrationTests/Sentry.DiagnosticSource.IntegrationTests.csproj index 1842a0f831..d0b9b16f74 100644 --- a/test/Sentry.DiagnosticSource.IntegrationTests/Sentry.DiagnosticSource.IntegrationTests.csproj +++ b/test/Sentry.DiagnosticSource.IntegrationTests/Sentry.DiagnosticSource.IntegrationTests.csproj @@ -6,13 +6,16 @@ $(TargetFrameworks);net48 - + + + + From c2030e6e354014f8a52560bc742f2d1b9b003410 Mon Sep 17 00:00:00 2001 From: Ricardo Colombo Oliveira Date: Fri, 30 Oct 2026 08:14:11 +0100 Subject: [PATCH 2/3] ci: run the device tests when Sentry.Extensions.Hosting changes Sentry.Maui.Tests references Sentry.Extensions.Hosting and runs on device, but neither device test workflow listed it in its path filter. A PR that only changed Sentry.Extensions.Hosting skipped the device tests. Co-Authored-By: Claude Opus 5.5 --- .github/workflows/device-tests-android.yml | 2 ++ .github/workflows/device-tests-ios.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/device-tests-android.yml b/.github/workflows/device-tests-android.yml index 8972524831..3fa581ab12 100644 --- a/.github/workflows/device-tests-android.yml +++ b/.github/workflows/device-tests-android.yml @@ -28,6 +28,8 @@ on: - 'test/Sentry.Testing/**' - 'test/Sentry.Testing.CrashableApp/**' - 'test/AndroidTestApp/**' + # Referenced by Sentry.Maui.Tests + - 'src/Sentry.Extensions.Hosting/**' # Integration tests - 'integration-test/android.Tests.ps1' - 'integration-test/ios.Tests.ps1' diff --git a/.github/workflows/device-tests-ios.yml b/.github/workflows/device-tests-ios.yml index 8b3d652aa8..0f3f4d5c65 100644 --- a/.github/workflows/device-tests-ios.yml +++ b/.github/workflows/device-tests-ios.yml @@ -28,6 +28,8 @@ on: - 'test/Sentry.Testing/**' - 'test/Sentry.Testing.CrashableApp/**' - 'test/AndroidTestApp/**' + # Referenced by Sentry.Maui.Tests + - 'src/Sentry.Extensions.Hosting/**' # Integration tests - 'integration-test/android.Tests.ps1' - 'integration-test/ios.Tests.ps1' From 3b8e22a2f9df9126f15316cf2133f8d2d0362056 Mon Sep 17 00:00:00 2001 From: Ricardo Colombo Oliveira Date: Fri, 30 Oct 2026 08:45:44 +0100 Subject: [PATCH 3/3] ci: remove the Cocoa cache steps the version7 sync duplicated MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The main→version7 merge (11b5491f) kept both sides' copy of the Cocoa cache steps. The ios-tests job in device-tests-ios.yml got "Get Cocoa SDK cache key" and "Restore Cocoa SDK" twice, and GitHub rejects a workflow whose steps repeat an id, so the iOS device tests haven't run on version7 since. The build-sentry job in build.yml got "Save Cocoa SDK" twice in a row. That one has no id, so it only tried to save the same key a second time. Co-Authored-By: Claude Opus 5.5 --- .github/workflows/build.yml | 8 -------- .github/workflows/device-tests-ios.yml | 12 ------------ 2 files changed, 20 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d8f18852d9..ce697fde02 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -261,14 +261,6 @@ jobs: path: modules/sentry-cocoa/Carthage key: ${{ steps.cache-cocoa.outputs.cache-primary-key }} - # Only a completed Cocoa build writes the stamp, so a failed one is never cached. - - name: Save Cocoa SDK - if: ${{ !cancelled() && steps.cache-cocoa.outputs.cache-primary-key != '' && steps.cache-cocoa.outputs.cache-hit != 'true' && hashFiles('modules/sentry-cocoa/Carthage/.built-from-sha') != '' }} - uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 - with: - path: modules/sentry-cocoa/Carthage - key: ${{ steps.cache-cocoa.outputs.cache-primary-key }} - - name: Upload build logs if: ${{ always() }} uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2 diff --git a/.github/workflows/device-tests-ios.yml b/.github/workflows/device-tests-ios.yml index 0f3f4d5c65..fff2bb3409 100644 --- a/.github/workflows/device-tests-ios.yml +++ b/.github/workflows/device-tests-ios.yml @@ -91,18 +91,6 @@ jobs: path: modules/sentry-cocoa/Carthage key: ${{ steps.cocoa-key.outputs.key }} - # See build.yml - - name: Get Cocoa SDK cache key - id: cocoa-key - uses: ./.github/actions/cocoa-cache-key - - - name: Restore Cocoa SDK - id: cache-cocoa - uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 - with: - path: modules/sentry-cocoa/Carthage - key: ${{ steps.cocoa-key.outputs.key }} - - name: Build iOS Test App run: pwsh ./scripts/device-test.ps1 ios -Build