From 476336fff68d96b2e0414b01395268611de8612f Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Mon, 26 Jun 2023 21:08:53 +0200
Subject: [PATCH 01/10] added proguard keeps to the bindings project

---
 src/Sentry.Bindings.Android/Sentry.Bindings.Android.csproj   | 2 ++
 .../build/Sentry.Bindings.Android.targets                    | 5 +++++
 src/Sentry.Bindings.Android/sentry-proguard.cfg              | 5 +++++
 3 files changed, 12 insertions(+)
 create mode 100644 src/Sentry.Bindings.Android/build/Sentry.Bindings.Android.targets
 create mode 100644 src/Sentry.Bindings.Android/sentry-proguard.cfg

diff --git a/src/Sentry.Bindings.Android/Sentry.Bindings.Android.csproj b/src/Sentry.Bindings.Android/Sentry.Bindings.Android.csproj
index 2da2af2bae..6b9f640b97 100644
--- a/src/Sentry.Bindings.Android/Sentry.Bindings.Android.csproj
+++ b/src/Sentry.Bindings.Android/Sentry.Bindings.Android.csproj
@@ -12,6 +12,8 @@
   <ItemGroup>
     <None Remove="$(MSBuildThisFileDirectory)..\..\README.md" />
     <None Include="$(MSBuildThisFileDirectory)README.md" Pack="true" PackagePath="" />
+    <None Include="$(MSBuildThisFileDirectory)build/Sentry.Bindings.Android.targets" Pack="true" PackagePath="build/Sentry.Bindings.Android.targets" />
+    <None Include="$(MSBuildThisFileDirectory)sentry-proguard.cfg" Pack="true" PackagePath="" />
     <PackageReference Remove="SIL.ReleaseTasks" />
   </ItemGroup>
 
diff --git a/src/Sentry.Bindings.Android/build/Sentry.Bindings.Android.targets b/src/Sentry.Bindings.Android/build/Sentry.Bindings.Android.targets
new file mode 100644
index 0000000000..de8c267362
--- /dev/null
+++ b/src/Sentry.Bindings.Android/build/Sentry.Bindings.Android.targets
@@ -0,0 +1,5 @@
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ProguardConfiguration Include="$(MSBuildThisFileDirectory)..\proguard.cfg" />
+  </ItemGroup>
+</Project>
diff --git a/src/Sentry.Bindings.Android/sentry-proguard.cfg b/src/Sentry.Bindings.Android/sentry-proguard.cfg
new file mode 100644
index 0000000000..a0cd6438c9
--- /dev/null
+++ b/src/Sentry.Bindings.Android/sentry-proguard.cfg
@@ -0,0 +1,5 @@
+# Keep names on select sentry-java classes & their methods - we use string-based JNI lookup in our integration.
+-keep class io.sentry.android.core.SentryAndroid { *; }
+-keep class io.sentry.android.core.SentryAndroidOptions { *; }
+-keep class io.sentry.android.core.SentryInitProvider { *; }
+-keep class io.sentry.android.core.SentryPerformanceProvider { *; }

From 9e4778c0504cb2144df9903b94f86c494cf7bdc8 Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Mon, 26 Jun 2023 21:13:58 +0200
Subject: [PATCH 02/10] updating the sample project to use the proguard.cfg

---
 .../Sentry.Samples.Android.csproj                      | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/samples/Sentry.Samples.Android/Sentry.Samples.Android.csproj b/samples/Sentry.Samples.Android/Sentry.Samples.Android.csproj
index a2a2bbd458..57cfa70fd6 100644
--- a/samples/Sentry.Samples.Android/Sentry.Samples.Android.csproj
+++ b/samples/Sentry.Samples.Android/Sentry.Samples.Android.csproj
@@ -12,8 +12,14 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\Sentry\Sentry.csproj" />
     <Using Include="Android.App.Activity" Alias="Activity" />
+    
+    <!--
+      The NuGet package the containing the binding comes with a .targets that sets the ProguardConfiguration
+      Since we're referencing the project itself we're grabbing the ProguardConfiguration from project directly.
+    -->    
+    <ProguardConfiguration Include="..\..\src\Sentry.Bindings.Android\sentry-proguard.cfg" />
   </ItemGroup>
-
+  
   <!--
     For this demo app, let's upload sources and symbols to Sentry on every build, regardless of configuration.
     In a real app, you probably only want to do this on Release builds.
@@ -22,5 +28,5 @@
     <SentryUploadSources>true</SentryUploadSources>
     <SentryUploadSymbols>true</SentryUploadSymbols>
   </PropertyGroup>
