From b9823359a40922536d00449c2db8f045f3337bea Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Thu, 17 Jul 2025 09:04:52 +0200
Subject: [PATCH 01/22] fix(build): set unique BaseIntermediateOutputPath for
 AndroidTestApp

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

diff --git a/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj b/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
index 0bbb2b5b92..0f04dd12ce 100644
--- a/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
+++ b/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
@@ -47,7 +47,7 @@
       <SourceAPK>..\AndroidTestApp\bin\$(TargetFramework)\$(_ConfigString)\com.companyname.AndroidTestApp-Signed.apk</SourceAPK>
       <DestinationAPK>TestAPKs\$(TargetFramework)-$(_ConfigString).apk</DestinationAPK>
     </PropertyGroup>
-    <MSBuild Projects="..\AndroidTestApp\AndroidTestApp.csproj" Targets="Build" Properties="Configuration=Release;PublishAot=$(_Aot);_IsPublishing=true;RuntimeIdentifier=android-x64;AndroidUseAssemblyStore=$(_Store);AndroidEnableAssemblyCompression=$(_Compressed);OutDir=bin\$(TargetFramework)\$(_ConfigString)\" Condition="!Exists('$(DestinationAPK)')" />
+    <MSBuild Projects="..\AndroidTestApp\AndroidTestApp.csproj" Targets="Build" Properties="Configuration=Release;PublishAot=$(_Aot);_IsPublishing=true;RuntimeIdentifier=android-x64;AndroidUseAssemblyStore=$(_Store);AndroidEnableAssemblyCompression=$(_Compressed);OutDir=bin\$(TargetFramework)\$(_ConfigString)\;BaseIntermediateOutputPath=obj\$(TargetFramework)\$(_ConfigString)\" Condition="!Exists('$(DestinationAPK)')" />
 
     <Message Text="Copying APK from $(SourceAPK) to $(DestinationAPK)" Importance="high" />
     <Copy SourceFiles="$(SourceAPK)" DestinationFiles="$(DestinationAPK)" Condition="!Exists('$(DestinationAPK)')" />

From 25dbc10b9a7e35bd4f48a084606cd1648c5e3897 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Thu, 17 Jul 2025 09:27:30 +0200
Subject: [PATCH 02/22] Try without EnsureAndroidTestAppRestored

---
 .../Sentry.Android.AssemblyReader.Tests.csproj        | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj b/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
index 0f04dd12ce..905546ac2e 100644
--- a/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
+++ b/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
@@ -16,17 +16,8 @@
     <Folder Include="TestAPKs\" />
   </ItemGroup>
 
-  <!-- Target to ensure AndroidTestApp is restored -->
-  <Target Name="EnsureAndroidTestAppRestored" Condition="'$(TargetPlatformIdentifier)' != 'android' and '$(AndroidTestAppRestored)' != 'true'">
-    <!-- Only restore once. Spawn as a separate process to escape any "no-restore" arguments to the build -->
-    <Exec Command="dotnet restore ../AndroidTestApp/AndroidTestApp.csproj --nologo" />
-    <PropertyGroup>
-      <AndroidTestAppRestored>true</AndroidTestAppRestored>
-    </PropertyGroup>
-  </Target>
-
   <!--  Build the Android test app in various configurations during the build of this test project. -->
-  <Target Name="BuildTestAPKs" BeforeTargets="DispatchToInnerBuilds;BeforeBuild" DependsOnTargets="EnsureAndroidTestAppRestored" Condition="'$(TargetPlatformIdentifier)' != 'android'">
+  <Target Name="BuildTestAPKs" BeforeTargets="DispatchToInnerBuilds;BeforeBuild" Condition="'$(TargetPlatformIdentifier)' != 'android'">
     <MSBuild Projects="$(MSBuildProjectFile)" Targets="_InnerBuildTestAPKs" Properties="TargetFramework=net8.0-android" Condition="$(TargetFramework) == 'net8.0'" />
     <MSBuild Projects="$(MSBuildProjectFile)" Targets="_InnerBuildTestAPKs" Properties="TargetFramework=net9.0-android" Condition="$(TargetFramework) == 'net9.0'" />
   </Target>

From bc22db90765d42dc3e7940b3106683a3cc624eb0 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Thu, 17 Jul 2025 09:36:11 +0200
Subject: [PATCH 03/22] Let MSBuild run the default target including Restore

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

diff --git a/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj b/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
index 905546ac2e..15cd2cdd26 100644
--- a/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
+++ b/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
@@ -38,7 +38,7 @@
       <SourceAPK>..\AndroidTestApp\bin\$(TargetFramework)\$(_ConfigString)\com.companyname.AndroidTestApp-Signed.apk</SourceAPK>
       <DestinationAPK>TestAPKs\$(TargetFramework)-$(_ConfigString).apk</DestinationAPK>
     </PropertyGroup>
-    <MSBuild Projects="..\AndroidTestApp\AndroidTestApp.csproj" Targets="Build" Properties="Configuration=Release;PublishAot=$(_Aot);_IsPublishing=true;RuntimeIdentifier=android-x64;AndroidUseAssemblyStore=$(_Store);AndroidEnableAssemblyCompression=$(_Compressed);OutDir=bin\$(TargetFramework)\$(_ConfigString)\;BaseIntermediateOutputPath=obj\$(TargetFramework)\$(_ConfigString)\" Condition="!Exists('$(DestinationAPK)')" />
+    <MSBuild Projects="..\AndroidTestApp\AndroidTestApp.csproj" Properties="Configuration=Release;PublishAot=$(_Aot);_IsPublishing=true;RuntimeIdentifier=android-x64;AndroidUseAssemblyStore=$(_Store);AndroidEnableAssemblyCompression=$(_Compressed);OutDir=bin\$(TargetFramework)\$(_ConfigString)\;BaseIntermediateOutputPath=obj\$(TargetFramework)\$(_ConfigString)\" Condition="!Exists('$(DestinationAPK)')" />
 
     <Message Text="Copying APK from $(SourceAPK) to $(DestinationAPK)" Importance="high" />
     <Copy SourceFiles="$(SourceAPK)" DestinationFiles="$(DestinationAPK)" Condition="!Exists('$(DestinationAPK)')" />

From a7dc820c7e7a3d240a0e8d9909395bdf091f429c Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Thu, 17 Jul 2025 09:43:58 +0200
Subject: [PATCH 04/22] Revert changes

---
 .../Sentry.Android.AssemblyReader.Tests.csproj      | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj b/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
index 15cd2cdd26..0bbb2b5b92 100644
--- a/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
+++ b/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
@@ -16,8 +16,17 @@
     <Folder Include="TestAPKs\" />
   </ItemGroup>
 
+  <!-- Target to ensure AndroidTestApp is restored -->
+  <Target Name="EnsureAndroidTestAppRestored" Condition="'$(TargetPlatformIdentifier)' != 'android' and '$(AndroidTestAppRestored)' != 'true'">
+    <!-- Only restore once. Spawn as a separate process to escape any "no-restore" arguments to the build -->
+    <Exec Command="dotnet restore ../AndroidTestApp/AndroidTestApp.csproj --nologo" />
+    <PropertyGroup>
+      <AndroidTestAppRestored>true</AndroidTestAppRestored>
+    </PropertyGroup>
+  </Target>
+
   <!--  Build the Android test app in various configurations during the build of this test project. -->
-  <Target Name="BuildTestAPKs" BeforeTargets="DispatchToInnerBuilds;BeforeBuild" Condition="'$(TargetPlatformIdentifier)' != 'android'">
+  <Target Name="BuildTestAPKs" BeforeTargets="DispatchToInnerBuilds;BeforeBuild" DependsOnTargets="EnsureAndroidTestAppRestored" Condition="'$(TargetPlatformIdentifier)' != 'android'">
     <MSBuild Projects="$(MSBuildProjectFile)" Targets="_InnerBuildTestAPKs" Properties="TargetFramework=net8.0-android" Condition="$(TargetFramework) == 'net8.0'" />
     <MSBuild Projects="$(MSBuildProjectFile)" Targets="_InnerBuildTestAPKs" Properties="TargetFramework=net9.0-android" Condition="$(TargetFramework) == 'net9.0'" />
   </Target>
@@ -38,7 +47,7 @@
       <SourceAPK>..\AndroidTestApp\bin\$(TargetFramework)\$(_ConfigString)\com.companyname.AndroidTestApp-Signed.apk</SourceAPK>
       <DestinationAPK>TestAPKs\$(TargetFramework)-$(_ConfigString).apk</DestinationAPK>
     </PropertyGroup>
