diff --git a/cmake-modules/FolderList.cmake b/cmake-modules/FolderList.cmake index f2a555f2da..6937a122e0 100644 --- a/cmake-modules/FolderList.cmake +++ b/cmake-modules/FolderList.cmake @@ -2,15 +2,15 @@ macro(GetFolderList project) message ("project found ${project}") message ("FLAG VALUE : ${FETCH_SOURCE_DEPS}") if(${project} STREQUAL CERTIFICATES) - DownloadDepVersion(sdk/core azure-core 1.2.0) + DownloadDepVersion(sdk/core azure-core 1.5.0) DownloadDepVersion(sdk/identity azure-identity 1.1.0) elseif(${project} STREQUAL IDENTITY) DownloadDepVersion(sdk/core azure-core 1.2.0) elseif(${project} STREQUAL SECRETS) - DownloadDepVersion(sdk/core azure-core 1.2.0) + DownloadDepVersion(sdk/core azure-core 1.5.0) DownloadDepVersion(sdk/identity azure-identity 1.1.0) elseif(${project} STREQUAL KEYS) - DownloadDepVersion(sdk/core azure-core 1.2.0) + DownloadDepVersion(sdk/core azure-core 1.5.0) DownloadDepVersion(sdk/identity azure-identity 1.1.0) elseif(${project} STREQUAL STORAGE_COMMON) DownloadDepVersion(sdk/core azure-core 1.3.1) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-cmake-generate.yml b/eng/pipelines/templates/jobs/archetype-sdk-cmake-generate.yml index 4452b018de..33a416cbc9 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-cmake-generate.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-cmake-generate.yml @@ -14,10 +14,14 @@ parameters: - name: CMakeSourceTestOptions type: object default: [] + - name: GenerateTimeoutInMinutes + type: number + default: 90 jobs: - job: CMakeGenerate condition: and(succeededOrFailed(), ne(variables['Skip.CMakeGenerate'], 'true')) + timeoutInMinutes: ${{ parameters.GenerateTimeoutInMinutes }} strategy: matrix: Linux: @@ -73,6 +77,7 @@ jobs: - job: CMakeSourceGenerate condition: and(succeededOrFailed(), ne(variables['Skip.CMakeGenerate'], 'true')) + timeoutInMinutes: ${{ parameters.GenerateTimeoutInMinutes }} strategy: matrix: Windows: diff --git a/eng/vcpkg-commit.txt b/eng/vcpkg-commit.txt index f6d8d6d61c..628d846658 100644 --- a/eng/vcpkg-commit.txt +++ b/eng/vcpkg-commit.txt @@ -1 +1 @@ -be5c4ef68b51142ba705f0678b45d284977de677 +d8cd44e7026e294ad82c49eaf2cb6a046cf2c994 diff --git a/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt index 4c999dedd9..8215bde7af 100644 --- 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.2.0" CONFIG QUIET) + find_package(azure-core-cpp "1.5.0" CONFIG QUIET) if(NOT azure-core-cpp_FOUND) - find_package(azure-core-cpp "1.2.0" REQUIRED) + find_package(azure-core-cpp "1.5.0" REQUIRED) endif() endif() diff --git a/sdk/keyvault/azure-security-keyvault-certificates/vcpkg/Config.cmake.in b/sdk/keyvault/azure-security-keyvault-certificates/vcpkg/Config.cmake.in index 736a77adc7..0c1fdad135 100644 --- 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.3.1") +find_dependency(azure-core-cpp "1.5.0") include("${CMAKE_CURRENT_LIST_DIR}/azure-security-keyvault-certificates-cppTargets.cmake") diff --git a/sdk/keyvault/azure-security-keyvault-certificates/vcpkg/vcpkg.json b/sdk/keyvault/azure-security-keyvault-certificates/vcpkg/vcpkg.json index 1c1571cd04..73dc87af88 100644 --- a/sdk/keyvault/azure-security-keyvault-certificates/vcpkg/vcpkg.json +++ b/sdk/keyvault/azure-security-keyvault-certificates/vcpkg/vcpkg.json @@ -14,7 +14,7 @@ { "name": "azure-core-cpp", "default-features": false, - "version>=": "1.3.1" + "version>=": "1.5.0" }, { "name": "vcpkg-cmake", diff --git a/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt index 684ab3c60a..afc771f665 100644 --- 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.2.0" CONFIG QUIET) + find_package(azure-core-cpp "1.5.0" CONFIG QUIET) if(NOT azure-core-cpp_FOUND) - find_package(azure-core-cpp "1.2.0" REQUIRED) + find_package(azure-core-cpp "1.5.0" REQUIRED) endif() endif() diff --git a/sdk/keyvault/azure-security-keyvault-keys/vcpkg/Config.cmake.in b/sdk/keyvault/azure-security-keyvault-keys/vcpkg/Config.cmake.in index dc5770bc51..f65086f864 100644 --- 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.3.1") +find_dependency(azure-core-cpp "1.5.0") include("${CMAKE_CURRENT_LIST_DIR}/azure-security-keyvault-keys-cppTargets.cmake") diff --git a/sdk/keyvault/azure-security-keyvault-keys/vcpkg/vcpkg.json b/sdk/keyvault/azure-security-keyvault-keys/vcpkg/vcpkg.json index 57133d05b1..ef96e5e755 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/vcpkg/vcpkg.json +++ b/sdk/keyvault/azure-security-keyvault-keys/vcpkg/vcpkg.json @@ -14,7 +14,7 @@ { "name": "azure-core-cpp", "default-features": false, - "version>=": "1.3.1" + "version>=": "1.5.0" }, { "name": "vcpkg-cmake", diff --git a/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt index a5f0dc3365..5564adfe41 100644 --- 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.2.0" CONFIG QUIET) + find_package(azure-core-cpp "1.5.0" CONFIG QUIET) if(NOT azure-core-cpp_FOUND) - find_package(azure-core-cpp "1.2.0" REQUIRED) + find_package(azure-core-cpp "1.5.0" REQUIRED) endif() endif() diff --git a/sdk/keyvault/azure-security-keyvault-secrets/vcpkg/Config.cmake.in b/sdk/keyvault/azure-security-keyvault-secrets/vcpkg/Config.cmake.in index 76c4d4ab2c..f7a3e4fbc6 100644 --- 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.3.1") +find_dependency(azure-core-cpp "1.5.0") include("${CMAKE_CURRENT_LIST_DIR}/azure-security-keyvault-secrets-cppTargets.cmake") diff --git a/sdk/keyvault/azure-security-keyvault-secrets/vcpkg/vcpkg.json b/sdk/keyvault/azure-security-keyvault-secrets/vcpkg/vcpkg.json index 7734a4352d..07c978c24e 100644 --- a/sdk/keyvault/azure-security-keyvault-secrets/vcpkg/vcpkg.json +++ b/sdk/keyvault/azure-security-keyvault-secrets/vcpkg/vcpkg.json @@ -14,7 +14,7 @@ { "name": "azure-core-cpp", "default-features": false, - "version>=": "1.3.1" + "version>=": "1.5.0" }, { "name": "vcpkg-cmake",