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 8a158c98cd6..52835a5b4ca 100644 --- a/OpenTelemetry.sln +++ b/OpenTelemetry.sln @@ -15,11 +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 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.TXT b/THIRD-PARTY-NOTICES.TXT new file mode 100644 index 00000000000..b65f5723308 --- /dev/null +++ b/THIRD-PARTY-NOTICES.TXT @@ -0,0 +1,31 @@ +OpenTelemetry .NET uses third-party libraries or other resources that may be +distributed under licenses different than the OpenTelemetry .NET software. + +The attached notices are provided for information only. + +License notice for .NET +------------------------------- + +The MIT License (MIT) + +Copyright (c) .NET Foundation and Contributors + +All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. 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 @@ + + + + + diff --git a/src/OpenTelemetry/Metrics/AggregatorStore.cs b/src/OpenTelemetry/Metrics/AggregatorStore.cs index 631c4fb01da..1ca4baa1114 100644 --- a/src/OpenTelemetry/Metrics/AggregatorStore.cs +++ b/src/OpenTelemetry/Metrics/AggregatorStore.cs @@ -1033,7 +1033,6 @@ private void UpdateDouble(double value, ReadOnlySpan