Clean up version requirements (#4814)

* Clean up version requirements * Revert curl back to 7.44 * Update vcpkg.json --------- Co-authored-by: Anton Kolesnyk <antkmsft@users.noreply.github.com>
2023-07-20 16:03:57 -07:00 · 2023-07-20 16:03:57 -07:00 · 0a175f2c83
commit 0a175f2c83
parent 7d52c01d18
27 changed files with 40 additions and 41 deletions
--- a/sdk/attestation/azure-security-attestation/vcpkg/Config.cmake.in
+++ b/sdk/attestation/azure-security-attestation/vcpkg/Config.cmake.in
@ -4,7 +4,7 @@
@PACKAGE_INIT@

 include(CMakeFindDependencyMacro)
-find_dependency(azure-core-cpp "1.8.0")
+find_dependency(azure-core-cpp)
 find_dependency(OpenSSL)

 include("${CMAKE_CURRENT_LIST_DIR}/azure-security-attestation-cppTargets.cmake")
--- a/sdk/core/azure-core-tracing-opentelemetry/vcpkg/Config.cmake.in
+++ b/sdk/core/azure-core-tracing-opentelemetry/vcpkg/Config.cmake.in
@ -4,7 +4,7 @@
@PACKAGE_INIT@

 include(CMakeFindDependencyMacro)
-find_dependency(azure-core-cpp "1.8.0")
+find_dependency(azure-core-cpp)
 find_dependency(Threads)

 find_dependency(opentelemetry-cpp)
--- a/sdk/core/azure-core/CMakeLists.txt
+++ b/sdk/core/azure-core/CMakeLists.txt
@ -26,12 +26,9 @@ include(CreateMapFile)
 find_package(Threads REQUIRED)

 if(BUILD_TRANSPORT_CURL)
-  # min version for `CURLSSLOPT_NO_REVOKE`
-  # https://curl.haxx.se/libcurl/c/CURLOPT_SSL_OPTIONS.html
-  set(CURL_MIN_REQUIRED_VERSION 7.44)
-  find_package(CURL ${CURL_MIN_REQUIRED_VERSION} CONFIG QUIET)
+  find_package(CURL CONFIG QUIET)
  if(NOT CURL_FOUND)
-    find_package(CURL ${CURL_MIN_REQUIRED_VERSION} REQUIRED)
+    find_package(CURL REQUIRED)
  endif()
  message("Libcurl version ${CURL_VERSION_STRING}")
 endif()
--- a/sdk/core/azure-core/vcpkg.json
+++ b/sdk/core/azure-core/vcpkg.json
@ -35,7 +35,8 @@
          "default-features": false,
          "features": [
            "ssl"
-          ]
+          ],
+          "version>=": "7.44"
        }
      ]
    },
--- a/sdk/core/azure-core/vcpkg/Config.cmake.in
+++ b/sdk/core/azure-core/vcpkg/Config.cmake.in
@ -7,7 +7,7 @@ include(CMakeFindDependencyMacro)
 find_dependency(Threads)

 if(@BUILD_TRANSPORT_CURL@)
-  find_dependency(CURL @CURL_MIN_REQUIRED_VERSION@)
+  find_dependency(CURL)
 endif()

 if(@BUILD_TRANSPORT_WINHTTP@)
--- a/sdk/core/azure-core/vcpkg/vcpkg.json
+++ b/sdk/core/azure-core/vcpkg/vcpkg.json
@ -40,7 +40,8 @@
          "default-features": false,
          "features": [
            "ssl"
-          ]
+          ],
+          "version>=": "7.44"
        }
      ]
    },
--- a/sdk/identity/azure-identity/vcpkg/Config.cmake.in
+++ b/sdk/identity/azure-identity/vcpkg/Config.cmake.in
@ -4,7 +4,7 @@
@PACKAGE_INIT@

 include(CMakeFindDependencyMacro)
-find_dependency(azure-core-cpp "1.9.0")
+find_dependency(azure-core-cpp)

 find_dependency(OpenSSL)

