Skip to content

[build] Bump $(XABuildToolsVersion)=35 #9071

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

Merged
jonpryor merged 1 commit into from
Jul 2, 2024
Merged

[build] Bump $(XABuildToolsVersion)=35 #9071

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions Configuration.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@
<XABuildToolsPackagePrefixLinux></XABuildToolsPackagePrefixLinux>
<XABuildToolsPackagePrefix Condition=" '$(HostOS)' == 'Darwin' ">$(XABuildToolsPackagePrefixMacOS)</XABuildToolsPackagePrefix>
<XABuildToolsPackagePrefix Condition=" '$(HostOS)' == 'Windows' ">$(XABuildToolsPackagePrefixWindows)</XABuildToolsPackagePrefix>
<XABuildToolsVersion>34</XABuildToolsVersion>
<XABuildToolsFolder Condition="'$(XABuildToolsFolder)' == ''">34.0.0</XABuildToolsFolder>
<XABuildToolsVersion>35</XABuildToolsVersion>
<XABuildToolsFolder Condition="'$(XABuildToolsFolder)' == ''">35.0.0</XABuildToolsFolder>
<XAPlatformToolsPackagePrefix Condition=" '$(HostOS)' == 'Darwin' "></XAPlatformToolsPackagePrefix>
<XAPlatformToolsVersion>34.0.5</XAPlatformToolsVersion>
<XABundleToolVersion Condition="'$(XABundleToolVersion)' == ''">1.15.1</XABundleToolVersion>
Expand Down
2 changes: 1 addition & 1 deletion build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public AndroidToolchain ()
buildToolName: $"android-ndk-r{AndroidNdkVersion}",
buildToolVersion: AndroidPkgRevision
),
new AndroidToolchainComponent ($"{XABuildToolsPackagePrefix}build-tools_r{XABuildToolsVersion}-{altOsTag}",
new AndroidToolchainComponent ($"{XABuildToolsPackagePrefix}build-tools_r{XABuildToolsVersion}_{altOsTag}",
destDir: Path.Combine ("build-tools", XABuildToolsFolder),
isMultiVersion: true,
buildToolName: "android-sdk-build-tools",
Expand Down
6 changes: 3 additions & 3 deletions build-tools/xaprepare/xaprepare/Steps/Step_Get_Android_BuildTools.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ public Step_Get_Android_BuildTools ()
string XABuildToolsPackagePrefixWindows = Context.Instance.Properties [KnownProperties.XABuildToolsPackagePrefixWindows] ?? string.Empty;
string XABuildToolsPackagePrefixLinux = Context.Instance.Properties [KnownProperties.XABuildToolsPackagePrefixLinux] ?? string.Empty;

packages.Add ((package: $"build-tools_r{XABuildToolsVersion}-macosx.zip", prefix: XABuildToolsPackagePrefixMacOS));
packages.Add ((package: $"build-tools_r{XABuildToolsVersion}-windows.zip", prefix: XABuildToolsPackagePrefixWindows));
packages.Add ((package: $"build-tools_r{XABuildToolsVersion}-linux.zip", prefix: XABuildToolsPackagePrefixLinux));
packages.Add ((package: $"build-tools_r{XABuildToolsVersion}_macosx.zip", prefix: XABuildToolsPackagePrefixMacOS));
packages.Add ((package: $"build-tools_r{XABuildToolsVersion}_windows.zip", prefix: XABuildToolsPackagePrefixWindows));
packages.Add ((package: $"build-tools_r{XABuildToolsVersion}_linux.zip", prefix: XABuildToolsPackagePrefixLinux));
}

protected override async Task<bool> Execute (Context context)
Expand Down
6 changes: 3 additions & 3 deletions src/aapt2/aapt2.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@
</PropertyGroup>

<ItemGroup>
<_BuildTools Include="build-tools_r$(XABuildToolsVersion)-macosx.zip">
<_BuildTools Include="build-tools_r$(XABuildToolsVersion)_macosx.zip">
<Platform>osx</Platform>
<HostOS>Darwin</HostOS>
<FilesToExtract>aapt2</FilesToExtract>
</_BuildTools>
<_BuildTools Include="build-tools_r$(XABuildToolsVersion)-linux.zip">
<_BuildTools Include="build-tools_r$(XABuildToolsVersion)_linux.zip">
<Platform>linux</Platform>
<HostOS>Linux</HostOS>
<FilesToExtract>aapt2</FilesToExtract>
</_BuildTools>
<_BuildTools Include="build-tools_r$(XABuildToolsVersion)-windows.zip">
<_BuildTools Include="build-tools_r$(XABuildToolsVersion)_windows.zip">
<Platform>windows</Platform>
<HostOS></HostOS>
<FilesToExtract>aapt2.exe</FilesToExtract>
Expand Down