From 14ee5c456ee91ffc11e29b35333834b2e04f53d3 Mon Sep 17 00:00:00 2001 From: Mikel Blanchard Date: Tue, 19 Dec 2023 15:45:49 -0800 Subject: [PATCH] [repo] Include license files in packages (#5192) --- LICENSE => LICENSE.TXT | 0 OpenTelemetry.sln | 4 ++-- THIRD-PARTY-NOTICES => THIRD-PARTY-NOTICES.TXT | 0 build/Common.prod.props | 6 ++++-- src/Directory.Build.targets | 11 +++++++++++ 5 files changed, 17 insertions(+), 4 deletions(-) rename LICENSE => LICENSE.TXT (100%) rename THIRD-PARTY-NOTICES => THIRD-PARTY-NOTICES.TXT (100%) diff --git a/LICENSE b/LICENSE.TXT similarity index 100% rename from LICENSE rename to LICENSE.TXT diff --git a/OpenTelemetry.sln b/OpenTelemetry.sln index 9fb54e2f691..52835a5b4ca 100644 --- a/OpenTelemetry.sln +++ b/OpenTelemetry.sln @@ -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}" diff --git a/THIRD-PARTY-NOTICES b/THIRD-PARTY-NOTICES.TXT similarity index 100% rename from THIRD-PARTY-NOTICES rename to THIRD-PARTY-NOTICES.TXT diff --git a/build/Common.prod.props b/build/Common.prod.props index 555776982f0..95c9f0c63ea 100644 --- a/build/Common.prod.props +++ b/build/Common.prod.props @@ -13,13 +13,15 @@ Observability;OpenTelemetry;Monitoring;Telemetry;Tracing;Metrics;Logging opentelemetry-icon-color.png https://opentelemetry.io - Apache-2.0 OpenTelemetry Authors Copyright The OpenTelemetry Authors - true $(Build_ArtifactStagingDirectory) true snupkg + Apache-2.0 + true + $(RepoRoot)\LICENSE.TXT + $(RepoRoot)\THIRD-PARTY-NOTICES.TXT diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index 203352a3f75..f7426c0fe37 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -19,4 +19,15 @@ + + + + +