From c6f4ad0807bc96ac800d2fea359002ebae81e4ec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Oct 2023 12:28:27 +0000 Subject: [PATCH 1/3] Bump Google.Protobuf from 3.24.3 to 3.24.4 Bumps [Google.Protobuf](https://github.com/protocolbuffers/protobuf) from 3.24.3 to 3.24.4. - [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.24.3...v3.24.4) --- 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 7cf9041dcc..7b38c7abad 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -59,7 +59,7 @@ - + diff --git a/test/Directory.Packages.props b/test/Directory.Packages.props index 7e2a44c898..bfa0c448d6 100644 --- a/test/Directory.Packages.props +++ b/test/Directory.Packages.props @@ -4,7 +4,7 @@ - + From cb704bf474b75b096d93eea12e968b3ec428ee4a Mon Sep 17 00:00:00 2001 From: Paulo Janotti Date: Thu, 5 Oct 2023 09:54:22 -0700 Subject: [PATCH 2/3] Update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 79f37cb6d3..a7d35271b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,8 @@ This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.h #### Dependency updates +- .NET Framework only, `Google.Protobuf` updated from `3.24.3` to `3.24.4`. + ### Deprecated ### Removed From 760138e0678db2d0eadf5a225df50456d789cec3 Mon Sep 17 00:00:00 2001 From: Paulo Janotti Date: Thu, 5 Oct 2023 09:55:00 -0700 Subject: [PATCH 3/3] Update .NET Framework redirection --- .../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 6b4249f145..938d403674 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, 24, 3, 0} }, + { L"Google.Protobuf", {3, 24, 4, 0} }, { L"Grpc.Core", {2, 0, 0, 0} }, { L"Grpc.Core.Api", {2, 0, 0, 0} }, { L"Microsoft.Bcl.AsyncInterfaces", {7, 0, 0, 0} },