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.

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 net10 from assembly-store-3

CHANGELOG.md

-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,8 @@ @@
     ### 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
     ### Features
@@ Expand Down Expand Up / @@ -54,7 +56,7 @@ @@
       - [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)
+        - [diff](https://github.com/getsentry/sentry-native/compare/0.10.1...0.11.0)
     ## 5.15.0
@@ Expand Down @@

modules/sentry-native

Submodule sentry-native updated 57 files

+2 −23		.github/workflows/ci.yml
+3 −41		CHANGELOG.md
+10 −76		CMakeLists.txt
+0 −4		CONTRIBUTING.md
+3 −7		README.md
+9 −4		cmake/utils.cmake
+3 −171		examples/example.c
+0 −11		external/CMakeLists.txt
+1 −1		external/crashpad
+4 −94		include/sentry.h
+1 −1		ndk/gradle.properties
+1 −16		scripts/install-llvm-mingw.ps1
+2 −2		sentry.rc.in
+0 −2		src/CMakeLists.txt
+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 −39		src/sentry_core.c
+0 −15		src/sentry_embedded_info.cpp.in
+0 −41		src/sentry_envelope.c
+0 −6		src/sentry_envelope.h
+2 −20		src/sentry_logger.c
+0 −8		src/sentry_logger.h
+0 −767		src/sentry_logs.c
+0 −24		src/sentry_logs.h
+2 −30		src/sentry_options.c
+0 −5		src/sentry_options.h
+0 −11		src/sentry_string.h
+0 −29		src/sentry_tsan.h
+5 −19		src/sentry_value.c
+0 −13		src/transports/sentry_transport_winhttp.c
+0 −1		tests/__init__.py
+2 −34		tests/assertions.py
+2 −7		tests/conditions.py
+0 −18		tests/test_build_static.py
+0 −152		tests/test_embedded_info.py
+3 −3		tests/test_integration_crashpad.py
+1 −223		tests/test_integration_http.py
+0 −176		tests/test_integration_logger.py
+1 −1		tests/test_unit.py
+0 −7		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 −111		tests/unit/test_logger.c
+0 −166		tests/unit/test_logs.c
+1 −2		tests/unit/test_modulefinder.c
+0 −22		tests/unit/test_options.c
+0 −4		tests/unit/test_path.c
+1 −1		tests/unit/test_process.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 −11		tests/unit/tests.inc
+1 −1		tests/win_utils.py
+2 −2		vendor/acutest.h

src/Sentry.Android.AssemblyReader/AndroidAssemblyReaderFactory.cs

-Original file 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 @@
         {
             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);
         }
     }

src/Sentry.Android.AssemblyReader/V1/ATTRIBUTION.txt

This file was deleted.

src/Sentry.Android.AssemblyReader/V1/AndroidAssemblyDirectoryReaderV1.cs

This file was deleted.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Add support for v3 of the AssemblyStore format #4516

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Uh oh!