From bf113f358cc85aeb20acd9fe69d11e0e95bea5bb Mon Sep 17 00:00:00 2001 From: azure-sdk Date: Wed, 13 Nov 2024 22:17:09 +0000 Subject: [PATCH] Daily vcpkg ports for storage --- ports/azure-storage-blobs-cpp/portfile.cmake | 6 ++---- .../azure-storage-blobs-cpp/set_version.patch | 12 ----------- ports/azure-storage-blobs-cpp/vcpkg.json | 3 +-- ports/azure-storage-common-cpp/portfile.cmake | 6 ++---- .../set_version.patch | 12 ----------- ports/azure-storage-common-cpp/vcpkg.json | 5 ++--- .../portfile.cmake | 6 ++---- .../set_version.patch | 12 ----------- .../vcpkg.json | 3 +-- .../portfile.cmake | 6 ++---- .../set_version.patch | 12 ----------- .../azure-storage-files-shares-cpp/vcpkg.json | 5 ++--- ports/azure-storage-queues-cpp/portfile.cmake | 6 ++---- .../set_version.patch | 12 ----------- ports/azure-storage-queues-cpp/vcpkg.json | 3 +-- versions/a-/azure-storage-blobs-cpp.json | 5 +++++ versions/a-/azure-storage-common-cpp.json | 5 +++++ .../a-/azure-storage-files-datalake-cpp.json | 5 +++++ .../a-/azure-storage-files-shares-cpp.json | 5 +++++ versions/a-/azure-storage-queues-cpp.json | 5 +++++ versions/baseline.json | 20 +++++++++---------- 21 files changed, 52 insertions(+), 102 deletions(-) delete mode 100644 ports/azure-storage-blobs-cpp/set_version.patch delete mode 100644 ports/azure-storage-common-cpp/set_version.patch delete mode 100644 ports/azure-storage-files-datalake-cpp/set_version.patch delete mode 100644 ports/azure-storage-files-shares-cpp/set_version.patch delete mode 100644 ports/azure-storage-queues-cpp/set_version.patch diff --git a/ports/azure-storage-blobs-cpp/portfile.cmake b/ports/azure-storage-blobs-cpp/portfile.cmake index 5fb4f7c590a2ee..07d21ddb121ebe 100644 --- a/ports/azure-storage-blobs-cpp/portfile.cmake +++ b/ports/azure-storage-blobs-cpp/portfile.cmake @@ -4,11 +4,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF "azure-storage-blobs_${VERSION}" - SHA512 b8d060c0e26e48c590ecacbe0491361a93f41dbd14a1f76564056b288e47e472e5525588122ba7d12653f43110a56ac88dc66c0ea77fff02dc708978a9dfcfa3 + REF e6eaee72444a2142f7c48318a3f6a230949d79ee + SHA512 3c56c9b2fa4983d1d6c8ad4977317fd41fd1dd218f990cecd0becf021f001e8c24ccf8b833c310a69e6088b6759f7f6ac874385ab1a9f1076fa905afd01ec309 HEAD_REF main - PATCHES - set_version.patch ) if(EXISTS "${SOURCE_PATH}/sdk/storage/azure-storage-blobs") diff --git a/ports/azure-storage-blobs-cpp/set_version.patch b/ports/azure-storage-blobs-cpp/set_version.patch deleted file mode 100644 index 2269eec1d08b6c..00000000000000 --- a/ports/azure-storage-blobs-cpp/set_version.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/sdk/storage/azure-storage-blobs/CMakeLists.txt b/sdk/storage/azure-storage-blobs/CMakeLists.txt -index f87ceae40..d624433d8 100644 ---- a/sdk/storage/azure-storage-blobs/CMakeLists.txt -+++ b/sdk/storage/azure-storage-blobs/CMakeLists.txt -@@ -96,6 +96,7 @@ target_link_libraries(azure-storage-blobs PUBLIC Azure::azure-storage-common) - target_compile_definitions(azure-storage-blobs PRIVATE _azure_BUILDING_SDK) - - get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") -+set_target_properties(azure-storage-blobs PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) - generate_documentation(azure-storage-blobs ${AZ_LIBRARY_VERSION}) - - az_vcpkg_export( diff --git a/ports/azure-storage-blobs-cpp/vcpkg.json b/ports/azure-storage-blobs-cpp/vcpkg.json index 2295214c864dd4..5d89cc6325bb96 100644 --- a/ports/azure-storage-blobs-cpp/vcpkg.json +++ b/ports/azure-storage-blobs-cpp/vcpkg.json @@ -4,8 +4,7 @@ "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp." ], "name": "azure-storage-blobs-cpp", - "version-semver": "12.13.0", - "port-version": 1, + "version-semver": "12.14.0-beta.1", "description": [ "Microsoft Azure Storage Blobs SDK for C++", "This library provides Azure Storage Blobs SDK." diff --git a/ports/azure-storage-common-cpp/portfile.cmake b/ports/azure-storage-common-cpp/portfile.cmake index 6f7a44121f417f..c6c1a64f9efcf3 100644 --- a/ports/azure-storage-common-cpp/portfile.cmake +++ b/ports/azure-storage-common-cpp/portfile.cmake @@ -4,11 +4,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF "azure-storage-common_${VERSION}" - SHA512 2b82ff3e8d4e76c1c7205d363e2e9ff042cf4034c41a0bc7d47591a42c144b09ad6f732ea322ce0c918bcf5de548c88c58a577571182d988b85a4418c51d9f59 + REF e6eaee72444a2142f7c48318a3f6a230949d79ee + SHA512 3c56c9b2fa4983d1d6c8ad4977317fd41fd1dd218f990cecd0becf021f001e8c24ccf8b833c310a69e6088b6759f7f6ac874385ab1a9f1076fa905afd01ec309 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 6cebbe2c1b25fb..00000000000000 --- 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 81ec4d5730682a..c69d2702072d81 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-datalake-cpp/portfile.cmake b/ports/azure-storage-files-datalake-cpp/portfile.cmake index 1fcccbf3611f98..98c0350811ecd8 100644 --- a/ports/azure-storage-files-datalake-cpp/portfile.cmake +++ b/ports/azure-storage-files-datalake-cpp/portfile.cmake @@ -4,11 +4,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF "azure-storage-files-datalake_${VERSION}" - SHA512 fa91118b8f17c6c2800610833f0a6fbb6543a1470d8cdffd1d654516252df62f54496d9dd9756ab5ee0772230dbf58873819fc07a642fdc24af32d255f525de5 + REF e6eaee72444a2142f7c48318a3f6a230949d79ee + SHA512 3c56c9b2fa4983d1d6c8ad4977317fd41fd1dd218f990cecd0becf021f001e8c24ccf8b833c310a69e6088b6759f7f6ac874385ab1a9f1076fa905afd01ec309 HEAD_REF main - PATCHES - set_version.patch ) if(EXISTS "${SOURCE_PATH}/sdk/storage/azure-storage-files-datalake") diff --git a/ports/azure-storage-files-datalake-cpp/set_version.patch b/ports/azure-storage-files-datalake-cpp/set_version.patch deleted file mode 100644 index edc82e88fae3b1..00000000000000 --- a/ports/azure-storage-files-datalake-cpp/set_version.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/sdk/storage/azure-storage-files-datalake/CMakeLists.txt b/sdk/storage/azure-storage-files-datalake/CMakeLists.txt -index 71905c86d..d02850bf1 100644 ---- a/sdk/storage/azure-storage-files-datalake/CMakeLists.txt -+++ b/sdk/storage/azure-storage-files-datalake/CMakeLists.txt -@@ -92,6 +92,7 @@ target_include_directories( - target_link_libraries(azure-storage-files-datalake PUBLIC Azure::azure-storage-blobs) - - get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") -+set_target_properties(azure-storage-files-datalake PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) - generate_documentation(azure-storage-files-datalake ${AZ_LIBRARY_VERSION}) - - az_vcpkg_export( diff --git a/ports/azure-storage-files-datalake-cpp/vcpkg.json b/ports/azure-storage-files-datalake-cpp/vcpkg.json index b49b8cea7d8a5d..b6c1730ec10c63 100644 --- a/ports/azure-storage-files-datalake-cpp/vcpkg.json +++ b/ports/azure-storage-files-datalake-cpp/vcpkg.json @@ -4,8 +4,7 @@ "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp." ], "name": "azure-storage-files-datalake-cpp", - "version-semver": "12.12.0", - "port-version": 1, + "version-semver": "12.13.0-beta.1", "description": [ "Microsoft Azure Storage Files Data Lake SDK for C++", "This library provides Azure Storage Files Data Lake SDK." diff --git a/ports/azure-storage-files-shares-cpp/portfile.cmake b/ports/azure-storage-files-shares-cpp/portfile.cmake index 5785a94fef869e..1d5ae7e0fb0bc0 100644 --- a/ports/azure-storage-files-shares-cpp/portfile.cmake +++ b/ports/azure-storage-files-shares-cpp/portfile.cmake @@ -4,11 +4,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF "azure-storage-files-shares_${VERSION}" - SHA512 56119c742d09164363d10690659513de7491c0274b1afc0ca09ad32c4a6f0252bb63634972403f27142e53df40ef812842150a6d8e9589b73c7fddcd73ed974e + REF e6eaee72444a2142f7c48318a3f6a230949d79ee + SHA512 3c56c9b2fa4983d1d6c8ad4977317fd41fd1dd218f990cecd0becf021f001e8c24ccf8b833c310a69e6088b6759f7f6ac874385ab1a9f1076fa905afd01ec309 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 3ca4422a7d9634..00000000000000 --- 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 77638829f898bc..1dfc698487fbdf 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/ports/azure-storage-queues-cpp/portfile.cmake b/ports/azure-storage-queues-cpp/portfile.cmake index 81c9a8bf3e6662..f1797e8e3595d1 100644 --- a/ports/azure-storage-queues-cpp/portfile.cmake +++ b/ports/azure-storage-queues-cpp/portfile.cmake @@ -4,11 +4,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF "azure-storage-queues_${VERSION}" - SHA512 919353a8cf8c98906bfbe6795245c81ece5a82914f01c8d7083fd6e44f13877f42aefee3ed16c2078befa89e520339b8430e8dc115064bdffdd366b8c83684da + REF e6eaee72444a2142f7c48318a3f6a230949d79ee + SHA512 3c56c9b2fa4983d1d6c8ad4977317fd41fd1dd218f990cecd0becf021f001e8c24ccf8b833c310a69e6088b6759f7f6ac874385ab1a9f1076fa905afd01ec309 HEAD_REF main - PATCHES - set_version.patch ) if(EXISTS "${SOURCE_PATH}/sdk/storage/azure-storage-queues") diff --git a/ports/azure-storage-queues-cpp/set_version.patch b/ports/azure-storage-queues-cpp/set_version.patch deleted file mode 100644 index eb0450c632f542..00000000000000 --- a/ports/azure-storage-queues-cpp/set_version.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/sdk/storage/azure-storage-queues/CMakeLists.txt b/sdk/storage/azure-storage-queues/CMakeLists.txt -index e567623d5..9ffc621ad 100644 ---- a/sdk/storage/azure-storage-queues/CMakeLists.txt -+++ b/sdk/storage/azure-storage-queues/CMakeLists.txt -@@ -81,6 +81,7 @@ target_include_directories( - target_link_libraries(azure-storage-queues PUBLIC Azure::azure-storage-common) - - get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") -+set_target_properties(azure-storage-queues PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) - generate_documentation(azure-storage-queues ${AZ_LIBRARY_VERSION}) - - az_vcpkg_export( diff --git a/ports/azure-storage-queues-cpp/vcpkg.json b/ports/azure-storage-queues-cpp/vcpkg.json index f1f2be238d2c8b..b441f1a956e8d1 100644 --- a/ports/azure-storage-queues-cpp/vcpkg.json +++ b/ports/azure-storage-queues-cpp/vcpkg.json @@ -4,8 +4,7 @@ "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp." ], "name": "azure-storage-queues-cpp", - "version-semver": "12.4.0", - "port-version": 1, + "version-semver": "12.5.0-beta.1", "description": [ "Microsoft Azure Storage Queues SDK for C++", "This library provides Azure Storage Queues SDK." diff --git a/versions/a-/azure-storage-blobs-cpp.json b/versions/a-/azure-storage-blobs-cpp.json index bbdd070aa4d17e..1bf18e773b55b7 100644 --- a/versions/a-/azure-storage-blobs-cpp.json +++ b/versions/a-/azure-storage-blobs-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0b6bdc7ffc712ddea072223de352618be8b185bb", + "version-semver": "12.14.0-beta.1", + "port-version": 0 + }, { "git-tree": "cd9abe94e013e42493479d573f7e7d60a89c5821", "version-semver": "12.13.0", diff --git a/versions/a-/azure-storage-common-cpp.json b/versions/a-/azure-storage-common-cpp.json index 99d17f8c6fc4f0..03632a8568c3c8 100644 --- a/versions/a-/azure-storage-common-cpp.json +++ b/versions/a-/azure-storage-common-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2c6f71c48c25caa2ba3c62ab1b013717646c8176", + "version-semver": "12.9.0", + "port-version": 0 + }, { "git-tree": "a200d88271a1801801abee4e06da137e698cbcec", "version-semver": "12.8.0", diff --git a/versions/a-/azure-storage-files-datalake-cpp.json b/versions/a-/azure-storage-files-datalake-cpp.json index e5be1b5fd9a046..dc88c53846362a 100644 --- a/versions/a-/azure-storage-files-datalake-cpp.json +++ b/versions/a-/azure-storage-files-datalake-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3abb5d1d2858e1470d8bf60f631027fb01dd8989", + "version-semver": "12.13.0-beta.1", + "port-version": 0 + }, { "git-tree": "4932548d090f0897b607b71e7c41720cc975970a", "version-semver": "12.12.0", diff --git a/versions/a-/azure-storage-files-shares-cpp.json b/versions/a-/azure-storage-files-shares-cpp.json index c4dd03a0a67bcb..bc468c1026de23 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": "3e37043731f5419b39e5c1914286dd0a0bf8485d", + "version-semver": "12.12.0", + "port-version": 0 + }, { "git-tree": "dbe687f016f7747967b99e26138e09ff1a098767", "version-semver": "12.11.0", diff --git a/versions/a-/azure-storage-queues-cpp.json b/versions/a-/azure-storage-queues-cpp.json index 91b28e06ed3266..7947ea58677753 100644 --- a/versions/a-/azure-storage-queues-cpp.json +++ b/versions/a-/azure-storage-queues-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c2af8d13437fe430c454b9d49a856711e5ed6ca4", + "version-semver": "12.5.0-beta.1", + "port-version": 0 + }, { "git-tree": "fb06e818a33a9970e3475d03b339f87ef17f8039", "version-semver": "12.4.0", diff --git a/versions/baseline.json b/versions/baseline.json index 048573184a5416..4d474218be5abc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -513,28 +513,28 @@ "port-version": 0 }, "azure-storage-blobs-cpp": { - "baseline": "12.13.0", - "port-version": 1 + "baseline": "12.14.0-beta.1", + "port-version": 0 }, "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", "port-version": 6 }, "azure-storage-files-datalake-cpp": { - "baseline": "12.12.0", - "port-version": 1 + "baseline": "12.13.0-beta.1", + "port-version": 0 }, "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", - "port-version": 1 + "baseline": "12.5.0-beta.1", + "port-version": 0 }, "azure-uamqp-c": { "baseline": "2024-08-12",