-    <MSBuild Projects="..\AndroidTestApp\AndroidTestApp.csproj" Properties="Configuration=Release;PublishAot=$(_Aot);_IsPublishing=true;RuntimeIdentifier=android-x64;AndroidUseAssemblyStore=$(_Store);AndroidEnableAssemblyCompression=$(_Compressed);OutDir=bin\$(TargetFramework)\$(_ConfigString)\;BaseIntermediateOutputPath=obj\$(TargetFramework)\$(_ConfigString)\" Condition="!Exists('$(DestinationAPK)')" />
+    <MSBuild Projects="..\AndroidTestApp\AndroidTestApp.csproj" Targets="Build" Properties="Configuration=Release;PublishAot=$(_Aot);_IsPublishing=true;RuntimeIdentifier=android-x64;AndroidUseAssemblyStore=$(_Store);AndroidEnableAssemblyCompression=$(_Compressed);OutDir=bin\$(TargetFramework)\$(_ConfigString)\" Condition="!Exists('$(DestinationAPK)')" />
 
     <Message Text="Copying APK from $(SourceAPK) to $(DestinationAPK)" Importance="high" />
     <Copy SourceFiles="$(SourceAPK)" DestinationFiles="$(DestinationAPK)" Condition="!Exists('$(DestinationAPK)')" />

From d682d994e483fea11a2cb2c9450d29b2033c354b Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Thu, 17 Jul 2025 09:44:48 +0200
Subject: [PATCH 05/22] Try BuildInParallel="false" instead

---
 .../Sentry.Android.AssemblyReader.Tests.csproj | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj b/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
index 0bbb2b5b92..07eeb46857 100644
--- a/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
+++ b/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
@@ -31,15 +31,15 @@
     <MSBuild Projects="$(MSBuildProjectFile)" Targets="_InnerBuildTestAPKs" Properties="TargetFramework=net9.0-android" Condition="$(TargetFramework) == 'net9.0'" />
   </Target>
   <Target Name="_InnerBuildTestAPKs">
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Properties="_Aot=False;_Store=False;_Compressed=False" />
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Properties="_Aot=False;_Store=False;_Compressed=True" />
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Properties="_Aot=False;_Store=True;_Compressed=False" />
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Properties="_Aot=False;_Store=True;_Compressed=True" />
-
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Condition="!$(TargetFramework.StartsWith('net8'))" Properties="_Aot=True;_Store=False;_Compressed=False" />
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Condition="!$(TargetFramework.StartsWith('net8'))" Properties="_Aot=True;_Store=False;_Compressed=True" />
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Condition="!$(TargetFramework.StartsWith('net8'))" Properties="_Aot=True;_Store=True;_Compressed=False" />
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Condition="!$(TargetFramework.StartsWith('net8'))" Properties="_Aot=True;_Store=True;_Compressed=True" />
+    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Properties="_Aot=False;_Store=False;_Compressed=False" BuildInParallel="false" />
+    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Properties="_Aot=False;_Store=False;_Compressed=True" BuildInParallel="false" />
+    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Properties="_Aot=False;_Store=True;_Compressed=False" BuildInParallel="false" />
+    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Properties="_Aot=False;_Store=True;_Compressed=True" BuildInParallel="false" />
+
+    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Condition="!$(TargetFramework.StartsWith('net8'))" Properties="_Aot=True;_Store=False;_Compressed=False" BuildInParallel="false" />
+    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Condition="!$(TargetFramework.StartsWith('net8'))" Properties="_Aot=True;_Store=False;_Compressed=True" BuildInParallel="false" />
+    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Condition="!$(TargetFramework.StartsWith('net8'))" Properties="_Aot=True;_Store=True;_Compressed=False" BuildInParallel="false" />
+    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Condition="!$(TargetFramework.StartsWith('net8'))" Properties="_Aot=True;_Store=True;_Compressed=True" BuildInParallel="false" />
   </Target>
   <Target Name="_BuildTestAPK">
     <PropertyGroup>

From ba775e0aca4b166aa6da2bc3944ede9ce0d4e252 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Fri, 18 Jul 2025 09:20:50 +0200
Subject: [PATCH 06/22] Switch back to `BaseIntermediateOutputPath`

---
 .github/workflows/build.yml                   |  1 -
 ...Sentry.Android.AssemblyReader.Tests.csproj | 31 +++++++------------
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 602ee7a71b..bcb5af4243 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,7 +8,6 @@ on:
   pull_request:
     paths-ignore:
       - "**.md"
-  workflow_dispatch:
 
 jobs:
   build-sentry-native:
diff --git a/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj b/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
index 07eeb46857..15cd2cdd26 100644
--- a/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
+++ b/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
@@ -16,30 +16,21 @@
     <Folder Include="TestAPKs\" />
   </ItemGroup>
 
-  <!-- Target to ensure AndroidTestApp is restored -->
-  <Target Name="EnsureAndroidTestAppRestored" Condition="'$(TargetPlatformIdentifier)' != 'android' and '$(AndroidTestAppRestored)' != 'true'">
-    <!-- Only restore once. Spawn as a separate process to escape any "no-restore" arguments to the build -->
-    <Exec Command="dotnet restore ../AndroidTestApp/AndroidTestApp.csproj --nologo" />
-    <PropertyGroup>
-      <AndroidTestAppRestored>true</AndroidTestAppRestored>
-    </PropertyGroup>
-  </Target>
-
   <!--  Build the Android test app in various configurations during the build of this test project. -->
-  <Target Name="BuildTestAPKs" BeforeTargets="DispatchToInnerBuilds;BeforeBuild" DependsOnTargets="EnsureAndroidTestAppRestored" Condition="'$(TargetPlatformIdentifier)' != 'android'">
+  <Target Name="BuildTestAPKs" BeforeTargets="DispatchToInnerBuilds;BeforeBuild" Condition="'$(TargetPlatformIdentifier)' != 'android'">
     <MSBuild Projects="$(MSBuildProjectFile)" Targets="_InnerBuildTestAPKs" Properties="TargetFramework=net8.0-android" Condition="$(TargetFramework) == 'net8.0'" />
     <MSBuild Projects="$(MSBuildProjectFile)" Targets="_InnerBuildTestAPKs" Properties="TargetFramework=net9.0-android" Condition="$(TargetFramework) == 'net9.0'" />
   </Target>
   <Target Name="_InnerBuildTestAPKs">
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Properties="_Aot=False;_Store=False;_Compressed=False" BuildInParallel="false" />
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Properties="_Aot=False;_Store=False;_Compressed=True" BuildInParallel="false" />
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Properties="_Aot=False;_Store=True;_Compressed=False" BuildInParallel="false" />
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Properties="_Aot=False;_Store=True;_Compressed=True" BuildInParallel="false" />
-
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Condition="!$(TargetFramework.StartsWith('net8'))" Properties="_Aot=True;_Store=False;_Compressed=False" BuildInParallel="false" />
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Condition="!$(TargetFramework.StartsWith('net8'))" Properties="_Aot=True;_Store=False;_Compressed=True" BuildInParallel="false" />
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Condition="!$(TargetFramework.StartsWith('net8'))" Properties="_Aot=True;_Store=True;_Compressed=False" BuildInParallel="false" />
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Condition="!$(TargetFramework.StartsWith('net8'))" Properties="_Aot=True;_Store=True;_Compressed=True" BuildInParallel="false" />
+    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Properties="_Aot=False;_Store=False;_Compressed=False" />
+    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Properties="_Aot=False;_Store=False;_Compressed=True" />
+    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Properties="_Aot=False;_Store=True;_Compressed=False" />
+    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Properties="_Aot=False;_Store=True;_Compressed=True" />
+
+    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Condition="!$(TargetFramework.StartsWith('net8'))" Properties="_Aot=True;_Store=False;_Compressed=False" />
+    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Condition="!$(TargetFramework.StartsWith('net8'))" Properties="_Aot=True;_Store=False;_Compressed=True" />
+    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Condition="!$(TargetFramework.StartsWith('net8'))" Properties="_Aot=True;_Store=True;_Compressed=False" />
+    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Condition="!$(TargetFramework.StartsWith('net8'))" Properties="_Aot=True;_Store=True;_Compressed=True" />
   </Target>
   <Target Name="_BuildTestAPK">
     <PropertyGroup>
