From 1b203a3927e1b7a838ce42219aac303be12e9b68 Mon Sep 17 00:00:00 2001 From: Rajkumar Rangaraj Date: Fri, 20 Sep 2024 10:57:06 -0700 Subject: [PATCH 1/3] Update the System.Diagnostics.DiagnosticSource and Microsoft.Extensions.* packages to .NET 9.0 RC.1 --- Directory.Packages.props | 30 +++++++++---------- RELEASENOTES.md | 9 ++++++ examples/Directory.Packages.props | 2 +- .../CHANGELOG.md | 4 +++ .../CHANGELOG.md | 4 +++ .../CHANGELOG.md | 4 +++ src/OpenTelemetry/CHANGELOG.md | 5 ++++ test/Directory.Packages.props | 2 +- 8 files changed, 43 insertions(+), 17 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index f54bd7353a3..fe1f04c7fbe 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -26,14 +26,14 @@ these packages even during major version bumps, so compatibility is not a concern here. --> - - - - - - - - + + + + + + + + @@ -52,7 +52,7 @@ 3) The .NET runtime team provides extra backward compatibility guarantee to System.Diagnostics.DiagnosticSource even during major version bumps, so compatibility is not a concern here. --> - + @@ -68,7 +68,7 @@ This section covers packages that are **not** directly referenced by the NuGet packages published from this repository. For example, these packages are used in the tests, examples or referenced as "PrivateAssets", but not in the NuGet packages themselves. --> - + @@ -77,11 +77,11 @@ - - - - - + + + + + diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 0f1d0b50669..b8be728f230 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -4,6 +4,15 @@ This file contains highlights and announcements covering all components. For more details see `CHANGELOG.md` files maintained in the root source directory of each individual package. +## Unreleased + +* Added `net9.0` targets to all the components. + +* Removed `net6.0` targets from all the components. + +* Bumped the package versions of `System.Diagnostic.DiagnosticSource` and other + `Microsoft.Extensions.*` packages to `9.0.0-rc.1.24431.7`. + ## 1.9.0 * `Exemplars` are now part of the stable API! For details see: [customizing diff --git a/examples/Directory.Packages.props b/examples/Directory.Packages.props index 549e1ed325b..02296b44608 100644 --- a/examples/Directory.Packages.props +++ b/examples/Directory.Packages.props @@ -1,6 +1,6 @@ - + diff --git a/src/OpenTelemetry.Api.ProviderBuilderExtensions/CHANGELOG.md b/src/OpenTelemetry.Api.ProviderBuilderExtensions/CHANGELOG.md index 6609f3d51c4..d87172b1d99 100644 --- a/src/OpenTelemetry.Api.ProviderBuilderExtensions/CHANGELOG.md +++ b/src/OpenTelemetry.Api.ProviderBuilderExtensions/CHANGELOG.md @@ -7,6 +7,10 @@ Notes](../../RELEASENOTES.md). ## Unreleased +* Updated `Microsoft.Extensions.DependencyInjection.Abstractions` package + version to `9.0.0-rc.1.24431.7`. + ([#](https://github.com/open-telemetry/opentelemetry-dotnet/pull/)) + ## 1.9.0 Released 2024-Jun-14 diff --git a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/CHANGELOG.md b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/CHANGELOG.md index ffb47ff3a33..1c9d5bb77fb 100644 --- a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/CHANGELOG.md +++ b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/CHANGELOG.md @@ -22,6 +22,10 @@ Notes](../../RELEASENOTES.md). on mobile platforms which caused telemetry to be dropped silently. ([#5821](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/5821)) +* Updated `Microsoft.Extensions.Hosting.Abstractions` package + version to `9.0.0-rc.1.24431.7`. + ([#](https://github.com/open-telemetry/opentelemetry-dotnet/pull/)) + ## 1.9.0 Released 2024-Jun-14 diff --git a/src/OpenTelemetry.Extensions.Hosting/CHANGELOG.md b/src/OpenTelemetry.Extensions.Hosting/CHANGELOG.md index ac95bbe985e..13827102a79 100644 --- a/src/OpenTelemetry.Extensions.Hosting/CHANGELOG.md +++ b/src/OpenTelemetry.Extensions.Hosting/CHANGELOG.md @@ -6,6 +6,10 @@ Notes](../../RELEASENOTES.md). ## Unreleased +* Updated `Microsoft.Extensions.Hosting.Abstractions` package + version to `9.0.0-rc.1.24431.7`. + ([#](https://github.com/open-telemetry/opentelemetry-dotnet/pull/)) + ## 1.9.0 Released 2024-Jun-14 diff --git a/src/OpenTelemetry/CHANGELOG.md b/src/OpenTelemetry/CHANGELOG.md index 844b237e1d2..5b81f347967 100644 --- a/src/OpenTelemetry/CHANGELOG.md +++ b/src/OpenTelemetry/CHANGELOG.md @@ -12,6 +12,11 @@ Notes](../../RELEASENOTES.md). `IOpenTelemetryBuilder`. ([#5325](https://github.com/open-telemetry/opentelemetry-dotnet/pull/5325)) +* Updated the `Microsoft.Extensions.Logging.Configuration` and + `Microsoft.Extensions.Diagnostics.Abstractions` packages version to + `9.0.0-rc.1.24431.7`. + ([#](https://github.com/open-telemetry/opentelemetry-dotnet/pull/)) + ## 1.9.0 Released 2024-Jun-14 diff --git a/test/Directory.Packages.props b/test/Directory.Packages.props index d6755d05725..9e456e2826f 100644 --- a/test/Directory.Packages.props +++ b/test/Directory.Packages.props @@ -2,7 +2,7 @@ - + From 391dbecb30055a054479ad6e01f9601d2a8c35f6 Mon Sep 17 00:00:00 2001 From: Rajkumar Rangaraj Date: Fri, 20 Sep 2024 11:12:25 -0700 Subject: [PATCH 2/3] Update changelog pr section --- src/OpenTelemetry.Api.ProviderBuilderExtensions/CHANGELOG.md | 2 +- src/OpenTelemetry.Api/CHANGELOG.md | 4 ++++ src/OpenTelemetry.Exporter.OpenTelemetryProtocol/CHANGELOG.md | 2 +- src/OpenTelemetry.Extensions.Hosting/CHANGELOG.md | 2 +- src/OpenTelemetry/CHANGELOG.md | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/OpenTelemetry.Api.ProviderBuilderExtensions/CHANGELOG.md b/src/OpenTelemetry.Api.ProviderBuilderExtensions/CHANGELOG.md index d87172b1d99..7af158935fc 100644 --- a/src/OpenTelemetry.Api.ProviderBuilderExtensions/CHANGELOG.md +++ b/src/OpenTelemetry.Api.ProviderBuilderExtensions/CHANGELOG.md @@ -9,7 +9,7 @@ Notes](../../RELEASENOTES.md). * Updated `Microsoft.Extensions.DependencyInjection.Abstractions` package version to `9.0.0-rc.1.24431.7`. - ([#](https://github.com/open-telemetry/opentelemetry-dotnet/pull/)) + ([#5853](https://github.com/open-telemetry/opentelemetry-dotnet/pull/5853)) ## 1.9.0 diff --git a/src/OpenTelemetry.Api/CHANGELOG.md b/src/OpenTelemetry.Api/CHANGELOG.md index b3b2738a111..f4d70e46949 100644 --- a/src/OpenTelemetry.Api/CHANGELOG.md +++ b/src/OpenTelemetry.Api/CHANGELOG.md @@ -25,6 +25,10 @@ Notes](../../RELEASENOTES.md). APIs for reading the status of an `Activity` instance. ([#5781](https://github.com/open-telemetry/opentelemetry-dotnet/pull/5781)) +* Updated `System.Diagnostics.DiagnosticSource` package version to + `9.0.0-rc.1.24431.7`. + ([#5853](https://github.com/open-telemetry/opentelemetry-dotnet/pull/5853)) + ## 1.9.0 Released 2024-Jun-14 diff --git a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/CHANGELOG.md b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/CHANGELOG.md index 1c9d5bb77fb..e90109e737b 100644 --- a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/CHANGELOG.md +++ b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/CHANGELOG.md @@ -24,7 +24,7 @@ Notes](../../RELEASENOTES.md). * Updated `Microsoft.Extensions.Hosting.Abstractions` package version to `9.0.0-rc.1.24431.7`. - ([#](https://github.com/open-telemetry/opentelemetry-dotnet/pull/)) + ([#5853](https://github.com/open-telemetry/opentelemetry-dotnet/pull/5853)) ## 1.9.0 diff --git a/src/OpenTelemetry.Extensions.Hosting/CHANGELOG.md b/src/OpenTelemetry.Extensions.Hosting/CHANGELOG.md index 13827102a79..935f07ffc55 100644 --- a/src/OpenTelemetry.Extensions.Hosting/CHANGELOG.md +++ b/src/OpenTelemetry.Extensions.Hosting/CHANGELOG.md @@ -8,7 +8,7 @@ Notes](../../RELEASENOTES.md). * Updated `Microsoft.Extensions.Hosting.Abstractions` package version to `9.0.0-rc.1.24431.7`. - ([#](https://github.com/open-telemetry/opentelemetry-dotnet/pull/)) + ([#5853](https://github.com/open-telemetry/opentelemetry-dotnet/pull/5853)) ## 1.9.0 diff --git a/src/OpenTelemetry/CHANGELOG.md b/src/OpenTelemetry/CHANGELOG.md index 5b81f347967..1e802f55fd1 100644 --- a/src/OpenTelemetry/CHANGELOG.md +++ b/src/OpenTelemetry/CHANGELOG.md @@ -15,7 +15,7 @@ Notes](../../RELEASENOTES.md). * Updated the `Microsoft.Extensions.Logging.Configuration` and `Microsoft.Extensions.Diagnostics.Abstractions` packages version to `9.0.0-rc.1.24431.7`. - ([#](https://github.com/open-telemetry/opentelemetry-dotnet/pull/)) + ([#5853](https://github.com/open-telemetry/opentelemetry-dotnet/pull/5853)) ## 1.9.0 From c6b9d22861e7a492ea99cf7583a7a773f69c5922 Mon Sep 17 00:00:00 2001 From: Rajkumar Rangaraj Date: Fri, 20 Sep 2024 11:48:08 -0700 Subject: [PATCH 3/3] Undo release notes update. --- RELEASENOTES.md | 9 --------- 1 file changed, 9 deletions(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index b8be728f230..0f1d0b50669 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -4,15 +4,6 @@ This file contains highlights and announcements covering all components. For more details see `CHANGELOG.md` files maintained in the root source directory of each individual package. -## Unreleased - -* Added `net9.0` targets to all the components. - -* Removed `net6.0` targets from all the components. - -* Bumped the package versions of `System.Diagnostic.DiagnosticSource` and other - `Microsoft.Extensions.*` packages to `9.0.0-rc.1.24431.7`. - ## 1.9.0 * `Exemplars` are now part of the stable API! For details see: [customizing