--- a/sdk/keyvault/azure-security-keyvault-administration/CMakeLists.txt
+++ b/sdk/keyvault/azure-security-keyvault-administration/CMakeLists.txt
@ -39,9 +39,9 @@ if(FETCH_SOURCE_DEPS)
        add_subdirectory(${oneFolder})
    endforeach()
 elseif(NOT AZ_ALL_LIBRARIES)
-  find_package(azure-core-cpp "1.7.2" CONFIG QUIET)
+  find_package(azure-core-cpp CONFIG QUIET)
  if(NOT azure-core-cpp_FOUND)
-    find_package(azure-core-cpp "1.7.2" REQUIRED)
+    find_package(azure-core-cpp REQUIRED)
  endif()
 endif()

--- a/sdk/keyvault/azure-security-keyvault-administration/vcpkg/Config.cmake.in
+++ b/sdk/keyvault/azure-security-keyvault-administration/vcpkg/Config.cmake.in
@ -4,7 +4,7 @@
@PACKAGE_INIT@

 include(CMakeFindDependencyMacro)
-find_dependency(azure-core-cpp "1.9.0")
+find_dependency(azure-core-cpp)

 include("${CMAKE_CURRENT_LIST_DIR}/azure-security-keyvault-administration-cppTargets.cmake")

--- a/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt
+++ b/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt
@ -40,9 +40,9 @@ if(FETCH_SOURCE_DEPS)
        add_subdirectory(${oneFolder} EXCLUDE_FROM_ALL)
    endforeach()
 elseif(NOT AZ_ALL_LIBRARIES)
-  find_package(azure-core-cpp "1.5.0" CONFIG QUIET)
+  find_package(azure-core-cpp CONFIG QUIET)
  if(NOT azure-core-cpp_FOUND)
-    find_package(azure-core-cpp "1.5.0" REQUIRED)
+    find_package(azure-core-cpp REQUIRED)
  endif()
 endif()

--- a/sdk/keyvault/azure-security-keyvault-certificates/vcpkg/Config.cmake.in
+++ b/sdk/keyvault/azure-security-keyvault-certificates/vcpkg/Config.cmake.in
@ -4,7 +4,7 @@
@PACKAGE_INIT@

 include(CMakeFindDependencyMacro)
-find_dependency(azure-core-cpp "1.9.0")
+find_dependency(azure-core-cpp)

 include("${CMAKE_CURRENT_LIST_DIR}/azure-security-keyvault-certificates-cppTargets.cmake")

--- a/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt
+++ b/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt
@ -39,9 +39,9 @@ if(FETCH_SOURCE_DEPS)
        add_subdirectory(${oneFolder} EXCLUDE_FROM_ALL)
    endforeach()
 elseif(NOT AZ_ALL_LIBRARIES)
-  find_package(azure-core-cpp "1.5.0" CONFIG QUIET)
+  find_package(azure-core-cpp CONFIG QUIET)
  if(NOT azure-core-cpp_FOUND)
-    find_package(azure-core-cpp "1.5.0" REQUIRED)
+    find_package(azure-core-cpp REQUIRED)
  endif()
 endif()

--- a/sdk/keyvault/azure-security-keyvault-keys/vcpkg/Config.cmake.in
+++ b/sdk/keyvault/azure-security-keyvault-keys/vcpkg/Config.cmake.in
@ -4,7 +4,7 @@
@PACKAGE_INIT@

 include(CMakeFindDependencyMacro)
-find_dependency(azure-core-cpp "1.9.0")
+find_dependency(azure-core-cpp)

 include("${CMAKE_CURRENT_LIST_DIR}/azure-security-keyvault-keys-cppTargets.cmake")

--- a/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt
+++ b/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt
@ -39,9 +39,9 @@ if(FETCH_SOURCE_DEPS)
        add_subdirectory(${oneFolder})
    endforeach()
 elseif(NOT AZ_ALL_LIBRARIES)
-  find_package(azure-core-cpp "1.5.0" CONFIG QUIET)
+  find_package(azure-core-cpp CONFIG QUIET)
  if(NOT azure-core-cpp_FOUND)
