Skip to content
Closed
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
### 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

Expand Down
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))
{
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
}
}
31 changes: 0 additions & 31 deletions src/Sentry.Android.AssemblyReader/V1/ATTRIBUTION.txt

This file was deleted.

This file was deleted.

Loading
Loading