Skip to content

Commit 2081a20

Browse files
authored
[build] Include ThirdPartyNotices in workload packs (#8455)
Adds the `THIRD-PARTY-NOTICES.TXT` file to all packs that contain a license file.
1 parent 9b2d1b4 commit 2081a20

File tree

6 files changed

+7
-6
lines changed

6 files changed

+7
-6
lines changed

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
@@ -340,7 +340,7 @@
340340
<MonoDocFiles Include="$(_MonoDocOutputPath)MonoAndroid-lib.zip" />
341341
</ItemGroup>
342342
<ItemGroup>
343-
<ThirdPartyNotice Include="$(XAInstallPrefix)ThirdPartyNotices.txt" />
343+
<ThirdPartyNotice Include="$(XAInstallPrefix)THIRD-PARTY-NOTICES.TXT" />
344344
</ItemGroup>
345345
<!-- monodroid -->
346346
<!-- new files to be included from monodroid should be added to the following projitems file in that repo. -->

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/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_ThirdPartyNotices.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@ public Step_ThirdPartyNotices ()
6060
#pragma warning disable CS1998
6161
protected override async Task<bool> Execute (Context context)
6262
{
63-
GenerateThirdPartyNotices (Path.Combine (BuildPaths.XamarinAndroidSourceRoot, "ThirdPartyNotices.txt"),
63+
GenerateThirdPartyNotices (Path.Combine (BuildPaths.XamarinAndroidSourceRoot, "THIRD-PARTY-NOTICES.TXT"),
6464
ThirdPartyLicenseType.Foundation,
6565
includeExternalDeps: false,
6666
includeBuildDeps: true);
6767
Log.StatusLine ();
68-
GenerateThirdPartyNotices (Path.Combine (context.XAInstallPrefix, "ThirdPartyNotices.txt"),
68+
GenerateThirdPartyNotices (Path.Combine (context.XAInstallPrefix, "THIRD-PARTY-NOTICES.TXT"),
6969
ThirdPartyLicenseType.MicrosoftOSS,
7070
includeExternalDeps: true,
7171
includeBuildDeps: false);

0 commit comments

Comments
 (0)