-
+  
 </Project>

From 4c2568f0a2863ea4b0e477644895c93a47b8b430 Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Mon, 26 Jun 2023 21:16:07 +0200
Subject: [PATCH 03/10] whitespaces

---
 samples/Sentry.Samples.Android/Sentry.Samples.Android.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/Sentry.Samples.Android/Sentry.Samples.Android.csproj b/samples/Sentry.Samples.Android/Sentry.Samples.Android.csproj
index 57cfa70fd6..3b3f8af433 100644
--- a/samples/Sentry.Samples.Android/Sentry.Samples.Android.csproj
+++ b/samples/Sentry.Samples.Android/Sentry.Samples.Android.csproj
@@ -12,14 +12,14 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\Sentry\Sentry.csproj" />
     <Using Include="Android.App.Activity" Alias="Activity" />
-    
+
     <!--
       The NuGet package the containing the binding comes with a .targets that sets the ProguardConfiguration
       Since we're referencing the project itself we're grabbing the ProguardConfiguration from project directly.
     -->    
     <ProguardConfiguration Include="..\..\src\Sentry.Bindings.Android\sentry-proguard.cfg" />
   </ItemGroup>
-  
+
   <!--
     For this demo app, let's upload sources and symbols to Sentry on every build, regardless of configuration.
     In a real app, you probably only want to do this on Release builds.

From 623a3d2100468074473611d51f96afc2303d5623 Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Mon, 26 Jun 2023 21:18:51 +0200
Subject: [PATCH 04/10] fixed comment

---
 src/Sentry.Bindings.Android/sentry-proguard.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Sentry.Bindings.Android/sentry-proguard.cfg b/src/Sentry.Bindings.Android/sentry-proguard.cfg
index a0cd6438c9..9b538ca0d6 100644
--- a/src/Sentry.Bindings.Android/sentry-proguard.cfg
+++ b/src/Sentry.Bindings.Android/sentry-proguard.cfg
@@ -1,4 +1,4 @@
-# Keep names on select sentry-java classes & their methods - we use string-based JNI lookup in our integration.
+# Because we use string-based lookups we need to keep names on selected sentry-java classes
 -keep class io.sentry.android.core.SentryAndroid { *; }
 -keep class io.sentry.android.core.SentryAndroidOptions { *; }
 -keep class io.sentry.android.core.SentryInitProvider { *; }

From e423ea21eb952c6d49ee41b680f7a2cc6318d747 Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Mon, 26 Jun 2023 21:20:15 +0200
Subject: [PATCH 05/10] more whitespace

---
 samples/Sentry.Samples.Android/Sentry.Samples.Android.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/Sentry.Samples.Android/Sentry.Samples.Android.csproj b/samples/Sentry.Samples.Android/Sentry.Samples.Android.csproj
index 3b3f8af433..15515ca88d 100644
--- a/samples/Sentry.Samples.Android/Sentry.Samples.Android.csproj
+++ b/samples/Sentry.Samples.Android/Sentry.Samples.Android.csproj
@@ -28,5 +28,5 @@
     <SentryUploadSources>true</SentryUploadSources>
     <SentryUploadSymbols>true</SentryUploadSymbols>
   </PropertyGroup>
-  
+
 </Project>

From bd0729529db81b1a2f863f79cb81aefb09a4c718 Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Mon, 26 Jun 2023 21:37:26 +0200
Subject: [PATCH 06/10] setting the path properly

---
 src/Sentry.Bindings.Android/Sentry.Bindings.Android.csproj      | 2 +-
 .../build/Sentry.Bindings.Android.targets                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Sentry.Bindings.Android/Sentry.Bindings.Android.csproj b/src/Sentry.Bindings.Android/Sentry.Bindings.Android.csproj
index 6b9f640b97..2cefb384da 100644
--- a/src/Sentry.Bindings.Android/Sentry.Bindings.Android.csproj
+++ b/src/Sentry.Bindings.Android/Sentry.Bindings.Android.csproj
@@ -12,7 +12,7 @@
   <ItemGroup>
     <None Remove="$(MSBuildThisFileDirectory)..\..\README.md" />
     <None Include="$(MSBuildThisFileDirectory)README.md" Pack="true" PackagePath="" />