-    find_package(azure-core-cpp "1.5.0" REQUIRED)
+    find_package(azure-core-cpp REQUIRED)
  endif()
 endif()

--- a/sdk/keyvault/azure-security-keyvault-secrets/vcpkg/Config.cmake.in
+++ b/sdk/keyvault/azure-security-keyvault-secrets/vcpkg/Config.cmake.in
@ -4,7 +4,7 @@
@PACKAGE_INIT@

 include(CMakeFindDependencyMacro)
-find_dependency(azure-core-cpp "1.9.0")
+find_dependency(azure-core-cpp)

 include("${CMAKE_CURRENT_LIST_DIR}/azure-security-keyvault-secrets-cppTargets.cmake")

--- a/sdk/storage/azure-storage-blobs/CMakeLists.txt
+++ b/sdk/storage/azure-storage-blobs/CMakeLists.txt
@ -33,9 +33,9 @@ if(FETCH_SOURCE_DEPS)
        add_subdirectory(${oneFolder} EXCLUDE_FROM_ALL)
    endforeach()
 elseif(NOT AZ_ALL_LIBRARIES)
-  find_package(azure-storage-common-cpp "12.3.1" CONFIG QUIET)
+  find_package(azure-storage-common-cpp CONFIG QUIET)
  if(NOT azure-storage-common-cpp_FOUND)
-    find_package(azure-storage-common-cpp "12.3.1" REQUIRED)
+    find_package(azure-storage-common-cpp REQUIRED)
  endif()
 endif()

--- a/sdk/storage/azure-storage-blobs/vcpkg/Config.cmake.in
+++ b/sdk/storage/azure-storage-blobs/vcpkg/Config.cmake.in
@ -4,7 +4,7 @@
@PACKAGE_INIT@

 include(CMakeFindDependencyMacro)
-find_dependency(azure-storage-common-cpp "12.3.1")
+find_dependency(azure-storage-common-cpp)

 include("${CMAKE_CURRENT_LIST_DIR}/azure-storage-blobs-cppTargets.cmake")

--- a/sdk/storage/azure-storage-common/CMakeLists.txt
+++ b/sdk/storage/azure-storage-common/CMakeLists.txt
@ -33,9 +33,9 @@ if(FETCH_SOURCE_DEPS)
        add_subdirectory(${oneFolder} EXCLUDE_FROM_ALL)
    endforeach()
 elseif(NOT AZ_ALL_LIBRARIES)
-  find_package(azure-core-cpp "1.9.0" CONFIG QUIET)
+  find_package(azure-core-cpp CONFIG QUIET)
  if(NOT azure-core-cpp_FOUND)
-    find_package(azure-core-cpp "1.9.0" REQUIRED)
+    find_package(azure-core-cpp REQUIRED)
  endif()
 endif()

--- a/sdk/storage/azure-storage-common/vcpkg/Config.cmake.in
+++ b/sdk/storage/azure-storage-common/vcpkg/Config.cmake.in
@ -5,7 +5,7 @@

 include(CMakeFindDependencyMacro)
 find_dependency(Threads)
-find_dependency(azure-core-cpp "1.9.0")
+find_dependency(azure-core-cpp)

 if(NOT WIN32)
  find_dependency(LibXml2)
--- a/sdk/storage/azure-storage-files-datalake/CMakeLists.txt
+++ b/sdk/storage/azure-storage-files-datalake/CMakeLists.txt
@ -33,9 +33,9 @@ if(FETCH_SOURCE_DEPS)
        add_subdirectory(${oneFolder} EXCLUDE_FROM_ALL)
    endforeach()
 elseif(NOT AZ_ALL_LIBRARIES)
-  find_package(azure-storage-blobs-cpp "12.7.0" CONFIG QUIET)
+  find_package(azure-storage-blobs-cpp CONFIG QUIET)
  if(NOT azure-storage-blobs-cpp_FOUND)
-    find_package(azure-storage-blobs-cpp "12.7.0" REQUIRED)
+    find_package(azure-storage-blobs-cpp REQUIRED)
  endif()
 endif()

