4.0.0

.gitattributes

@@ -2,6 +2,7 @@
 *.cs text=auto eol=lf diff=csharp
 *.sln text=auto eol=crlf
 *.sh eol=lf
+*.ps1 eol=lf
 CHANGELOG.md merge=union
 
 

.github/actions/buildnative/action.yml

@@ -9,26 +9,39 @@ runs:
       shell: bash
       run: echo "JAVA_HOME_11=$JAVA_HOME_11_X64" >> $GITHUB_ENV
 
+    - uses: actions/cache@v3
+      id: cache-c
+      with:
+        path: lib/sentrysupplemental/bin
+        key: supplemental-c-${{ runner.os }}-${{ hashFiles('lib/sentrysupplemental/*.*') }}
+
     - name: Install Ninja
+      if: ${{ steps.cache-c.outputs.cache-hit != 'true' }}
       shell: bash
       run: ${{ runner.os == 'macOS' && 'brew install ninja' || runner.os == 'Windows' && 'choco install ninja' || 'sudo apt-get update && sudo apt-get install ninja-build' }}
 
     - name: Build C Project
-      if: runner.os == 'Linux' || runner.os == 'macOS'
+      if: ${{ steps.cache-c.outputs.cache-hit != 'true' && (runner.os == 'Linux' || runner.os == 'macOS') }}
       shell: bash
       run: lib/sentrysupplemental/build.sh
 
     - name: Build C Project
-      if: runner.os == 'Windows'
+      if: ${{ steps.cache-c.outputs.cache-hit != 'true' && runner.os == 'Windows' }}
       shell: cmd
       run: lib\sentrysupplemental\build.cmd
 
+    - uses: actions/cache@v3
+      id: cache-android
+      with:
+        path: lib/sentry-android-supplemental/bin
+        key: supplemental-android-${{ runner.os }}-${{ hashFiles('lib/sentry-android-supplemental/*.*') }}
+
     - name: Build Java Project
-      if: runner.os == 'Linux' || runner.os == 'macOS'
+      if: ${{ steps.cache-android.outputs.cache-hit != 'true' && runner.os == 'Linux' || runner.os == 'macOS' }}
       shell: bash
       run: lib/sentry-android-supplemental/build.sh
 
     - name: Build Java Project
-      if: runner.os == 'Windows'
+      if: ${{ steps.cache-android.outputs.cache-hit != 'true' && runner.os == 'Windows' }}
       shell: cmd
       run: lib\sentry-android-supplemental\build.cmd

.github/actions/environment/action.yml

@@ -17,38 +17,21 @@ runs:
         distribution: 'temurin'
         java-version: '11'
 
-    # .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
+    # .NET 6 and .NET 8 are not built-in with macos-13
+    - name: Install .NET SDK
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 3.1.x
-
-    - name: Install .NET 7 SDK
-      uses: actions/setup-dotnet@v3
-      with:
-        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
+        dotnet-version: |
+          6.0.x
+          7.0.x
+          8.0.x
 
     - name: Install .NET Workloads
       shell: bash
       run: >
         dotnet workload install \
           maui-android \
-          ${{ runner.os == 'macOS' && 'maui-ios maui-maccatalyst maui-windows maui-tizen' || '' }} \
+          ${{ runner.os == 'macOS' && 'maui-ios maui-maccatalyst maui-windows' || '' }} \
           ${{ runner.os == 'Windows' && 'maui-windows' || '' }} \
-          --temp-dir "${{ runner.temp }}" --from-rollback-file rollback.json \
+          --temp-dir "${{ runner.temp }}" \
           --skip-sign-check
-
-    # 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.
-    # Though we could install it on all runners, we really only need it when building and packing for NuGet, which we do on macOS only.
-    - name: Install Tizen Workload
-      if: runner.os == 'macOS'
-      shell: bash
-      run: "curl -sSL https://raw.githubusercontent.com/Samsung/Tizen.NET/main/workload/scripts/workload-install.sh | sudo bash"

.github/workflows/build.yml