@@ -47,7 +38,7 @@
       <SourceAPK>..\AndroidTestApp\bin\$(TargetFramework)\$(_ConfigString)\com.companyname.AndroidTestApp-Signed.apk</SourceAPK>
       <DestinationAPK>TestAPKs\$(TargetFramework)-$(_ConfigString).apk</DestinationAPK>
     </PropertyGroup>
-    <MSBuild Projects="..\AndroidTestApp\AndroidTestApp.csproj" Targets="Build" Properties="Configuration=Release;PublishAot=$(_Aot);_IsPublishing=true;RuntimeIdentifier=android-x64;AndroidUseAssemblyStore=$(_Store);AndroidEnableAssemblyCompression=$(_Compressed);OutDir=bin\$(TargetFramework)\$(_ConfigString)\" Condition="!Exists('$(DestinationAPK)')" />
+    <MSBuild Projects="..\AndroidTestApp\AndroidTestApp.csproj" Properties="Configuration=Release;PublishAot=$(_Aot);_IsPublishing=true;RuntimeIdentifier=android-x64;AndroidUseAssemblyStore=$(_Store);AndroidEnableAssemblyCompression=$(_Compressed);OutDir=bin\$(TargetFramework)\$(_ConfigString)\;BaseIntermediateOutputPath=obj\$(TargetFramework)\$(_ConfigString)\" Condition="!Exists('$(DestinationAPK)')" />
 
     <Message Text="Copying APK from $(SourceAPK) to $(DestinationAPK)" Importance="high" />
     <Copy SourceFiles="$(SourceAPK)" DestinationFiles="$(DestinationAPK)" Condition="!Exists('$(DestinationAPK)')" />

From fd164e6e531654364c06fd155aa6fe646d24d62e Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Fri, 18 Jul 2025 10:14:49 +0200
Subject: [PATCH 07/22] Switch to `IntermediateOutputPath` and fix target
 framework conditions

---
 .../Sentry.Android.AssemblyReader.Tests.csproj              | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj b/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
index 15cd2cdd26..0422eb204f 100644
--- a/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
+++ b/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
@@ -18,8 +18,8 @@
 
   <!--  Build the Android test app in various configurations during the build of this test project. -->
   <Target Name="BuildTestAPKs" BeforeTargets="DispatchToInnerBuilds;BeforeBuild" Condition="'$(TargetPlatformIdentifier)' != 'android'">
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_InnerBuildTestAPKs" Properties="TargetFramework=net8.0-android" Condition="$(TargetFramework) == 'net8.0'" />
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_InnerBuildTestAPKs" Properties="TargetFramework=net9.0-android" Condition="$(TargetFramework) == 'net9.0'" />
+    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_InnerBuildTestAPKs" Properties="TargetFramework=net8.0-android" Condition="$(TargetFramework.StartsWith('net8.0-android'))" />
+    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_InnerBuildTestAPKs" Properties="TargetFramework=net9.0-android" Condition="$(TargetFramework.StartsWith('net9.0-android'))" />
   </Target>
   <Target Name="_InnerBuildTestAPKs">
     <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Properties="_Aot=False;_Store=False;_Compressed=False" />
@@ -38,7 +38,7 @@
       <SourceAPK>..\AndroidTestApp\bin\$(TargetFramework)\$(_ConfigString)\com.companyname.AndroidTestApp-Signed.apk</SourceAPK>
       <DestinationAPK>TestAPKs\$(TargetFramework)-$(_ConfigString).apk</DestinationAPK>
     </PropertyGroup>
-    <MSBuild Projects="..\AndroidTestApp\AndroidTestApp.csproj" Properties="Configuration=Release;PublishAot=$(_Aot);_IsPublishing=true;RuntimeIdentifier=android-x64;AndroidUseAssemblyStore=$(_Store);AndroidEnableAssemblyCompression=$(_Compressed);OutDir=bin\$(TargetFramework)\$(_ConfigString)\;BaseIntermediateOutputPath=obj\$(TargetFramework)\$(_ConfigString)\" Condition="!Exists('$(DestinationAPK)')" />
+    <MSBuild Projects="..\AndroidTestApp\AndroidTestApp.csproj" Properties="Configuration=Release;PublishAot=$(_Aot);_IsPublishing=true;RuntimeIdentifier=android-x64;AndroidUseAssemblyStore=$(_Store);AndroidEnableAssemblyCompression=$(_Compressed);OutDir=bin\$(TargetFramework)\$(_ConfigString)\;IntermediateOutputPath=obj\$(TargetFramework)\$(_ConfigString)" Condition="!Exists('$(DestinationAPK)')" />
 
     <Message Text="Copying APK from $(SourceAPK) to $(DestinationAPK)" Importance="high" />
     <Copy SourceFiles="$(SourceAPK)" DestinationFiles="$(DestinationAPK)" Condition="!Exists('$(DestinationAPK)')" />

From 7f5533f5baf91ce4f00b44c0cc2fa2729ee46ba0 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Fri, 18 Jul 2025 16:21:43 +0200
Subject: [PATCH 08/22] restore workflow_dispatch that went accidentally
 missing

---
 .github/workflows/build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bcb5af4243..602ee7a71b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,6 +8,7 @@ on:
   pull_request:
     paths-ignore:
       - "**.md"
+  workflow_dispatch:
 
 jobs:
   build-sentry-native:

From 6a3c2a5dcb02ac3f641b7f8101a110766595ea1e Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Fri, 18 Jul 2025 17:51:02 +0200
Subject: [PATCH 09/22] Try MSBuildProjectExtensionsPath + explicit versions

---
 test/AndroidTestApp/AndroidTestApp.csproj                   | 2 +-
 .../Sentry.Android.AssemblyReader.Tests.csproj              | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/AndroidTestApp/AndroidTestApp.csproj b/test/AndroidTestApp/AndroidTestApp.csproj
index 3d8a1981e1..987eac2943 100644
--- a/test/AndroidTestApp/AndroidTestApp.csproj
+++ b/test/AndroidTestApp/AndroidTestApp.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net8.0-android;net9.0-android</TargetFrameworks>
+    <TargetFrameworks>net8.0-android34.0;net9.0-android35.0</TargetFrameworks>
     <IsAotCompatible>false</IsAotCompatible>
     <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
     <OutputType>Exe</OutputType>
diff --git a/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj b/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
index 0422eb204f..b752712656 100644
--- a/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
+++ b/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
@@ -18,8 +18,8 @@
 
   <!--  Build the Android test app in various configurations during the build of this test project. -->
   <Target Name="BuildTestAPKs" BeforeTargets="DispatchToInnerBuilds;BeforeBuild" Condition="'$(TargetPlatformIdentifier)' != 'android'">
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_InnerBuildTestAPKs" Properties="TargetFramework=net8.0-android" Condition="$(TargetFramework.StartsWith('net8.0-android'))" />
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_InnerBuildTestAPKs" Properties="TargetFramework=net9.0-android" Condition="$(TargetFramework.StartsWith('net9.0-android'))" />
+    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_InnerBuildTestAPKs" Properties="TargetFramework=net8.0-android34.0" Condition="'$(TargetFramework)' == 'net8.0'" />
+    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_InnerBuildTestAPKs" Properties="TargetFramework=net9.0-android35.0" Condition="'$(TargetFramework)' == 'net9.0'" />
   </Target>
   <Target Name="_InnerBuildTestAPKs">
     <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Properties="_Aot=False;_Store=False;_Compressed=False" />
@@ -38,7 +38,7 @@
       <SourceAPK>..\AndroidTestApp\bin\$(TargetFramework)\$(_ConfigString)\com.companyname.AndroidTestApp-Signed.apk</SourceAPK>
       <DestinationAPK>TestAPKs\$(TargetFramework)-$(_ConfigString).apk</DestinationAPK>
     </PropertyGroup>
