Skip to content

Commit

Permalink
[repo] Include license files in packages (#5192)
Browse files Browse the repository at this point in the history
  • Loading branch information
CodeBlanch committed Dec 19, 2023
1 parent 9d8ef70 commit 14ee5c4
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 4 deletions.
File renamed without changes.
4 changes: 2 additions & 2 deletions OpenTelemetry.sln
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
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
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{7CB2F02E-03FA-4FFF-89A5-C51F107623FD}"
Expand Down
File renamed without changes.
6 changes: 4 additions & 2 deletions build/Common.prod.props
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>
<PackagePrimaryLicenseFile>$(RepoRoot)\LICENSE.TXT</PackagePrimaryLicenseFile>
<PackageThirdPartyNoticesFile>$(RepoRoot)\THIRD-PARTY-NOTICES.TXT</PackageThirdPartyNoticesFile>
</PropertyGroup>

<PropertyGroup Label="SourceLinkProperties">
Expand Down
11 changes: 11 additions & 0 deletions src/Directory.Build.targets
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>

0 comments on commit 14ee5c4

Please sign in to comment.