From 61c2409a8124181a7983947927328dabab5e578b Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Tue, 24 Oct 2023 13:24:45 -0400 Subject: [PATCH 1/3] [build] Include ThirdPartyNotices.txt in the SDK nupkg Adds our `ThirdPartyNotices.txt` file to Microsoft.Android.Sdk.*.nupkg. --- build-tools/create-packs/Microsoft.Android.Sdk.proj | 1 + 1 file changed, 1 insertion(+) diff --git a/build-tools/create-packs/Microsoft.Android.Sdk.proj b/build-tools/create-packs/Microsoft.Android.Sdk.proj index 7deb4a8975a..0e674182503 100644 --- a/build-tools/create-packs/Microsoft.Android.Sdk.proj +++ b/build-tools/create-packs/Microsoft.Android.Sdk.proj @@ -61,6 +61,7 @@ core workload SDK packs imported by WorkloadManifest.targets. <_PackageFiles Include="$(XamarinAndroidSourcePath)src\profiled-aot\dotnet.aotprofile" PackagePath="targets" /> <_PackageFiles Include="$(IntermediateOutputPath)UnixFilePermissions.xml" PackagePath="data" Condition=" '$(HostOS)' != 'Windows' " /> <_PackageFiles Include="$(MSBuildThisFileDirectory)\linux-README.md" PackagePath="\README.md" Condition=" '$(HostOS)' == 'Linux' " /> + <_PackageFiles Include="@(ThirdPartyNotice)" PackagePath="\" /> <_PackageFiles Include="$(_MonoAndroidNETOutputRoot)$(AndroidLatestStableApiLevel)\AndroidApiInfo.xml" PackagePath="data\$(DotNetAndroidTargetFramework)$(AndroidLatestStableApiLevel)" /> <_PackageFiles Include="$(_MonoAndroidNETOutputRoot)$(AndroidDefaultTargetDotnetApiLevel)\AndroidApiInfo.xml" From 3cbbb119bc5604ffd1246c976e623a7d6af2293d Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Tue, 24 Oct 2023 14:40:29 -0400 Subject: [PATCH 2/3] Rename to THIRD-PARTY-NOTICES.TXT --- build-tools/installers/create-installers.targets | 2 +- .../xaprepare/xaprepare/ConfigAndData/Configurables.cs | 2 +- .../xaprepare/Scenarios/Scenario_ThirdPartyNotices.cs | 2 +- .../xaprepare/Steps/Step_CopyExtraResultFilesForCI.cs | 2 +- .../xaprepare/xaprepare/Steps/Step_ThirdPartyNotices.cs | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build-tools/installers/create-installers.targets b/build-tools/installers/create-installers.targets index 4cd80baa804..612683bde26 100644 --- a/build-tools/installers/create-installers.targets +++ b/build-tools/installers/create-installers.targets @@ -340,7 +340,7 @@ - + diff --git a/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs b/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs index 873d6251c5d..5911e6bce70 100644 --- a/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs +++ b/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs @@ -201,7 +201,7 @@ public static partial class Defaults /// Used in rules.mk generator. Files to include in the XA bundle archives. /// public static readonly List BundleZipsInclude = new List { - "$(ZIP_OUTPUT_BASENAME)/ThirdPartyNotices.txt", + "$(ZIP_OUTPUT_BASENAME)/THIRD-PARTY-NOTICES.TXT", "$(ZIP_OUTPUT_BASENAME)/bin/Debug", "$(ZIP_OUTPUT_BASENAME)/bin/Release", }; diff --git a/build-tools/xaprepare/xaprepare/Scenarios/Scenario_ThirdPartyNotices.cs b/build-tools/xaprepare/xaprepare/Scenarios/Scenario_ThirdPartyNotices.cs index e8aa50e8c0c..3934dc69ce3 100644 --- a/build-tools/xaprepare/xaprepare/Scenarios/Scenario_ThirdPartyNotices.cs +++ b/build-tools/xaprepare/xaprepare/Scenarios/Scenario_ThirdPartyNotices.cs @@ -7,7 +7,7 @@ namespace Xamarin.Android.Prepare class Scenario_ThirdPartyNotices : Scenario { public Scenario_ThirdPartyNotices () - : base ("ThirdPartyNotices", "Generate the `ThirdPartyNotices.txt` files.") + : base ("ThirdPartyNotices", "Generate the `THIRD-PARTY-NOTICES.TXT` files.") { NeedsGitSubmodules = true; } diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_CopyExtraResultFilesForCI.cs b/build-tools/xaprepare/xaprepare/Steps/Step_CopyExtraResultFilesForCI.cs index 2bacace73b0..aca10a98d6f 100644 --- a/build-tools/xaprepare/xaprepare/Steps/Step_CopyExtraResultFilesForCI.cs +++ b/build-tools/xaprepare/xaprepare/Steps/Step_CopyExtraResultFilesForCI.cs @@ -29,7 +29,7 @@ await Task.Run (() => { string[] xaRootDirBuildFiles = { "Configuration.OperatingSystem.props", "Configuration.Override.props", - "ThirdPartyNotices.txt", + "THIRD-PARTY-NOTICES.TXT", "config.log", "config.status", "config.h", diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_ThirdPartyNotices.cs b/build-tools/xaprepare/xaprepare/Steps/Step_ThirdPartyNotices.cs index c2d40345da1..1aa1c2cad04 100644 --- a/build-tools/xaprepare/xaprepare/Steps/Step_ThirdPartyNotices.cs +++ b/build-tools/xaprepare/xaprepare/Steps/Step_ThirdPartyNotices.cs @@ -60,12 +60,12 @@ public Step_ThirdPartyNotices () #pragma warning disable CS1998 protected override async Task Execute (Context context) { - GenerateThirdPartyNotices (Path.Combine (BuildPaths.XamarinAndroidSourceRoot, "ThirdPartyNotices.txt"), + GenerateThirdPartyNotices (Path.Combine (BuildPaths.XamarinAndroidSourceRoot, "THIRD-PARTY-NOTICES.TXT"), ThirdPartyLicenseType.Foundation, includeExternalDeps: false, includeBuildDeps: true); Log.StatusLine (); - GenerateThirdPartyNotices (Path.Combine (context.XAInstallPrefix, "ThirdPartyNotices.txt"), + GenerateThirdPartyNotices (Path.Combine (context.XAInstallPrefix, "THIRD-PARTY-NOTICES.TXT"), ThirdPartyLicenseType.MicrosoftOSS, includeExternalDeps: true, includeBuildDeps: false); From 9077e190ff08424de39c3f8970d0ae77237aa5f2 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Tue, 24 Oct 2023 15:15:06 -0400 Subject: [PATCH 3/3] Include TPN in all packs --- build-tools/create-packs/License.targets | 1 + build-tools/create-packs/Microsoft.Android.Sdk.proj | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/build-tools/create-packs/License.targets b/build-tools/create-packs/License.targets index b711f0a54fb..603b5ed5520 100644 --- a/build-tools/create-packs/License.targets +++ b/build-tools/create-packs/License.targets @@ -18,6 +18,7 @@ /> <_PackageFiles Include="$(IntermediateOutputPath)$(PackageLicenseFile)" PackagePath="\" /> + <_PackageFiles Include="$(XAInstallPrefix)THIRD-PARTY-NOTICES.TXT" PackagePath="\" /> diff --git a/build-tools/create-packs/Microsoft.Android.Sdk.proj b/build-tools/create-packs/Microsoft.Android.Sdk.proj index 0e674182503..7deb4a8975a 100644 --- a/build-tools/create-packs/Microsoft.Android.Sdk.proj +++ b/build-tools/create-packs/Microsoft.Android.Sdk.proj @@ -61,7 +61,6 @@ core workload SDK packs imported by WorkloadManifest.targets. <_PackageFiles Include="$(XamarinAndroidSourcePath)src\profiled-aot\dotnet.aotprofile" PackagePath="targets" /> <_PackageFiles Include="$(IntermediateOutputPath)UnixFilePermissions.xml" PackagePath="data" Condition=" '$(HostOS)' != 'Windows' " /> <_PackageFiles Include="$(MSBuildThisFileDirectory)\linux-README.md" PackagePath="\README.md" Condition=" '$(HostOS)' == 'Linux' " /> - <_PackageFiles Include="@(ThirdPartyNotice)" PackagePath="\" /> <_PackageFiles Include="$(_MonoAndroidNETOutputRoot)$(AndroidLatestStableApiLevel)\AndroidApiInfo.xml" PackagePath="data\$(DotNetAndroidTargetFramework)$(AndroidLatestStableApiLevel)" /> <_PackageFiles Include="$(_MonoAndroidNETOutputRoot)$(AndroidDefaultTargetDotnetApiLevel)\AndroidApiInfo.xml"