From 83036bc9395fa68f5a40f0296857a4385df23f15 Mon Sep 17 00:00:00 2001
From: Allan Ritchie <allan.ritchie@gmail.com>
Date: Mon, 7 Apr 2025 11:52:11 -0400
Subject: [PATCH 1/4] Prevent users building with
 AndroidEnableAssemblyCompression set to false

---
 .../Sentry.Samples.Android/Sentry.Samples.Android.csproj    | 3 +++
 src/Sentry/buildTransitive/Sentry.targets                   | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/samples/Sentry.Samples.Android/Sentry.Samples.Android.csproj b/samples/Sentry.Samples.Android/Sentry.Samples.Android.csproj
index ace5748bae..42ced03d67 100644
--- a/samples/Sentry.Samples.Android/Sentry.Samples.Android.csproj
+++ b/samples/Sentry.Samples.Android/Sentry.Samples.Android.csproj
@@ -9,6 +9,9 @@
     <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
     <!-- XA0119: Using fast deployment and a code shrinker at the same time is not recommended. Use fast deployment for Debug configurations and a code shrinker for Release configurations.-->
     <NoWarn>$(NoWarn);XA0119</NoWarn>
+
+    <!--uncomment to test targets that block this flag-->
+    <!--<AndroidEnableAssemblyCompression>false</AndroidEnableAssemblyCompression>-->
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Sentry/buildTransitive/Sentry.targets b/src/Sentry/buildTransitive/Sentry.targets
index 57ab5a9285..f5b8baed0b 100644
--- a/src/Sentry/buildTransitive/Sentry.targets
+++ b/src/Sentry/buildTransitive/Sentry.targets
@@ -9,6 +9,12 @@
     <SentryAttributesFile>Sentry.Attributes$(MSBuildProjectExtension.Replace('proj', ''))</SentryAttributesFile>
   </PropertyGroup>
 
+  <Target Name="_SentryEnsureAndroidEnableAssemblyCompressionDisabled"
+          Condition="$(TargetFramework.Contains('-android')) AND '$(AndroidEnableAssemblyCompression)' == 'false'"
+          BeforeTargets="ResolveAssemblyReferences;Build;Rebuild">
+    <Error Text="Android projects using Sentry cannot build using AndroidEnableAssemblyCompression = false due to a Microsoft issue.  Please follow https://github.com/dotnet/android/issues/9752" />
+  </Target>
+
   <Target Name="WriteSentryAttributes"
           Condition="$(Language) == 'VB' or $(Language) == 'C#' or $(Language) == 'F#'"
           BeforeTargets="BeforeCompile;CoreCompile"

From 06dd00ac2bb8fb5d53f980736c050e2038d9360b Mon Sep 17 00:00:00 2001
From: Allan Ritchie <allan.ritchie@gmail.com>
Date: Mon, 7 Apr 2025 11:59:08 -0400
Subject: [PATCH 2/4] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 70dc0214c6..ed277da469 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
 - Changed default value for `SentryOptions.EnableAppHangTrackingV2` to `false` ([#4042](https://github.com/getsentry/sentry-dotnet/pull/4042))
 - Missing MAUI `Shell` navigation breadcrumbs on iOS ([#4006](https://github.com/getsentry/sentry-dotnet/pull/4006))
 - Prevent application crashes when capturing screenshots on iOS ([#4069](https://github.com/getsentry/sentry-dotnet/pull/4069))
+- Prevent users from disabling AndroidEnableAssemblyCompression which leads to untrappable crash ([#4089](https://github.com/getsentry/sentry-dotnet/pull/4089))
 
 ### Dependencies
 

From 7904676128390a5f8924aa31a681beff905257fe Mon Sep 17 00:00:00 2001
From: Allan Ritchie <allan.ritchie@gmail.com>
Date: Mon, 7 Apr 2025 20:52:17 -0400
Subject: [PATCH 3/4] Update src/Sentry/buildTransitive/Sentry.targets

Co-authored-by: James Crosswell <jamescrosswell@users.noreply.github.com>
---
 src/Sentry/buildTransitive/Sentry.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Sentry/buildTransitive/Sentry.targets b/src/Sentry/buildTransitive/Sentry.targets
index f5b8baed0b..790ed2aa1e 100644
--- a/src/Sentry/buildTransitive/Sentry.targets
+++ b/src/Sentry/buildTransitive/Sentry.targets
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <Target Name="_SentryEnsureAndroidEnableAssemblyCompressionDisabled"
-          Condition="$(TargetFramework.Contains('-android')) AND '$(AndroidEnableAssemblyCompression)' == 'false'"
+          Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android' AND '$(AndroidEnableAssemblyCompression)' == 'false'"
           BeforeTargets="ResolveAssemblyReferences;Build;Rebuild">
     <Error Text="Android projects using Sentry cannot build using AndroidEnableAssemblyCompression = false due to a Microsoft issue.  Please follow https://github.com/dotnet/android/issues/9752" />
   </Target>

From b73e8b6ec0b49a49ab28841ff96c66e9fe711704 Mon Sep 17 00:00:00 2001
From: Allan Ritchie <allan.ritchie@gmail.com>
Date: Mon, 7 Apr 2025 21:04:57 -0400
Subject: [PATCH 4/4] Update Sentry.Samples.Android.csproj

---
 samples/Sentry.Samples.Android/Sentry.Samples.Android.csproj | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/samples/Sentry.Samples.Android/Sentry.Samples.Android.csproj b/samples/Sentry.Samples.Android/Sentry.Samples.Android.csproj
index 42ced03d67..ace5748bae 100644
--- a/samples/Sentry.Samples.Android/Sentry.Samples.Android.csproj
+++ b/samples/Sentry.Samples.Android/Sentry.Samples.Android.csproj
@@ -9,9 +9,6 @@
     <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
     <!-- XA0119: Using fast deployment and a code shrinker at the same time is not recommended. Use fast deployment for Debug configurations and a code shrinker for Release configurations.-->
     <NoWarn>$(NoWarn);XA0119</NoWarn>
-
-    <!--uncomment to test targets that block this flag-->
-    <!--<AndroidEnableAssemblyCompression>false</AndroidEnableAssemblyCompression>-->
   </PropertyGroup>
 
   <ItemGroup>