Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump to google/bundletool/main@f17ce94a #8135

Merged
merged 6 commits into from
Jun 22, 2023
Merged

Bump to google/bundletool/main@f17ce94a #8135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e2b763c
Bump to google/bundletool/main@f17ce94a
jonathanpeppers Jun 20, 2023
43fe871
[tests] Update `ManifestTest.cs`
jonathanpeppers Jun 20, 2023
7f214ee
Merge branch 'main' into bundletools-1.15.1
jonathanpeppers Jun 21, 2023
f9e4f86
Revert "[tests] Update `ManifestTest.cs`"
jonathanpeppers Jun 21, 2023
2e229b8
Update ManifestTest.cs
jonathanpeppers Jun 21, 2023
a0e0ce0
Update ManifestTest.cs
jonathanpeppers Jun 22, 2023
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
2 changes: 1 addition & 1 deletion Configuration.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 0 additions & 8 deletions Documentation/release-notes/bundletool-1.8.1.md
View file
Open in desktop

This file was deleted.

9 changes: 8 additions & 1 deletion src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ManifestTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)""
/>
Expand Down