Merge branch 'main' into chore/integrate-traceevent

.github/CODEOWNERS

@@ -1 +1 @@
-*       @mattjohnsonpint @bitsandfoxes
+*       @bitsandfoxes @jamescrosswell @SeanFeldman

.github/actions/environment/action.yml

@@ -16,24 +16,23 @@ runs:
         distribution: 'temurin'
         java-version: '11'
 
-    # Android 33 is required for .NET Android targets, but is missing on windows-2019 images.
-    - name: Install Android 33
-      if: runner.os == 'Windows'
-      shell: cmd
-      run: '%ANDROID_HOME%\cmdline-tools\latest\bin\sdkmanager "platforms;android-33"'
-
-    # Note, the following is needed on the windows-2019 image only.
-    # All other versions of .NET we need are pre-installed on the GitHub Actions virtual images.
-    - name: Install .NET 6 SDK
+    # .NET 3.1 has been removed from all OS due to EOL
+    # https://github.com/actions/runner-images/issues/7667
+    - name: Install .NET 3.1 SDK
       uses: actions/setup-dotnet@v3
-      if: runner.os == 'Windows'
       with:
-        dotnet-version: 6.x.x
+        dotnet-version: 3.1.x
 
     - name: Install .NET 7 SDK
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.x.x
+        dotnet-version: 7.0.203   # switch back to 7.x.x after resolving the below Tizen issue.
+
+    # Workaround for Tizen issue
+    # See https://github.com/dotnet/sdk/issues/33192
+    - name: Pin to .NET SDK 7.0.203
+      run: dotnet new globaljson --sdk-version 7.0.203 --force
+      shell: bash
 
     - name: Dependency Caching
       uses: actions/cache@v3
@@ -53,7 +52,7 @@ runs:
           maui-android \
           ${{ runner.os == 'macOS' && 'maui-ios maui-maccatalyst maui-windows maui-tizen' || '' }} \
           ${{ runner.os == 'Windows' && 'maui-windows' || '' }} \
-          --temp-dir "${{ runner.temp }}"
+          --temp-dir "${{ runner.temp }}" --from-rollback-file rollback.json
 
     # We build Sentry.Maui for every supported MAUI target so we can access platform-specific features.
     # That includes Tizen. We don't need the entire Tizen SDK, but we do need the base Tizen workload.

.github/dependabot.yml

@@ -5,6 +5,12 @@ updates:
   schedule:
     interval: monthly
   open-pull-requests-limit: 2
+
+- package-ecosystem: nuget
+  directory: "/test"
+  schedule:
+    interval: weekly
+  open-pull-requests-limit: 2 
 
 - package-ecosystem: "github-actions"
   directory: "/"

.github/workflows/build.yml

@@ -15,13 +15,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # Using ubuntu-20.04 because ubuntu-latest is 22.04, which is fails Sentry.DiagnosticSource.Tests due to a SQLite on Mono issue.
-        # Using macos-12 because we need Xcode 13.3 or later to build Sentry.Samples.Maui. (macos-latest currently points at macos-11 which uses Xcode 13.2)
-        # Using windows-2019 because windows-latest is much slower and we don't need anything in particular from it.
-        os: [ubuntu-20.04, windows-2019, macos-12]
+        os: [ubuntu-latest, windows-latest, macos-latest]
 
     steps:
       - name: Cancel Previous Runs
+        if: github.ref_name != 'main' && !startsWith(github.ref_name, 'release/')
         uses: styfle/cancel-workflow-action@b173b6ec0100793626c2d9e6b90435061f4fc3e5 # Tag: 0.11.0
 
       - name: Checkout

.github/workflows/codeql-analysis.yml

@@ -23,6 +23,7 @@ jobs:
 
     steps:
       - name: Cancel Previous Runs
+        if: github.ref_name != 'main' && !startsWith(github.ref_name, 'release/')
         uses: styfle/cancel-workflow-action@b173b6ec0100793626c2d9e6b90435061f4fc3e5 # Tag: 0.11.0
 
       - name: Checkout repository
