Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
Original file line number Diff line number Diff line change
Expand Up @@ -2988,24 +2988,26 @@ because xbuild doesn't support framework reference assemblies.
<Target Name="_DeployAppBundle"
Condition=" '$(AndroidPackageFormat)' == 'aab' "
DependsOnTargets="_BuildApkSet">
<!-- 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="uninstall"
Arguments="-k $(_AndroidPackage)"
Command="shell pm uninstall -k"
Arguments="$(_AndroidPackage)"
>
<Output TaskParameter="Result" PropertyName="_UninstallResult" />
</AndroidAdb>
<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)"
ToolPath="$(AdbToolPath)"
AdbTarget="$(AdbTarget)"
Command="shell cmd package uninstall"
Command="shell pm uninstall"
Arguments="$(_AndroidPackage)"
/>
<InstallApkSet
Expand Down
Loading