Merge main

commit de20b78 Author: Ivan Dlugos <6349682+vaind@users.noreply.github.com> Date: Wed Dec 6 14:37:19 2023 +0100 Revert "Proguard upload test (#2947)" (#2951) commit d7a04a8 Author: Ivan Dlugos <6349682+vaind@users.noreply.github.com> Date: Wed Dec 6 13:42:17 2023 +0100 test: fix maui integration test (#2948) commit 22e93a7 Author: Giorgi Dalakishvili <Giorgi@users.noreply.github.com> Date: Wed Dec 6 00:56:00 2023 +0400 Proguard upload test (#2947) * Generate and upload mapping file for test app * Verify that test server recieves proguard mapping file
getsentry · Dec 6, 2023 · f3abc24 · f3abc24
1 parent 6684481
commit f3abc24
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,7 +7,7 @@ on:
       - release/*
   pull_request:
     paths-ignore:
-      - '**.md'
+      - "**.md"
 
 jobs:
   build-sentry-native:
@@ -104,7 +104,7 @@ jobs:
 
       # 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')
+        if: runner.os == 'macOS'
 
       - name: Restore .NET Dependencies
         run: dotnet restore Sentry-CI-Build-${{ runner.os }}.slnf --nologo
@@ -141,12 +141,12 @@ jobs:
   integration-test:
     needs: build
     name: Integration test (${{ matrix.os }})
-    runs-on: ${{ matrix.os }}-latest
+    runs-on: ${{ matrix.os }}
 
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu, windows, macos]
+        os: [ubuntu-latest, windows-latest, macos-13]
 
     steps:
       - uses: actions/checkout@v4
@@ -169,11 +169,12 @@ jobs:
           sudo apt update
           sudo apt install libcurl4-openssl-dev
 
+      - run: sudo xcode-select -s /Applications/Xcode_15.0.1.app
+        if: runner.os == 'macOS'
+
       - uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: |
-            7.0.x
-            8.0.x
+          dotnet-version: 8.0.x
 
       - run: dotnet workload install android maui-android
 

diff --git a/integration-test/cli.Tests.ps1 b/integration-test/cli.Tests.ps1
@@ -105,12 +105,9 @@ Describe 'Console apps (<framework>) - native AOT publish' -ForEach @(
     }
 }
 
-# TODO creating a sample app with `dotnet new` currently fails in CI on all platforms with:
-#  'error: NU1100: Unable to resolve 'Microsoft.Extensions.Http (>= 6.0.0)' for 'net7.0-android33.0'. PackageSourceMapping is enabled, the following source(s) were not considered: integration-test.'
-# Tracking issue: https://github.com/getsentry/sentry-dotnet/issues/2809
 Describe 'MAUI' -ForEach @(
-    @{ framework = "net7.0" }
-) -Skip:$true {
+    @{ framework = "net8.0" }
+) {
     BeforeAll {
         RegisterLocalPackage 'Sentry.Android.AssemblyReader'
         RegisterLocalPackage 'Sentry.Bindings.Android'
@@ -155,8 +152,8 @@ Describe 'MAUI' -ForEach @(
             'libxamarin-app.so',
             'maui-app.pdb'
         )
-        $result.ScriptOutput | Should -AnyElementMatch 'Found 1 debug information file \(1 with embedded sources\)'
         $result.ScriptOutput | Should -AnyElementMatch 'Uploaded a total of 1 new mapping files'
+        $result.ScriptOutput | Should -AnyElementMatch 'Found 17 debug information files \(1 with embedded sources\)'
     }
 
     It "uploads symbols and sources for an iOS build" -Skip:(!$IsMacOS) {
@@ -165,7 +162,9 @@ Describe 'MAUI' -ForEach @(
             'libmono-component-debugger.dylib',
             'libmono-component-diagnostics_tracing.dylib',
             'libmono-component-hot_reload.dylib',
+            'libmono-component-marshal-ilgen.dylib',
             'libmonosgen-2.0.dylib',
+            'libSystem.Globalization.Native.dylib',
             'libSystem.IO.Compression.Native.dylib',
             'libSystem.Native.dylib',
             'libSystem.Net.Security.Native.dylib',