Skip to content

Add support for v3 of the AssemblyStore format #4516

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jamescrosswell wants to merge 12 commits into from
Closed

Add support for v3 of the AssemblyStore format #4516

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a76a137
Add support for v3 of the AssemblyStore format
jamescrosswell Sep 12, 2025
8e28d70
Format code
getsentry-bot Sep 12, 2025
c2f5bed
Merge branch 'net10' into assembly-store-3
jamescrosswell Sep 18, 2025
05e17a2
Fixed AndroidAssemblyReader tests
jamescrosswell Sep 18, 2025
9f96217
Update CHANGELOG.md
jamescrosswell Sep 18, 2025
d3aa5bc
Renamed v2 classes and remove remaining vestiges of v1
jamescrosswell Sep 24, 2025
5f9cffa
Merge branch 'main' into assembly-store-3
jamescrosswell Sep 24, 2025
29abe0a
Revert "Merge branch 'main' into assembly-store-3"
jamescrosswell Sep 24, 2025
55c38fa
Merge branch 'net10' into assembly-store-3
jamescrosswell Sep 24, 2025
fee26aa
Merge branch 'net10' into assembly-store-3
jamescrosswell Sep 30, 2025
61254ed
Fix accidental merge changes
jamescrosswell Sep 30, 2025
9faa32e
.
jamescrosswell Sep 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions .github/actions/environment/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -76,14 +76,6 @@ runs:
brew install mono || true
brew link --overwrite mono

- name: Install Mono (Ubuntu)
Copy link
Collaborator

@jpnurmi jpnurmi Sep 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was this intentionally removed, or did something go wrong with the merges?

Copy link
Collaborator Author

@jamescrosswell jamescrosswell Sep 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Definitely something wrong with the merges... which is painful. Looks like I'll have to roll it all back manually.

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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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'
2 changes: 1 addition & 1 deletion .github/workflows/device-tests-android.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
15 changes: 2 additions & 13 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Comment on lines 49 to 57
Copy link
Member

@Flash0ver Flash0ver Sep 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These downgrades (see also Directory.Build.props, modules/sentry-cocoa.properties, modules/sentry-native, ...) don't seem intended, are they?


## 5.15.0

Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Copy link

@cursor cursor bot Sep 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bug: Sentry CLI and Native Downgrade Due to Merge Conflict

This commit unintentionally downgraded the SentryCLIVersion from 2.55.0 to 2.53.0 and the sentry-native submodule from commit 075b3bfee1dbb85fa10d50df631286196943a3e0 to 11f94efc64d55e90aef9456ce01716c846ae1732. These changes appear to be artifacts from merge conflicts, as acknowledged in the PR discussion.

Additional Locations (1)

Fix in Cursor Fix in Web

<SentryCLIDirectory>$(MSBuildThisFileDirectory)tools\sentry-cli\$(SentryCLIVersion)\</SentryCLIDirectory>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion modules/sentry-cocoa.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version = 8.56.0
version = 8.55.1
repo = https://github.com/getsentry/sentry-cocoa
2 changes: 1 addition & 1 deletion modules/sentry-native
Open in desktop
Submodule sentry-native updated 45 files
+2 −23 .github/workflows/ci.yml
+3 −35 CHANGELOG.md
+10 −76 CMakeLists.txt
+0 −4 CONTRIBUTING.md
+3 −7 README.md
+9 −4 cmake/utils.cmake
+2 −43 examples/example.c
+0 −11 external/CMakeLists.txt
+1 −1 external/crashpad
+4 −16 include/sentry.h
+1 −1 ndk/gradle.properties
+1 −16 scripts/install-llvm-mingw.ps1
+2 −2 sentry.rc.in
+0 −8 src/backends/sentry_backend_breakpad.cpp
+0 −9 src/backends/sentry_backend_crashpad.cpp
+0 −8 src/backends/sentry_backend_inproc.c
+8 −24 src/sentry_core.c
+0 −15 src/sentry_embedded_info.cpp.in
+0 −17 src/sentry_logger.c
+0 −3 src/sentry_logger.h
+2 −10 src/sentry_options.c
+0 −2 src/sentry_options.h
+0 −29 src/sentry_tsan.h
+0 −13 src/transports/sentry_transport_winhttp.c
+2 −2 tests/assertions.py
+0 −18 tests/test_build_static.py
+0 −152 tests/test_embedded_info.py
+1 −1 tests/test_integration_http.py
+0 −168 tests/test_integration_logger.py
+1 −1 tests/test_unit.py
+0 −6 tests/unit/CMakeLists.txt
+1 −1 tests/unit/sentry_testsupport.h
+0 −106 tests/unit/test_embedded_info.c
+1 −2 tests/unit/test_envelopes.c
+1 −45 tests/unit/test_logger.c
+1 −2 tests/unit/test_modulefinder.c
+0 −22 tests/unit/test_options.c
+0 −4 tests/unit/test_path.c
+2 −6 tests/unit/test_sampling.c
+1 −2 tests/unit/test_symbolizer.c
+1 −2 tests/unit/test_unwinder.c
+4 −5 tests/unit/test_value.c
+0 −6 tests/unit/tests.inc
+1 −1 tests/win_utils.py
+2 −2 vendor/acutest.h
3 changes: 3 additions & 0 deletions scripts/generate-cocoa-bindings.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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', ''

Expand Down
22 changes: 3 additions & 19 deletions src/Sentry.Android.AssemblyReader/AndroidAssemblyReaderFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using Sentry.Android.AssemblyReader.V1;
using Sentry.Android.AssemblyReader.V2;

namespace Sentry.Android.AssemblyReader;
Expand All @@ -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);
}
}
31 changes: 0 additions & 31 deletions src/Sentry.Android.AssemblyReader/V1/ATTRIBUTION.txt
View file
Open in desktop

This file was deleted.

53 changes: 0 additions & 53 deletions src/Sentry.Android.AssemblyReader/V1/AndroidAssemblyDirectoryReaderV1.cs
View file
Open in desktop

This file was deleted.

Loading
Loading