From ce064b34ad01eca17df4d291f5533a2cc55725da Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Mon, 7 Aug 2023 09:03:37 -0700 Subject: [PATCH] [azure-core-amqp-cpp] Update to 1.0.0-beta.2 (#32973) ## 1.0.0-beta.2 (2023-08-04) ### Features Added - Added `Azure::Core::Amqp::Models::AmqpBinaryData::operator=(std::vector const&)`. - Added `Azure::Core::Amqp::Models::AmqpMessage::MessageFormat`. - Collection types (`AmqpArray`, `AmqpMap`, `AmqpList`, `AmqpBinaryData`, `AmqpSymbol` and `AmqpComposite`): - Added explicit cast operator to underlying collection type. - Added `find()`. - Rationalized the return code for AMQP MessageSender and MessageReceiver and Management APIs to use AmqpError for error codes. - Added additional AMQP Error values. ### Breaking Changes - Renamed `Azure::Core::Amqp::Models::AmqpMessageFormatValue` to `AmqpDefaultMessageFormatValue`. - Changed the return values for the MessageSender, MessageReceiver and Management APIs. --- .../00100-fix_dependency.patch | 43 ------------------- ports/azure-core-amqp-cpp/portfile.cmake | 6 +-- ports/azure-core-amqp-cpp/vcpkg.json | 2 +- versions/a-/azure-core-amqp-cpp.json | 5 +++ versions/baseline.json | 2 +- 5 files changed, 9 insertions(+), 49 deletions(-) delete mode 100644 ports/azure-core-amqp-cpp/00100-fix_dependency.patch diff --git a/ports/azure-core-amqp-cpp/00100-fix_dependency.patch b/ports/azure-core-amqp-cpp/00100-fix_dependency.patch deleted file mode 100644 index b977653186..0000000000 --- a/ports/azure-core-amqp-cpp/00100-fix_dependency.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/sdk/core/azure-core-amqp/CMakeLists.txt b/sdk/core/azure-core-amqp/CMakeLists.txt -index 4af39728..f888b1ba 100644 ---- a/sdk/core/azure-core-amqp/CMakeLists.txt -+++ b/sdk/core/azure-core-amqp/CMakeLists.txt -@@ -31,7 +31,7 @@ if(NOT AZ_ALL_LIBRARIES) - endif() - - find_package(uamqp CONFIG REQUIRED) --find_package(umock_c) -+find_package(umock_c CONFIG REQUIRED) - find_package(azure_macro_utils_c CONFIG REQUIRED) - find_package(azure_c_shared_utility CONFIG REQUIRED) - -@@ -101,8 +101,8 @@ add_library(Azure::azure-core-amqp ALIAS azure-core-amqp) - # coverage. Has no effect if BUILD_CODE_COVERAGE is OFF - create_code_coverage(core azure-core-amqp azure-core-amqp-tests "tests?/*;samples?/*") - --# uAMQP's headers require the manual addition of umock_c and azure_macro_utils_c to the target link libraries. --target_link_libraries(azure-core-amqp PRIVATE uamqp umock_c azure_macro_utils_c PUBLIC Azure::azure-core) -+# uAMQP's headers require the manual addition of umock_c, azure_macro_utils_c, and aziotsharedutil to the target link libraries. -+target_link_libraries(azure-core-amqp PRIVATE uamqp umock_c azure_macro_utils_c aziotsharedutil PUBLIC Azure::azure-core) - - get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") - generate_documentation(azure-core-amqp ${AZ_LIBRARY_VERSION}) -diff --git a/sdk/core/azure-core-amqp/vcpkg/Config.cmake.in b/sdk/core/azure-core-amqp/vcpkg/Config.cmake.in -index 989c8be1..176bc75f 100644 ---- a/sdk/core/azure-core-amqp/vcpkg/Config.cmake.in -+++ b/sdk/core/azure-core-amqp/vcpkg/Config.cmake.in -@@ -4,9 +4,12 @@ - @PACKAGE_INIT@ - - include(CMakeFindDependencyMacro) --find_dependency(azure-core-cpp "1.9.0-beta.1") -+find_dependency(azure-core-cpp) - --find_dependency(azure-uamqp-c) -+find_dependency(uamqp) -+find_dependency(umock_c) -+find_dependency(azure_macro_utils_c) -+find_dependency(azure_c_shared_utility) - - include("${CMAKE_CURRENT_LIST_DIR}/azure-core-amqp-cppTargets.cmake") - diff --git a/ports/azure-core-amqp-cpp/portfile.cmake b/ports/azure-core-amqp-cpp/portfile.cmake index 97ee21a9b1..12ba7074a6 100644 --- a/ports/azure-core-amqp-cpp/portfile.cmake +++ b/ports/azure-core-amqp-cpp/portfile.cmake @@ -1,10 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-core-amqp_1.0.0-beta.1 - SHA512 4fc520c546cd395d4c50a9385d33db09b50865046b5383b1442057d4ac78ffc6a6be221af6aef3dcb938ffde1927e8de4270d5b1c9cf5d97ac8b1581b51d014b - PATCHES - 00100-fix_dependency.patch + REF azure-core-amqp_1.0.0-beta.2 + SHA512 ccbcf564027f8f4d0c596548bc67aa27dbfba63fc6afbad9ba22139b7aff42da2c09085b9510efbaa4dd81326673b5aa06441b4be43474d711506bd255612822 ) vcpkg_cmake_configure( diff --git a/ports/azure-core-amqp-cpp/vcpkg.json b/ports/azure-core-amqp-cpp/vcpkg.json index 686fceca47..bc7d8c9149 100644 --- a/ports/azure-core-amqp-cpp/vcpkg.json +++ b/ports/azure-core-amqp-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-core-amqp-cpp", - "version-semver": "1.0.0-beta.1", + "version-semver": "1.0.0-beta.2", "description": [ "Microsoft Azure AMQP SDK for C++", "This library provides AMQP functionality to Azure SDK services." diff --git a/versions/a-/azure-core-amqp-cpp.json b/versions/a-/azure-core-amqp-cpp.json index 09b01e2569..77f9be27c3 100644 --- a/versions/a-/azure-core-amqp-cpp.json +++ b/versions/a-/azure-core-amqp-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "22f82ee324a3d5a33f8e3f9896b780f5a90f786e", + "version-semver": "1.0.0-beta.2", + "port-version": 0 + }, { "git-tree": "c42a4ff250d353e2d0764b8f58dfec820b3cea69", "version-semver": "1.0.0-beta.1", diff --git a/versions/baseline.json b/versions/baseline.json index 359df30135..7ba15d932f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -405,7 +405,7 @@ "port-version": 1 }, "azure-core-amqp-cpp": { - "baseline": "1.0.0-beta.1", + "baseline": "1.0.0-beta.2", "port-version": 0 }, "azure-core-cpp": {