-    <MSBuild Projects="..\AndroidTestApp\AndroidTestApp.csproj" Properties="Configuration=Release;PublishAot=$(_Aot);_IsPublishing=true;RuntimeIdentifier=android-x64;AndroidUseAssemblyStore=$(_Store);AndroidEnableAssemblyCompression=$(_Compressed);OutDir=bin\$(TargetFramework)\$(_ConfigString)\;IntermediateOutputPath=obj\$(TargetFramework)\$(_ConfigString)" Condition="!Exists('$(DestinationAPK)')" />
+    <MSBuild Projects="..\AndroidTestApp\AndroidTestApp.csproj" Targets="Restore;Build" Properties="Configuration=Release;TargetFramework=$(TargetFramework);PublishAot=$(_Aot);_IsPublishing=true;RuntimeIdentifier=android-x64;AndroidUseAssemblyStore=$(_Store);AndroidEnableAssemblyCompression=$(_Compressed);OutDir=bin\$(TargetFramework)\$(_ConfigString)\;IntermediateOutputPath=obj\$(TargetFramework)\$(_ConfigString)\;MSBuildProjectExtensionsPath=obj\$(TargetFramework)\$(_ConfigString)\" Condition="!Exists('$(DestinationAPK)')" />
 
     <Message Text="Copying APK from $(SourceAPK) to $(DestinationAPK)" Importance="high" />
     <Copy SourceFiles="$(SourceAPK)" DestinationFiles="$(DestinationAPK)" Condition="!Exists('$(DestinationAPK)')" />

From a093280e87f687a561dd52a3530a0c1350caf38c Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Mon, 21 Jul 2025 08:37:38 +0200
Subject: [PATCH 10/22] Revert changes, again

---
 test/AndroidTestApp/AndroidTestApp.csproj       |  2 +-
 .../Sentry.Android.AssemblyReader.Tests.csproj  | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/test/AndroidTestApp/AndroidTestApp.csproj b/test/AndroidTestApp/AndroidTestApp.csproj
index 987eac2943..3d8a1981e1 100644
--- a/test/AndroidTestApp/AndroidTestApp.csproj
+++ b/test/AndroidTestApp/AndroidTestApp.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net8.0-android34.0;net9.0-android35.0</TargetFrameworks>
+    <TargetFrameworks>net8.0-android;net9.0-android</TargetFrameworks>
     <IsAotCompatible>false</IsAotCompatible>
     <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
     <OutputType>Exe</OutputType>
diff --git a/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj b/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
index b752712656..0bbb2b5b92 100644
--- a/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
+++ b/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
@@ -16,10 +16,19 @@
     <Folder Include="TestAPKs\" />
   </ItemGroup>
 
+  <!-- Target to ensure AndroidTestApp is restored -->
+  <Target Name="EnsureAndroidTestAppRestored" Condition="'$(TargetPlatformIdentifier)' != 'android' and '$(AndroidTestAppRestored)' != 'true'">
+    <!-- Only restore once. Spawn as a separate process to escape any "no-restore" arguments to the build -->
+    <Exec Command="dotnet restore ../AndroidTestApp/AndroidTestApp.csproj --nologo" />
+    <PropertyGroup>
+      <AndroidTestAppRestored>true</AndroidTestAppRestored>
+    </PropertyGroup>
+  </Target>
+
   <!--  Build the Android test app in various configurations during the build of this test project. -->
-  <Target Name="BuildTestAPKs" BeforeTargets="DispatchToInnerBuilds;BeforeBuild" Condition="'$(TargetPlatformIdentifier)' != 'android'">
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_InnerBuildTestAPKs" Properties="TargetFramework=net8.0-android34.0" Condition="'$(TargetFramework)' == 'net8.0'" />
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_InnerBuildTestAPKs" Properties="TargetFramework=net9.0-android35.0" Condition="'$(TargetFramework)' == 'net9.0'" />
+  <Target Name="BuildTestAPKs" BeforeTargets="DispatchToInnerBuilds;BeforeBuild" DependsOnTargets="EnsureAndroidTestAppRestored" Condition="'$(TargetPlatformIdentifier)' != 'android'">
+    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_InnerBuildTestAPKs" Properties="TargetFramework=net8.0-android" Condition="$(TargetFramework) == 'net8.0'" />
+    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_InnerBuildTestAPKs" Properties="TargetFramework=net9.0-android" Condition="$(TargetFramework) == 'net9.0'" />
   </Target>
   <Target Name="_InnerBuildTestAPKs">
     <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Properties="_Aot=False;_Store=False;_Compressed=False" />
@@ -38,7 +47,7 @@
       <SourceAPK>..\AndroidTestApp\bin\$(TargetFramework)\$(_ConfigString)\com.companyname.AndroidTestApp-Signed.apk</SourceAPK>
       <DestinationAPK>TestAPKs\$(TargetFramework)-$(_ConfigString).apk</DestinationAPK>
     </PropertyGroup>
-    <MSBuild Projects="..\AndroidTestApp\AndroidTestApp.csproj" Targets="Restore;Build" Properties="Configuration=Release;TargetFramework=$(TargetFramework);PublishAot=$(_Aot);_IsPublishing=true;RuntimeIdentifier=android-x64;AndroidUseAssemblyStore=$(_Store);AndroidEnableAssemblyCompression=$(_Compressed);OutDir=bin\$(TargetFramework)\$(_ConfigString)\;IntermediateOutputPath=obj\$(TargetFramework)\$(_ConfigString)\;MSBuildProjectExtensionsPath=obj\$(TargetFramework)\$(_ConfigString)\" Condition="!Exists('$(DestinationAPK)')" />
+    <MSBuild Projects="..\AndroidTestApp\AndroidTestApp.csproj" Targets="Build" Properties="Configuration=Release;PublishAot=$(_Aot);_IsPublishing=true;RuntimeIdentifier=android-x64;AndroidUseAssemblyStore=$(_Store);AndroidEnableAssemblyCompression=$(_Compressed);OutDir=bin\$(TargetFramework)\$(_ConfigString)\" Condition="!Exists('$(DestinationAPK)')" />
 
     <Message Text="Copying APK from $(SourceAPK) to $(DestinationAPK)" Importance="high" />
     <Copy SourceFiles="$(SourceAPK)" DestinationFiles="$(DestinationAPK)" Condition="!Exists('$(DestinationAPK)')" />

From 89e8035529aadc98fd7b881e7c0f4d702e3ba3e3 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Mon, 21 Jul 2025 08:41:35 +0200
Subject: [PATCH 11/22] Remove EnsureAndroidTestAppRestored

---
 .../Sentry.Android.AssemblyReader.Tests.csproj      | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj b/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
index 0bbb2b5b92..3a3ea0c8a8 100644
--- a/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
+++ b/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
@@ -16,17 +16,8 @@
     <Folder Include="TestAPKs\" />
   </ItemGroup>
 
-  <!-- Target to ensure AndroidTestApp is restored -->
-  <Target Name="EnsureAndroidTestAppRestored" Condition="'$(TargetPlatformIdentifier)' != 'android' and '$(AndroidTestAppRestored)' != 'true'">
-    <!-- Only restore once. Spawn as a separate process to escape any "no-restore" arguments to the build -->
-    <Exec Command="dotnet restore ../AndroidTestApp/AndroidTestApp.csproj --nologo" />
-    <PropertyGroup>
-      <AndroidTestAppRestored>true</AndroidTestAppRestored>
-    </PropertyGroup>
-  </Target>
-
   <!--  Build the Android test app in various configurations during the build of this test project. -->
-  <Target Name="BuildTestAPKs" BeforeTargets="DispatchToInnerBuilds;BeforeBuild" DependsOnTargets="EnsureAndroidTestAppRestored" Condition="'$(TargetPlatformIdentifier)' != 'android'">
+  <Target Name="BuildTestAPKs" BeforeTargets="DispatchToInnerBuilds;BeforeBuild" Condition="'$(TargetPlatformIdentifier)' != 'android'">
     <MSBuild Projects="$(MSBuildProjectFile)" Targets="_InnerBuildTestAPKs" Properties="TargetFramework=net8.0-android" Condition="$(TargetFramework) == 'net8.0'" />
     <MSBuild Projects="$(MSBuildProjectFile)" Targets="_InnerBuildTestAPKs" Properties="TargetFramework=net9.0-android" Condition="$(TargetFramework) == 'net9.0'" />
   </Target>
@@ -47,7 +38,7 @@
       <SourceAPK>..\AndroidTestApp\bin\$(TargetFramework)\$(_ConfigString)\com.companyname.AndroidTestApp-Signed.apk</SourceAPK>
       <DestinationAPK>TestAPKs\$(TargetFramework)-$(_ConfigString).apk</DestinationAPK>
     </PropertyGroup>
