From e9b4cc61dead4820b0b7c90cfa94b03975823f68 Mon Sep 17 00:00:00 2001 From: azure-sdk Date: Fri, 22 Nov 2024 21:18:01 +0000 Subject: [PATCH] Daily vcpkg ports for keyvault --- .../portfile.cmake | 6 ++---- .../set_version.patch | 12 ------------ .../vcpkg.json | 3 +-- .../portfile.cmake | 7 ++----- .../set_version.patch | 12 ------------ .../useragent.patch | 13 ------------- .../vcpkg.json | 3 +-- .../portfile.cmake | 7 ++----- .../set_version.patch | 12 ------------ .../useragent.patch | 13 ------------- .../azure-security-keyvault-keys-cpp/vcpkg.json | 3 +-- .../portfile.cmake | 7 ++----- .../set_version.patch | 12 ------------ .../useragent.patch | 13 ------------- .../vcpkg.json | 3 +-- ...ure-security-keyvault-administration-cpp.json | 5 +++++ ...azure-security-keyvault-certificates-cpp.json | 5 +++++ .../a-/azure-security-keyvault-keys-cpp.json | 5 +++++ .../a-/azure-security-keyvault-secrets-cpp.json | 5 +++++ versions/baseline.json | 16 ++++++++-------- 20 files changed, 40 insertions(+), 122 deletions(-) delete mode 100644 ports/azure-security-keyvault-administration-cpp/set_version.patch delete mode 100644 ports/azure-security-keyvault-certificates-cpp/set_version.patch delete mode 100644 ports/azure-security-keyvault-certificates-cpp/useragent.patch delete mode 100644 ports/azure-security-keyvault-keys-cpp/set_version.patch delete mode 100644 ports/azure-security-keyvault-keys-cpp/useragent.patch delete mode 100644 ports/azure-security-keyvault-secrets-cpp/set_version.patch delete mode 100644 ports/azure-security-keyvault-secrets-cpp/useragent.patch diff --git a/ports/azure-security-keyvault-administration-cpp/portfile.cmake b/ports/azure-security-keyvault-administration-cpp/portfile.cmake index 0a99235928..ca8a87777e 100644 --- a/ports/azure-security-keyvault-administration-cpp/portfile.cmake +++ b/ports/azure-security-keyvault-administration-cpp/portfile.cmake @@ -4,11 +4,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF "azure-security-keyvault-administration_${VERSION}" - SHA512 075364958d05b4eace3babbcc700706a02f2125577d3f903ef4ca2cc71245a45963ca5ac82f1e9bd3903c799d3c44846741802cbd917bbc8f65a92d047caf7ef + REF 573ee503d28a7c95e08f488d1bfd911666060bed + SHA512 6287178f7dc34ca6046f889e75607d041eeee0f45eaf4e6d0e7a9e3dc233dd7bcbb1d450f91faf3b884fa7e22c5475204f760420b18bf1a4a18a273046ee5ca4 HEAD_REF main - PATCHES - set_version.patch ) if(EXISTS "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-administration") diff --git a/ports/azure-security-keyvault-administration-cpp/set_version.patch b/ports/azure-security-keyvault-administration-cpp/set_version.patch deleted file mode 100644 index 3d8966f305..0000000000 --- a/ports/azure-security-keyvault-administration-cpp/set_version.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/sdk/keyvault/azure-security-keyvault-administration/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-administration/CMakeLists.txt -index 5f70eb301..45a1181e7 100644 ---- a/sdk/keyvault/azure-security-keyvault-administration/CMakeLists.txt -+++ b/sdk/keyvault/azure-security-keyvault-administration/CMakeLists.txt -@@ -95,6 +95,7 @@ target_compile_definitions(azure-security-keyvault-administration PRIVATE _azure - create_code_coverage(keyvault azure-security-keyvault-administration azure-security-keyvault-administration-test "tests?/*;samples?/*") - - get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") -+set_target_properties(azure-security-keyvault-administration PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) - generate_documentation(azure-security-keyvault-administration ${AZ_LIBRARY_VERSION}) - if(BUILD_TESTING) - diff --git a/ports/azure-security-keyvault-administration-cpp/vcpkg.json b/ports/azure-security-keyvault-administration-cpp/vcpkg.json index 1207ed01c4..aeba8422a5 100644 --- a/ports/azure-security-keyvault-administration-cpp/vcpkg.json +++ b/ports/azure-security-keyvault-administration-cpp/vcpkg.json @@ -4,8 +4,7 @@ "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp." ], "name": "azure-security-keyvault-administration-cpp", - "version-semver": "4.0.0-beta.5", - "port-version": 1, + "version-semver": "4.0.0-beta.6", "description": [ "Microsoft Azure Key Vault Administration SDK for C++", "This library provides Azure Key Vault Administration SDK." diff --git a/ports/azure-security-keyvault-certificates-cpp/portfile.cmake b/ports/azure-security-keyvault-certificates-cpp/portfile.cmake index 1960aae4e6..eacd4ae095 100644 --- a/ports/azure-security-keyvault-certificates-cpp/portfile.cmake +++ b/ports/azure-security-keyvault-certificates-cpp/portfile.cmake @@ -4,12 +4,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF "azure-security-keyvault-certificates_${VERSION}" - SHA512 f18d205ee0be9ab4289860fe4fdc0f4a6c3571eb0a8d0ca0ea66e7fef477e04ed0ba455e1a5af687e0980d7f12b919d1a5c85ee40d41dbcfd695f5d62843dcd5 + REF 573ee503d28a7c95e08f488d1bfd911666060bed + SHA512 6287178f7dc34ca6046f889e75607d041eeee0f45eaf4e6d0e7a9e3dc233dd7bcbb1d450f91faf3b884fa7e22c5475204f760420b18bf1a4a18a273046ee5ca4 HEAD_REF main - PATCHES - useragent.patch - set_version.patch ) if(EXISTS "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-certificates") diff --git a/ports/azure-security-keyvault-certificates-cpp/set_version.patch b/ports/azure-security-keyvault-certificates-cpp/set_version.patch deleted file mode 100644 index e22a1d3ddb..0000000000 --- a/ports/azure-security-keyvault-certificates-cpp/set_version.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt -index 0806e09b0..0c08f1576 100644 ---- a/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt -+++ b/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt -@@ -100,6 +100,7 @@ target_compile_definitions(azure-security-keyvault-certificates PRIVATE _azure_B - create_code_coverage(keyvault azure-security-keyvault-certificates azure-security-keyvault-certificates-test "tests?/*;samples?/*") - - get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") -+set_target_properties(azure-security-keyvault-certificates PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) - generate_documentation(azure-security-keyvault-certificates ${AZ_LIBRARY_VERSION}) - - if(BUILD_TESTING) diff --git a/ports/azure-security-keyvault-certificates-cpp/useragent.patch b/ports/azure-security-keyvault-certificates-cpp/useragent.patch deleted file mode 100644 index 36b878500d..0000000000 --- a/ports/azure-security-keyvault-certificates-cpp/useragent.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt -index 084e41fb6..bae592cb0 100644 ---- a/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt -+++ b/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt -@@ -94,6 +94,8 @@ target_include_directories( - - target_link_libraries(azure-security-keyvault-certificates PUBLIC Azure::azure-core) - -+target_compile_definitions(azure-security-keyvault-certificates PRIVATE _azure_BUILDING_SDK) -+ - # coverage. Has no effect if BUILD_CODE_COVERAGE is OFF - create_code_coverage(keyvault azure-security-keyvault-certificates azure-security-keyvault-certificates-test "tests?/*;samples?/*") - diff --git a/ports/azure-security-keyvault-certificates-cpp/vcpkg.json b/ports/azure-security-keyvault-certificates-cpp/vcpkg.json index fa45bcd04f..f43401be20 100644 --- a/ports/azure-security-keyvault-certificates-cpp/vcpkg.json +++ b/ports/azure-security-keyvault-certificates-cpp/vcpkg.json @@ -4,8 +4,7 @@ "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp." ], "name": "azure-security-keyvault-certificates-cpp", - "version-semver": "4.2.1", - "port-version": 3, + "version-semver": "4.3.0-beta.3", "description": [ "Microsoft Azure Key Vault Certificates SDK for C++", "This library provides Azure Key Vault Certificates SDK." diff --git a/ports/azure-security-keyvault-keys-cpp/portfile.cmake b/ports/azure-security-keyvault-keys-cpp/portfile.cmake index ff865983bc..e8c3d64e3e 100644 --- a/ports/azure-security-keyvault-keys-cpp/portfile.cmake +++ b/ports/azure-security-keyvault-keys-cpp/portfile.cmake @@ -4,12 +4,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF "azure-security-keyvault-keys_${VERSION}" - SHA512 758ff05ce33672d81cf14d347edada2a7c008c7df61639b7bac9ce1a1114144a1f6fcc3d364d1d90f5f9cda8f8c1db14f80873403d4190d4aca1844fb25dd517 + REF 573ee503d28a7c95e08f488d1bfd911666060bed + SHA512 6287178f7dc34ca6046f889e75607d041eeee0f45eaf4e6d0e7a9e3dc233dd7bcbb1d450f91faf3b884fa7e22c5475204f760420b18bf1a4a18a273046ee5ca4 HEAD_REF main - PATCHES - useragent.patch - set_version.patch ) if(EXISTS "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-keys") diff --git a/ports/azure-security-keyvault-keys-cpp/set_version.patch b/ports/azure-security-keyvault-keys-cpp/set_version.patch deleted file mode 100644 index 49ab6c0cb2..0000000000 --- a/ports/azure-security-keyvault-keys-cpp/set_version.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt -index 6217fd13f..d5b6db60a 100644 ---- a/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt -+++ b/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt -@@ -138,6 +138,7 @@ target_compile_definitions(azure-security-keyvault-keys PRIVATE _azure_BUILDING_ - create_code_coverage(keyvault azure-security-keyvault-keys azure-security-keyvault-keys-test "tests?/*;samples?/*") - - get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") -+set_target_properties(azure-security-keyvault-keys PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) - generate_documentation(azure-security-keyvault-keys ${AZ_LIBRARY_VERSION}) - - if(BUILD_TESTING) diff --git a/ports/azure-security-keyvault-keys-cpp/useragent.patch b/ports/azure-security-keyvault-keys-cpp/useragent.patch deleted file mode 100644 index 2ca7de9f4f..0000000000 --- a/ports/azure-security-keyvault-keys-cpp/useragent.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt -index 18098c757..7bda8dba0 100644 ---- a/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt -+++ b/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt -@@ -132,6 +132,8 @@ target_include_directories( - - target_link_libraries(azure-security-keyvault-keys PUBLIC Azure::azure-core) - -+target_compile_definitions(azure-security-keyvault-keys PRIVATE _azure_BUILDING_SDK) -+ - # coverage. Has no effect if BUILD_CODE_COVERAGE is OFF - create_code_coverage(keyvault azure-security-keyvault-keys azure-security-keyvault-keys-test "tests?/*;samples?/*") - diff --git a/ports/azure-security-keyvault-keys-cpp/vcpkg.json b/ports/azure-security-keyvault-keys-cpp/vcpkg.json index badfdb2255..3f3b1d86dc 100644 --- a/ports/azure-security-keyvault-keys-cpp/vcpkg.json +++ b/ports/azure-security-keyvault-keys-cpp/vcpkg.json @@ -4,8 +4,7 @@ "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp." ], "name": "azure-security-keyvault-keys-cpp", - "version-semver": "4.4.1", - "port-version": 3, + "version-semver": "4.5.0-beta.3", "description": [ "Microsoft Azure Key Vault Keys SDK for C++", "This library provides Azure Key Vault Keys SDK." diff --git a/ports/azure-security-keyvault-secrets-cpp/portfile.cmake b/ports/azure-security-keyvault-secrets-cpp/portfile.cmake index 5f17c65e03..2ea838cc23 100644 --- a/ports/azure-security-keyvault-secrets-cpp/portfile.cmake +++ b/ports/azure-security-keyvault-secrets-cpp/portfile.cmake @@ -4,12 +4,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF "azure-security-keyvault-secrets_${VERSION}" - SHA512 8d944bbcc29b670b884234a789455bb6b33e33fa45c7b02a4200c2267189597cb849f3cbbaa5f7c4db013ec74a2ea0b073237254db7fcac96c290888c05dcba5 + REF 573ee503d28a7c95e08f488d1bfd911666060bed + SHA512 6287178f7dc34ca6046f889e75607d041eeee0f45eaf4e6d0e7a9e3dc233dd7bcbb1d450f91faf3b884fa7e22c5475204f760420b18bf1a4a18a273046ee5ca4 HEAD_REF main - PATCHES - useragent.patch - set_version.patch ) if(EXISTS "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-secrets") diff --git a/ports/azure-security-keyvault-secrets-cpp/set_version.patch b/ports/azure-security-keyvault-secrets-cpp/set_version.patch deleted file mode 100644 index 623ee43893..0000000000 --- a/ports/azure-security-keyvault-secrets-cpp/set_version.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt -index e5acb6001..647285994 100644 ---- a/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt -+++ b/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt -@@ -133,6 +133,7 @@ target_compile_definitions(azure-security-keyvault-secrets PRIVATE _azure_BUILDI - create_code_coverage(keyvault azure-security-keyvault-secrets azure-security-keyvault-secrets-test "tests?/*;samples?/*") - - get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") -+set_target_properties(azure-security-keyvault-secrets PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) - generate_documentation(azure-security-keyvault-secrets ${AZ_LIBRARY_VERSION}) - if(BUILD_TESTING) - diff --git a/ports/azure-security-keyvault-secrets-cpp/useragent.patch b/ports/azure-security-keyvault-secrets-cpp/useragent.patch deleted file mode 100644 index 8f6e46cc76..0000000000 --- a/ports/azure-security-keyvault-secrets-cpp/useragent.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt -index 280208205..e04413950 100644 ---- a/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt -+++ b/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt -@@ -97,6 +97,8 @@ target_include_directories( - - target_link_libraries(azure-security-keyvault-secrets PUBLIC Azure::azure-core) - -+target_compile_definitions(azure-security-keyvault-secrets PRIVATE _azure_BUILDING_SDK) -+ - # coverage. Has no effect if BUILD_CODE_COVERAGE is OFF - create_code_coverage(keyvault azure-security-keyvault-secrets azure-security-keyvault-secrets-test "tests?/*;samples?/*") - diff --git a/ports/azure-security-keyvault-secrets-cpp/vcpkg.json b/ports/azure-security-keyvault-secrets-cpp/vcpkg.json index 1bc75c16d8..683ba6055e 100644 --- a/ports/azure-security-keyvault-secrets-cpp/vcpkg.json +++ b/ports/azure-security-keyvault-secrets-cpp/vcpkg.json @@ -4,8 +4,7 @@ "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp." ], "name": "azure-security-keyvault-secrets-cpp", - "version-semver": "4.2.1", - "port-version": 3, + "version-semver": "4.3.0-beta.3", "description": [ "Microsoft Azure Key Vault Secrets SDK for C++", "This library provides Azure Key Vault Secrets SDK." diff --git a/versions/a-/azure-security-keyvault-administration-cpp.json b/versions/a-/azure-security-keyvault-administration-cpp.json index 24d934348d..e586efff47 100644 --- a/versions/a-/azure-security-keyvault-administration-cpp.json +++ b/versions/a-/azure-security-keyvault-administration-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9cd93fb9263453bb9542ce34ae3111db3dd82e6f", + "version-semver": "4.0.0-beta.6", + "port-version": 0 + }, { "git-tree": "a6ee89f64c55c1202b7d71fd7551916ea5e62d93", "version-semver": "4.0.0-beta.5", diff --git a/versions/a-/azure-security-keyvault-certificates-cpp.json b/versions/a-/azure-security-keyvault-certificates-cpp.json index 47dc4d2499..df4b214dc4 100644 --- a/versions/a-/azure-security-keyvault-certificates-cpp.json +++ b/versions/a-/azure-security-keyvault-certificates-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5fc71159cc5e66569faf4c4457a4993e7064e159", + "version-semver": "4.3.0-beta.3", + "port-version": 0 + }, { "git-tree": "04bc0d3763fbdd8773ae5ef3f00107f3a2bb3c70", "version-semver": "4.2.1", diff --git a/versions/a-/azure-security-keyvault-keys-cpp.json b/versions/a-/azure-security-keyvault-keys-cpp.json index 99fd3e5b1a..3409ef1100 100644 --- a/versions/a-/azure-security-keyvault-keys-cpp.json +++ b/versions/a-/azure-security-keyvault-keys-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0d7af3c58e95cefa339f1d80ae046d5a9298f6cd", + "version-semver": "4.5.0-beta.3", + "port-version": 0 + }, { "git-tree": "4afe6efdcdc0e5df2c45c177a8ad5f4815fb98b2", "version-semver": "4.4.1", diff --git a/versions/a-/azure-security-keyvault-secrets-cpp.json b/versions/a-/azure-security-keyvault-secrets-cpp.json index b1d600e844..4d5ca8765e 100644 --- a/versions/a-/azure-security-keyvault-secrets-cpp.json +++ b/versions/a-/azure-security-keyvault-secrets-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7d6c359c3602f4b9207a5c5fbdab2ce7f4dbf289", + "version-semver": "4.3.0-beta.3", + "port-version": 0 + }, { "git-tree": "59fc00624617f87b2f6cc2001dc559d87b78c604", "version-semver": "4.2.1", diff --git a/versions/baseline.json b/versions/baseline.json index ef39f525d6..e2d9594067 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -501,20 +501,20 @@ "port-version": 0 }, "azure-security-keyvault-administration-cpp": { - "baseline": "4.0.0-beta.5", - "port-version": 1 + "baseline": "4.0.0-beta.6", + "port-version": 0 }, "azure-security-keyvault-certificates-cpp": { - "baseline": "4.2.1", - "port-version": 3 + "baseline": "4.3.0-beta.3", + "port-version": 0 }, "azure-security-keyvault-keys-cpp": { - "baseline": "4.4.1", - "port-version": 3 + "baseline": "4.5.0-beta.3", + "port-version": 0 }, "azure-security-keyvault-secrets-cpp": { - "baseline": "4.2.1", - "port-version": 3 + "baseline": "4.3.0-beta.3", + "port-version": 0 }, "azure-storage-blobs-cpp": { "baseline": "12.13.0",