From 03cebe9c86693f08776cddc2eddddcb9229d4eff Mon Sep 17 00:00:00 2001
From: Dean Ellis <dellis1972@googlemail.com>
Date: Wed, 9 Apr 2025 10:43:48 +0100
Subject: [PATCH 1/4] Try to preserve the app cache on uninstall.

Context #9259

Due to various reasons `adb` may not be able to preserve the app cache
on uninstall. To work around this we have to use the `-k` flag to
uninstall the app when using the `cmd package uninstall` call.
This will keep the app data and cache on the device.

However this might also fail. So in that case we need to completely
uninstall the app and then install it again.
---
 .../Xamarin.Android.Common.targets               | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
index c04712421c4..a5f14a661a7 100644
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
@@ -2988,6 +2988,7 @@ because xbuild doesn't support framework reference assemblies.
 <Target Name="_DeployAppBundle"
     Condition=" '$(AndroidPackageFormat)' == 'aab' "
     DependsOnTargets="_BuildApkSet">
+  <!-- Try to uninstall but save the cache -->
   <AndroidAdb
       Condition=" '$(EmbedAssembliesIntoApk)' == 'true' "
       ContinueOnError="True"
@@ -2999,7 +3000,20 @@ because xbuild doesn't support framework reference assemblies.
   >
     <Output TaskParameter="Result" PropertyName="_UninstallResult" />
   </AndroidAdb>
-   <AndroidAdb
+  <!-- The previous attempt failed. So yry to uninstall but save the cache using cmd package uninstall -k -->
+  <AndroidAdb
+      Condition=" '$(EmbedAssembliesIntoApk)' == 'true' And '$(_UninstallResult)' == 'false' "
+      ContinueOnError="True"
+      ToolExe="$(AdbToolExe)"
+      ToolPath="$(AdbToolPath)"
+      AdbTarget="$(AdbTarget)"
+      Command="shell cmd package uninstall -k"
+      Arguments="$(_AndroidPackage)"
+  >
+    <Output TaskParameter="Result" PropertyName="_UninstallResult" />
+  </AndroidAdb>
+  <!-- adb really can't uninstall this app with the cache intact, we need to completely uninstall it. -->
+  <AndroidAdb
       Condition=" '$(EmbedAssembliesIntoApk)' == 'true' And '$(_UninstallResult)' == 'false' "
       ContinueOnError="True"
       ToolExe="$(AdbToolExe)"

From 34f59f6d6e7bc84c7782fd877632c2fde2cb1f87 Mon Sep 17 00:00:00 2001
From: Dean Ellis <dellis1972@googlemail.com>
Date: Sat, 26 Apr 2025 10:05:10 +0100
Subject: [PATCH 2/4] Just use pm uninstall

---
 .../Xamarin.Android.Common.targets                 | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
index a5f14a661a7..b09c1756bdf 100644
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
@@ -2988,21 +2988,9 @@ because xbuild doesn't support framework reference assemblies.
 <Target Name="_DeployAppBundle"
     Condition=" '$(AndroidPackageFormat)' == 'aab' "
     DependsOnTargets="_BuildApkSet">
-  <!-- Try to uninstall but save the cache -->
-  <AndroidAdb
-      Condition=" '$(EmbedAssembliesIntoApk)' == 'true' "
-      ContinueOnError="True"
-      ToolExe="$(AdbToolExe)"
-      ToolPath="$(AdbToolPath)"
-      AdbTarget="$(AdbTarget)"
-      Command="uninstall"
-      Arguments="-k $(_AndroidPackage)"
-  >
-    <Output TaskParameter="Result" PropertyName="_UninstallResult" />
-  </AndroidAdb>
   <!-- The previous attempt failed. So yry to uninstall but save the cache using cmd package uninstall -k -->
   <AndroidAdb
-      Condition=" '$(EmbedAssembliesIntoApk)' == 'true' And '$(_UninstallResult)' == 'false' "
+      Condition=" '$(EmbedAssembliesIntoApk)' == 'true' "
       ContinueOnError="True"
       ToolExe="$(AdbToolExe)"
       ToolPath="$(AdbToolPath)"

From 6fcb64c43822856e12b4db3f4bd6452042df0c41 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Mon, 5 May 2025 14:31:58 -0500
Subject: [PATCH 3/4] Update Xamarin.Android.Common.targets

---
 .../Xamarin.Android.Common.targets                            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
index b09c1756bdf..2ef44e83eba 100644
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
@@ -2988,14 +2988,14 @@ because xbuild doesn't support framework reference assemblies.
 <Target Name="_DeployAppBundle"
     Condition=" '$(AndroidPackageFormat)' == 'aab' "
     DependsOnTargets="_BuildApkSet">
-  <!-- The previous attempt failed. So yry to uninstall but save the cache using cmd package uninstall -k -->
+  <!-- The previous attempt failed. So try to uninstall but save the cache using cmd package uninstall -k -->
   <AndroidAdb
       Condition=" '$(EmbedAssembliesIntoApk)' == 'true' "
       ContinueOnError="True"
       ToolExe="$(AdbToolExe)"
       ToolPath="$(AdbToolPath)"
       AdbTarget="$(AdbTarget)"
-      Command="shell cmd package uninstall -k"
+      Command="shell pm uninstall -k"
       Arguments="$(_AndroidPackage)"
   >
     <Output TaskParameter="Result" PropertyName="_UninstallResult" />

From 3ab8c578893a85bc4b744b11f3fd9dc67389ce03 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Mon, 5 May 2025 14:32:52 -0500
Subject: [PATCH 4/4] Update Xamarin.Android.Common.targets

---
 src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
index 2ef44e83eba..eb1f394219e 100644
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
@@ -3007,7 +3007,7 @@ because xbuild doesn't support framework reference assemblies.
       ToolExe="$(AdbToolExe)"
       ToolPath="$(AdbToolPath)"
       AdbTarget="$(AdbTarget)"
-      Command="shell cmd package uninstall"
+      Command="shell pm uninstall"
       Arguments="$(_AndroidPackage)"
   />
   <InstallApkSet