Add support for net10.0-rc.1

.github/actions/environment/action.yml

@@ -24,6 +24,12 @@ runs:
       shell: bash
       run: sudo chmod 666 /var/run/docker.sock
 
+    # Install old deprecated libssl1 for .NET 5.0 on Linux
+    - name: Install libssl1 for NET 5.0 on Linux
+      if: ${{ runner.os == 'Linux' }}
+      shell: bash
+      run: sudo ./scripts/install-libssl1.sh
+
     - name: Install Linux ARM 32-bit dependencies
       if: ${{ matrix.rid == 'linux-arm' }}
       shell: bash
@@ -56,7 +62,7 @@ runs:
       uses: android-actions/setup-android@07976c6290703d34c16d382cb36445f98bb43b1f # v3.2.0
       with:
         # Exclude "tools" because the emulator is not needed (nor available for Windows/Linux ARM64)
-        packages: platform-tools platforms;android-34 platforms;android-35 build-tools;36.0.0
+        packages: platform-tools platforms;android-35 platforms;android-36 build-tools;36.0.0
         log-accepted-android-sdk-licenses: false
 
     # Java 11 is needed by .NET Android
@@ -90,6 +96,15 @@ runs:
         dotnet-version: |
           8.0.x
           9.0.304
+          10.0.100-rc.1.25451.107
+        global-json-file: global.json
+
+    # .NET 5.0 does not support ARM64 on macOS
+    - name: Install .NET 5.0 SDK
+      if: ${{ runner.os != 'macOS' || runner.arch != 'ARM64' }}
+      uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
+      with:
+        dotnet-version: 5.0.x
 
     - name: Install .NET Workloads
       shell: bash

.github/workflows/build.yml

@@ -64,15 +64,11 @@ jobs:
           key: sentry-native-${{ matrix.rid }}-${{ hashFiles('scripts/build-sentry-native.ps1') }}-${{ hashFiles('.git/modules/modules/sentry-native/HEAD') }}
           enableCrossOsArchive: true
 
-      - name: Remove unused applications
-        if: ${{ !matrix.container }}
-        uses: ./.github/actions/freediskspace
-
       - run: scripts/build-sentry-native.ps1
         if: steps.cache.outputs.cache-hit != 'true'
         shell: pwsh
 
-  build:
+  build-sentry:
     needs: build-sentry-native
     name: .NET (${{ matrix.rid }})
     runs-on: ${{ matrix.os }}
@@ -254,7 +250,8 @@ jobs:
         uses: actions/checkout@v5
         with:
           # We only check out what is absolutely necessary to reduce a chance of local files impacting
-          # integration tests, e.g. Directory.Build.props, nuget.config, ...
+          # integration tests (nuget.config etc.)... But we need the root Directory.Build.props calculate
+          # the package version
           sparse-checkout: |
             integration-test
             .github
@@ -267,11 +264,23 @@ jobs:
           path: src
 
       - name: Integration test
+        if: ${{ (matrix.rid != 'linux-musl-x64') && (matrix.rid != 'linux-musl-arm64') }}
+        uses: getsentry/github-workflows/sentry-cli/integration-test/@a5e409bd5bad4c295201cdcfe862b17c50b29ab7 # v2.14.1
+        with:
+          path: integration-test
+
+      # For the linux-musl runtimes we have to pin the ContainerBaseImage for preview or RC builds, since
+      # these don't conform to the normal naming conventions and don't get resolved automatically. We do
+      # by passing it as parameter to aot.Tests.ps1 via an environment variable
+      - name: Integration test (musl)
+        if: ${{ (matrix.rid == 'linux-musl-x64') || (matrix.rid == 'linux-musl-arm64') }}
         uses: getsentry/github-workflows/sentry-cli/integration-test/@v2
+        env:
+          ContainerBaseImage: 'mcr.microsoft.com/dotnet/nightly/runtime-deps:10.0-preview-alpine3.22'
         with:
           path: integration-test
 
-  msbuild:
+  ms-build:
     needs: build-sentry-native
     name: MSBuild
     runs-on: windows-latest
@@ -301,7 +310,12 @@ jobs:
 
       - name: Run MSBuild
         id: msbuild
