From 6e375d5c16af55d670b677f8d408533cb1554fb0 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Thu, 22 Jun 2023 14:05:30 -0500
Subject: [PATCH] Bump to google/bundletool/main@f17ce94a (#8135)

Context: https://github.com/google/bundletool/releases/tag/1.15.1
Changes: https://github.com/google/bundletool/compare/1.8.1...1.15.1

We are seeing an error with API 34:

    XABBA7024: Xamarin.Tools.Zip.ZipIOException: The file 'obj\Release\android\bin\base.zip' is not a ZIP archive.

We wonder if updating `bundletool` will help. It was last updated in
989dc07b.

* [tests] Update `ManifestTest.cs`

Context: https://github.com/xamarin/xamarin-android/blob/f1d59181c8daaa8d2abcdfd151b592ece49155ca/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ManifestTest.cs#L650-L651

The `ModifyManifest` test actually writes "too much" to the
`AndroidManifest.xml` file, removing the `<application>` element,
causing the latest version of `bundletool` to error with:

    BT One element <application> was expected, but none were found.

To solve this, let's update the test to not overwrite any existing XML content.
---
 Configuration.props                                      | 2 +-
 Documentation/release-notes/bundletool-1.8.1.md          | 8 --------
 .../Tests/Xamarin.Android.Build.Tests/ManifestTest.cs    | 9 ++++++++-
 3 files changed, 9 insertions(+), 10 deletions(-)
 delete mode 100644 Documentation/release-notes/bundletool-1.8.1.md

diff --git a/Configuration.props b/Configuration.props
index f6a614a3061..5aa5ad17cf8 100644
--- a/Configuration.props
+++ b/Configuration.props
@@ -148,7 +148,7 @@
     <XAPlatformToolsPackagePrefix Condition=" '$(HostOS)' == 'Darwin' "></XAPlatformToolsPackagePrefix>
     <XAPlatformToolsVersion>34.0.1</XAPlatformToolsVersion>
     <XAIncludeProprietaryBits Condition="'$(XAIncludeProprietaryBits)' == ''">False</XAIncludeProprietaryBits>
-    <XABundleToolVersion Condition="'$(XABundleToolVersion)' == ''">1.8.1</XABundleToolVersion>
+    <XABundleToolVersion Condition="'$(XABundleToolVersion)' == ''">1.15.1</XABundleToolVersion>
     <XAPackagesDir Condition=" '$(XAPackagesDir)' == '' And '$(NUGET_PACKAGES)' != ''">$(NUGET_PACKAGES)</XAPackagesDir>
     <XAPackagesDir Condition=" '$(XAPackagesDir)' == '' And '$(HostOS)' == 'Windows'">$(userprofile)\.nuget\packages</XAPackagesDir>
     <XAPackagesDir Condition=" '$(XAPackagesDir)' == '' And '$(HostOS)' != 'Windows'">$(HOME)/.nuget/packages</XAPackagesDir>
diff --git a/Documentation/release-notes/bundletool-1.8.1.md b/Documentation/release-notes/bundletool-1.8.1.md
deleted file mode 100644
index b295ef52f6a..00000000000
--- a/Documentation/release-notes/bundletool-1.8.1.md
+++ /dev/null
@@ -1,8 +0,0 @@
-### bundletool version update to 1.8.1
-
-The version of the [`bundletool`][bundletool] executable included in
-Xamarin.Android has been updated from 1.4.0 to [1.8.1][bundletool-1.8.1],
-bringing in several improvements and bug fixes.
-
-[bundletool]: https://developer.android.com/studio/command-line/bundletool
-[bundletool-1.8.1]: https://github.com/google/bundletool/releases/tag/1.8.1
\ No newline at end of file
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ManifestTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ManifestTest.cs
index 7642eeabe6b..03088e4a2ee 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ManifestTest.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ManifestTest.cs
@@ -669,9 +669,16 @@ public void ModifyManifest ([Values (true, false)] bool isRelease)
 	<_Permissions Include=""&lt;uses-permission android:name=&quot;android.permission.READ_CONTACTS&quot; /&gt;"" />
 </ItemGroup>
 <Target Name=""_Foo"">
+	<XmlPeek Query=""/manifest/*"" XmlInputPath=""$(IntermediateOutputPath)android\AndroidManifest.xml"">
+		<Output TaskParameter=""Result"" ItemName=""_XmlNodes"" />
+	</XmlPeek>
+	<PropertyGroup>
+		<_ExistingXml>@(_XmlNodes, ' ')</_ExistingXml>
+		<_NewXml>@(_Permissions, ' ')</_NewXml>
+	</PropertyGroup>
 	<XmlPoke
 		XmlInputPath=""$(IntermediateOutputPath)android\AndroidManifest.xml""
-		Value=""@(_Permissions)""
+		Value=""$(_ExistingXml)$(_NewXml)""
 		Query=""/manifest""
 		Namespaces=""$(Namespace)""
 	/>