From ac71b118e373e6127c6bbf004a9affc3f79ab59d Mon Sep 17 00:00:00 2001 From: azure-sdk Date: Fri, 20 Dec 2024 22:16:42 +0000 Subject: [PATCH] Daily vcpkg ports for storage --- ports/azure-storage-blobs-cpp/portfile.cmake | 6 ++---- ports/azure-storage-blobs-cpp/set_version.patch | 12 ------------ ports/azure-storage-blobs-cpp/vcpkg.json | 3 +-- ports/azure-storage-common-cpp/portfile.cmake | 4 ++-- ports/azure-storage-common-cpp/vcpkg.json | 2 +- .../portfile.cmake | 6 ++---- .../set_version.patch | 12 ------------ .../azure-storage-files-datalake-cpp/vcpkg.json | 3 +-- .../portfile.cmake | 4 ++-- ports/azure-storage-files-shares-cpp/vcpkg.json | 2 +- ports/azure-storage-queues-cpp/portfile.cmake | 6 ++---- ports/azure-storage-queues-cpp/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 +++++ versions/a-/azure-storage-files-shares-cpp.json | 5 +++++ versions/a-/azure-storage-queues-cpp.json | 5 +++++ versions/baseline.json | 16 ++++++++-------- 19 files changed, 48 insertions(+), 68 deletions(-) delete mode 100644 ports/azure-storage-blobs-cpp/set_version.patch delete mode 100644 ports/azure-storage-files-datalake-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..94398ce0ccc56c 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 049b7a6fe699334d8c03b32cd459357b90c2c27f + SHA512 5277907a405ed229846c6b50e33be3873b778bcacf76925e454f5c75ba39b4f1a2e7461f40e0b2896b8267de274107a0078fd533929063c2aebc99cba5c097ac 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 26adb9d3b604cf..a4ae4686abc014 100644 --- a/ports/azure-storage-common-cpp/portfile.cmake +++ b/ports/azure-storage-common-cpp/portfile.cmake @@ -4,8 +4,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF "azure-storage-common_${VERSION}" - SHA512 fad728edbbd062f00640027c5ce87fc2048674aff7269807160abcabfd0b36c1716f0bbf27e9724c0207585fc81600ce3886c0417b9ac2177bba54a111d8e081 + REF 049b7a6fe699334d8c03b32cd459357b90c2c27f + SHA512 5277907a405ed229846c6b50e33be3873b778bcacf76925e454f5c75ba39b4f1a2e7461f40e0b2896b8267de274107a0078fd533929063c2aebc99cba5c097ac HEAD_REF main ) diff --git a/ports/azure-storage-common-cpp/vcpkg.json b/ports/azure-storage-common-cpp/vcpkg.json index c69d2702072d81..7aa54a37079257 100644 --- a/ports/azure-storage-common-cpp/vcpkg.json +++ b/ports/azure-storage-common-cpp/vcpkg.json @@ -4,7 +4,7 @@ "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp." ], "name": "azure-storage-common-cpp", - "version-semver": "12.9.0", + "version-semver": "12.10.0-beta.1", "description": [ "Microsoft Azure Common Storage SDK for C++", "This library provides common Azure Storage-related abstractions for Azure SDK." diff --git a/ports/azure-storage-files-datalake-cpp/portfile.cmake b/ports/azure-storage-files-datalake-cpp/portfile.cmake index 1fcccbf3611f98..4b014122b805ed 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 049b7a6fe699334d8c03b32cd459357b90c2c27f + SHA512 5277907a405ed229846c6b50e33be3873b778bcacf76925e454f5c75ba39b4f1a2e7461f40e0b2896b8267de274107a0078fd533929063c2aebc99cba5c097ac 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 9bea8dd3d82650..1aada271cf3fbb 100644 --- a/ports/azure-storage-files-shares-cpp/portfile.cmake +++ b/ports/azure-storage-files-shares-cpp/portfile.cmake @@ -4,8 +4,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF "azure-storage-files-shares_${VERSION}" - SHA512 296e0798c9a831ba16bcfd9b29d2bc8613a2b7d6a117bfccb46f49f4d5d91caf8e1fbb82465dca5daae3305656cf44bee2f78ad0341a8e13b36940938317b45c + REF 049b7a6fe699334d8c03b32cd459357b90c2c27f + SHA512 5277907a405ed229846c6b50e33be3873b778bcacf76925e454f5c75ba39b4f1a2e7461f40e0b2896b8267de274107a0078fd533929063c2aebc99cba5c097ac HEAD_REF main ) diff --git a/ports/azure-storage-files-shares-cpp/vcpkg.json b/ports/azure-storage-files-shares-cpp/vcpkg.json index 1dfc698487fbdf..2f96e8f2e1bcab 100644 --- a/ports/azure-storage-files-shares-cpp/vcpkg.json +++ b/ports/azure-storage-files-shares-cpp/vcpkg.json @@ -4,7 +4,7 @@ "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp." ], "name": "azure-storage-files-shares-cpp", - "version-semver": "12.12.0", + "version-semver": "12.13.0-beta.1", "description": [ "Microsoft Azure Storage Files Shares SDK for C++", "This library provides Azure Storage Files Shares SDK." diff --git a/ports/azure-storage-queues-cpp/portfile.cmake b/ports/azure-storage-queues-cpp/portfile.cmake index 81c9a8bf3e6662..a0c2fb91026698 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 049b7a6fe699334d8c03b32cd459357b90c2c27f + SHA512 5277907a405ed229846c6b50e33be3873b778bcacf76925e454f5c75ba39b4f1a2e7461f40e0b2896b8267de274107a0078fd533929063c2aebc99cba5c097ac 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..425b0ed2674c29 100644 --- a/versions/a-/azure-storage-blobs-cpp.json +++ b/versions/a-/azure-storage-blobs-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d557b533004cce2c23458bd7c2a4fe924912f74a", + "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 70d795dde18fb9..e277be54a6af0f 100644 --- a/versions/a-/azure-storage-common-cpp.json +++ b/versions/a-/azure-storage-common-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "72eecc807114ab8b81a86dcb647c879608b3f79d", + "version-semver": "12.10.0-beta.1", + "port-version": 0 + }, { "git-tree": "8c1ba485d656f727ec4441d5c5b3a1bba79f951a", "version-semver": "12.9.0", diff --git a/versions/a-/azure-storage-files-datalake-cpp.json b/versions/a-/azure-storage-files-datalake-cpp.json index e5be1b5fd9a046..951d43d878ecd0 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": "d38940f4931164e4248530e4d68ab496364f3808", + "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 f1ed1aab10d125..a1d8147d7741bc 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": "2bebf68ca69540cbf193f3562c007c671d01f4bd", + "version-semver": "12.13.0-beta.1", + "port-version": 0 + }, { "git-tree": "2fd221be0ffac626d014208273dce26e7b53b6ec", "version-semver": "12.12.0", diff --git a/versions/a-/azure-storage-queues-cpp.json b/versions/a-/azure-storage-queues-cpp.json index 91b28e06ed3266..9a8e5cc987adc0 100644 --- a/versions/a-/azure-storage-queues-cpp.json +++ b/versions/a-/azure-storage-queues-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c9068920b81a710353d1308b998dedcfb45e2b2b", + "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 41d5fe13661458..88d32da18767ca 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -513,11 +513,11 @@ "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.9.0", + "baseline": "12.10.0-beta.1", "port-version": 0 }, "azure-storage-cpp": { @@ -525,16 +525,16 @@ "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.12.0", + "baseline": "12.13.0-beta.1", "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",