-        run: msbuild Sentry-CI-Build-Windows.slnf -t:Restore,Build -p:Configuration=Release --nologo -v:minimal -flp:logfile=msbuild.log -p:CopyLocalLockFileAssemblies=true -bl:msbuild.binlog
+        run: msbuild Sentry-CI-Build-Windows.slnf -t:Restore,Build,Pack -p:Configuration=Release --nologo -v:minimal -flp:logfile=msbuild.log -p:CopyLocalLockFileAssemblies=true -bl:msbuild.binlog
+
+      - name: Test MSBuild
+        uses: getsentry/github-workflows/sentry-cli/integration-test/@a5e409bd5bad4c295201cdcfe862b17c50b29ab7 # v2.14.1
+        with:
+          path: integration-test/msbuild.Tests.ps1
 
       - name: Upload logs
         if: ${{ always() }}
@@ -316,7 +330,7 @@ jobs:
   # Unsupported Native AOT runtimes should have SentryNative auto-disabled
   # to avoid native library loading errors on startup.
   unsupported-aot:
-    needs: build
+    needs: build-sentry
     name: Unsupported AOT (${{ matrix.rid }})
     runs-on: ${{ matrix.os }}
 
@@ -348,7 +362,7 @@ jobs:
           path: src
 
       - name: Test AOT
-        uses: getsentry/github-workflows/sentry-cli/integration-test/@v2
+        uses: getsentry/github-workflows/sentry-cli/integration-test/@a5e409bd5bad4c295201cdcfe862b17c50b29ab7 # v2.14.1
         env:
           RuntimeIdentifier: ${{ matrix.rid }}
         with:
@@ -384,7 +398,7 @@ jobs:
         uses: ./.github/actions/buildnative
 
       - name: Publish Test app (macOS)
-        run: dotnet publish test/Sentry.TrimTest/Sentry.TrimTest.csproj -c Release -r osx-arm64
+        run: dotnet publish test/Sentry.TrimTest/Sentry.TrimTest.csproj -c Release -r osx-arm64 -p:NO_MOBILE=true
 
       - name: Publish Test app (Android)
         run: dotnet publish test/Sentry.MauiTrimTest/Sentry.MauiTrimTest.csproj -c Release -f net9.0-android35.0 -r android-arm64

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

@@ -8,6 +8,7 @@ on:
   pull_request:
     paths-ignore:
       - "**.md"
+  workflow_dispatch:
 
 jobs:
   build:
@@ -64,6 +65,12 @@ jobs:
     env:
       DOTNET_CLI_TELEMETRY_OPTOUT: 1
       DOTNET_NOLOGO: 1
+      # We don't need the Google APIs, but the default images are not available for 32+
+      ANDROID_EMULATOR_TARGET: google_apis
+      ANDROID_EMULATOR_RAM_SIZE: 2048M
+      ANDROID_EMULATOR_ARCH: x86_64
+      ANDROID_EMULATOR_DISK_SIZE: 4096M
+      ANDROID_EMULATOR_OPTIONS: -no-snapshot-save -no-window -accel on -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
     steps:
       # See https://github.blog/changelog/2023-02-23-hardware-accelerated-android-virtualization-on-actions-windows-and-linux-larger-hosted-runners/
       - name: Enable KVM group perms
@@ -87,17 +94,33 @@ jobs:
       # Cached AVD setup per https://github.com/ReactiveCircus/android-emulator-runner/blob/main/README.md
 
       - name: Run Tests
+        id: first-run
+        continue-on-error: true
         timeout-minutes: 40
         uses: reactivecircus/android-emulator-runner@1dcd0090116d15e7c562f8db72807de5e036a4ed # Tag: v2.34.0
         with:
           api-level: ${{ matrix.api-level }}
-          # We don't need the Google APIs, but the default images are not available for 32+
-          target: google_apis
+          target: ${{ env.ANDROID_EMULATOR_TARGET }}
           force-avd-creation: false
-          ram-size: 2048M
-          arch: x86_64
-          disk-size: 4096M
-          emulator-options: -no-snapshot-save -no-window -accel on -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          ram-size: ${{ env.ANDROID_EMULATOR_RAM_SIZE }}
+          arch: ${{ env.ANDROID_EMULATOR_ARCH }}
+          disk-size: ${{ env.ANDROID_EMULATOR_DISK_SIZE }}
+          emulator-options: ${{ env.ANDROID_EMULATOR_OPTIONS }}
+          disable-animations: false
+          script: pwsh scripts/device-test.ps1 android -Run -Tfm ${{ matrix.tfm }}
+
+      - name: Retry Tests (if previous failed to run)
+        if: steps.first-run.outcome == 'failure'
+        timeout-minutes: 40
+        uses: reactivecircus/android-emulator-runner@1dcd0090116d15e7c562f8db72807de5e036a4ed # Tag: v2.34.0
+        with:
+          api-level: ${{ matrix.api-level }}
+          target: ${{ env.ANDROID_EMULATOR_TARGET }}
+          force-avd-creation: false
+          ram-size: ${{ env.ANDROID_EMULATOR_RAM_SIZE }}
+          arch: ${{ env.ANDROID_EMULATOR_ARCH }}
+          disk-size: ${{ env.ANDROID_EMULATOR_DISK_SIZE }}
+          emulator-options: ${{ env.ANDROID_EMULATOR_OPTIONS }}
           disable-animations: false
           script: pwsh scripts/device-test.ps1 android -Run -Tfm ${{ matrix.tfm }}
 

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

