diff --git a/ports/azure-core-amqp-cpp/portfile.cmake b/ports/azure-core-amqp-cpp/portfile.cmake index 6b1f056805af73..21182a23da522d 100644 --- a/ports/azure-core-amqp-cpp/portfile.cmake +++ b/ports/azure-core-amqp-cpp/portfile.cmake @@ -4,8 +4,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-core-amqp_1.0.0-beta.5 - SHA512 d9a75d1cdac2a58b2064f12c4f61adfc9969d4fd860146d6de398eb466e61602d6ce6db4a69554aadaa4f77105b8b746f51ca4a80758981895bb0a82cdf5aa70 + REF azure-core-amqp_1.0.0-beta.6 + SHA512 dd4ad71a1658e79c8abc6beabd78da5281bfba75f80a85a6ec47335ac416c13538b95196fd553c5c4131bdc496b5a43a8653379cca5a9b73d1e5f233fa16940d ) if(EXISTS "${SOURCE_PATH}/sdk/core/azure-core-amqp") diff --git a/ports/azure-core-amqp-cpp/vcpkg.json b/ports/azure-core-amqp-cpp/vcpkg.json index 23ed1da1ba0b10..a763d8c3b9d302 100644 --- a/ports/azure-core-amqp-cpp/vcpkg.json +++ b/ports/azure-core-amqp-cpp/vcpkg.json @@ -1,7 +1,10 @@ { - "$comment": "NOTE: All changes made to this file will get overwritten by the next port release. Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.", + "$comment": [ + "NOTE: All changes made to this file will get overwritten by the next port release.", + "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp." + ], "name": "azure-core-amqp-cpp", - "version-semver": "1.0.0-beta.5", + "version-semver": "1.0.0-beta.6", "description": [ "Microsoft Azure AMQP SDK for C++", "This library provides AMQP functionality to Azure SDK services." diff --git a/ports/azure-core-cpp/fix_gcc13.patch b/ports/azure-core-cpp/fix_gcc13.patch deleted file mode 100644 index b283e1bdd3a718..00000000000000 --- a/ports/azure-core-cpp/fix_gcc13.patch +++ /dev/null @@ -1,115 +0,0 @@ -diff --git a/CMakePresets.json b/CMakePresets.json -index eb862b0..2331864 100644 ---- a/CMakePresets.json -+++ b/CMakePresets.json -@@ -370,6 +370,24 @@ - "rhs": "Linux" - } - }, -+ { -+ "name": "linux-basic-clang-13", -+ "displayName": "Linux clang-13", -+ "description": "Using compilers: C = /usr/bin/clang-13, CXX = /usr/bin/clang++-13", -+ "binaryDir": "${sourceDir}/out/build/${presetName}", -+ "generator": "Ninja", -+ "hidden": true, -+ "cacheVariables": { -+ "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}", -+ "CMAKE_C_COMPILER": "/usr/bin/clang-13", -+ "CMAKE_CXX_COMPILER": "/usr/bin/clang++-13" -+ }, -+ "condition": { -+ "type": "equals", -+ "lhs": "${hostSystemName}", -+ "rhs": "Linux" -+ } -+ }, - { - "name": "linux-basic-g++", - "displayName": "Linux G++", -@@ -403,9 +421,19 @@ - "inherits": [ "linux-basic-clang-11", "debug-build" ] - }, - { -- "name": "linux-clang-11-debug-tests", -- "inherits": [ "linux-basic-clang-11", "debug-build", "enable-tests" ], -- "displayName": "Linux clang 11 Debug+Tests" -+ "name": "linux-clang-13-debug-tests", -+ "inherits": [ "linux-basic-clang-13", "debug-build", "enable-tests" ], -+ "displayName": "Linux clang 13 Debug+Tests" -+ }, -+ { -+ "name": "linux-clang-11-debug", -+ "displayName": "Linux clang 11 Debug", -+ "inherits": [ "linux-basic-clang-11", "debug-build" ] -+ }, -+ { -+ "name": "linux-clang-13-debug-tests", -+ "inherits": [ "linux-basic-clang-13", "debug-build", "enable-tests" ], -+ "displayName": "Linux clang 13 Debug+Tests" - }, - { - "name": "linux-g++-debug", -diff --git a/sdk/core/azure-core/inc/azure/core/base64.hpp b/sdk/core/azure-core/inc/azure/core/base64.hpp -index 97d01ce..97264cb 100644 ---- a/sdk/core/azure-core/inc/azure/core/base64.hpp -+++ b/sdk/core/azure-core/inc/azure/core/base64.hpp -@@ -10,8 +10,9 @@ - #pragma once - - #include --#include -+#include // defines std::uint8_t - #include -+#include // deprecated, defines uint8_t in global namespace. TODO: Remove when uint8_t in the global namespace is removed. - #include - #include - -diff --git a/sdk/core/azure-core/inc/azure/core/uuid.hpp b/sdk/core/azure-core/inc/azure/core/uuid.hpp -index 1fe0788..d2acb48 100644 ---- a/sdk/core/azure-core/inc/azure/core/uuid.hpp -+++ b/sdk/core/azure-core/inc/azure/core/uuid.hpp -@@ -11,8 +11,9 @@ - #include "azure/core/platform.hpp" - - #include --#include -+#include // defines std::uint8_t - #include -+#include // deprecated, defines uint8_t in global namespace. TODO: Remove in the future when references to uint8_t and friends are removed. - #include - - namespace Azure { namespace Core { -diff --git a/eng/pipelines/templates/stages/platform-matrix.json b/eng/pipelines/templates/stages/platform-matrix.json -index e0ac5ae..af17184 100644 ---- a/eng/pipelines/templates/stages/platform-matrix.json -+++ b/eng/pipelines/templates/stages/platform-matrix.json -@@ -148,6 +148,16 @@ - "AptDependencies": "g++-9", - "CC": "/usr/bin/gcc-9", - "CXX": "/usr/bin/g++-9" -+ }, -+ "clang-13": { -+ "AptDependencies": "clang-13", -+ "CC": "/usr/bin/clang-13", -+ "CXX": "/usr/bin/clang++-13" -+ }, -+ "clang-15": { -+ "AptDependencies": "clang-15", -+ "CC": "/usr/bin/clang-15", -+ "CXX": "/usr/bin/clang++-15" - }, - "included_coverage": { - "AptDependencies": "gcovr lcov", -@@ -156,6 +166,11 @@ - "CODE_COVERAGE": "enabled", - "PublishMapFiles": "true" - }, -+ "included_debug": { -+ "CMAKE_BUILD_TYPE": "Debug", -+ "CmakeArgs": " -DBUILD_TESTING=ON -DBUILD_PERFORMANCE_TESTS=ON -DRUN_LONG_UNIT_TESTS=ON", -+ "PublishMapFiles": "true" -+ }, - "included_release": { - "CMAKE_BUILD_TYPE": "Release", - "CmakeArgs": " -DBUILD_TESTING=ON -DBUILD_PERFORMANCE_TESTS=ON -DRUN_LONG_UNIT_TESTS=ON", diff --git a/ports/azure-core-cpp/portfile.cmake b/ports/azure-core-cpp/portfile.cmake index 7701007537d037..16f9c0651acf94 100644 --- a/ports/azure-core-cpp/portfile.cmake +++ b/ports/azure-core-cpp/portfile.cmake @@ -1,10 +1,11 @@ +# NOTE: All changes made to this file will get overwritten by the next port release. +# Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp. + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-core_1.10.3 - SHA512 b3705cf757a14693f65a5ea4a43cc3c5f8377b3156ef24869bd664e9e8b25797fd21107ad543db476335bbb2389687cc1ed8fb8fe1010bb9b5a0eb406f3c0d59 - PATCHES - fix_gcc13.patch + REF azure-core_1.11.0 + SHA512 0627e65ba429e6caba027e1e0473ad00de1a5a0259df9f2ac823fb37dda6e9dbd307bd75ab92b1acb2967b123d221b25ea9cfe07f0b7d7ec89c789142e7643ac ) vcpkg_check_features( diff --git a/ports/azure-core-cpp/vcpkg.json b/ports/azure-core-cpp/vcpkg.json index f7d5e2da39c1fb..e0ee8792a6edc9 100644 --- a/ports/azure-core-cpp/vcpkg.json +++ b/ports/azure-core-cpp/vcpkg.json @@ -1,7 +1,10 @@ { + "$comment": [ + "NOTE: All changes made to this file will get overwritten by the next port release.", + "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp." + ], "name": "azure-core-cpp", - "version-semver": "1.10.3", - "port-version": 2, + "version-semver": "1.11.0", "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 175f59d56fde9f..b2189d927ed5fa 100644 --- a/ports/azure-messaging-eventhubs-cpp/portfile.cmake +++ b/ports/azure-messaging-eventhubs-cpp/portfile.cmake @@ -4,8 +4,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-messaging-eventhubs_1.0.0-beta.4 - SHA512 a96adb497b583356e7d38e3a24814b2ed12e116d273ad1bd4b710a65ae32b5840a72905d107b8ec157a75b80135416af9326839741795082d187d39335b14bf7 + REF azure-messaging-eventhubs_1.0.0-beta.5 + SHA512 1c8200a0ae2618ef7c4fbf82770a45fcd922cdc76618022711f9cb934355cc13ccc49c61ca48f70235d799e217cc813c27d57cdb4bd74ddc1916e9dfbb768367 ) if(EXISTS "${SOURCE_PATH}/sdk/eventhubs/azure-messaging-eventhubs") diff --git a/ports/azure-messaging-eventhubs-cpp/vcpkg.json b/ports/azure-messaging-eventhubs-cpp/vcpkg.json index e13512e01b1496..18af5d7cdf4383 100644 --- a/ports/azure-messaging-eventhubs-cpp/vcpkg.json +++ b/ports/azure-messaging-eventhubs-cpp/vcpkg.json @@ -1,7 +1,10 @@ { - "$comment": "NOTE: All changes made to this file will get overwritten by the next port release. Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.", + "$comment": [ + "NOTE: All changes made to this file will get overwritten by the next port release.", + "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp." + ], "name": "azure-messaging-eventhubs-cpp", - "version-semver": "1.0.0-beta.4", + "version-semver": "1.0.0-beta.5", "description": [ "Microsoft Azure Messaging Event Hubs SDK for C++", "This library provides Azure Messaging Event Hubs SDK." diff --git a/versions/a-/azure-core-amqp-cpp.json b/versions/a-/azure-core-amqp-cpp.json index 2ff612fadd94e2..7d404d71c71afe 100644 --- a/versions/a-/azure-core-amqp-cpp.json +++ b/versions/a-/azure-core-amqp-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "67e6280661e8992e3fd118517ac0f1d0f0cc662e", + "version-semver": "1.0.0-beta.6", + "port-version": 0 + }, { "git-tree": "a5742923375357a52887b2c969db207937b01592", "version-semver": "1.0.0-beta.5", diff --git a/versions/a-/azure-core-cpp.json b/versions/a-/azure-core-cpp.json index aa128c4a14d975..70c9320e69f14a 100644 --- a/versions/a-/azure-core-cpp.json +++ b/versions/a-/azure-core-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "30673e31e776858e870bff22344de32cada95d13", + "version-semver": "1.11.0", + "port-version": 0 + }, { "git-tree": "3de5ec61efe0f113131a5a7847a2964b930b8f88", "version-semver": "1.10.3", diff --git a/versions/a-/azure-messaging-eventhubs-cpp.json b/versions/a-/azure-messaging-eventhubs-cpp.json index 7e7f4994a6b487..09136a27c55435 100644 --- a/versions/a-/azure-messaging-eventhubs-cpp.json +++ b/versions/a-/azure-messaging-eventhubs-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b863a91f0ee55df12d178fb00837d37d640e6f80", + "version-semver": "1.0.0-beta.5", + "port-version": 0 + }, { "git-tree": "bde9f1c76919eecaaf6680e602eba5126c8d1fad", "version-semver": "1.0.0-beta.4", diff --git a/versions/baseline.json b/versions/baseline.json index 403ffea52715f3..26e0a49f621123 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -417,12 +417,12 @@ "port-version": 0 }, "azure-core-amqp-cpp": { - "baseline": "1.0.0-beta.5", + "baseline": "1.0.0-beta.6", "port-version": 0 }, "azure-core-cpp": { - "baseline": "1.10.3", - "port-version": 2 + "baseline": "1.11.0", + "port-version": 0 }, "azure-core-tracing-opentelemetry-cpp": { "baseline": "1.0.0-beta.4", @@ -449,7 +449,7 @@ "port-version": 0 }, "azure-messaging-eventhubs-cpp": { - "baseline": "1.0.0-beta.4", + "baseline": "1.0.0-beta.5", "port-version": 0 }, "azure-security-attestation-cpp": {