--- a/sdk/storage/azure-storage-files-datalake/vcpkg/Config.cmake.in
+++ b/sdk/storage/azure-storage-files-datalake/vcpkg/Config.cmake.in
@ -4,7 +4,7 @@
@PACKAGE_INIT@

 include(CMakeFindDependencyMacro)
-find_dependency(azure-storage-blobs-cpp "12.7.0")
+find_dependency(azure-storage-blobs-cpp)

 include("${CMAKE_CURRENT_LIST_DIR}/azure-storage-files-datalake-cppTargets.cmake")

--- a/sdk/storage/azure-storage-files-shares/CMakeLists.txt
+++ b/sdk/storage/azure-storage-files-shares/CMakeLists.txt
@ -33,9 +33,9 @@ if(FETCH_SOURCE_DEPS)
        add_subdirectory(${oneFolder} EXCLUDE_FROM_ALL)
    endforeach()
 elseif(NOT AZ_ALL_LIBRARIES)
-  find_package(azure-storage-common-cpp "12.3.2" CONFIG QUIET)
+  find_package(azure-storage-common-cpp CONFIG QUIET)
  if(NOT azure-storage-common-cpp_FOUND)
-    find_package(azure-storage-common-cpp "12.3.2" REQUIRED)
+    find_package(azure-storage-common-cpp REQUIRED)
  endif()
 endif()

--- a/sdk/storage/azure-storage-files-shares/vcpkg/Config.cmake.in
+++ b/sdk/storage/azure-storage-files-shares/vcpkg/Config.cmake.in
@ -4,7 +4,7 @@
@PACKAGE_INIT@

 include(CMakeFindDependencyMacro)
-find_dependency(azure-storage-common-cpp "12.3.2")
+find_dependency(azure-storage-common-cpp)

 include("${CMAKE_CURRENT_LIST_DIR}/azure-storage-files-shares-cppTargets.cmake")

--- a/sdk/storage/azure-storage-queues/CMakeLists.txt
+++ b/sdk/storage/azure-storage-queues/CMakeLists.txt
@ -33,9 +33,9 @@ if(FETCH_SOURCE_DEPS)
        add_subdirectory(${oneFolder} EXCLUDE_FROM_ALL)
    endforeach()
 elseif(NOT AZ_ALL_LIBRARIES)
-  find_package(azure-storage-common-cpp "12.2.3" CONFIG QUIET)
+  find_package(azure-storage-common-cpp CONFIG QUIET)
  if(NOT azure-storage-common-cpp_FOUND)
-    find_package(azure-storage-common-cpp "12.2.3" REQUIRED)
+    find_package(azure-storage-common-cpp REQUIRED)
  endif()
 endif()

--- a/sdk/storage/azure-storage-queues/vcpkg/Config.cmake.in
+++ b/sdk/storage/azure-storage-queues/vcpkg/Config.cmake.in
@ -4,7 +4,7 @@
@PACKAGE_INIT@

 include(CMakeFindDependencyMacro)
-find_dependency(azure-storage-common-cpp "12.2.3")
+find_dependency(azure-storage-common-cpp)

 include("${CMAKE_CURRENT_LIST_DIR}/azure-storage-queues-cppTargets.cmake")

--- a/sdk/template/azure-template/CMakeLists.txt
+++ b/sdk/template/azure-template/CMakeLists.txt
@ -33,9 +33,9 @@ include(CreateMapFile)


 if(NOT AZ_ALL_LIBRARIES)
-  find_package(azure-core-cpp "1.2.0" CONFIG QUIET)
+  find_package(azure-core-cpp CONFIG QUIET)
  if(NOT azure-core-cpp_FOUND)
-    find_package(azure-core-cpp "1.2.0" REQUIRED)
+    find_package(azure-core-cpp REQUIRED)
  endif()
 endif()

--- 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.3.1")
+find_dependency(azure-core-cpp)

 include("${CMAKE_CURRENT_LIST_DIR}/azure-template-cppTargets.cmake")