-    <None Include="$(MSBuildThisFileDirectory)build/Sentry.Bindings.Android.targets" Pack="true" PackagePath="build/Sentry.Bindings.Android.targets" />
+    <None Include="$(MSBuildThisFileDirectory)build/Sentry.Bindings.Android.targets" Pack="true" PackagePath="build/$(TargetFramework)$(TargetPlatformVersion)/Sentry.Bindings.Android.targets" />
     <None Include="$(MSBuildThisFileDirectory)sentry-proguard.cfg" Pack="true" PackagePath="" />
     <PackageReference Remove="SIL.ReleaseTasks" />
   </ItemGroup>
diff --git a/src/Sentry.Bindings.Android/build/Sentry.Bindings.Android.targets b/src/Sentry.Bindings.Android/build/Sentry.Bindings.Android.targets
index de8c267362..1cb4d52b49 100644
--- a/src/Sentry.Bindings.Android/build/Sentry.Bindings.Android.targets
+++ b/src/Sentry.Bindings.Android/build/Sentry.Bindings.Android.targets
@@ -1,5 +1,5 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ProguardConfiguration Include="$(MSBuildThisFileDirectory)..\proguard.cfg" />
+    <ProguardConfiguration Include="$(MSBuildThisFileDirectory)..\..\proguard.cfg" />
   </ItemGroup>
 </Project>

From 257e90a6e733d8771eb182aa961999ed2f97ae83 Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Mon, 26 Jun 2023 22:12:24 +0200
Subject: [PATCH 07/10] updated config

---
 src/Sentry.Bindings.Android/sentry-proguard.cfg | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Sentry.Bindings.Android/sentry-proguard.cfg b/src/Sentry.Bindings.Android/sentry-proguard.cfg
index 9b538ca0d6..1102833cc9 100644
--- a/src/Sentry.Bindings.Android/sentry-proguard.cfg
+++ b/src/Sentry.Bindings.Android/sentry-proguard.cfg
@@ -1,5 +1,8 @@
 # Because we use string-based lookups we need to keep names on selected sentry-java classes
+-keep class io.sentry.Sentry { *; }
 -keep class io.sentry.android.core.SentryAndroid { *; }
 -keep class io.sentry.android.core.SentryAndroidOptions { *; }
 -keep class io.sentry.android.core.SentryInitProvider { *; }
 -keep class io.sentry.android.core.SentryPerformanceProvider { *; }
+-keep class io.sentry.android.supplemental.* { *; }
+-keep class io.sentry.protocol.**

From 0237c1714719be1800b9742e7cd1f9e7d5c3ad95 Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Mon, 26 Jun 2023 22:18:37 +0200
Subject: [PATCH 08/10] Updated CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d9afcc9ee..a9dfeddd5b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 
 ### Fixes
 
+- Builds targeting Android no longer crash during SDK init. The package now contains the required proguard rules ([#2450]https://github.com/getsentry/sentry-dotnet/pull/2450)
 - Fix Sentry logger options for MAUI and Azure Functions ([#2423](https://github.com/getsentry/sentry-dotnet/pull/2423))
 
 ### Dependencies

From 1b32bbd4c431fc702c8d002ea8f3a3e38191e5bc Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Mon, 26 Jun 2023 22:20:34 +0200
Subject: [PATCH 09/10] Updated CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a9dfeddd5b..61e3d02abc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@
 
 ### Fixes
 
-- Builds targeting Android no longer crash during SDK init. The package now contains the required proguard rules ([#2450]https://github.com/getsentry/sentry-dotnet/pull/2450)
+- Builds targeting Android with `r8` enabled no longer crash during SDK init. The package now contains the required proguard rules ([#2450]https://github.com/getsentry/sentry-dotnet/pull/2450)
 - Fix Sentry logger options for MAUI and Azure Functions ([#2423](https://github.com/getsentry/sentry-dotnet/pull/2423))
 
 ### Dependencies

From 17dd4ff8871671d90b1b03512ba0ede5efc93da3 Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Tue, 27 Jun 2023 14:29:10 +0200
Subject: [PATCH 10/10] updated the rules

---
 src/Sentry.Bindings.Android/sentry-proguard.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Sentry.Bindings.Android/sentry-proguard.cfg b/src/Sentry.Bindings.Android/sentry-proguard.cfg
index 1102833cc9..05fa66a914 100644
--- a/src/Sentry.Bindings.Android/sentry-proguard.cfg
+++ b/src/Sentry.Bindings.Android/sentry-proguard.cfg
@@ -5,4 +5,4 @@
 -keep class io.sentry.android.core.SentryInitProvider { *; }
 -keep class io.sentry.android.core.SentryPerformanceProvider { *; }
 -keep class io.sentry.android.supplemental.* { *; }
--keep class io.sentry.protocol.**
+-keep class io.sentry.protocol.** { *; }