@@ -6,16 +6,45 @@ on:
       - main
       - release/*
   pull_request:
+    paths-ignore:
+      - '**.md'
 
 jobs:
+  build-sentry-native:
+    name: sentry-native (${{ matrix.os }})
+    runs-on: ${{ matrix.os }}-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu, windows, macos]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - run: git submodule update --init modules/sentry-native
+
+      - uses: actions/cache@v3
+        id: cache
+        with:
+          path: src/Sentry/Platforms/Native/sentry-native
+          key: sentry-native-${{ runner.os }}-${{ hashFiles('scripts/build-sentry-native.ps1') }}-${{ hashFiles('.git/modules/modules/sentry-native/HEAD') }}
+          enableCrossOsArchive: true
+
+      - run: scripts/build-sentry-native.ps1
+        if: steps.cache.outputs.cache-hit != 'true'
+        shell: pwsh
+
   build:
-    name: ${{ matrix.os }}
+    needs: build-sentry-native
+    name: .NET (${{ matrix.os }})
     runs-on: ${{ matrix.os }}
 
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        # Pinning `macos-13` because Microsoft.iOS 16.4 requires Xcode 14.3 which is only built-in in 13
+        os: [ubuntu-latest, windows-latest, macos-13]
 
     steps:
       - name: Cancel Previous Runs
@@ -29,9 +58,34 @@ jobs:
 
       # We use macOS for the final publishing build so we we get all the iOS/macCatalyst targets in the packages
       - name: Set Environment Variables
-        if: startsWith(matrix.os, 'macos') && startsWith(github.ref_name, 'release/')
+        if: startsWith(matrix.os, 'macos')
         run: echo "CI_PUBLISHING_BUILD=true" >> $GITHUB_ENV
 
+      - name: Download sentry-native (Linux)
+        if: ${{ (env.CI_PUBLISHING_BUILD == 'true') || (runner.os == 'Linux') }}
+        uses: actions/cache/restore@v3
+        with:
+          path: src/Sentry/Platforms/Native/sentry-native
+          key: sentry-native-Linux-${{ hashFiles('scripts/build-sentry-native.ps1') }}-${{ hashFiles('.git/modules/modules/sentry-native/HEAD') }}
+          fail-on-cache-miss: true
+
+      - name: Download sentry-native (macOS)
+        if: ${{ (env.CI_PUBLISHING_BUILD == 'true') || (runner.os == 'macOS') }}
+        uses: actions/cache/restore@v3
+        with:
+          path: src/Sentry/Platforms/Native/sentry-native
+          key: sentry-native-macOS-${{ hashFiles('scripts/build-sentry-native.ps1') }}-${{ hashFiles('.git/modules/modules/sentry-native/HEAD') }}
+          fail-on-cache-miss: true
+
+      - name: Download sentry-native (Windows)
+        if: ${{ (env.CI_PUBLISHING_BUILD == 'true') || (runner.os == 'Windows') }}
+        uses: actions/cache/restore@v3
+        with:
+          path: src/Sentry/Platforms/Native/sentry-native
+          key: sentry-native-Windows-${{ hashFiles('scripts/build-sentry-native.ps1') }}-${{ hashFiles('.git/modules/modules/sentry-native/HEAD') }}
+          fail-on-cache-miss: true
+          enableCrossOsArchive: true
+
       - name: Setup Environment
         uses: ./.github/actions/environment
 
@@ -42,28 +96,20 @@ jobs:
         if: runner.os == 'macOS'
         uses: ./.github/actions/buildcocoasdk
 
+      # Only switch to newer xcode after building the Cocoa SDK so that it can keep IPHONEOS_DEPLOYMENT_TARGET=11.0
+      - run: sudo xcode-select -s /Applications/Xcode_15.0.1.app
+        if: startsWith(matrix.os, 'macos')
+
       - name: Restore .NET Dependencies
         run: dotnet restore Sentry-CI-Build-${{ runner.os }}.slnf --nologo
 
-      - name: Build (for non-release branch)
-        if: env.CI_PUBLISHING_BUILD != 'true'
-        run: dotnet build Sentry-CI-Build-${{ runner.os }}.slnf -c Release --no-restore --nologo
-
-      - name: Build (for release branch)
-        if: env.CI_PUBLISHING_BUILD == 'true'
-        run: dotnet build Sentry-CI-Build-${{ runner.os }}.slnf -c Release --no-restore --nologo -p:CopyLocalLockFileAssemblies=true
-        env:
-          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+      - name: Build
+        run: dotnet build Sentry-CI-Build-${{ runner.os }}.slnf -c Release --no-restore --nologo -flp:logfile=build.log -p:CopyLocalLockFileAssemblies=true
 
       - name: Test
         run: dotnet test Sentry-CI-Build-${{ runner.os }}.slnf -c Release --no-build --nologo -l GitHubActions -l "trx;LogFilePrefix=testresults_${{ runner.os }}"
 
-      - name: Test symbol upload
-        uses: getsentry/github-workflows/sentry-cli/integration-test/@v2
-        with:
-          path: test
-
-      - name: Upload Verify Results
+      - name: Upload build and test outputs
         if: failure()
         uses: actions/upload-artifact@v3
         with:
@@ -72,19 +118,57 @@ jobs:
 
       # To save time and disk space, we only create and archive the Nuget packages when we're actually releasing.
 
-      - name: Create Nuget Packages (release branch only)
+      - name: Create Nuget Packages
         if: env.CI_PUBLISHING_BUILD == 'true'
         run: dotnet pack Sentry-CI-Build-${{ runner.os }}.slnf -c Release --no-build --nologo
 
-      - name: Archive Nuget Packages (release branch only)
+      - name: Archive Nuget Packages
         if: env.CI_PUBLISHING_BUILD == 'true'
         uses: actions/upload-artifact@v3
         with:
           name: ${{ github.sha }}
           if-no-files-found: error
           path: |
-            ${{ github.workspace }}/src/**/Release/*.nupkg
-            ${{ github.workspace }}/src/**/Release/*.snupkg
+            src/**/Release/*.nupkg
+            src/**/Release/*.snupkg
+
+  integration-test:
+    needs: build
+    name: Integration test (${{ matrix.os }})
+    runs-on: ${{ matrix.os }}-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu, windows, macos]
+
+    steps:
+      - 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
+
+      - name: Fetch Nuget Packages
+        uses: actions/download-artifact@v3
+        with:
+          name: ${{ github.sha }}
+          path: src
+
+      - uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: |
+            7.0.x
+            8.0.x
+
+      - run: dotnet workload install android maui-android
+
+      - name: Test
+        uses: getsentry/github-workflows/sentry-cli/integration-test/@v2
+        with:
+          path: integration-test
 
   test-solution-filters:
     runs-on: ubuntu-latest

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

@@ -6,6 +6,8 @@ on:
       - main
       - release/*
   pull_request:
+    paths-ignore:
+      - '**.md'
 
 jobs:
   build:
@@ -26,27 +28,24 @@ jobs:
       - name: Set Java Version
         uses: actions/setup-java@v3
         with:
-          distribution: 'temurin'
-          java-version: '11'
+          distribution: "temurin"
+          java-version: "11"
+
+      - name: Setup Environment
+        uses: ./.github/actions/environment
 
       - name: Build Native Dependencies
         uses: ./.github/actions/buildnative
 
-      - name: Install .NET Workloads
-        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
-
       - name: Build Android Test App
-        run: dotnet build test/Sentry.Maui.Device.TestApp -c Release -f net7.0-android --no-restore --nologo
+        run: pwsh ./scripts/device-test.ps1 android -Build
 
       - name: Upload Android Test App
         uses: actions/upload-artifact@v3
         with:
           name: device-test-android
           if-no-files-found: error
-          path: test/Sentry.Maui.Device.TestApp/bin/Release/net7.0-android/io.sentry.dotnet.maui.device.testapp-Signed.apk
+          path: test/Sentry.Maui.Device.TestApp/bin/Release/net7.0-android/android-x64/io.sentry.dotnet.maui.device.testapp-Signed.apk
 
   android:
     needs: [build]
@@ -64,13 +63,12 @@ jobs:
       DOTNET_CLI_TELEMETRY_OPTOUT: 1
       DOTNET_NOLOGO: 1
     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
         run: |
-            echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
-            sudo udevadm control --reload-rules
-            sudo udevadm trigger --name-match=kvm
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
 
       - name: Checkout
         uses: actions/checkout@v4
@@ -81,9 +79,6 @@ jobs:
           name: device-test-android
           path: bin
 
-      - name: Install XHarness
-        run: dotnet tool install Microsoft.DotNet.XHarness.CLI --global --version "1.*-*"
-
       - name: Setup Gradle
         uses: gradle/gradle-build-action@87a9a15658c426a54dd469d4fc7dc1a73ca9d4a6 # pin@v2
 
@@ -127,12 +122,7 @@ jobs:
           disk-size: 4096M
           emulator-options: -no-snapshot-save -no-window -accel on -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: false
-          script: xharness android test --output-directory=./test_output --app=bin/io.sentry.dotnet.maui.device.testapp-Signed.apk --package-name=io.sentry.dotnet.maui.device.testapp
-
-      - name: Create Test Report
-        if: success() || failure()
-        run: scripts/parse-xunit2-xml.ps1 ./test_output/TestResults.xml | Out-File $env:GITHUB_STEP_SUMMARY
-        shell: pwsh
+          script: pwsh scripts/device-test.ps1 android -Run
 
       - name: Upload results
         if: success() || failure()