-    <MSBuild Projects="..\AndroidTestApp\AndroidTestApp.csproj" Targets="Build" Properties="Configuration=Release;PublishAot=$(_Aot);_IsPublishing=true;RuntimeIdentifier=android-x64;AndroidUseAssemblyStore=$(_Store);AndroidEnableAssemblyCompression=$(_Compressed);OutDir=bin\$(TargetFramework)\$(_ConfigString)\" Condition="!Exists('$(DestinationAPK)')" />
+    <MSBuild Projects="..\AndroidTestApp\AndroidTestApp.csproj" Targets="Restore;Build" Properties="Configuration=Release;PublishAot=$(_Aot);_IsPublishing=true;RuntimeIdentifier=android-x64;AndroidUseAssemblyStore=$(_Store);AndroidEnableAssemblyCompression=$(_Compressed);OutDir=bin\$(TargetFramework)\$(_ConfigString)\" Condition="!Exists('$(DestinationAPK)')" />
 
     <Message Text="Copying APK from $(SourceAPK) to $(DestinationAPK)" Importance="high" />
     <Copy SourceFiles="$(SourceAPK)" DestinationFiles="$(DestinationAPK)" Condition="!Exists('$(DestinationAPK)')" />

From e237b912d783c21004ce6ee78a0acc32a6dc5343 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Mon, 21 Jul 2025 09:04:55 +0200
Subject: [PATCH 12/22] Drop PublishAot=true targets for Windows
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Not supported:

>  AndroidTestApp net9.0-android failed with 1 error(s) (0,0s)
>    C:\Users\jpnurmi\.nuget\packages\microsoft.dotnet.ilcompiler\9.0.6\build\Microsoft.NETCore.Native.Publish.targets(61,5): error : Cross-OS native compilation is not supported.
>  AndroidTestApp net9.0-android failed (1,0s) → test\AndroidTestApp\bin\net9.0-android\A=True-S=False-C=False\AndroidTestApp.dll
---
 .../Sentry.Android.AssemblyReader.Tests.csproj            | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj b/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
index 3a3ea0c8a8..c9ccefbde6 100644
--- a/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
+++ b/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
@@ -27,10 +27,10 @@
     <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Properties="_Aot=False;_Store=True;_Compressed=False" />
     <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Properties="_Aot=False;_Store=True;_Compressed=True" />
 
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Condition="!$(TargetFramework.StartsWith('net8'))" Properties="_Aot=True;_Store=False;_Compressed=False" />
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Condition="!$(TargetFramework.StartsWith('net8'))" Properties="_Aot=True;_Store=False;_Compressed=True" />
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Condition="!$(TargetFramework.StartsWith('net8'))" Properties="_Aot=True;_Store=True;_Compressed=False" />
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Condition="!$(TargetFramework.StartsWith('net8'))" Properties="_Aot=True;_Store=True;_Compressed=True" />
+    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Condition="!$(TargetFramework.StartsWith('net8')) and !$([MSBuild]::IsOSPlatform('Windows'))" Properties="_Aot=True;_Store=False;_Compressed=False" />
+    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Condition="!$(TargetFramework.StartsWith('net8')) and !$([MSBuild]::IsOSPlatform('Windows'))" Properties="_Aot=True;_Store=False;_Compressed=True" />
+    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Condition="!$(TargetFramework.StartsWith('net8')) and !$([MSBuild]::IsOSPlatform('Windows'))" Properties="_Aot=True;_Store=True;_Compressed=False" />
+    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Condition="!$(TargetFramework.StartsWith('net8')) and !$([MSBuild]::IsOSPlatform('Windows'))" Properties="_Aot=True;_Store=True;_Compressed=True" />
   </Target>
   <Target Name="_BuildTestAPK">
     <PropertyGroup>

From 58dddcffa7968f4a3e47beeaa9533729d071f114 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Mon, 21 Jul 2025 14:07:17 +0200
Subject: [PATCH 13/22] Another non-parallelized attempt

---
 ...Sentry.Android.AssemblyReader.Tests.csproj | 59 +++++++++++++++----
 1 file changed, 49 insertions(+), 10 deletions(-)

diff --git a/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj b/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
index c9ccefbde6..77254c8754 100644
--- a/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
+++ b/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
@@ -22,15 +22,54 @@
     <MSBuild Projects="$(MSBuildProjectFile)" Targets="_InnerBuildTestAPKs" Properties="TargetFramework=net9.0-android" Condition="$(TargetFramework) == 'net9.0'" />
   </Target>
   <Target Name="_InnerBuildTestAPKs">
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Properties="_Aot=False;_Store=False;_Compressed=False" />
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Properties="_Aot=False;_Store=False;_Compressed=True" />
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Properties="_Aot=False;_Store=True;_Compressed=False" />
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Properties="_Aot=False;_Store=True;_Compressed=True" />
-
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Condition="!$(TargetFramework.StartsWith('net8')) and !$([MSBuild]::IsOSPlatform('Windows'))" Properties="_Aot=True;_Store=False;_Compressed=False" />
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Condition="!$(TargetFramework.StartsWith('net8')) and !$([MSBuild]::IsOSPlatform('Windows'))" Properties="_Aot=True;_Store=False;_Compressed=True" />
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Condition="!$(TargetFramework.StartsWith('net8')) and !$([MSBuild]::IsOSPlatform('Windows'))" Properties="_Aot=True;_Store=True;_Compressed=False" />
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Condition="!$(TargetFramework.StartsWith('net8')) and !$([MSBuild]::IsOSPlatform('Windows'))" Properties="_Aot=True;_Store=True;_Compressed=True" />
+    <ItemGroup>
+      <_TestAPK Include="1">
+        <Aot>False</Aot>
+        <Store>False</Store>
+        <Compressed>False</Compressed>
+      </_TestAPK>
+      <_TestAPK Include="1">
+        <Aot>False</Aot>
+        <Store>False</Store>
+        <Compressed>True</Compressed>
+      </_TestAPK>
+      <_TestAPK Include="2">
+        <Aot>False</Aot>
+        <Store>True</Store>
+        <Compressed>False</Compressed>
+      </_TestAPK>
+      <_TestAPK Include="3">
+        <Aot>False</Aot>
+        <Store>True</Store>
+        <Compressed>True</Compressed>
+      </_TestAPK>
+
+      <_TestAPK Include="4">
+        <Aot>!$([MSBuild]::IsOSPlatform('Windows'))</Aot>
+        <Store>False</Store>
+        <Compressed>False</Compressed>
+      </_TestAPK>
+      <_TestAPK Include="5">
+        <Aot>!$([MSBuild]::IsOSPlatform('Windows'))</Aot>
+        <Store>False</Store>
+        <Compressed>True</Compressed>
+      </_TestAPK>
+      <_TestAPK Include="6">
+        <Aot>!$([MSBuild]::IsOSPlatform('Windows'))</Aot>
+        <Store>True</Store>
+        <Compressed>False</Compressed>
+      </_TestAPK>
+      <_TestAPK Include="7">
+        <Aot>!$([MSBuild]::IsOSPlatform('Windows'))</Aot>
+        <Store>True</Store>
+        <Compressed>True</Compressed>
+      </_TestAPK>
+    </ItemGroup>
+
+    <MSBuild Projects="$(MSBuildProjectFile)" 
+             Targets="_BuildTestAPK" 
+             Properties="_Aot=%(_TestAPK.Aot);_Store=%(_TestAPK.Store);_Compressed=%(_TestAPK.Compressed)"
+             BuildInParallel="false" />
   </Target>
   <Target Name="_BuildTestAPK">
     <PropertyGroup>
@@ -38,7 +77,7 @@
       <SourceAPK>..\AndroidTestApp\bin\$(TargetFramework)\$(_ConfigString)\com.companyname.AndroidTestApp-Signed.apk</SourceAPK>
       <DestinationAPK>TestAPKs\$(TargetFramework)-$(_ConfigString).apk</DestinationAPK>
     </PropertyGroup>
