From ba9744450908d4cb906b19226826747d36f8cd93 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Thu, 14 Nov 2024 01:49:37 -0800 Subject: [PATCH] [Azure Storage] Update to November Release (#42146) --- ports/azure-storage-common-cpp/portfile.cmake | 4 +--- ports/azure-storage-common-cpp/set_version.patch | 12 ------------ ports/azure-storage-common-cpp/vcpkg.json | 5 ++--- ports/azure-storage-files-shares-cpp/portfile.cmake | 4 +--- .../azure-storage-files-shares-cpp/set_version.patch | 12 ------------ ports/azure-storage-files-shares-cpp/vcpkg.json | 5 ++--- versions/a-/azure-storage-common-cpp.json | 5 +++++ versions/a-/azure-storage-files-shares-cpp.json | 5 +++++ versions/baseline.json | 8 ++++---- 9 files changed, 20 insertions(+), 40 deletions(-) delete mode 100644 ports/azure-storage-common-cpp/set_version.patch delete mode 100644 ports/azure-storage-files-shares-cpp/set_version.patch diff --git a/ports/azure-storage-common-cpp/portfile.cmake b/ports/azure-storage-common-cpp/portfile.cmake index 6f7a44121f..26adb9d3b6 100644 --- a/ports/azure-storage-common-cpp/portfile.cmake +++ b/ports/azure-storage-common-cpp/portfile.cmake @@ -5,10 +5,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp REF "azure-storage-common_${VERSION}" - SHA512 2b82ff3e8d4e76c1c7205d363e2e9ff042cf4034c41a0bc7d47591a42c144b09ad6f732ea322ce0c918bcf5de548c88c58a577571182d988b85a4418c51d9f59 + SHA512 fad728edbbd062f00640027c5ce87fc2048674aff7269807160abcabfd0b36c1716f0bbf27e9724c0207585fc81600ce3886c0417b9ac2177bba54a111d8e081 HEAD_REF main - PATCHES - set_version.patch ) if(EXISTS "${SOURCE_PATH}/sdk/storage/azure-storage-common") diff --git a/ports/azure-storage-common-cpp/set_version.patch b/ports/azure-storage-common-cpp/set_version.patch deleted file mode 100644 index 6cebbe2c1b..0000000000 --- a/ports/azure-storage-common-cpp/set_version.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/sdk/storage/azure-storage-common/CMakeLists.txt b/sdk/storage/azure-storage-common/CMakeLists.txt -index 30f056dca..76afb17a3 100644 ---- a/sdk/storage/azure-storage-common/CMakeLists.txt -+++ b/sdk/storage/azure-storage-common/CMakeLists.txt -@@ -107,6 +107,7 @@ else() - endif() - - get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") -+set_target_properties(azure-storage-common PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) - generate_documentation(azure-storage-common ${AZ_LIBRARY_VERSION}) - - az_vcpkg_export( diff --git a/ports/azure-storage-common-cpp/vcpkg.json b/ports/azure-storage-common-cpp/vcpkg.json index 81ec4d5730..c69d270207 100644 --- a/ports/azure-storage-common-cpp/vcpkg.json +++ b/ports/azure-storage-common-cpp/vcpkg.json @@ -4,8 +4,7 @@ "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp." ], "name": "azure-storage-common-cpp", - "version-semver": "12.8.0", - "port-version": 1, + "version-semver": "12.9.0", "description": [ "Microsoft Azure Common Storage SDK for C++", "This library provides common Azure Storage-related abstractions for Azure SDK." @@ -16,7 +15,7 @@ { "name": "azure-core-cpp", "default-features": false, - "version>=": "1.13.0" + "version>=": "1.14.1" }, { "name": "libxml2", diff --git a/ports/azure-storage-files-shares-cpp/portfile.cmake b/ports/azure-storage-files-shares-cpp/portfile.cmake index 5785a94fef..9bea8dd3d8 100644 --- a/ports/azure-storage-files-shares-cpp/portfile.cmake +++ b/ports/azure-storage-files-shares-cpp/portfile.cmake @@ -5,10 +5,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp REF "azure-storage-files-shares_${VERSION}" - SHA512 56119c742d09164363d10690659513de7491c0274b1afc0ca09ad32c4a6f0252bb63634972403f27142e53df40ef812842150a6d8e9589b73c7fddcd73ed974e + SHA512 296e0798c9a831ba16bcfd9b29d2bc8613a2b7d6a117bfccb46f49f4d5d91caf8e1fbb82465dca5daae3305656cf44bee2f78ad0341a8e13b36940938317b45c HEAD_REF main - PATCHES - set_version.patch ) if(EXISTS "${SOURCE_PATH}/sdk/storage/azure-storage-files-shares") diff --git a/ports/azure-storage-files-shares-cpp/set_version.patch b/ports/azure-storage-files-shares-cpp/set_version.patch deleted file mode 100644 index 3ca4422a7d..0000000000 --- a/ports/azure-storage-files-shares-cpp/set_version.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/sdk/storage/azure-storage-files-shares/CMakeLists.txt b/sdk/storage/azure-storage-files-shares/CMakeLists.txt -index 891f95480..3b79e1041 100644 ---- a/sdk/storage/azure-storage-files-shares/CMakeLists.txt -+++ b/sdk/storage/azure-storage-files-shares/CMakeLists.txt -@@ -88,6 +88,7 @@ target_include_directories( - target_link_libraries(azure-storage-files-shares PUBLIC Azure::azure-storage-common) - - get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") -+set_target_properties(azure-storage-files-shares PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) - generate_documentation(azure-storage-files-shares ${AZ_LIBRARY_VERSION}) - - az_vcpkg_export( diff --git a/ports/azure-storage-files-shares-cpp/vcpkg.json b/ports/azure-storage-files-shares-cpp/vcpkg.json index 77638829f8..1dfc698487 100644 --- a/ports/azure-storage-files-shares-cpp/vcpkg.json +++ b/ports/azure-storage-files-shares-cpp/vcpkg.json @@ -4,8 +4,7 @@ "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp." ], "name": "azure-storage-files-shares-cpp", - "version-semver": "12.11.0", - "port-version": 1, + "version-semver": "12.12.0", "description": [ "Microsoft Azure Storage Files Shares SDK for C++", "This library provides Azure Storage Files Shares SDK." @@ -16,7 +15,7 @@ { "name": "azure-storage-common-cpp", "default-features": false, - "version>=": "12.8.0" + "version>=": "12.9.0" }, { "name": "vcpkg-cmake", diff --git a/versions/a-/azure-storage-common-cpp.json b/versions/a-/azure-storage-common-cpp.json index 99d17f8c6f..70d795dde1 100644 --- a/versions/a-/azure-storage-common-cpp.json +++ b/versions/a-/azure-storage-common-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8c1ba485d656f727ec4441d5c5b3a1bba79f951a", + "version-semver": "12.9.0", + "port-version": 0 + }, { "git-tree": "a200d88271a1801801abee4e06da137e698cbcec", "version-semver": "12.8.0", diff --git a/versions/a-/azure-storage-files-shares-cpp.json b/versions/a-/azure-storage-files-shares-cpp.json index c4dd03a0a6..f1ed1aab10 100644 --- a/versions/a-/azure-storage-files-shares-cpp.json +++ b/versions/a-/azure-storage-files-shares-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2fd221be0ffac626d014208273dce26e7b53b6ec", + "version-semver": "12.12.0", + "port-version": 0 + }, { "git-tree": "dbe687f016f7747967b99e26138e09ff1a098767", "version-semver": "12.11.0", diff --git a/versions/baseline.json b/versions/baseline.json index 91f8d494b0..5cc7931063 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -517,8 +517,8 @@ "port-version": 1 }, "azure-storage-common-cpp": { - "baseline": "12.8.0", - "port-version": 1 + "baseline": "12.9.0", + "port-version": 0 }, "azure-storage-cpp": { "baseline": "7.5.0", @@ -529,8 +529,8 @@ "port-version": 1 }, "azure-storage-files-shares-cpp": { - "baseline": "12.11.0", - "port-version": 1 + "baseline": "12.12.0", + "port-version": 0 }, "azure-storage-queues-cpp": { "baseline": "12.4.0",