From 3974826d0d0fd240bf9cbe041abbc13cc6289fcb Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Tue, 5 Nov 2024 01:00:28 -0800 Subject: [PATCH] [azure-core-cpp] Update to 1.14.1 (#41908) --- ports/azure-core-cpp/portfile.cmake | 5 +--- ports/azure-core-cpp/set_version.patch | 12 -------- ports/azure-core-cpp/useragent.patch | 30 ------------------- ports/azure-core-cpp/vcpkg.json | 3 +- .../portfile.cmake | 5 +--- .../set_version.patch | 12 -------- .../useragent.patch | 13 -------- .../azure-messaging-eventhubs-cpp/vcpkg.json | 8 +++-- versions/a-/azure-core-cpp.json | 5 ++++ .../a-/azure-messaging-eventhubs-cpp.json | 5 ++++ versions/baseline.json | 8 ++--- 11 files changed, 23 insertions(+), 83 deletions(-) delete mode 100644 ports/azure-core-cpp/set_version.patch delete mode 100644 ports/azure-core-cpp/useragent.patch delete mode 100644 ports/azure-messaging-eventhubs-cpp/set_version.patch delete mode 100644 ports/azure-messaging-eventhubs-cpp/useragent.patch diff --git a/ports/azure-core-cpp/portfile.cmake b/ports/azure-core-cpp/portfile.cmake index 09c71b3f7f..5f1fd10c23 100644 --- a/ports/azure-core-cpp/portfile.cmake +++ b/ports/azure-core-cpp/portfile.cmake @@ -5,11 +5,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp REF "azure-core_${VERSION}" - SHA512 5d6c93fb5914c3ed1f9e31b37244e6a9e210467ed6887cb35ec31e8ca88119d734cbb80a6c48aef17e823062f5aa202ac7c2cf0139de5bda7b86668b13908150 + SHA512 f639e8fcabfdc81816abcfe9869d6ebf2862e39398a4ee14e82e91345fad3aaf279159486cfc5c72d7cedefce539eeb63fc694d318fe7647e521f57173e980d2 HEAD_REF main - PATCHES - useragent.patch - set_version.patch ) vcpkg_check_features( diff --git a/ports/azure-core-cpp/set_version.patch b/ports/azure-core-cpp/set_version.patch deleted file mode 100644 index 685171adf5..0000000000 --- a/ports/azure-core-cpp/set_version.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/sdk/core/azure-core/CMakeLists.txt b/sdk/core/azure-core/CMakeLists.txt -index 87c5cfd9b..c7d29c3f2 100644 ---- a/sdk/core/azure-core/CMakeLists.txt -+++ b/sdk/core/azure-core/CMakeLists.txt -@@ -192,6 +192,7 @@ if(BUILD_TRANSPORT_WINHTTP) - endif() - - get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") -+set_target_properties(azure-core PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) - generate_documentation(azure-core ${AZ_LIBRARY_VERSION}) - - az_vcpkg_export( diff --git a/ports/azure-core-cpp/useragent.patch b/ports/azure-core-cpp/useragent.patch deleted file mode 100644 index 565b87e395..0000000000 --- a/ports/azure-core-cpp/useragent.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/sdk/core/azure-core/inc/azure/core/internal/http/user_agent.hpp b/sdk/core/azure-core/inc/azure/core/internal/http/user_agent.hpp -index 46c182386..43feca858 100644 ---- a/sdk/core/azure-core/inc/azure/core/internal/http/user_agent.hpp -+++ b/sdk/core/azure-core/inc/azure/core/internal/http/user_agent.hpp -@@ -11,6 +11,8 @@ - #include - - namespace Azure { namespace Core { namespace Http { namespace _detail { -+ // NOTE: Treat Azure::Core::Http::_detail::UserAgentGenerator::GenerateUserAgent() as _internal - -+ // it is being/has been used by eventhubs. - class UserAgentGenerator { - public: - static std::string GenerateUserAgent( -@@ -18,5 +20,16 @@ namespace Azure { namespace Core { namespace Http { namespace _detail { - std::string const& componentVersion, - std::string const& applicationId, - long cplusplusValue); -+ -+ [[deprecated("Use an overload with additional cplusplusValue parameter.")]] static std::string -+ GenerateUserAgent( -+ std::string const& componentName, -+ std::string const& componentVersion, -+ std::string const& applicationId) -+ { -+ // The value of -3L is to signify that an old version of signature has been used (older -+ // version of eventhubs); we can't rely on cpp version reported by it. -+ return GenerateUserAgent(componentName, componentVersion, applicationId, -3L); -+ } - }; - }}}} // namespace Azure::Core::Http::_detail diff --git a/ports/azure-core-cpp/vcpkg.json b/ports/azure-core-cpp/vcpkg.json index cee04f30c3..316e2c811f 100644 --- a/ports/azure-core-cpp/vcpkg.json +++ b/ports/azure-core-cpp/vcpkg.json @@ -4,8 +4,7 @@ "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp." ], "name": "azure-core-cpp", - "version-semver": "1.14.0", - "port-version": 1, + "version-semver": "1.14.1", "description": [ "Microsoft Azure Core SDK for C++", "This library provides shared primitives, abstractions, and helpers for modern Azure SDK client libraries written in the C++." diff --git a/ports/azure-messaging-eventhubs-cpp/portfile.cmake b/ports/azure-messaging-eventhubs-cpp/portfile.cmake index 204acf1d56..ea0bf92a4f 100644 --- a/ports/azure-messaging-eventhubs-cpp/portfile.cmake +++ b/ports/azure-messaging-eventhubs-cpp/portfile.cmake @@ -5,11 +5,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp REF "azure-messaging-eventhubs_${VERSION}" - SHA512 e479d1a60be139d56ba8ecf7896d94dd90bf0b6fa668fbc74abe228733c9c6709693c42c2a05c0c39a17a46596dba2fe8fe606a805217df830f8ccf30769932c + SHA512 13f1ad09a4093ab3a591208e47d6ce5daad2a4e055f2c86fdb49a9dbee4826efb19ddb294c0d5d9a4e5f4e2318059bd57fc346fec5ae1cee26f20839030f4276 HEAD_REF main - PATCHES - useragent.patch - set_version.patch ) if(EXISTS "${SOURCE_PATH}/sdk/eventhubs/azure-messaging-eventhubs") diff --git a/ports/azure-messaging-eventhubs-cpp/set_version.patch b/ports/azure-messaging-eventhubs-cpp/set_version.patch deleted file mode 100644 index b82ca7f916..0000000000 --- a/ports/azure-messaging-eventhubs-cpp/set_version.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/CMakeLists.txt b/sdk/eventhubs/azure-messaging-eventhubs/CMakeLists.txt -index 0ea0b8e10..1cb7273fa 100644 ---- a/sdk/eventhubs/azure-messaging-eventhubs/CMakeLists.txt -+++ b/sdk/eventhubs/azure-messaging-eventhubs/CMakeLists.txt -@@ -116,6 +116,7 @@ target_compile_definitions(azure-messaging-eventhubs PRIVATE _azure_BUILDING_SDK - create_code_coverage(eventhubs azure-messaging-eventhubs azure-messaging-eventhubs-test "tests?/*;samples?/*") - - get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") -+set_target_properties(azure-messaging-eventhubs PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) - generate_documentation(azure-messaging-eventhubs ${AZ_LIBRARY_VERSION}) - - add_subdirectory(test) diff --git a/ports/azure-messaging-eventhubs-cpp/useragent.patch b/ports/azure-messaging-eventhubs-cpp/useragent.patch deleted file mode 100644 index e83f2fffab..0000000000 --- a/ports/azure-messaging-eventhubs-cpp/useragent.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/CMakeLists.txt b/sdk/eventhubs/azure-messaging-eventhubs/CMakeLists.txt -index 5b69cf55c..0ea0b8e10 100644 ---- a/sdk/eventhubs/azure-messaging-eventhubs/CMakeLists.txt -+++ b/sdk/eventhubs/azure-messaging-eventhubs/CMakeLists.txt -@@ -110,6 +110,8 @@ target_include_directories( - - target_link_libraries(azure-messaging-eventhubs PUBLIC Azure::azure-core Azure::azure-core-amqp) - -+target_compile_definitions(azure-messaging-eventhubs PRIVATE _azure_BUILDING_SDK) -+ - # coverage. Has no effect if BUILD_CODE_COVERAGE is OFF - create_code_coverage(eventhubs azure-messaging-eventhubs azure-messaging-eventhubs-test "tests?/*;samples?/*") - diff --git a/ports/azure-messaging-eventhubs-cpp/vcpkg.json b/ports/azure-messaging-eventhubs-cpp/vcpkg.json index 97e7eeeffe..0bf6ceacec 100644 --- a/ports/azure-messaging-eventhubs-cpp/vcpkg.json +++ b/ports/azure-messaging-eventhubs-cpp/vcpkg.json @@ -4,8 +4,7 @@ "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp." ], "name": "azure-messaging-eventhubs-cpp", - "version-semver": "1.0.0-beta.9", - "port-version": 2, + "version-semver": "1.0.0-beta.10", "description": [ "Microsoft Azure Messaging Event Hubs SDK for C++", "This library provides Azure Messaging Event Hubs SDK." @@ -18,6 +17,11 @@ "default-features": false, "version>=": "1.0.0-beta.9" }, + { + "name": "azure-core-cpp", + "default-features": false, + "version>=": "1.14.1" + }, { "name": "vcpkg-cmake", "host": true diff --git a/versions/a-/azure-core-cpp.json b/versions/a-/azure-core-cpp.json index cba35dfae4..69775f9e72 100644 --- a/versions/a-/azure-core-cpp.json +++ b/versions/a-/azure-core-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9baf7e69af4e1eb2cfb6d9ca485b1c622f9f2211", + "version-semver": "1.14.1", + "port-version": 0 + }, { "git-tree": "f937bf0444060d596ffb2693a71640086939a542", "version-semver": "1.14.0", diff --git a/versions/a-/azure-messaging-eventhubs-cpp.json b/versions/a-/azure-messaging-eventhubs-cpp.json index 3902c85926..6a55cac369 100644 --- a/versions/a-/azure-messaging-eventhubs-cpp.json +++ b/versions/a-/azure-messaging-eventhubs-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0f4c7ad624ca6bba7d771e9c90ea24ae8f71dff8", + "version-semver": "1.0.0-beta.10", + "port-version": 0 + }, { "git-tree": "20acc123d4bc4b1499ba80cefbf27648204dba78", "version-semver": "1.0.0-beta.9", diff --git a/versions/baseline.json b/versions/baseline.json index 9a66d6b4e7..875e6deec2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -457,8 +457,8 @@ "port-version": 1 }, "azure-core-cpp": { - "baseline": "1.14.0", - "port-version": 1 + "baseline": "1.14.1", + "port-version": 0 }, "azure-core-tracing-opentelemetry-cpp": { "baseline": "1.0.0-beta.4", @@ -489,8 +489,8 @@ "port-version": 4 }, "azure-messaging-eventhubs-cpp": { - "baseline": "1.0.0-beta.9", - "port-version": 2 + "baseline": "1.0.0-beta.10", + "port-version": 0 }, "azure-security-attestation-cpp": { "baseline": "1.1.0",