From e6a488193b5b00de9be91510486c3a1749260161 Mon Sep 17 00:00:00 2001 From: JinmingHu Date: Wed, 8 Sep 2021 09:39:24 +0800 Subject: [PATCH] Storage Sept Release (#2836) --- sdk/storage/azure-storage-blobs/CHANGELOG.md | 4 +--- sdk/storage/azure-storage-blobs/CMakeLists.txt | 4 ++-- .../src/private/package_version.hpp | 2 +- .../azure-storage-blobs/vcpkg/Config.cmake.in | 2 +- .../azure-storage-blobs/vcpkg/vcpkg.json | 2 +- sdk/storage/azure-storage-common/CHANGELOG.md | 6 +----- .../src/private/package_version.hpp | 2 +- .../azure-storage-files-datalake/CHANGELOG.md | 4 +--- .../CMakeLists.txt | 4 ++-- .../src/private/package_version.hpp | 2 +- .../vcpkg/Config.cmake.in | 2 +- .../vcpkg/vcpkg.json | 2 +- .../azure-storage-files-shares/CHANGELOG.md | 4 +--- .../azure-storage-files-shares/CMakeLists.txt | 4 ++-- .../src/private/package_version.hpp | 2 +- .../vcpkg/Config.cmake.in | 2 +- .../vcpkg/vcpkg.json | 2 +- sdk/storage/azure-storage-queues/CHANGELOG.md | 2 +- .../azure-storage-queues/CMakeLists.txt | 18 +++++++++--------- .../src/private/package_version.hpp | 2 +- .../azure-storage-queues/vcpkg/Config.cmake.in | 2 +- .../azure-storage-queues/vcpkg/vcpkg.json | 2 +- 22 files changed, 33 insertions(+), 43 deletions(-) diff --git a/sdk/storage/azure-storage-blobs/CHANGELOG.md b/sdk/storage/azure-storage-blobs/CHANGELOG.md index 152bc5e3e..42aba3ca0 100644 --- a/sdk/storage/azure-storage-blobs/CHANGELOG.md +++ b/sdk/storage/azure-storage-blobs/CHANGELOG.md @@ -1,8 +1,6 @@ # Release History -## 12.2.0-beta.1 (Unreleased) - -### Features Added +## 12.2.0 (2021-09-08) ### Breaking Changes diff --git a/sdk/storage/azure-storage-blobs/CMakeLists.txt b/sdk/storage/azure-storage-blobs/CMakeLists.txt index d7e22cbeb..a313f467a 100644 --- a/sdk/storage/azure-storage-blobs/CMakeLists.txt +++ b/sdk/storage/azure-storage-blobs/CMakeLists.txt @@ -20,9 +20,9 @@ include(AzureGlobalCompileOptions) az_vcpkg_integrate() if(NOT AZ_ALL_LIBRARIES) - find_package(azure-storage-common-cpp "12.1.0" CONFIG QUIET) + find_package(azure-storage-common-cpp "12.2.0" CONFIG QUIET) if(NOT azure-storage-common-cpp_FOUND) - find_package(azure-storage-common-cpp "12.1.0" REQUIRED) + find_package(azure-storage-common-cpp "12.2.0" REQUIRED) endif() endif() diff --git a/sdk/storage/azure-storage-blobs/src/private/package_version.hpp b/sdk/storage/azure-storage-blobs/src/private/package_version.hpp index b59158bfe..61e3b45bb 100644 --- a/sdk/storage/azure-storage-blobs/src/private/package_version.hpp +++ b/sdk/storage/azure-storage-blobs/src/private/package_version.hpp @@ -11,7 +11,7 @@ #define AZURE_STORAGE_BLOBS_VERSION_MAJOR 12 #define AZURE_STORAGE_BLOBS_VERSION_MINOR 2 #define AZURE_STORAGE_BLOBS_VERSION_PATCH 0 -#define AZURE_STORAGE_BLOBS_VERSION_PRERELEASE "beta.1" +#define AZURE_STORAGE_BLOBS_VERSION_PRERELEASE "" #define AZURE_STORAGE_BLOBS_VERSION_ITOA_HELPER(i) #i #define AZURE_STORAGE_BLOBS_VERSION_ITOA(i) AZURE_STORAGE_BLOBS_VERSION_ITOA_HELPER(i) diff --git a/sdk/storage/azure-storage-blobs/vcpkg/Config.cmake.in b/sdk/storage/azure-storage-blobs/vcpkg/Config.cmake.in index 467b8da8a..2f2f29602 100644 --- 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.1.0") +find_dependency(azure-storage-common-cpp "12.2.0") include("${CMAKE_CURRENT_LIST_DIR}/azure-storage-blobs-cppTargets.cmake") diff --git a/sdk/storage/azure-storage-blobs/vcpkg/vcpkg.json b/sdk/storage/azure-storage-blobs/vcpkg/vcpkg.json index 01b1acb8a..83de396d6 100644 --- a/sdk/storage/azure-storage-blobs/vcpkg/vcpkg.json +++ b/sdk/storage/azure-storage-blobs/vcpkg/vcpkg.json @@ -14,7 +14,7 @@ { "name": "azure-storage-common-cpp", "default-features": false, - "version>=": "12.1.0" + "version>=": "12.2.0" }, { "name": "vcpkg-cmake", diff --git a/sdk/storage/azure-storage-common/CHANGELOG.md b/sdk/storage/azure-storage-common/CHANGELOG.md index 129aad2b4..8c9fe1152 100644 --- a/sdk/storage/azure-storage-common/CHANGELOG.md +++ b/sdk/storage/azure-storage-common/CHANGELOG.md @@ -1,19 +1,15 @@ # Release History -## 12.2.0-beta.1 (Unreleased) +## 12.2.0 (2021-09-08) ### Features Added - Used new xml library on Windows, dropped dependency for libxml2. -### Breaking Changes - ### Bugs Fixed - Fixed a bug that may cause crash when parsing XML. -### Other Changes - ## 12.1.0 (2021-08-10) ### Bugs Fixed diff --git a/sdk/storage/azure-storage-common/src/private/package_version.hpp b/sdk/storage/azure-storage-common/src/private/package_version.hpp index 3f6f80967..1e3581803 100644 --- a/sdk/storage/azure-storage-common/src/private/package_version.hpp +++ b/sdk/storage/azure-storage-common/src/private/package_version.hpp @@ -13,7 +13,7 @@ #define AZURE_STORAGE_COMMON_VERSION_MAJOR 12 #define AZURE_STORAGE_COMMON_VERSION_MINOR 2 #define AZURE_STORAGE_COMMON_VERSION_PATCH 0 -#define AZURE_STORAGE_COMMON_VERSION_PRERELEASE "beta.1" +#define AZURE_STORAGE_COMMON_VERSION_PRERELEASE "" #define AZURE_STORAGE_COMMON_VERSION_ITOA_HELPER(i) #i #define AZURE_STORAGE_COMMON_VERSION_ITOA(i) AZURE_STORAGE_COMMON_VERSION_ITOA_HELPER(i) diff --git a/sdk/storage/azure-storage-files-datalake/CHANGELOG.md b/sdk/storage/azure-storage-files-datalake/CHANGELOG.md index ef68c6c82..980ec81b4 100644 --- a/sdk/storage/azure-storage-files-datalake/CHANGELOG.md +++ b/sdk/storage/azure-storage-files-datalake/CHANGELOG.md @@ -1,8 +1,6 @@ # Release History -## 12.2.0-beta.1 (Unreleased) - -### Features Added +## 12.2.0 (2021-09-08) ### Breaking Changes diff --git a/sdk/storage/azure-storage-files-datalake/CMakeLists.txt b/sdk/storage/azure-storage-files-datalake/CMakeLists.txt index 620c65a61..1192082f3 100644 --- a/sdk/storage/azure-storage-files-datalake/CMakeLists.txt +++ b/sdk/storage/azure-storage-files-datalake/CMakeLists.txt @@ -20,9 +20,9 @@ include(AzureGlobalCompileOptions) az_vcpkg_integrate() if(NOT AZ_ALL_LIBRARIES) - find_package(azure-storage-blobs-cpp "12.1.0" CONFIG QUIET) + find_package(azure-storage-blobs-cpp "12.2.0" CONFIG QUIET) if(NOT azure-storage-blobs-cpp_FOUND) - find_package(azure-storage-blobs-cpp "12.1.0" REQUIRED) + find_package(azure-storage-blobs-cpp "12.2.0" REQUIRED) endif() endif() diff --git a/sdk/storage/azure-storage-files-datalake/src/private/package_version.hpp b/sdk/storage/azure-storage-files-datalake/src/private/package_version.hpp index 91fed4925..971a5989c 100644 --- a/sdk/storage/azure-storage-files-datalake/src/private/package_version.hpp +++ b/sdk/storage/azure-storage-files-datalake/src/private/package_version.hpp @@ -11,7 +11,7 @@ #define AZURE_STORAGE_FILES_DATALAKE_VERSION_MAJOR 12 #define AZURE_STORAGE_FILES_DATALAKE_VERSION_MINOR 2 #define AZURE_STORAGE_FILES_DATALAKE_VERSION_PATCH 0 -#define AZURE_STORAGE_FILES_DATALAKE_VERSION_PRERELEASE "beta.1" +#define AZURE_STORAGE_FILES_DATALAKE_VERSION_PRERELEASE "" #define AZURE_STORAGE_FILES_DATALAKE_VERSION_ITOA_HELPER(i) #i #define AZURE_STORAGE_FILES_DATALAKE_VERSION_ITOA(i) \ diff --git a/sdk/storage/azure-storage-files-datalake/vcpkg/Config.cmake.in b/sdk/storage/azure-storage-files-datalake/vcpkg/Config.cmake.in index 656f58210..32328c5be 100644 --- 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.1.0") +find_dependency(azure-storage-blobs-cpp "12.2.0") include("${CMAKE_CURRENT_LIST_DIR}/azure-storage-files-datalake-cppTargets.cmake") diff --git a/sdk/storage/azure-storage-files-datalake/vcpkg/vcpkg.json b/sdk/storage/azure-storage-files-datalake/vcpkg/vcpkg.json index 9246e4570..f59b4b2cf 100644 --- a/sdk/storage/azure-storage-files-datalake/vcpkg/vcpkg.json +++ b/sdk/storage/azure-storage-files-datalake/vcpkg/vcpkg.json @@ -14,7 +14,7 @@ { "name": "azure-storage-blobs-cpp", "default-features": false, - "version>=": "12.1.0" + "version>=": "12.2.0" }, { "name": "vcpkg-cmake", diff --git a/sdk/storage/azure-storage-files-shares/CHANGELOG.md b/sdk/storage/azure-storage-files-shares/CHANGELOG.md index 779d1a4e4..2e9cf99f0 100644 --- a/sdk/storage/azure-storage-files-shares/CHANGELOG.md +++ b/sdk/storage/azure-storage-files-shares/CHANGELOG.md @@ -1,8 +1,6 @@ # Release History -## 12.2.0-beta.1 (Unreleased) - -### Features Added +## 12.2.0 (2021-09-08) ### Breaking Changes diff --git a/sdk/storage/azure-storage-files-shares/CMakeLists.txt b/sdk/storage/azure-storage-files-shares/CMakeLists.txt index 33e8b1fd2..466f5ea61 100644 --- a/sdk/storage/azure-storage-files-shares/CMakeLists.txt +++ b/sdk/storage/azure-storage-files-shares/CMakeLists.txt @@ -20,9 +20,9 @@ include(AzureGlobalCompileOptions) az_vcpkg_integrate() if(NOT AZ_ALL_LIBRARIES) - find_package(azure-storage-common-cpp "12.1.0" CONFIG QUIET) + find_package(azure-storage-common-cpp "12.2.0" CONFIG QUIET) if(NOT azure-storage-common-cpp_FOUND) - find_package(azure-storage-common-cpp "12.1.0" REQUIRED) + find_package(azure-storage-common-cpp "12.2.0" REQUIRED) endif() endif() diff --git a/sdk/storage/azure-storage-files-shares/src/private/package_version.hpp b/sdk/storage/azure-storage-files-shares/src/private/package_version.hpp index d18c63641..8b55e7636 100644 --- a/sdk/storage/azure-storage-files-shares/src/private/package_version.hpp +++ b/sdk/storage/azure-storage-files-shares/src/private/package_version.hpp @@ -11,7 +11,7 @@ #define AZURE_STORAGE_FILES_SHARES_VERSION_MAJOR 12 #define AZURE_STORAGE_FILES_SHARES_VERSION_MINOR 2 #define AZURE_STORAGE_FILES_SHARES_VERSION_PATCH 0 -#define AZURE_STORAGE_FILES_SHARES_VERSION_PRERELEASE "beta.1" +#define AZURE_STORAGE_FILES_SHARES_VERSION_PRERELEASE "" #define AZURE_STORAGE_FILES_SHARES_VERSION_ITOA_HELPER(i) #i #define AZURE_STORAGE_FILES_SHARES_VERSION_ITOA(i) AZURE_STORAGE_FILES_SHARES_VERSION_ITOA_HELPER(i) diff --git a/sdk/storage/azure-storage-files-shares/vcpkg/Config.cmake.in b/sdk/storage/azure-storage-files-shares/vcpkg/Config.cmake.in index ddf559eab..a6eb58a43 100644 --- 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.1.0") +find_dependency(azure-storage-common-cpp "12.2.0") include("${CMAKE_CURRENT_LIST_DIR}/azure-storage-files-shares-cppTargets.cmake") diff --git a/sdk/storage/azure-storage-files-shares/vcpkg/vcpkg.json b/sdk/storage/azure-storage-files-shares/vcpkg/vcpkg.json index 6f0e1bf3c..f0448f56f 100644 --- a/sdk/storage/azure-storage-files-shares/vcpkg/vcpkg.json +++ b/sdk/storage/azure-storage-files-shares/vcpkg/vcpkg.json @@ -14,7 +14,7 @@ { "name": "azure-storage-common-cpp", "default-features": false, - "version>=": "12.1.0" + "version>=": "12.2.0" }, { "name": "vcpkg-cmake", diff --git a/sdk/storage/azure-storage-queues/CHANGELOG.md b/sdk/storage/azure-storage-queues/CHANGELOG.md index 15c2dea5f..3dfcd1eae 100644 --- a/sdk/storage/azure-storage-queues/CHANGELOG.md +++ b/sdk/storage/azure-storage-queues/CHANGELOG.md @@ -1,6 +1,6 @@ # Release History -## 12.0.0-beta.1 (Unreleased) +## 12.0.0-beta.1 (2021-09-08) ### New Features diff --git a/sdk/storage/azure-storage-queues/CMakeLists.txt b/sdk/storage/azure-storage-queues/CMakeLists.txt index 76fd22ee5..5e38a5e4c 100644 --- a/sdk/storage/azure-storage-queues/CMakeLists.txt +++ b/sdk/storage/azure-storage-queues/CMakeLists.txt @@ -10,19 +10,19 @@ set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake-modules") -# include(AzureVcpkg) +include(AzureVcpkg) include(AzureVersion) include(AzureCodeCoverage) include(AzureTransportAdapters) include(AzureDoxygen) include(AzureGlobalCompileOptions) -# az_vcpkg_integrate() +az_vcpkg_integrate() if(NOT AZ_ALL_LIBRARIES) - find_package(azure-storage-common-cpp "12.1.0" CONFIG QUIET) + find_package(azure-storage-common-cpp "12.2.0" CONFIG QUIET) if(NOT azure-storage-common-cpp_FOUND) - find_package(azure-storage-common-cpp "12.1.0" REQUIRED) + find_package(azure-storage-common-cpp "12.2.0" REQUIRED) endif() endif() @@ -66,11 +66,11 @@ target_link_libraries(azure-storage-queues PUBLIC Azure::azure-storage-common) get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") generate_documentation(azure-storage-queues ${AZ_LIBRARY_VERSION}) -# az_vcpkg_export( -# azure-storage-queues -# STORAGE_QUEUES -# "azure/storage/queues/dll_import_export.hpp" -# ) +az_vcpkg_export( + azure-storage-queues + STORAGE_QUEUES + "azure/storage/queues/dll_import_export.hpp" + ) # coverage. Has no effect if BUILD_CODE_COVERAGE is OFF create_code_coverage(storage azure-storage-queues azure-storage-test) diff --git a/sdk/storage/azure-storage-queues/src/private/package_version.hpp b/sdk/storage/azure-storage-queues/src/private/package_version.hpp index 817761f96..b75464237 100644 --- a/sdk/storage/azure-storage-queues/src/private/package_version.hpp +++ b/sdk/storage/azure-storage-queues/src/private/package_version.hpp @@ -9,7 +9,7 @@ #pragma once #define AZURE_STORAGE_QUEUES_VERSION_MAJOR 12 -#define AZURE_STORAGE_QUEUES_VERSION_MINOR 1 +#define AZURE_STORAGE_QUEUES_VERSION_MINOR 0 #define AZURE_STORAGE_QUEUES_VERSION_PATCH 0 #define AZURE_STORAGE_QUEUES_VERSION_PRERELEASE "beta.1" diff --git a/sdk/storage/azure-storage-queues/vcpkg/Config.cmake.in b/sdk/storage/azure-storage-queues/vcpkg/Config.cmake.in index 5eb4ec78d..cf651e8d8 100644 --- 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.1.0") +find_dependency(azure-storage-common-cpp "12.2.0") include("${CMAKE_CURRENT_LIST_DIR}/azure-storage-queues-cppTargets.cmake") diff --git a/sdk/storage/azure-storage-queues/vcpkg/vcpkg.json b/sdk/storage/azure-storage-queues/vcpkg/vcpkg.json index efcf138b3..c00678bbf 100644 --- a/sdk/storage/azure-storage-queues/vcpkg/vcpkg.json +++ b/sdk/storage/azure-storage-queues/vcpkg/vcpkg.json @@ -14,7 +14,7 @@ { "name": "azure-storage-common-cpp", "default-features": false, - "version>=": "12.1.0" + "version>=": "12.2.0" }, { "name": "vcpkg-cmake",