@@ -8,6 +8,7 @@ on:
   pull_request:
     paths-ignore:
       - "**.md"
+  workflow_dispatch:
 
 jobs:
   ios-tests:

CHANGELOG.md

@@ -2,6 +2,40 @@
 
 ## Version 6.0.0
 
+### BREAKING CHANGES
+
+- This release adds support for .NET 10 and drops support for net8.0-android, net8.0-ios, net8.0-maccatalyst and net8.0-windows10.0.19041.0 ([#4461](https://github.com/getsentry/sentry-dotnet/pull/4461))
+## Unreleased
+
+### Features
+
+- Added `EnableBackpressureHandling` option for Automatic backpressure handling. When enabled this automatically reduces the sample rate when the SDK detects events being dropped. ([#4452](https://github.com/getsentry/sentry-dotnet/pull/4452))
+- Add (experimental) _Structured Logs_ integration for `Serilog` ([#4462](https://github.com/getsentry/sentry-dotnet/pull/4462))
+
+### Fixes
+
+- Upload linked PDBs to fix non-IL-stripped symbolication for iOS ([#4527](https://github.com/getsentry/sentry-dotnet/pull/4527))
+- In MAUI Android apps, generate and inject UUID to APK and upload ProGuard mapping to Sentry with the UUID ([#4532](https://github.com/getsentry/sentry-dotnet/pull/4532))
+- Fixed WASM0001 warning when building Blazor WebAssembly projects ([#4519](https://github.com/getsentry/sentry-dotnet/pull/4519))
+
+### Dependencies
+
+- Bump Cocoa SDK from v8.56.0 to v8.56.2 ([#4555](https://github.com/getsentry/sentry-dotnet/pull/4555), [#4572](https://github.com/getsentry/sentry-dotnet/pull/4572))
+  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8562)
+  - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.56.0...8.56.2)
+- Bump Native SDK from v0.11.0 to v0.11.1 ([#4557](https://github.com/getsentry/sentry-dotnet/pull/4557))
+  - [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#0111)
+  - [diff](https://github.com/getsentry/sentry-native/compare/0.11.0...0.11.1)
+- Bump CLI from v2.54.0 to v2.55.0 ([#4556](https://github.com/getsentry/sentry-dotnet/pull/4556))
+  - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#2550)
+  - [diff](https://github.com/getsentry/sentry-cli/compare/2.54.0...2.55.0)
+
+### Dependencies
+
+- Bump Java SDK from v8.21.1 to v8.22.0 ([#4552](https://github.com/getsentry/sentry-dotnet/pull/4552))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8220)
+  - [diff](https://github.com/getsentry/sentry-java/compare/8.21.1...8.22.0)
+
 ## 5.15.1
 
 ### Fixes

Directory.Build.props

@@ -1,7 +1,8 @@
 <Project>
 
   <PropertyGroup>
-    <VersionPrefix>5.15.1</VersionPrefix>
+    <VersionPrefix>6.0.0</VersionPrefix>
+    <VersionSuffix>prerelease</VersionSuffix>
     <LangVersion>13</LangVersion>
     <AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -20,11 +21,27 @@
     <!-- We need to support old stuff. Applications should definitely address these advisory warnings though. -->
     <NoWarn>$(NoWarn);NU1902;NU1903</NoWarn>
 
+    <!-- For Xcode 26 support in .NET 10 -->
+    <NoWarn>$(NoWarn);XCODE_26_0_PREVIEW</NoWarn>
+
     <!-- https://learn.microsoft.com/en-us/dotnet/core/compatibility/sdk/8.0/dotnet-restore-audit#version-introduced -->
     <WarningsNotAsErrors>NU1902;NU1903</WarningsNotAsErrors>
+
+    <!-- Centralized TFM versions -->
+    <LatestTfm>net10.0</LatestTfm>
+    <PreviousTfm>net9.0</PreviousTfm>
+    <OldestTfm>net8.0</OldestTfm>
+    <CurrentTfms>net8.0;net9.0;net10.0</CurrentTfms>
+    <LatestAndroidTfm>net10.0-android36.0</LatestAndroidTfm>
+    <PreviousAndroidTfm>net9.0-android35.0</PreviousAndroidTfm>
+    <LatestIosTfm>net9.0-ios26</LatestIosTfm>
+    <PreviousIosTfm>net9.0-ios18.0</PreviousIosTfm>
+    <LatestMacCatalystTfm>net9.0-maccatalyst26</LatestMacCatalystTfm>
+    <PreviousMacCatalystTfm>net9.0-maccatalyst18.0</PreviousMacCatalystTfm>
+    <PreviousWindowsTfm>net9.0-windows10.0.19041.0</PreviousWindowsTfm>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)' != 'Release'">
+  <PropertyGroup Condition="'$(Configuration)' != 'Release' And '$(VersionSuffix)' == ''">
     <VersionSuffix>dev</VersionSuffix>
   </PropertyGroup>
 
@@ -86,7 +103,7 @@
 
   <!-- Set the version and local path for Sentry CLI (downloaded in the restore phase of Sentry.csproj) -->
   <PropertyGroup Condition="'$(SolutionName)' != 'Sentry.Unity'">
-    <SentryCLIVersion>2.54.0</SentryCLIVersion>
+    <SentryCLIVersion>2.55.0</SentryCLIVersion>
     <SentryCLIDirectory>$(MSBuildThisFileDirectory)tools\sentry-cli\$(SentryCLIVersion)\</SentryCLIDirectory>
   </PropertyGroup>
 

Sentry.sln

@@ -209,6 +209,74 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sentry.SourceGenerators.Tes
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sentry.Maui.CommunityToolkit.Mvvm.Tests", "test\Sentry.Maui.CommunityToolkit.Mvvm.Tests\Sentry.Maui.CommunityToolkit.Mvvm.Tests.csproj", "{ADC91A84-6054-42EC-8241-0D717E4C7194}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{A8A97D6A-02C0-4808-9D62-DFFAB324A323}"
+	ProjectSection(SolutionItems) = preProject
+		scripts\update-cli.ps1 = scripts\update-cli.ps1
+		scripts\bump-version.sh = scripts\bump-version.sh
+		scripts\device-test.ps1 = scripts\device-test.ps1
+		scripts\dirty-check.ps1 = scripts\dirty-check.ps1
+		scripts\update-java.ps1 = scripts\update-java.ps1
+		scripts\bump-version.ps1 = scripts\bump-version.ps1
+		scripts\parse-xunit2-xml.ps1 = scripts\parse-xunit2-xml.ps1
+		scripts\build-sentry-cocoa.sh = scripts\build-sentry-cocoa.sh
+		scripts\update-project-xml.ps1 = scripts\update-project-xml.ps1
+		scripts\build-sentry-native.ps1 = scripts\build-sentry-native.ps1
+		scripts\ios-simulator-utils.ps1 = scripts\ios-simulator-utils.ps1
+		scripts\commit-formatted-code.sh = scripts\commit-formatted-code.sh
+		scripts\accept-verifier-changes.ps1 = scripts\accept-verifier-changes.ps1
+		scripts\generate-cocoa-bindings.ps1 = scripts\generate-cocoa-bindings.ps1
+		scripts\generate-solution-filters.ps1 = scripts\generate-solution-filters.ps1
+		scripts\generate-solution-filters-config.yaml = scripts\generate-solution-filters-config.yaml
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{EC6ADE8A-E557-4848-8F03-519039830B5F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{BFF081D8-7CC0-4069-99F5-5CA0D70B56AB}"
+	ProjectSection(SolutionItems) = preProject
+		.github\workflows\build.yml = .github\workflows\build.yml
+		.github\workflows\alpine.yml = .github\workflows\alpine.yml
+		.github\workflows\danger.yml = .github\workflows\danger.yml
+		.github\workflows\release.yml = .github\workflows\release.yml
+		.github\workflows\format-code.yml = .github\workflows\format-code.yml
+		.github\workflows\update-deps.yml = .github\workflows\update-deps.yml
+		.github\workflows\codeql-analysis.yml = .github\workflows\codeql-analysis.yml
+		.github\workflows\vulnerabilities.yml = .github\workflows\vulnerabilities.yml
+		.github\workflows\device-tests-ios.yml = .github\workflows\device-tests-ios.yml
+		.github\workflows\device-tests-android.yml = .github\workflows\device-tests-android.yml
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "actions", "actions", "{5D50D425-244F-4B79-B9F5-21D26DD52DC1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "environment", "environment", "{39216438-F347-427C-AB70-48DB1BA6E299}"
+	ProjectSection(SolutionItems) = preProject
+		.github\actions\environment\action.yml = .github\actions\environment\action.yml
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "buildnative", "buildnative", "{A384A71C-A46F-49DB-B7FB-5DEEFC5E6CA3}"
+	ProjectSection(SolutionItems) = preProject
+		.github\actions\buildnative\action.yml = .github\actions\buildnative\action.yml
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "freediskspace", "freediskspace", "{E34AA22F-B42E-4D4C-B96E-426AEBC2F367}"
+	ProjectSection(SolutionItems) = preProject
+		.github\actions\freediskspace\action.yml = .github\actions\freediskspace\action.yml
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "install-zstd", "install-zstd", "{94A2DCA5-F298-41FB-913A-476668EF5786}"
+	ProjectSection(SolutionItems) = preProject
+		.github\actions\install-zstd\action.yml = .github\actions\install-zstd\action.yml
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "integration-test", "integration-test", "{94CCDBEF-5867-4C24-A305-0C2AE738AF42}"
+	ProjectSection(SolutionItems) = preProject
+		integration-test\common.ps1 = integration-test\common.ps1
+		integration-test\aot.Tests.ps1 = integration-test\aot.Tests.ps1
+		integration-test\cli.Tests.ps1 = integration-test\cli.Tests.ps1
+		integration-test\runtime.Tests.ps1 = integration-test\runtime.Tests.ps1
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "net4-console", "net4-console", "{33793113-C7B5-434D-B5C1-6CA1A9587842}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -1343,5 +1411,12 @@ Global
 		{C3CDF61C-3E28-441C-A9CE-011C89D11719} = {230B9384-90FD-4551-A5DE-1A5C197F25B6}
 		{3A76FF7D-2F32-4EA5-8999-2FFE3C7CB893} = {6987A1CC-608E-4868-A02C-09D30C8B7B2D}
 		{ADC91A84-6054-42EC-8241-0D717E4C7194} = {6987A1CC-608E-4868-A02C-09D30C8B7B2D}
+		{BFF081D8-7CC0-4069-99F5-5CA0D70B56AB} = {EC6ADE8A-E557-4848-8F03-519039830B5F}
+		{5D50D425-244F-4B79-B9F5-21D26DD52DC1} = {EC6ADE8A-E557-4848-8F03-519039830B5F}
+		{39216438-F347-427C-AB70-48DB1BA6E299} = {5D50D425-244F-4B79-B9F5-21D26DD52DC1}
+		{A384A71C-A46F-49DB-B7FB-5DEEFC5E6CA3} = {5D50D425-244F-4B79-B9F5-21D26DD52DC1}
+		{E34AA22F-B42E-4D4C-B96E-426AEBC2F367} = {5D50D425-244F-4B79-B9F5-21D26DD52DC1}
+		{94A2DCA5-F298-41FB-913A-476668EF5786} = {5D50D425-244F-4B79-B9F5-21D26DD52DC1}
+		{33793113-C7B5-434D-B5C1-6CA1A9587842} = {94CCDBEF-5867-4C24-A305-0C2AE738AF42}
 	EndGlobalSection
 EndGlobal

SentryNoMobile.slnf

@@ -24,7 +24,6 @@
       "samples\\Sentry.Samples.GraphQL.Server\\Sentry.Samples.GraphQL.Server.csproj",
       "samples\\Sentry.Samples.Hangfire\\Sentry.Samples.Hangfire.csproj",
       "samples\\Sentry.Samples.Log4Net\\Sentry.Samples.Log4Net.csproj",
-      "samples\\Sentry.Samples.MacCatalyst\\Sentry.Samples.MacCatalyst.csproj",
       "samples\\Sentry.Samples.MacOS\\Sentry.Samples.MacOS.csproj",
       "samples\\Sentry.Samples.ME.Logging\\Sentry.Samples.ME.Logging.csproj",
       "samples\\Sentry.Samples.NLog\\Sentry.Samples.NLog.csproj",

benchmarks/Sentry.Benchmarks/BackgroundWorkerFlushBenchmarks.cs

@@ -20,7 +20,7 @@ public Task SendEnvelopeAsync(Envelope envelope, CancellationToken cancellationT
     [IterationSetup]
     public void IterationSetup()
     {
-        _backgroundWorker = new BackgroundWorker(new FakeTransport(), new SentryOptions { MaxQueueItems = 1000 });
+        _backgroundWorker = new BackgroundWorker(new FakeTransport(), new SentryOptions { MaxQueueItems = 1000 }, null);
         _event = new SentryEvent();
         _envelope = Envelope.FromEvent(_event);