diff --git a/Configuration.props b/Configuration.props index f6a614a3061..5aa5ad17cf8 100644 --- a/Configuration.props +++ b/Configuration.props @@ -148,7 +148,7 @@ 34.0.1 False - 1.8.1 + 1.15.1 $(NUGET_PACKAGES) $(userprofile)\.nuget\packages $(HOME)/.nuget/packages 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=""<uses-permission android:name="android.permission.READ_CONTACTS" />"" /> + + + + + <_ExistingXml>@(_XmlNodes, ' ') + <_NewXml>@(_Permissions, ' ') +