Skip to content
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

[repo] Include license files in packages #5192

Merged
merged 5 commits into from
Dec 19, 2023
Merged

[repo] Include license files in packages #5192

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a1b67e6
Include license files in packages.
CodeBlanch Dec 19, 2023
a68fa6a
Tweaks.
CodeBlanch Dec 19, 2023
727d69a
Update OpenTelemetry.sln
CodeBlanch Dec 19, 2023
8e65ad8
Update OpenTelemetry.sln
CodeBlanch Dec 19, 2023
b839628
Merge branch 'main' into package-license-files
utpilla Dec 19, 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
0 LICENSE → LICENSE.txt
View file
Open in desktop
CodeBlanch marked this conversation as resolved.
Show resolved Hide resolved
File renamed without changes.
4 changes: 2 additions & 2 deletions OpenTelemetry.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
.github\workflows\ci-concurrency.yml = .github\workflows\ci-concurrency.yml
CONTRIBUTING.md = CONTRIBUTING.md
global.json = global.json
LICENSE = LICENSE
NuGet.config = NuGet.config
LICENSE.txt = LICENSE.txt
CodeBlanch marked this conversation as resolved.
Show resolved Hide resolved
OpenTelemetry.proj = OpenTelemetry.proj
README.md = README.md
THIRD-PARTY-NOTICES = THIRD-PARTY-NOTICES
VERSIONING.md = VERSIONING.md
THIRD-PARTY-NOTICES.txt = THIRD-PARTY-NOTICES.txt
CodeBlanch marked this conversation as resolved.
Show resolved Hide resolved
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{7CB2F02E-03FA-4FFF-89A5-C51F107623FD}"
Expand Down
0 THIRD-PARTY-NOTICES → THIRD-PARTY-NOTICES.txt
View file
Open in desktop
File renamed without changes.
6 changes: 4 additions & 2 deletions build/Common.prod.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,15 @@
<PackageTags>Observability;OpenTelemetry;Monitoring;Telemetry;Tracing;Metrics;Logging</PackageTags>
<PackageIcon>opentelemetry-icon-color.png</PackageIcon>
<PackageProjectUrl>https://opentelemetry.io</PackageProjectUrl>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<Authors>OpenTelemetry Authors</Authors>
<Copyright>Copyright The OpenTelemetry Authors</Copyright>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<PackageOutputPath Condition="$(Build_ArtifactStagingDirectory) != ''">$(Build_ArtifactStagingDirectory)</PackageOutputPath>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want this? .NET seems to use false. https://github.com/dotnet/runtime/blob/8bb7b2ac092a6580b1cc247bc705e737c2b0260d/Directory.Build.props#L355

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I noticed that too. Not sure why we have true there TBH. I'll bring up on the next SIG for discussion.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not a blocker for this PR.

<PackagePrimaryLicenseFile>$(RepoRoot)\LICENSE.txt</PackagePrimaryLicenseFile>
<PackageThirdPartyNoticesFile>$(RepoRoot)\THIRD-PARTY-NOTICES.txt</PackageThirdPartyNoticesFile>
reyang marked this conversation as resolved.
Show resolved Hide resolved
</PropertyGroup>

<PropertyGroup Label="SourceLinkProperties">
Expand Down
11 changes: 11 additions & 0 deletions src/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,15 @@
<Using Remove="System.Net.Http" />
</ItemGroup>

<ItemGroup Condition="'$(IsPackable)' == 'true'">
<None Include="$(PackagePrimaryLicenseFile)"
PackagePath="$([System.IO.Path]::GetFileName('$(PackagePrimaryLicenseFile)'))"
Pack="true"
Visible="false" />
<None Include="$(PackageThirdPartyNoticesFile)"
PackagePath="$([System.IO.Path]::GetFileName('$(PackageThirdPartyNoticesFile)'))"
Pack="true"
Visible="false" />
</ItemGroup>

</Project>