-    <MSBuild Projects="..\AndroidTestApp\AndroidTestApp.csproj" Targets="Restore;Build" Properties="Configuration=Release;PublishAot=$(_Aot);_IsPublishing=true;RuntimeIdentifier=android-x64;AndroidUseAssemblyStore=$(_Store);AndroidEnableAssemblyCompression=$(_Compressed);OutDir=bin\$(TargetFramework)\$(_ConfigString)\" Condition="!Exists('$(DestinationAPK)')" />
+    <MSBuild Projects="..\AndroidTestApp\AndroidTestApp.csproj" Targets="Restore;Build" Properties="Configuration=Release;PublishAot=$(_Aot);_IsPublishing=!$([MSBuild]::IsOSPlatform('Windows'));RuntimeIdentifier=android-x64;AndroidUseAssemblyStore=$(_Store);AndroidEnableAssemblyCompression=$(_Compressed);OutDir=bin\$(TargetFramework)\$(_ConfigString)\" Condition="!Exists('$(DestinationAPK)')" />
 
     <Message Text="Copying APK from $(SourceAPK) to $(DestinationAPK)" Importance="high" />
     <Copy SourceFiles="$(SourceAPK)" DestinationFiles="$(DestinationAPK)" Condition="!Exists('$(DestinationAPK)')" />

From 4bd0eb27662d06ea7ab55a427b5f1ca7d4d9dfc5 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Mon, 21 Jul 2025 14:23:52 +0200
Subject: [PATCH 14/22] Revert "Remove EnsureAndroidTestAppRestored"

This reverts commit 89e8035529aadc98fd7b881e7c0f4d702e3ba3e3.
---
 .../Sentry.Android.AssemblyReader.Tests.csproj      | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj b/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
index 77254c8754..800b2d4011 100644
--- a/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
+++ b/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
@@ -16,8 +16,17 @@
     <Folder Include="TestAPKs\" />
   </ItemGroup>
 
+  <!-- Target to ensure AndroidTestApp is restored -->
+  <Target Name="EnsureAndroidTestAppRestored" Condition="'$(TargetPlatformIdentifier)' != 'android' and '$(AndroidTestAppRestored)' != 'true'">
+    <!-- Only restore once. Spawn as a separate process to escape any "no-restore" arguments to the build -->
+    <Exec Command="dotnet restore ../AndroidTestApp/AndroidTestApp.csproj --nologo" />
+    <PropertyGroup>
+      <AndroidTestAppRestored>true</AndroidTestAppRestored>
+    </PropertyGroup>
+  </Target>
+
   <!--  Build the Android test app in various configurations during the build of this test project. -->
-  <Target Name="BuildTestAPKs" BeforeTargets="DispatchToInnerBuilds;BeforeBuild" Condition="'$(TargetPlatformIdentifier)' != 'android'">
+  <Target Name="BuildTestAPKs" BeforeTargets="DispatchToInnerBuilds;BeforeBuild" DependsOnTargets="EnsureAndroidTestAppRestored" Condition="'$(TargetPlatformIdentifier)' != 'android'">
     <MSBuild Projects="$(MSBuildProjectFile)" Targets="_InnerBuildTestAPKs" Properties="TargetFramework=net8.0-android" Condition="$(TargetFramework) == 'net8.0'" />
     <MSBuild Projects="$(MSBuildProjectFile)" Targets="_InnerBuildTestAPKs" Properties="TargetFramework=net9.0-android" Condition="$(TargetFramework) == 'net9.0'" />
   </Target>
@@ -77,7 +86,7 @@
       <SourceAPK>..\AndroidTestApp\bin\$(TargetFramework)\$(_ConfigString)\com.companyname.AndroidTestApp-Signed.apk</SourceAPK>
       <DestinationAPK>TestAPKs\$(TargetFramework)-$(_ConfigString).apk</DestinationAPK>
     </PropertyGroup>
-    <MSBuild Projects="..\AndroidTestApp\AndroidTestApp.csproj" Targets="Restore;Build" Properties="Configuration=Release;PublishAot=$(_Aot);_IsPublishing=!$([MSBuild]::IsOSPlatform('Windows'));RuntimeIdentifier=android-x64;AndroidUseAssemblyStore=$(_Store);AndroidEnableAssemblyCompression=$(_Compressed);OutDir=bin\$(TargetFramework)\$(_ConfigString)\" Condition="!Exists('$(DestinationAPK)')" />
+    <MSBuild Projects="..\AndroidTestApp\AndroidTestApp.csproj" Targets="Build" Properties="Configuration=Release;PublishAot=$(_Aot);_IsPublishing=!$([MSBuild]::IsOSPlatform('Windows'));RuntimeIdentifier=android-x64;AndroidUseAssemblyStore=$(_Store);AndroidEnableAssemblyCompression=$(_Compressed);OutDir=bin\$(TargetFramework)\$(_ConfigString)\" Condition="!Exists('$(DestinationAPK)')" />
 
     <Message Text="Copying APK from $(SourceAPK) to $(DestinationAPK)" Importance="high" />
     <Copy SourceFiles="$(SourceAPK)" DestinationFiles="$(DestinationAPK)" Condition="!Exists('$(DestinationAPK)')" />

From d5e3c45eaa083cb79fd6d55f7a428f702fb8b02c Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Mon, 21 Jul 2025 14:29:14 +0200
Subject: [PATCH 15/22] Clean up

---
 .../Sentry.Android.AssemblyReader.Tests.csproj              | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj b/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
index 800b2d4011..aa2e21c831 100644
--- a/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
+++ b/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
@@ -75,8 +75,8 @@
       </_TestAPK>
     </ItemGroup>
 
-    <MSBuild Projects="$(MSBuildProjectFile)" 
-             Targets="_BuildTestAPK" 
+    <MSBuild Projects="$(MSBuildProjectFile)"
+             Targets="_BuildTestAPK"
              Properties="_Aot=%(_TestAPK.Aot);_Store=%(_TestAPK.Store);_Compressed=%(_TestAPK.Compressed)"
              BuildInParallel="false" />
   </Target>
@@ -86,7 +86,7 @@
       <SourceAPK>..\AndroidTestApp\bin\$(TargetFramework)\$(_ConfigString)\com.companyname.AndroidTestApp-Signed.apk</SourceAPK>
       <DestinationAPK>TestAPKs\$(TargetFramework)-$(_ConfigString).apk</DestinationAPK>
     </PropertyGroup>
-    <MSBuild Projects="..\AndroidTestApp\AndroidTestApp.csproj" Targets="Build" Properties="Configuration=Release;PublishAot=$(_Aot);_IsPublishing=!$([MSBuild]::IsOSPlatform('Windows'));RuntimeIdentifier=android-x64;AndroidUseAssemblyStore=$(_Store);AndroidEnableAssemblyCompression=$(_Compressed);OutDir=bin\$(TargetFramework)\$(_ConfigString)\" Condition="!Exists('$(DestinationAPK)')" />
+    <MSBuild Projects="..\AndroidTestApp\AndroidTestApp.csproj" Targets="Build" Properties="Configuration=Release;PublishAot=$(_Aot);_IsPublishing=true;RuntimeIdentifier=android-x64;AndroidUseAssemblyStore=$(_Store);AndroidEnableAssemblyCompression=$(_Compressed);OutDir=bin\$(TargetFramework)\$(_ConfigString)\" Condition="!Exists('$(DestinationAPK)')" />
 
     <Message Text="Copying APK from $(SourceAPK) to $(DestinationAPK)" Importance="high" />
     <Copy SourceFiles="$(SourceAPK)" DestinationFiles="$(DestinationAPK)" Condition="!Exists('$(DestinationAPK)')" />

From 81f35c48cfcebd369dec83a8effb954bf19f0ba7 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Mon, 21 Jul 2025 14:38:49 +0200
Subject: [PATCH 16/22] fix _TestAPK condition

---
 .../Sentry.Android.AssemblyReader.Tests.csproj   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj b/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
index aa2e21c831..6b55df806f 100644
--- a/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
+++ b/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
@@ -53,23 +53,23 @@
         <Compressed>True</Compressed>
       </_TestAPK>
 
-      <_TestAPK Include="4">
-        <Aot>!$([MSBuild]::IsOSPlatform('Windows'))</Aot>
+      <_TestAPK Include="4" Condition="!$([MSBuild]::IsOSPlatform('Windows'))">
+        <Aot>True</Aot>
         <Store>False</Store>
         <Compressed>False</Compressed>
       </_TestAPK>
-      <_TestAPK Include="5">
-        <Aot>!$([MSBuild]::IsOSPlatform('Windows'))</Aot>
+      <_TestAPK Include="5" Condition="!$([MSBuild]::IsOSPlatform('Windows'))">
+        <Aot>True</Aot>
         <Store>False</Store>
         <Compressed>True</Compressed>
       </_TestAPK>
