Skip to content

Commit ddab60b

Browse files
grendellogrendello
committed
Merge branch 'main' into dev/grendel/assembly-blobs-per-rid
* main: Localized file check-in by OneLocBuild Task (#8462) [build] Do not install build-tools 30.0.3 (#8461) [build] Include ThirdPartyNotices in workload packs (#8455)
2 parents 2510c35 + d5c4ec0 commit ddab60b

25 files changed

+33
-78
lines changed

‎Configuration.props‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -137,14 +137,6 @@
137137
<XABuildToolsPackagePrefix Condition=" '$(HostOS)' == 'Windows' ">$(XABuildToolsPackagePrefixWindows)</XABuildToolsPackagePrefix>
138138
<XABuildToolsVersion>34</XABuildToolsVersion>
139139
<XABuildToolsFolder Condition="'$(XABuildToolsFolder)' == ''">34.0.0</XABuildToolsFolder>
140-
<!-- build-tools 30, for DX tests -->
141-
<XABuildTools30PackagePrefixMacOS>f6d24b187cc6bd534c6c37604205171784ac5621.</XABuildTools30PackagePrefixMacOS>
142-
<XABuildTools30PackagePrefixWindows>91936d4ee3ccc839f0addd53c9ebf087b1e39251.</XABuildTools30PackagePrefixWindows>
143-
<XABuildTools30PackagePrefixLinux></XABuildTools30PackagePrefixLinux>
144-
<XABuildTools30PackagePrefix Condition=" '$(HostOS)' == 'Darwin' ">$(XABuildTools30PackagePrefixMacOS)</XABuildTools30PackagePrefix>
145-
<XABuildTools30PackagePrefix Condition=" '$(HostOS)' == 'Windows' ">$(XABuildTools30PackagePrefixWindows)</XABuildTools30PackagePrefix>
146-
<XABuildTools30Version>30.0.3</XABuildTools30Version>
147-
<XABuildTools30Folder Condition="'$(XABuildTools30Folder)' == ''">30.0.3</XABuildTools30Folder>
148140
<XAPlatformToolsPackagePrefix Condition=" '$(HostOS)' == 'Darwin' "></XAPlatformToolsPackagePrefix>
149141
<XAPlatformToolsVersion>34.0.1</XAPlatformToolsVersion>
150142
<XAIncludeProprietaryBits Condition="'$(XAIncludeProprietaryBits)' == ''">False</XAIncludeProprietaryBits>

‎build-tools/create-packs/License.targets‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
/>
1919
<ItemGroup>
2020
<_PackageFiles Include="$(IntermediateOutputPath)$(PackageLicenseFile)" PackagePath="\" />
21+
<_PackageFiles Include="$(XAInstallPrefix)THIRD-PARTY-NOTICES.TXT" PackagePath="\" />
2122
</ItemGroup>
2223
</Target>
2324
</Project>

‎build-tools/installers/create-installers.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@
344344
<MonoDocFiles Include="$(_MonoDocOutputPath)MonoAndroid-lib.zip" />
345345
</ItemGroup>
346346
<ItemGroup>
347-
<ThirdPartyNotice Include="$(XAInstallPrefix)ThirdPartyNotices.txt" />
347+
<ThirdPartyNotice Include="$(XAInstallPrefix)THIRD-PARTY-NOTICES.TXT" />
348348
</ItemGroup>
349349
<!-- monodroid -->
350350
<!-- new files to be included from monodroid should be added to the following projitems file in that repo. -->

‎build-tools/xaprepare/xaprepare/Application/KnownProperties.cs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,6 @@ static class KnownProperties
6565
public const string XABuildToolsPackagePrefixWindows = "XABuildToolsPackagePrefixWindows";
6666
public const string XABuildToolsPackagePrefixLinux = "XABuildToolsPackagePrefixLinux";
6767
public const string XABuildToolsPackagePrefix = "XABuildToolsPackagePrefix";
68-
public const string XABuildTools30Folder = "XABuildTools30Folder";
69-
public const string XABuildTools30Version = "XABuildTools30Version";
70-
public const string XABuildTools30PackagePrefixMacOS = "XABuildTools30PackagePrefixMacOS";
71-
public const string XABuildTools30PackagePrefixWindows = "XABuildTools30PackagePrefixWindows";
72-
public const string XABuildTools30PackagePrefixLinux = "XABuildTools30PackagePrefixLinux";
73-
public const string XABuildTools30PackagePrefix = "XABuildTools30PackagePrefix";
7468
public const string XABinRelativeInstallPrefix = "XABinRelativeInstallPrefix";
7569
public const string XAInstallPrefix = "XAInstallPrefix";
7670
public const string XAPlatformToolsVersion = "XAPlatformToolsVersion";

‎build-tools/xaprepare/xaprepare/Application/Properties.Defaults.cs.in‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,6 @@ namespace Xamarin.Android.Prepare
6969
properties.Add (KnownProperties.XABuildToolsPackagePrefixWindows, StripQuotes ("@XABuildToolsPackagePrefixWindows@"));
7070
properties.Add (KnownProperties.XABuildToolsPackagePrefixLinux, StripQuotes ("@XABuildToolsPackagePrefixLinux@"));
7171
properties.Add (KnownProperties.XABuildToolsPackagePrefix, StripQuotes ("@XABuildToolsPackagePrefix@"));
72-
properties.Add (KnownProperties.XABuildTools30Folder, StripQuotes (@"@XABuildTools30Folder@"));
73-
properties.Add (KnownProperties.XABuildTools30Version, StripQuotes ("@XABuildTools30Version@"));
74-
properties.Add (KnownProperties.XABuildTools30PackagePrefixMacOS, StripQuotes ("@XABuildTools30PackagePrefixMacOS@"));
75-
properties.Add (KnownProperties.XABuildTools30PackagePrefixWindows, StripQuotes ("@XABuildTools30PackagePrefixWindows@"));
76-
properties.Add (KnownProperties.XABuildTools30PackagePrefixLinux, StripQuotes ("@XABuildTools30PackagePrefixLinux@"));
77-
properties.Add (KnownProperties.XABuildTools30PackagePrefix, StripQuotes ("@XABuildTools30PackagePrefix@"));
7872
properties.Add (KnownProperties.XABinRelativeInstallPrefix, StripQuotes (@"@XABinRelativeInstallPrefix@"));
7973
properties.Add (KnownProperties.XAInstallPrefix, StripQuotes (@"@XAInstallPrefix@"));
8074
properties.Add (KnownProperties.XAPlatformToolsVersion, StripQuotes ("@XAPlatformToolsVersion@"));

‎build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ public static partial class Defaults
201201
/// Used in rules.mk generator. Files to include in the XA bundle archives.
202202
/// </summary>
203203
public static readonly List <string> BundleZipsInclude = new List <string> {
204-
"$(ZIP_OUTPUT_BASENAME)/ThirdPartyNotices.txt",
204+
"$(ZIP_OUTPUT_BASENAME)/THIRD-PARTY-NOTICES.TXT",
205205
"$(ZIP_OUTPUT_BASENAME)/bin/Debug",
206206
"$(ZIP_OUTPUT_BASENAME)/bin/Release",
207207
};

‎build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ public AndroidToolchain ()
2626
string XABuildToolsFolder = GetRequiredProperty (KnownProperties.XABuildToolsFolder);
2727
string XABuildToolsVersion = GetRequiredProperty (KnownProperties.XABuildToolsVersion);
2828
string XABuildToolsPackagePrefix = Context.Instance.Properties [KnownProperties.XABuildToolsPackagePrefix] ?? String.Empty;
29-
string XABuildTools30Folder = GetRequiredProperty (KnownProperties.XABuildTools30Folder);
30-
string XABuildTools30Version = GetRequiredProperty (KnownProperties.XABuildTools30Version);
31-
string XABuildTools30PackagePrefix = Context.Instance.Properties [KnownProperties.XABuildTools30PackagePrefix] ?? String.Empty;
3229
string XAPlatformToolsVersion = GetRequiredProperty (KnownProperties.XAPlatformToolsVersion);
3330
string XAPlatformToolsPackagePrefix = Context.Instance.Properties [KnownProperties.XAPlatformToolsPackagePrefix] ?? String.Empty;
3431
bool isArm64Apple = Context.Instance.OS.Flavor == "macOS" && RuntimeInformation.OSArchitecture == Architecture.Arm64;
@@ -111,12 +108,6 @@ public AndroidToolchain ()
111108
buildToolName: "android-sdk-build-tools",
112109
buildToolVersion: $"{XABuildToolsVersion}"
113110
),
114-
new AndroidToolchainComponent ($"{XABuildTools30PackagePrefix}build-tools_r{XABuildTools30Version}-{altOsTag}",
115-
destDir: Path.Combine ("build-tools", XABuildTools30Folder),
116-
isMultiVersion: true,
117-
buildToolName: "android-sdk-build-tools",
118-
buildToolVersion: $"{XABuildTools30Version}"
119-
),
120111
new AndroidToolchainComponent ($"commandlinetools-{cltOsTag}-{CommandLineToolsVersion}",
121112
destDir: Path.Combine ("cmdline-tools", CommandLineToolsFolder),
122113
isMultiVersion: true,

‎build-tools/xaprepare/xaprepare/Scenarios/Scenario_ThirdPartyNotices.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace Xamarin.Android.Prepare
77
class Scenario_ThirdPartyNotices : Scenario
88
{
99
public Scenario_ThirdPartyNotices ()
10-
: base ("ThirdPartyNotices", "Generate the `ThirdPartyNotices.txt` files.")
10+
: base ("ThirdPartyNotices", "Generate the `THIRD-PARTY-NOTICES.TXT` files.")
1111
{
1212
NeedsGitSubmodules = true;
1313
}

‎build-tools/xaprepare/xaprepare/Steps/Step_CopyExtraResultFilesForCI.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ await Task.Run (() => {
2929
string[] xaRootDirBuildFiles = {
3030
"Configuration.OperatingSystem.props",
3131
"Configuration.Override.props",
32-
"ThirdPartyNotices.txt",
32+
"THIRD-PARTY-NOTICES.TXT",
3333
"config.log",
3434
"config.status",
3535
"config.h",

‎build-tools/xaprepare/xaprepare/Steps/Step_Get_Android_BuildTools.cs‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,6 @@ public Step_Get_Android_BuildTools ()
2121
packages.Add ((package: $"build-tools_r{XABuildToolsVersion}-macosx.zip", prefix: XABuildToolsPackagePrefixMacOS));
2222
packages.Add ((package: $"build-tools_r{XABuildToolsVersion}-windows.zip", prefix: XABuildToolsPackagePrefixWindows));
2323
packages.Add ((package: $"build-tools_r{XABuildToolsVersion}-linux.zip", prefix: XABuildToolsPackagePrefixLinux));
24-
25-
// build-tools 30, for DX tests
26-
string XABuildTools30Version = Context.Instance.Properties [KnownProperties.XABuildTools30Version] ?? String.Empty;
27-
string XABuildTools30PackagePrefixMacOS = Context.Instance.Properties [KnownProperties.XABuildTools30PackagePrefixMacOS] ?? string.Empty;
28-
string XABuildTools30PackagePrefixWindows = Context.Instance.Properties [KnownProperties.XABuildTools30PackagePrefixWindows] ?? string.Empty;
29-
string XABuildTools30PackagePrefixLinux = Context.Instance.Properties [KnownProperties.XABuildTools30PackagePrefixLinux] ?? string.Empty;
30-
if (!string.IsNullOrEmpty (XABuildTools30Version)) {
31-
packages.Add ((package: $"build-tools_r{XABuildTools30Version}-macosx.zip", prefix: XABuildTools30PackagePrefixMacOS));
32-
packages.Add ((package: $"build-tools_r{XABuildTools30Version}-windows.zip", prefix: XABuildTools30PackagePrefixWindows));
33-
packages.Add ((package: $"build-tools_r{XABuildTools30Version}-linux.zip", prefix: XABuildTools30PackagePrefixLinux));
34-
}
3524
}
3625

3726
protected override async Task<bool> Execute (Context context)

0 commit comments

Comments
 (0)