From 7332432efd3af148ffadc5d1a4ad833f869e1e92 Mon Sep 17 00:00:00 2001 From: Anton Kolesnyk <41349689+antkmsft@users.noreply.github.com> Date: Tue, 24 Aug 2021 16:10:07 -0700 Subject: [PATCH] Re-add vcpkg version constraints (#2781) Co-authored-by: Anton Kolesnyk --- sdk/identity/azure-identity/vcpkg/vcpkg.json | 3 ++- sdk/keyvault/azure-security-keyvault-common/vcpkg/vcpkg.json | 3 ++- sdk/keyvault/azure-security-keyvault-keys/vcpkg/vcpkg.json | 3 ++- sdk/keyvault/azure-security-keyvault-secrets/vcpkg/vcpkg.json | 3 ++- sdk/storage/azure-storage-blobs/vcpkg/vcpkg.json | 3 ++- sdk/storage/azure-storage-common/vcpkg/vcpkg.json | 3 ++- sdk/storage/azure-storage-files-datalake/vcpkg/vcpkg.json | 3 ++- sdk/storage/azure-storage-files-shares/vcpkg/vcpkg.json | 3 ++- sdk/storage/azure-storage-queues/vcpkg/vcpkg.json | 3 ++- sdk/template/azure-template/CMakeLists.txt | 4 ++-- sdk/template/azure-template/vcpkg/Config.cmake.in | 2 +- sdk/template/azure-template/vcpkg/vcpkg.json | 3 ++- 12 files changed, 23 insertions(+), 13 deletions(-) diff --git a/sdk/identity/azure-identity/vcpkg/vcpkg.json b/sdk/identity/azure-identity/vcpkg/vcpkg.json index 30354a2b9..64ae0d800 100644 --- a/sdk/identity/azure-identity/vcpkg/vcpkg.json +++ b/sdk/identity/azure-identity/vcpkg/vcpkg.json @@ -13,7 +13,8 @@ "dependencies": [ { "name": "azure-core-cpp", - "default-features": false + "default-features": false, + "version>=": "1.2.0" }, { "name": "vcpkg-cmake", diff --git a/sdk/keyvault/azure-security-keyvault-common/vcpkg/vcpkg.json b/sdk/keyvault/azure-security-keyvault-common/vcpkg/vcpkg.json index e15236361..9a70f4f8f 100644 --- a/sdk/keyvault/azure-security-keyvault-common/vcpkg/vcpkg.json +++ b/sdk/keyvault/azure-security-keyvault-common/vcpkg/vcpkg.json @@ -13,7 +13,8 @@ "dependencies": [ { "name": "azure-core-cpp", - "default-features": false + "default-features": false, + "version>=": "1.2.0" }, { "name": "vcpkg-cmake", diff --git a/sdk/keyvault/azure-security-keyvault-keys/vcpkg/vcpkg.json b/sdk/keyvault/azure-security-keyvault-keys/vcpkg/vcpkg.json index 0f426bfa7..7a3b1483e 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/vcpkg/vcpkg.json +++ b/sdk/keyvault/azure-security-keyvault-keys/vcpkg/vcpkg.json @@ -13,7 +13,8 @@ "dependencies": [ { "name": "azure-core-cpp", - "default-features": false + "default-features": false, + "version>=": "1.2.0" }, { "name": "vcpkg-cmake", diff --git a/sdk/keyvault/azure-security-keyvault-secrets/vcpkg/vcpkg.json b/sdk/keyvault/azure-security-keyvault-secrets/vcpkg/vcpkg.json index 0731e8159..f77fa487e 100644 --- a/sdk/keyvault/azure-security-keyvault-secrets/vcpkg/vcpkg.json +++ b/sdk/keyvault/azure-security-keyvault-secrets/vcpkg/vcpkg.json @@ -13,7 +13,8 @@ "dependencies": [ { "name": "azure-core-cpp", - "default-features": false + "default-features": false, + "version>=": "1.2.0" }, { "name": "vcpkg-cmake", diff --git a/sdk/storage/azure-storage-blobs/vcpkg/vcpkg.json b/sdk/storage/azure-storage-blobs/vcpkg/vcpkg.json index 6c02197da..01b1acb8a 100644 --- a/sdk/storage/azure-storage-blobs/vcpkg/vcpkg.json +++ b/sdk/storage/azure-storage-blobs/vcpkg/vcpkg.json @@ -13,7 +13,8 @@ "dependencies": [ { "name": "azure-storage-common-cpp", - "default-features": false + "default-features": false, + "version>=": "12.1.0" }, { "name": "vcpkg-cmake", diff --git a/sdk/storage/azure-storage-common/vcpkg/vcpkg.json b/sdk/storage/azure-storage-common/vcpkg/vcpkg.json index bbada0d55..851f77d45 100644 --- a/sdk/storage/azure-storage-common/vcpkg/vcpkg.json +++ b/sdk/storage/azure-storage-common/vcpkg/vcpkg.json @@ -13,7 +13,8 @@ "dependencies": [ { "name": "azure-core-cpp", - "default-features": false + "default-features": false, + "version>=": "1.0.0" }, "libxml2", { diff --git a/sdk/storage/azure-storage-files-datalake/vcpkg/vcpkg.json b/sdk/storage/azure-storage-files-datalake/vcpkg/vcpkg.json index 1712adb0e..9246e4570 100644 --- a/sdk/storage/azure-storage-files-datalake/vcpkg/vcpkg.json +++ b/sdk/storage/azure-storage-files-datalake/vcpkg/vcpkg.json @@ -13,7 +13,8 @@ "dependencies": [ { "name": "azure-storage-blobs-cpp", - "default-features": false + "default-features": false, + "version>=": "12.1.0" }, { "name": "vcpkg-cmake", diff --git a/sdk/storage/azure-storage-files-shares/vcpkg/vcpkg.json b/sdk/storage/azure-storage-files-shares/vcpkg/vcpkg.json index fe83d2926..6f0e1bf3c 100644 --- a/sdk/storage/azure-storage-files-shares/vcpkg/vcpkg.json +++ b/sdk/storage/azure-storage-files-shares/vcpkg/vcpkg.json @@ -13,7 +13,8 @@ "dependencies": [ { "name": "azure-storage-common-cpp", - "default-features": false + "default-features": false, + "version>=": "12.1.0" }, { "name": "vcpkg-cmake", diff --git a/sdk/storage/azure-storage-queues/vcpkg/vcpkg.json b/sdk/storage/azure-storage-queues/vcpkg/vcpkg.json index a90388ca4..efcf138b3 100644 --- a/sdk/storage/azure-storage-queues/vcpkg/vcpkg.json +++ b/sdk/storage/azure-storage-queues/vcpkg/vcpkg.json @@ -13,7 +13,8 @@ "dependencies": [ { "name": "azure-storage-common-cpp", - "default-features": false + "default-features": false, + "version>=": "12.1.0" }, { "name": "vcpkg-cmake", diff --git a/sdk/template/azure-template/CMakeLists.txt b/sdk/template/azure-template/CMakeLists.txt index adf506a12..805064087 100644 --- a/sdk/template/azure-template/CMakeLists.txt +++ b/sdk/template/azure-template/CMakeLists.txt @@ -20,9 +20,9 @@ include(AzureGlobalCompileOptions) az_vcpkg_integrate() if(NOT AZ_ALL_LIBRARIES) - find_package(azure-core-cpp "1.0.0" CONFIG QUIET) + find_package(azure-core-cpp "1.2.0" CONFIG QUIET) if(NOT azure-core-cpp_FOUND) - find_package(azure-core-cpp "1.0.0" REQUIRED) + find_package(azure-core-cpp "1.2.0" REQUIRED) endif() endif() diff --git a/sdk/template/azure-template/vcpkg/Config.cmake.in b/sdk/template/azure-template/vcpkg/Config.cmake.in index 2be062bde..0551b8926 100644 --- a/sdk/template/azure-template/vcpkg/Config.cmake.in +++ b/sdk/template/azure-template/vcpkg/Config.cmake.in @@ -4,7 +4,7 @@ @PACKAGE_INIT@ include(CMakeFindDependencyMacro) -find_dependency(azure-core-cpp "1.0.0") +find_dependency(azure-core-cpp "1.2.0") include("${CMAKE_CURRENT_LIST_DIR}/azure-template-cppTargets.cmake") diff --git a/sdk/template/azure-template/vcpkg/vcpkg.json b/sdk/template/azure-template/vcpkg/vcpkg.json index dfb83a0e1..1c3a1583c 100644 --- a/sdk/template/azure-template/vcpkg/vcpkg.json +++ b/sdk/template/azure-template/vcpkg/vcpkg.json @@ -14,7 +14,8 @@ "dependencies": [ { "name": "azure-core-cpp", - "default-features": false + "default-features": false, + "version>=": "1.2.0" }, { "name": "vcpkg-cmake",