From c5a353a4661ee92719979f64731f7aa72725ef41 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2024 12:17:59 +0000 Subject: [PATCH 1/3] Bump Google.Protobuf from 3.28.2 to 3.28.3 Bumps [Google.Protobuf](https://github.com/protocolbuffers/protobuf) from 3.28.2 to 3.28.3. - [Release notes](https://github.com/protocolbuffers/protobuf/releases) - [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/protobuf_release.bzl) - [Commits](https://github.com/protocolbuffers/protobuf/compare/v3.28.2...v3.28.3) --- updated-dependencies: - dependency-name: Google.Protobuf dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- src/Directory.Packages.props | 2 +- test/Directory.Packages.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index b155f70a3b..22b60a0663 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -63,7 +63,7 @@ - + diff --git a/test/Directory.Packages.props b/test/Directory.Packages.props index 095f1d63dc..d025c64941 100644 --- a/test/Directory.Packages.props +++ b/test/Directory.Packages.props @@ -5,7 +5,7 @@ - + From d55f9e078c1435ad992ca22d0aaba92e06c00bac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= Date: Wed, 23 Oct 2024 15:57:49 +0200 Subject: [PATCH 2/3] CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9df2ffb118..d47c4aa96a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.h #### Dependency updates - .NET Framework only, following packages updated + - `Google.Protobuf` updated from `3.28.2` to `3.28.3`, - `Microsoft.Extensions.DependencyInjection` from `8.0.0` to `8.0.1`, - `Microsoft.Extensions.DependencyInjection.Abstractions` from `8.0.1` to `8.0.2`, - `System.Text.Json` from `8.0.4` to `8.0.5`. From 805eb1dccebdfb1852e89dbe2fffbfa99aadb003 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= Date: Wed, 23 Oct 2024 15:59:50 +0200 Subject: [PATCH 3/3] generated files --- .../netfx_assembly_redirection.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h b/src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h index 3a8a0448e9..077558f334 100644 --- a/src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h +++ b/src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h @@ -18,7 +18,7 @@ void CorProfiler::InitNetFxAssemblyRedirectsMap() const USHORT auto_major = atoi(AUTO_MAJOR); assembly_version_redirect_map_.insert({ - { L"Google.Protobuf", {3, 28, 2, 0} }, + { L"Google.Protobuf", {3, 28, 3, 0} }, { L"Grpc.Core", {2, 0, 0, 0} }, { L"Grpc.Core.Api", {2, 0, 0, 0} }, { L"Microsoft.Bcl.AsyncInterfaces", {8, 0, 0, 0} },