From 087c7f43a1a60a6c92934d0a57c902e381877df3 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Wed, 16 Dec 2020 09:34:08 -0600
Subject: [PATCH] Bump to google/bundletool/1.4.0@f5c6dc66 (#5411)

Context: https://github.com/google/bundletool/releases/tag/1.2.0
Changes: https://github.com/google/bundletool/compare/1.2.0...1.4.0

1.3.0

  * Support generating and embedding source stamps in `.apk` files
    generated from Android App Bundles.
  * `output-format` option for `build-apks` command that allows to
    choose output format for generated `.apk`s: APK Set archive or
    directory.
  * `include-metadata` option for `extract-apks` command that allows
    to produce `metadata.json` file which contains information about
    extracted `.apk`s: module name and delivery type of the `.apk`.

1.4.0

  * Introduced DexMergingStrategy option in BundleConfig that allows to
    skip dex merging for multidex applications with minSdk below 21.
  * Conditional install-time modules can now depend on other
    install-time modules.

Other changes:

  * Make `Configuration.props` changes trigger all test runs.
---
 Configuration.props                                       | 2 +-
 Documentation/release-notes/bundletool-1.4.0.md           | 8 ++++++++
 .../Steps/Step_DetermineAzurePipelinesTestJobs.cs         | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 Documentation/release-notes/bundletool-1.4.0.md

diff --git a/Configuration.props b/Configuration.props
index a560bbe2dc6..664f1b35394 100644
--- a/Configuration.props
+++ b/Configuration.props
@@ -116,7 +116,7 @@
     <XAPlatformToolsPackagePrefix Condition=" '$(HostOS)' == 'Darwin' ">b2be9c80582174e645d3736daa0d44d8610b38a8.</XAPlatformToolsPackagePrefix>
     <XAPlatformToolsVersion>30.0.2</XAPlatformToolsVersion>
     <XAIncludeProprietaryBits Condition="'$(XAIncludeProprietaryBits)' == ''">False</XAIncludeProprietaryBits>
-    <XABundleToolVersion Condition="'$(XABundleToolVersion)' == ''">1.2.0</XABundleToolVersion>
+    <XABundleToolVersion Condition="'$(XABundleToolVersion)' == ''">1.4.0</XABundleToolVersion>
     <XAPackagesDir Condition=" '$(XAPackagesDir)' == '' And '$(NUGET_PACKAGES)' != '' ">$(NUGET_PACKAGES)</XAPackagesDir>
     <XAPackagesDir Condition=" '$(XAPackagesDir)' == '' ">$(XamarinAndroidSourcePath)\packages</XAPackagesDir>
     <PathSeparator>$([System.IO.Path]::PathSeparator)</PathSeparator>
diff --git a/Documentation/release-notes/bundletool-1.4.0.md b/Documentation/release-notes/bundletool-1.4.0.md
new file mode 100644
index 00000000000..778d4e2e157
--- /dev/null
+++ b/Documentation/release-notes/bundletool-1.4.0.md
@@ -0,0 +1,8 @@
+### bundletool version update to 1.4.0
+
+The version of the [`bundletool`][bundletool] executable included in
+Xamarin.Android has been updated from 1.2.0 to [1.4.0][bundletool-1.4.0],
+bringing in several improvements and bug fixes.
+
+[bundletool]: https://developer.android.com/studio/command-line/bundletool
+[bundletool-1.4.0]: https://github.com/google/bundletool/releases/tag/1.4.0
diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_DetermineAzurePipelinesTestJobs.cs b/build-tools/xaprepare/xaprepare/Steps/Step_DetermineAzurePipelinesTestJobs.cs
index 01990fc31ce..4fc28abfcf9 100644
--- a/build-tools/xaprepare/xaprepare/Steps/Step_DetermineAzurePipelinesTestJobs.cs
+++ b/build-tools/xaprepare/xaprepare/Steps/Step_DetermineAzurePipelinesTestJobs.cs
@@ -48,7 +48,7 @@ protected override async Task<bool> Execute (Context context)
 				// BCL: Runs BCL tests on emulator
 				// TimeZone: Runs timezone unit tests on emulator
 				// Designer: Runs designer integration tests
-				if (file == ".external") {
+				if (file == ".external" || file == "Configuration.props") {
 					testAreas.Add ("MSBuild");
 					testAreas.Add ("MSBuildDevice");
 					testAreas.Add ("BCL");