Add support for v3 of the AssemblyStore format

.github/actions/environment/action.yml

@@ -67,7 +67,7 @@ runs:
         distribution: ${{ runner.os == 'Windows' && runner.arch == 'ARM64' && 'microsoft' || 'temurin' }}
         java-version: '11'
 
-    - name: Install Mono (macOS)
+    - name: Install Mono
       if: runner.os == 'macOS'
       shell: bash
       # Attempt to install Mono, allowing it to fail silently
@@ -76,14 +76,6 @@ runs:
         brew install mono || true
         brew link --overwrite mono
 
-    - name: Install Mono (Ubuntu)
-      if: ${{ runner.os == 'Linux' && !matrix.container }}
-      shell: bash
-      run: |
-        sudo apt install -y mono-devel
-        # restore perms for actions/setup-dotnet
-        sudo chmod -R a+rw /usr/share/dotnet
-
     - name: Install .NET SDK
       uses: actions/setup-dotnet@v4
       with:

.github/workflows/build.yml

@@ -19,7 +19,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-22.04
+          - os: ubuntu-22.04 # Pin ubuntu to ensure mono is installed
             rid: linux-x64
           - os: ubuntu-22.04-arm
             rid: linux-arm64
@@ -82,7 +82,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-22.04
+          - os: ubuntu-22.04 # Pin ubuntu to ensure mono is installed
             rid: linux-x64
             slnf: Sentry-CI-Build-Linux.slnf
           - os: ubuntu-22.04-arm

.github/workflows/codeql-analysis.yml

@@ -35,7 +35,7 @@ jobs:
         uses: ./.github/actions/environment
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@192325c86100d080feab897ff886c34abd4c83a3 # pin@v2
+        uses: github/codeql-action/init@f1f6e5f6af878fb37288ce1c627459e94dbf7d01 # pin@v2
         with:
           languages: csharp
 
@@ -49,6 +49,6 @@ jobs:
         run: dotnet build Sentry-CI-CodeQL.slnf --no-restore --nologo
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@192325c86100d080feab897ff886c34abd4c83a3 # pin@v2
+        uses: github/codeql-action/analyze@f1f6e5f6af878fb37288ce1c627459e94dbf7d01 # pin@v2
         with:
           category: '/language:csharp'

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

@@ -82,7 +82,7 @@ jobs:
           path: bin
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # pin@v3
+        uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # pin@v3
 
       # Cached AVD setup per https://github.com/ReactiveCircus/android-emulator-runner/blob/main/README.md
 

.github/workflows/release.yml

@@ -20,7 +20,7 @@ jobs:
     steps:
       - name: Get auth token
         id: token
-        uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
+        uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
         with:
           app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
           private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}

CHANGELOG.md

@@ -5,26 +5,15 @@
 ### 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))
