Merge branch 'feat/logs' into feat/logs-initial-api

Author: Flash0ver

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,6 +1,6 @@
 name: 🐞 Bug Report
 description: Tell us about something that's not working the way we (probably) intend.
-labels: ["Platform: .NET", "bug"]
+labels: [".NET", "Bug"]
 body:
   - type: dropdown
     id: nuget

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/ISSUE_TEMPLATE/feature.yml

@@ -1,6 +1,6 @@
 name: 💡 Feature Request
 description: Tell us about a problem our SDK could solve but doesn't.
-labels: ["Platform: .NET", "enhancement"]
+labels: [".NET", "Feature"]
 body:
   - type: textarea
     id: problem

.github/ISSUE_TEMPLATE/maintainer-blank.yml

@@ -0,0 +1,17 @@
+name: Blank Issue
+description: Blank Issue. Reserved for maintainers.
+labels: [".NET"]
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: Please describe the issue.
+    validations:
+      required: true
+
+  - type: markdown
+    attributes:
+      value: |-
+        ## Thanks 🙏
+        Check our [triage docs](https://open.sentry.io/triage/) for what to expect next.

.github/actions/environment/action.yml

@@ -67,14 +67,14 @@ runs:
       with:
         dotnet-version: |
           8.0.x
-          9.0.203
+          9.0.301
 
     - name: Install .NET Workloads
       shell: bash
       run: |
         pwd
         dotnet workload install \
-          wasm-tools wasm-tools-net8 maui-android \
+          wasm-tools wasm-tools-net8 maui-android android mobile-librarybuilder \
           ${{ runner.os == 'macOS' && 'maui-ios maui-maccatalyst maui-windows macos' || '' }} \
           ${{ runner.os == 'Windows' && 'maui-ios maui-maccatalyst maui-windows' || '' }} \
           --temp-dir "${{ runner.temp }}" \

.github/workflows/build.yml

@@ -183,10 +183,7 @@ jobs:
           name: ${{ matrix.target || runner.os }}-verify-test-results
           path: "**/*.received.*"
 
-      # To save time and disk space, we only create and archive the NuGet packages when we're actually releasing.
-
       - name: Create NuGet Packages
-        if: env.CI_PUBLISHING_BUILD == 'true'
         run: dotnet pack Sentry-CI-Build-${{ matrix.target || runner.os }}.slnf -c Release --no-build --nologo
 
       - name: Archive NuGet Packages
@@ -199,44 +196,24 @@ jobs:
             src/**/Release/*.nupkg
             src/**/Release/*.snupkg
 
-  integration-test:
-    needs: build
-    name: Integration test (${{ matrix.container || matrix.os }})
-    runs-on: ${{ matrix.os }}
-    container: ${{ matrix.container }}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: ubuntu-22.04 # Pin ubuntu to ensure mono is installed
-          - os: ubuntu-22.04-arm
-          - os: ubuntu-latest
-            container: ghcr.io/getsentry/sentry-dotnet-alpine:3.21
-          - os: macos-15 # Pin macos to get the version of Xcode that we need: https://github.com/actions/runner-images/issues/10703
-          - os: windows-latest
-          - os: windows-11-arm
-
-    steps:
-      - uses: actions/checkout@v4
+      - name: Sparse checkout
+        if: env.CI_PUBLISHING_BUILD == 'true'
+        uses: actions/checkout@v4
         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, ...
           sparse-checkout: |
-            Directory.Build.props
             integration-test
             .github
 
       - name: Fetch NuGet Packages
+        if: env.CI_PUBLISHING_BUILD == 'true'
         uses: actions/download-artifact@v4
         with:
           name: ${{ github.sha }}
           path: src
 
-      - name: Setup Environment
-        uses: ./.github/actions/environment
-
-      - name: Test
+      - name: Integration test
         uses: getsentry/github-workflows/sentry-cli/integration-test/@v2
         with:
           path: integration-test

.gitignore

@@ -27,6 +27,7 @@ test/**/*.apk
 /tools/
 *.log
 .sentry-native
+**/EnvironmentVariables.g.cs
 
 # Download cache for Cocoa SDK
 modules/sentry-cocoa

CHANGELOG.md

@@ -5,13 +5,19 @@
 ### Features
 
 - Add experimental support for _Sentry Structured Logging_ via `SentrySdk.Experimental.Logger` ([#4158](https://github.com/getsentry/sentry-dotnet/pull/4158))
+- Added non-allocating `ConfigureScope` and `ConfigureScopeAsync` overloads ([#4244](https://github.com/getsentry/sentry-dotnet/pull/4244))
+- Add .NET MAUI `AutomationId` element information to breadcrumbs ([#4248](https://github.com/getsentry/sentry-dotnet/pull/4248))
 
 ### Fixes
 
 - The HTTP instrumentation uses the span created for the outgoing request in the sentry-trace header, fixing the parent-child relationship between client and server ([#4264](https://github.com/getsentry/sentry-dotnet/pull/4264))
+- InvalidOperationException sending attachments on Android with LLVM enabled ([#4276](https://github.com/getsentry/sentry-dotnet/pull/4276))
 
 ### Dependencies
 
+- Bump the version of the .NET SDK that we use from 9.0.203 to 9.0.301 ([#4272](https://github.com/getsentry/sentry-dotnet/pull/4272))
+  - Note that this also required we bump various Java dependencies (since version 9.0.300 of the Android workload requires newer versions of the these)
+  - See https://docs.sentry.io/platforms/dotnet/troubleshooting/#detected-package-version-outside-of-dependency-constraint if you see NU1605, NU1608 and/or NU1107 warnings after upgrading   
 - Bump Native SDK from v0.8.5 to v0.9.0 ([#4260](https://github.com/getsentry/sentry-dotnet/pull/4260))
   - [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#090)
   - [diff](https://github.com/getsentry/sentry-native/compare/0.8.5...0.9.0)

Directory.Build.props

@@ -67,6 +67,11 @@
     <DefineConstants>$(DefineConstants);CI_BUILD</DefineConstants>
   </PropertyGroup>
 
+  <!-- So we know at build time whether the DSN has been provided in an environment variable or not -->
+  <PropertyGroup Condition=" '$(SENTRY_DSN)' != '' ">
+    <DefineConstants>$(DefineConstants);SENTRY_DSN_DEFINED_IN_ENV</DefineConstants>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="UnoptimizedAssemblyDetector" Version="0.1.1" PrivateAssets="All" />
     <PackageReference Include="Roslynator.Analyzers" Version="4.9.0" PrivateAssets="All" />

Sentry-CI-Build-Linux-arm64.slnf

@@ -47,7 +47,6 @@
       "src\\Sentry.SourceGenerators\\Sentry.SourceGenerators.csproj",
       "src\\Sentry\\Sentry.csproj",
       "test\\Sentry.Analyzers.Tests\\Sentry.Analyzers.Tests.csproj",
-      "test\\Sentry.AspNet.Tests\\Sentry.AspNet.Tests.csproj",
       "test\\Sentry.AspNetCore.Grpc.Tests\\Sentry.AspNetCore.Grpc.Tests.csproj",
       "test\\Sentry.AspNetCore.Tests\\Sentry.AspNetCore.Tests.csproj",
       "test\\Sentry.AspNetCore.TestUtils\\Sentry.AspNetCore.TestUtils.csproj",