-      <_TestAPK Include="6">
-        <Aot>!$([MSBuild]::IsOSPlatform('Windows'))</Aot>
+      <_TestAPK Include="6" Condition="!$([MSBuild]::IsOSPlatform('Windows'))">
+        <Aot>True</Aot>
         <Store>True</Store>
         <Compressed>False</Compressed>
       </_TestAPK>
-      <_TestAPK Include="7">
-        <Aot>!$([MSBuild]::IsOSPlatform('Windows'))</Aot>
+      <_TestAPK Include="7" Condition="!$([MSBuild]::IsOSPlatform('Windows'))">
+        <Aot>True</Aot>
         <Store>True</Store>
         <Compressed>True</Compressed>
       </_TestAPK>

From 32a045c75e70074924cebdf3586fced2a9ae2536 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Mon, 21 Jul 2025 14:40:16 +0200
Subject: [PATCH 17/22] fix numbering

---
 .../Sentry.Android.AssemblyReader.Tests.csproj     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj b/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
index 6b55df806f..a765aaba22 100644
--- a/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
+++ b/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
@@ -37,38 +37,38 @@
         <Store>False</Store>
         <Compressed>False</Compressed>
       </_TestAPK>
-      <_TestAPK Include="1">
+      <_TestAPK Include="2">
         <Aot>False</Aot>
         <Store>False</Store>
         <Compressed>True</Compressed>
       </_TestAPK>
-      <_TestAPK Include="2">
+      <_TestAPK Include="3">
         <Aot>False</Aot>
         <Store>True</Store>
         <Compressed>False</Compressed>
       </_TestAPK>
-      <_TestAPK Include="3">
+      <_TestAPK Include="4">
         <Aot>False</Aot>
         <Store>True</Store>
         <Compressed>True</Compressed>
       </_TestAPK>
 
-      <_TestAPK Include="4" Condition="!$([MSBuild]::IsOSPlatform('Windows'))">
+      <_TestAPK Include="5" Condition="!$([MSBuild]::IsOSPlatform('Windows'))">
         <Aot>True</Aot>
         <Store>False</Store>
         <Compressed>False</Compressed>
       </_TestAPK>
-      <_TestAPK Include="5" Condition="!$([MSBuild]::IsOSPlatform('Windows'))">
+      <_TestAPK Include="6" Condition="!$([MSBuild]::IsOSPlatform('Windows'))">
         <Aot>True</Aot>
         <Store>False</Store>
         <Compressed>True</Compressed>
       </_TestAPK>
-      <_TestAPK Include="6" Condition="!$([MSBuild]::IsOSPlatform('Windows'))">
+      <_TestAPK Include="7" Condition="!$([MSBuild]::IsOSPlatform('Windows'))">
         <Aot>True</Aot>
         <Store>True</Store>
         <Compressed>False</Compressed>
       </_TestAPK>
-      <_TestAPK Include="7" Condition="!$([MSBuild]::IsOSPlatform('Windows'))">
+      <_TestAPK Include="8" Condition="!$([MSBuild]::IsOSPlatform('Windows'))">
         <Aot>True</Aot>
         <Store>True</Store>
         <Compressed>True</Compressed>

From b1a577778456a4857c1426ad3a60ff1cf548a98b Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Mon, 21 Jul 2025 22:07:48 +0200
Subject: [PATCH 18/22] Android AOT is not supported on Windows

---
 .../AndroidAssemblyReaderTests.cs                              | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/Sentry.Android.AssemblyReader.Tests/AndroidAssemblyReaderTests.cs b/test/Sentry.Android.AssemblyReader.Tests/AndroidAssemblyReaderTests.cs