@@ -34,7 +35,7 @@ jobs:
         uses: ./.github/actions/environment
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@7df0ce34898d659f95c0c4a09eaa8d4e32ee64db # pin@v2
+        uses: github/codeql-action/init@cdcdbb579706841c47f7063dda365e292e5cad7a # pin@v2
         with:
           languages: csharp
 
@@ -45,6 +46,6 @@ jobs:
         run: dotnet build Sentry-CI-CodeQL.slnf --no-restore --nologo
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@7df0ce34898d659f95c0c4a09eaa8d4e32ee64db # pin@v2
+        uses: github/codeql-action/analyze@cdcdbb579706841c47f7063dda365e292e5cad7a # pin@v2
         with:
           category: '/language:csharp'

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

@@ -15,6 +15,7 @@ jobs:
       DOTNET_NOLOGO: 1
     steps:
       - name: Cancel Previous Runs
+        if: github.ref_name != 'main' && !startsWith(github.ref_name, 'release/')
         uses: styfle/cancel-workflow-action@b173b6ec0100793626c2d9e6b90435061f4fc3e5 # Tag: 0.11.0
 
       - name: Checkout
@@ -32,7 +33,7 @@ jobs:
         uses: ./.github/actions/buildnative
 
       - name: Install .NET Workloads
-        run: dotnet workload install maui-android --temp-dir "${{ runner.temp }}"
+        run: dotnet workload install maui-android --temp-dir "${{ runner.temp }}" --from-rollback-file rollback.json
 
       - name: Restore .NET Dependencies
         run: dotnet restore test/Sentry.Maui.Device.TestApp --nologo
@@ -83,7 +84,7 @@ jobs:
         run: dotnet tool install Microsoft.DotNet.XHarness.CLI --global --version "1.*-*"
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@749f47bda3e44aa060e82d7b3ef7e40d953bd629 # pin@v2
+        uses: gradle/gradle-build-action@a4cf152f482c7ca97ef56ead29bf08bcd953284c # pin@v2
 
       # Cached AVD setup per https://github.com/ReactiveCircus/android-emulator-runner/blob/main/README.md
 

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

@@ -17,6 +17,7 @@ jobs:
       NO_MACCATALYST: true
     steps:
       - name: Cancel Previous Runs
+        if: github.ref_name != 'main' && !startsWith(github.ref_name, 'release/')
         uses: styfle/cancel-workflow-action@b173b6ec0100793626c2d9e6b90435061f4fc3e5 # Tag: 0.11.0
 
       - name: Checkout
@@ -28,7 +29,7 @@ jobs:
         uses: ./.github/actions/buildcocoasdk
 
       - name: Install .NET Workloads
-        run: dotnet workload install maui-ios --temp-dir "${{ runner.temp }}"
+        run: dotnet workload install maui-ios --temp-dir "${{ runner.temp }}" --from-rollback-file rollback.json
 
       - name: Restore .NET Dependencies
         run: dotnet restore test/Sentry.Maui.Device.TestApp --nologo

.github/workflows/vulnerabilities.yml

@@ -14,9 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # Using macos-12 because we need Xcode 13.3 or later to build Sentry.Samples.Maui. (macos-latest currently points at macos-11 which uses Xcode 13.2)
-        # Using windows-2019 because windows-latest is much slower and we don't need anything in particular from it.
-        os: [ubuntu-latest, windows-2019, macos-12]
+        os: [ubuntu-latest, windows-latest, macos-latest]
 
     steps:
       - name: Checkout
@@ -29,7 +27,7 @@ jobs:
 
       # We only need to restore to check for vulnerable packages
       - name: Restore .NET Dependencies
-        run: dotnet restore Sentry-CI-Build-${{ runner.os }}.slnf --nologo
+        run: dotnet restore --nologo
 
       # The dotnet list package command doesn't change its exit code on detection, so tee to a file and scan it
       # See https://github.com/NuGet/Home/issues/11315#issuecomment-1243055173