+- Added support for v3 of the Android AssemblyStore format that is used in .NET 10 and dropped support for v1 that was used in .NET 8 ([#4516](https://github.com/getsentry/sentry-dotnet/pull/4516))
 
+## Unreleased
 ## 5.15.1
 
 ### Fixes
 
 - Fail when building Blazor WASM with Profiling. We don't support profiling in Blazor WebAssembly projects. ([#4512](https://github.com/getsentry/sentry-dotnet/pull/4512))
 - Do not overwrite user IP if it is set manually in ASP.NET sdk ([#4513](https://github.com/getsentry/sentry-dotnet/pull/4513))
-- Fix `SentryOptions.Native.SuppressSignalAborts` and `SuppressExcBadAccess` on iOS ([#4521](https://github.com/getsentry/sentry-dotnet/pull/4521))
-
-### Dependencies
-
-- Bump Cocoa SDK from v8.55.1 to v8.56.0 ([#4528](https://github.com/getsentry/sentry-dotnet/pull/4528))
-  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8560)
-  - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.55.1...8.56.0)
-- Bump CLI from v2.53.0 to v2.54.0 ([#4541](https://github.com/getsentry/sentry-dotnet/pull/4541))
-  - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#2540)
-  - [diff](https://github.com/getsentry/sentry-cli/compare/2.53.0...2.54.0)
-- Bump Native SDK from v0.10.1 to v0.11.0 ([#4542](https://github.com/getsentry/sentry-dotnet/pull/4542))
-  - [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#0110)
-  - [diff](https://github.com/getsentry/sentry-native/compare/0.10.1...0.11.0)
 
 ## 5.15.0
 

Directory.Build.props

@@ -102,7 +102,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.53.0</SentryCLIVersion>
     <SentryCLIDirectory>$(MSBuildThisFileDirectory)tools\sentry-cli\$(SentryCLIVersion)\</SentryCLIDirectory>
   </PropertyGroup>
 

modules/sentry-cocoa.properties

@@ -1,2 +1,2 @@
-version = 8.56.0
+version = 8.55.1
 repo = https://github.com/getsentry/sentry-cocoa

scripts/generate-cocoa-bindings.ps1

@@ -278,6 +278,9 @@ $Text = $Text -replace '([\[,] )iOS \(', '$1Introduced (PlatformName.iOS, '
 # Make interface partial if we need to access private APIs.  Other parts will be defined in PrivateApiDefinitions.cs
 $Text = $Text -replace '(?m)^interface SentryScope', 'partial $&'
 
+# Prefix SentryBreadcrumb.Serialize and SentryScope.Serialize with new (since these hide the base method)
+$Text = $Text -replace '(?m)(^\s*\/\/[^\r\n]*$\s*\[Export \("serialize"\)\]$\s*)(NSDictionary)', '${1}new $2'
+
 $Text = $Text -replace '.*SentryEnvelope .*?[\s\S]*?\n\n', ''
 $Text = $Text -replace '.*typedef.*SentryOnAppStartMeasurementAvailable.*?[\s\S]*?\n\n', ''
 

src/Sentry.Android.AssemblyReader/AndroidAssemblyReaderFactory.cs

@@ -1,4 +1,3 @@
-using Sentry.Android.AssemblyReader.V1;
 using Sentry.Android.AssemblyReader.V2;
 
 namespace Sentry.Android.AssemblyReader;
@@ -19,28 +18,13 @@ public static IAndroidAssemblyReader Open(string apkPath, IList<string> supporte
     {
         logger?.Invoke(DebugLoggerLevel.Debug, "Opening APK: {0}", apkPath);
 
-#if NET9_0
-        logger?.Invoke(DebugLoggerLevel.Debug, "Reading files using V2 APK layout.");
-        if (AndroidAssemblyStoreReaderV2.TryReadStore(apkPath, supportedAbis, logger, out var readerV2))
+        if (AndroidAssemblyStoreReader.TryReadStore(apkPath, supportedAbis, logger, out var readerV2))
         {
-            logger?.Invoke(DebugLoggerLevel.Debug, "APK uses AssemblyStore V2");
+            logger?.Invoke(DebugLoggerLevel.Debug, "APK uses AssemblyStore");
             return readerV2;
         }
 
         logger?.Invoke(DebugLoggerLevel.Debug, "APK doesn't use AssemblyStore");
-        return new AndroidAssemblyDirectoryReaderV2(apkPath, supportedAbis, logger);
-#else
-        logger?.Invoke(DebugLoggerLevel.Debug, "Reading files using V1 APK layout.");
-
-        var zipArchive = ZipFile.OpenRead(apkPath);
-        if (zipArchive.GetEntry("assemblies/assemblies.manifest") is not null)
-        {
-            logger?.Invoke(DebugLoggerLevel.Debug, "APK uses AssemblyStore V1");
-            return new AndroidAssemblyStoreReaderV1(zipArchive, supportedAbis, logger);
-        }
-
-        logger?.Invoke(DebugLoggerLevel.Debug, "APK doesn't use AssemblyStore");
-        return new AndroidAssemblyDirectoryReaderV1(zipArchive, supportedAbis, logger);
-#endif
+        return new AndroidAssemblyDirectoryReader(apkPath, supportedAbis, logger);
     }
 }