index 4a9985f827..62ff62ed73 100644
--- a/test/Sentry.Android.AssemblyReader.Tests/AndroidAssemblyReaderTests.cs
+++ b/test/Sentry.Android.AssemblyReader.Tests/AndroidAssemblyReaderTests.cs
@@ -113,6 +113,9 @@ public void ReadsAssembly(bool isAot, bool isAssemblyStore, bool isCompressed, s
         Skip.If(!isAssemblyStore);
         Skip.If(!isCompressed);
 #endif
+
+        Skip.If(isAot && RuntimeInformation.IsOSPlatform(OSPlatform.Windows), "Android AOT is not supported on Windows");
+
         using var sut = GetSut(isAot, isAssemblyStore, isCompressed);
 
         var peReader = sut.TryReadAssembly(assemblyName);

From 45db870db25228089b325d9f81d04bf860195568 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Tue, 22 Jul 2025 08:23:27 +0200
Subject: [PATCH 19/22] Final clean up

---
 .../AndroidAssemblyReaderTests.cs             |  3 +-
 ...Sentry.Android.AssemblyReader.Tests.csproj | 50 ++++---------------
 2 files changed, 10 insertions(+), 43 deletions(-)

diff --git a/test/Sentry.Android.AssemblyReader.Tests/AndroidAssemblyReaderTests.cs b/test/Sentry.Android.AssemblyReader.Tests/AndroidAssemblyReaderTests.cs
index 62ff62ed73..2eb03f151e 100644
--- a/test/Sentry.Android.AssemblyReader.Tests/AndroidAssemblyReaderTests.cs
+++ b/test/Sentry.Android.AssemblyReader.Tests/AndroidAssemblyReaderTests.cs
@@ -113,8 +113,7 @@ public void ReadsAssembly(bool isAot, bool isAssemblyStore, bool isCompressed, s
         Skip.If(!isAssemblyStore);
         Skip.If(!isCompressed);
 #endif
-
-        Skip.If(isAot && RuntimeInformation.IsOSPlatform(OSPlatform.Windows), "Android AOT is not supported on Windows");
+        Skip.If(isAot && RuntimeInformation.IsOSPlatform(OSPlatform.Windows), "Cross-OS native compilation is not supported on Windows");
 
         using var sut = GetSut(isAot, isAssemblyStore, isCompressed);
 
diff --git a/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj b/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
index a765aaba22..8006cd5df0 100644
--- a/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
+++ b/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
@@ -32,47 +32,15 @@
   </Target>
   <Target Name="_InnerBuildTestAPKs">
     <ItemGroup>
-      <_TestAPK Include="1">
-        <Aot>False</Aot>
-        <Store>False</Store>
-        <Compressed>False</Compressed>
-      </_TestAPK>
-      <_TestAPK Include="2">
-        <Aot>False</Aot>
-        <Store>False</Store>
-        <Compressed>True</Compressed>
-      </_TestAPK>
-      <_TestAPK Include="3">
-        <Aot>False</Aot>
-        <Store>True</Store>
-        <Compressed>False</Compressed>
-      </_TestAPK>
-      <_TestAPK Include="4">
-        <Aot>False</Aot>
-        <Store>True</Store>
-        <Compressed>True</Compressed>
-      </_TestAPK>
-
-      <_TestAPK Include="5" Condition="!$([MSBuild]::IsOSPlatform('Windows'))">
-        <Aot>True</Aot>
-        <Store>False</Store>
-        <Compressed>False</Compressed>
-      </_TestAPK>
-      <_TestAPK Include="6" Condition="!$([MSBuild]::IsOSPlatform('Windows'))">
-        <Aot>True</Aot>
-        <Store>False</Store>
-        <Compressed>True</Compressed>
-      </_TestAPK>
-      <_TestAPK Include="7" Condition="!$([MSBuild]::IsOSPlatform('Windows'))">
-        <Aot>True</Aot>
-        <Store>True</Store>
-        <Compressed>False</Compressed>
-      </_TestAPK>
-      <_TestAPK Include="8" Condition="!$([MSBuild]::IsOSPlatform('Windows'))">
-        <Aot>True</Aot>
-        <Store>True</Store>
-        <Compressed>True</Compressed>
-      </_TestAPK>
+      <_TestAPK Include="1" Aot="False" Store="False" Compressed="False" />
+      <_TestAPK Include="2" Aot="False" Store="False" Compressed="True" />
+      <_TestAPK Include="3" Aot="False" Store="True" Compressed="False" />
+      <_TestAPK Include="4" Aot="False" Store="True" Compressed="True" />
+      <!-- Cross-OS native compilation is not supported on Windows (Microsoft.NETCore.Native.Publish.targets). -->
+      <_TestAPK Include="5" Aot="True" Store="False" Compressed="False" Condition="!$([MSBuild]::IsOSPlatform('Windows'))" />
+      <_TestAPK Include="6" Aot="True" Store="False" Compressed="True" Condition="!$([MSBuild]::IsOSPlatform('Windows'))" />
+      <_TestAPK Include="7" Aot="True" Store="True" Compressed="False" Condition="!$([MSBuild]::IsOSPlatform('Windows'))" />
+      <_TestAPK Include="8" Aot="True" Store="True" Compressed="True" Condition="!$([MSBuild]::IsOSPlatform('Windows'))" />
     </ItemGroup>
 
     <MSBuild Projects="$(MSBuildProjectFile)"

From fbbb84a024a75f52b7c4b3907cef30304b05ee9a Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Tue, 22 Jul 2025 08:38:40 +0200
Subject: [PATCH 20/22] Restore net8 checks

---
 .../AndroidAssemblyReaderTests.cs                        | 1 -
 .../Sentry.Android.AssemblyReader.Tests.csproj           | 9 ++++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/test/Sentry.Android.AssemblyReader.Tests/AndroidAssemblyReaderTests.cs b/test/Sentry.Android.AssemblyReader.Tests/AndroidAssemblyReaderTests.cs
index 2eb03f151e..a043fb86f4 100644
--- a/test/Sentry.Android.AssemblyReader.Tests/AndroidAssemblyReaderTests.cs
+++ b/test/Sentry.Android.AssemblyReader.Tests/AndroidAssemblyReaderTests.cs
@@ -113,7 +113,6 @@ public void ReadsAssembly(bool isAot, bool isAssemblyStore, bool isCompressed, s
         Skip.If(!isAssemblyStore);
         Skip.If(!isCompressed);
 #endif
-        Skip.If(isAot && RuntimeInformation.IsOSPlatform(OSPlatform.Windows), "Cross-OS native compilation is not supported on Windows");
 
         using var sut = GetSut(isAot, isAssemblyStore, isCompressed);
 
diff --git a/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj b/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
index 8006cd5df0..62ded36cef 100644
--- a/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
+++ b/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
@@ -36,11 +36,10 @@
       <_TestAPK Include="2" Aot="False" Store="False" Compressed="True" />
       <_TestAPK Include="3" Aot="False" Store="True" Compressed="False" />
       <_TestAPK Include="4" Aot="False" Store="True" Compressed="True" />
-      <!-- Cross-OS native compilation is not supported on Windows (Microsoft.NETCore.Native.Publish.targets). -->
-      <_TestAPK Include="5" Aot="True" Store="False" Compressed="False" Condition="!$([MSBuild]::IsOSPlatform('Windows'))" />
-      <_TestAPK Include="6" Aot="True" Store="False" Compressed="True" Condition="!$([MSBuild]::IsOSPlatform('Windows'))" />
-      <_TestAPK Include="7" Aot="True" Store="True" Compressed="False" Condition="!$([MSBuild]::IsOSPlatform('Windows'))" />
-      <_TestAPK Include="8" Aot="True" Store="True" Compressed="True" Condition="!$([MSBuild]::IsOSPlatform('Windows'))" />
+      <_TestAPK Include="5" Aot="True" Store="False" Compressed="False" Condition="!$(TargetFramework.StartsWith('net8'))" />
+      <_TestAPK Include="6" Aot="True" Store="False" Compressed="True" Condition="!$(TargetFramework.StartsWith('net8'))" />
+      <_TestAPK Include="7" Aot="True" Store="True" Compressed="False" Condition="!$(TargetFramework.StartsWith('net8'))" />
+      <_TestAPK Include="8" Aot="True" Store="True" Compressed="True" Condition="!$(TargetFramework.StartsWith('net8'))" />
     </ItemGroup>
 
     <MSBuild Projects="$(MSBuildProjectFile)"

From b9f40bb661b0c474c3347f851b4a8c10fc199455 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Tue, 22 Jul 2025 08:57:14 +0200
Subject: [PATCH 21/22] Minimize changes

---
 .../AndroidAssemblyReaderTests.cs             |  1 -
 ...Sentry.Android.AssemblyReader.Tests.csproj | 22 +++++++++----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/test/Sentry.Android.AssemblyReader.Tests/AndroidAssemblyReaderTests.cs b/test/Sentry.Android.AssemblyReader.Tests/AndroidAssemblyReaderTests.cs
index a043fb86f4..4a9985f827 100644
--- a/test/Sentry.Android.AssemblyReader.Tests/AndroidAssemblyReaderTests.cs
+++ b/test/Sentry.Android.AssemblyReader.Tests/AndroidAssemblyReaderTests.cs
@@ -113,7 +113,6 @@ public void ReadsAssembly(bool isAot, bool isAssemblyStore, bool isCompressed, s
         Skip.If(!isAssemblyStore);
         Skip.If(!isCompressed);
 #endif
-
         using var sut = GetSut(isAot, isAssemblyStore, isCompressed);
 
         var peReader = sut.TryReadAssembly(assemblyName);
diff --git a/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj b/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
index 62ded36cef..7a54ff13af 100644
--- a/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
+++ b/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
@@ -32,20 +32,18 @@
   </Target>
   <Target Name="_InnerBuildTestAPKs">
     <ItemGroup>
-      <_TestAPK Include="1" Aot="False" Store="False" Compressed="False" />
-      <_TestAPK Include="2" Aot="False" Store="False" Compressed="True" />
-      <_TestAPK Include="3" Aot="False" Store="True" Compressed="False" />
-      <_TestAPK Include="4" Aot="False" Store="True" Compressed="True" />
-      <_TestAPK Include="5" Aot="True" Store="False" Compressed="False" Condition="!$(TargetFramework.StartsWith('net8'))" />
-      <_TestAPK Include="6" Aot="True" Store="False" Compressed="True" Condition="!$(TargetFramework.StartsWith('net8'))" />
-      <_TestAPK Include="7" Aot="True" Store="True" Compressed="False" Condition="!$(TargetFramework.StartsWith('net8'))" />
-      <_TestAPK Include="8" Aot="True" Store="True" Compressed="True" Condition="!$(TargetFramework.StartsWith('net8'))" />
+      <_TestAPK Include="1" Properties="_Aot=False;_Store=False;_Compressed=False" />
+      <_TestAPK Include="2" Properties="_Aot=False;_Store=False;_Compressed=True" />
+      <_TestAPK Include="3" Properties="_Aot=False;_Store=True;_Compressed=False" />
+      <_TestAPK Include="4" Properties="_Aot=False;_Store=True;_Compressed=True" />
+
+      <_TestAPK Include="5" Condition="!$(TargetFramework.StartsWith('net8'))" Properties="_Aot=True;_Store=False;_Compressed=False" />
+      <_TestAPK Include="6" Condition="!$(TargetFramework.StartsWith('net8'))" Properties="_Aot=True;_Store=False;_Compressed=True" />
+      <_TestAPK Include="7" Condition="!$(TargetFramework.StartsWith('net8'))" Properties="_Aot=True;_Store=True;_Compressed=False" />
+      <_TestAPK Include="8" Condition="!$(TargetFramework.StartsWith('net8'))" Properties="_Aot=True;_Store=True;_Compressed=True" />
     </ItemGroup>
 
-    <MSBuild Projects="$(MSBuildProjectFile)"
-             Targets="_BuildTestAPK"
-             Properties="_Aot=%(_TestAPK.Aot);_Store=%(_TestAPK.Store);_Compressed=%(_TestAPK.Compressed)"
-             BuildInParallel="false" />
+    <MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Properties="%(_TestAPK.Properties)" BuildInParallel="false" />
   </Target>
   <Target Name="_BuildTestAPK">
     <PropertyGroup>

From db6e14ed404f09615572bef833ae8d9c64688ebf Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Tue, 22 Jul 2025 13:35:03 +0200
Subject: [PATCH 22/22] Add link

---
 .../Sentry.Android.AssemblyReader.Tests.csproj                   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj b/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
index 7a54ff13af..448a390c02 100644
--- a/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
+++ b/test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
@@ -31,6 +31,7 @@
     <MSBuild Projects="$(MSBuildProjectFile)" Targets="_InnerBuildTestAPKs" Properties="TargetFramework=net9.0-android" Condition="$(TargetFramework) == 'net9.0'" />
   </Target>
   <Target Name="_InnerBuildTestAPKs">
+    <!-- https://learn.microsoft.com/visualstudio/msbuild/msbuild-batching -->
     <ItemGroup>
       <_TestAPK Include="1" Properties="_Aot=False;_Store=False;_Compressed=False" />
       <_TestAPK Include="2" Properties="_Aot=False;_Store=False;_Compressed=True" />