Skip to content

[build] Include ThirdPartyNotices in workload packs #8455

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
merged 3 commits into from
Oct 25, 2023
Merged

[build] Include ThirdPartyNotices in workload packs #8455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
61c2409
[build] Include ThirdPartyNotices.txt in the SDK nupkg
pjcollins Oct 24, 2023
3cbbb11
Rename to THIRD-PARTY-NOTICES.TXT
pjcollins Oct 24, 2023
9077e19
Include TPN in all packs
pjcollins Oct 24, 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
1 change: 1 addition & 0 deletions build-tools/create-packs/License.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
/>
<ItemGroup>
<_PackageFiles Include="$(IntermediateOutputPath)$(PackageLicenseFile)" PackagePath="\" />
<_PackageFiles Include="$(XAInstallPrefix)THIRD-PARTY-NOTICES.TXT" PackagePath="\" />
</ItemGroup>
</Target>
</Project>
2 changes: 1 addition & 1 deletion build-tools/installers/create-installers.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@
<MonoDocFiles Include="$(_MonoDocOutputPath)MonoAndroid-lib.zip" />
</ItemGroup>
<ItemGroup>
<ThirdPartyNotice Include="$(XAInstallPrefix)ThirdPartyNotices.txt" />
<ThirdPartyNotice Include="$(XAInstallPrefix)THIRD-PARTY-NOTICES.TXT" />
</ItemGroup>
<!-- monodroid -->
<!-- new files to be included from monodroid should be added to the following projitems file in that repo. -->
Expand Down
2 changes: 1 addition & 1 deletion build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ public static partial class Defaults
/// Used in rules.mk generator. Files to include in the XA bundle archives.
/// </summary>
public static readonly List <string> BundleZipsInclude = new List <string> {
"$(ZIP_OUTPUT_BASENAME)/ThirdPartyNotices.txt",
"$(ZIP_OUTPUT_BASENAME)/THIRD-PARTY-NOTICES.TXT",
"$(ZIP_OUTPUT_BASENAME)/bin/Debug",
"$(ZIP_OUTPUT_BASENAME)/bin/Release",
};
Expand Down
2 changes: 1 addition & 1 deletion build-tools/xaprepare/xaprepare/Scenarios/Scenario_ThirdPartyNotices.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion build-tools/xaprepare/xaprepare/Steps/Step_CopyExtraResultFilesForCI.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions build-tools/xaprepare/xaprepare/Steps/Step_ThirdPartyNotices.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,12 @@ public Step_ThirdPartyNotices ()
#pragma warning disable CS1998
protected override async Task<bool> 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);
Expand Down