From 0886fa2b8126737524bae345e3e484fd79162a92 Mon Sep 17 00:00:00 2001 From: JinmingHu Date: Tue, 7 Jun 2022 07:37:30 +0800 Subject: [PATCH] Storage June Release (#3686) --- cmake-modules/FolderList.cmake | 2 +- sdk/storage/azure-storage-blobs/CHANGELOG.md | 8 +------- sdk/storage/azure-storage-blobs/CMakeLists.txt | 4 ++-- sdk/storage/azure-storage-blobs/vcpkg.json | 4 ++-- sdk/storage/azure-storage-blobs/vcpkg/Config.cmake.in | 2 +- sdk/storage/azure-storage-blobs/vcpkg/vcpkg.json | 2 +- sdk/storage/azure-storage-common/CHANGELOG.md | 8 +------- .../azure-storage-common/src/private/package_version.hpp | 6 +++--- sdk/storage/azure-storage-common/vcpkg.json | 2 +- 9 files changed, 13 insertions(+), 25 deletions(-) diff --git a/cmake-modules/FolderList.cmake b/cmake-modules/FolderList.cmake index 8c3685b43..fa53ce8b0 100644 --- a/cmake-modules/FolderList.cmake +++ b/cmake-modules/FolderList.cmake @@ -16,7 +16,7 @@ macro(GetFolderList project) DownloadDepVersion(sdk/core azure-core 1.5.0) elseif(${project} STREQUAL STORAGE_BLOBS) DownloadDepVersion(sdk/core azure-core 1.5.0) - DownloadDepVersion(sdk/storage/azure-storage-common azure-storage-common 12.2.3) + DownloadDepVersion(sdk/storage/azure-storage-common azure-storage-common 12.2.4) elseif(${project} STREQUAL STORAGE_FILES_DATALAKE) DownloadDepVersion(sdk/core azure-core 1.3.1) DownloadDepVersion(sdk/storage/azure-storage-common azure-storage-common 12.2.2) diff --git a/sdk/storage/azure-storage-blobs/CHANGELOG.md b/sdk/storage/azure-storage-blobs/CHANGELOG.md index 4e66c0eef..790ab45aa 100644 --- a/sdk/storage/azure-storage-blobs/CHANGELOG.md +++ b/sdk/storage/azure-storage-blobs/CHANGELOG.md @@ -1,6 +1,6 @@ # Release History -## 12.5.0-beta.1 (Unreleased) +## 12.5.0-beta.1 (2022-06-07) ### Features Added @@ -10,12 +10,6 @@ - Added support for listing system containers. - Added support for listing deleted root blob with active versions. -### Breaking Changes - -### Bugs Fixed - -### Other Changes - ## 12.4.0 (2022-04-06) ### Other changes diff --git a/sdk/storage/azure-storage-blobs/CMakeLists.txt b/sdk/storage/azure-storage-blobs/CMakeLists.txt index 2271cd584..5da8d43ef 100644 --- a/sdk/storage/azure-storage-blobs/CMakeLists.txt +++ b/sdk/storage/azure-storage-blobs/CMakeLists.txt @@ -32,9 +32,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 "12.2.4" 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 "12.2.4" REQUIRED) endif() endif() diff --git a/sdk/storage/azure-storage-blobs/vcpkg.json b/sdk/storage/azure-storage-blobs/vcpkg.json index 2847c101f..fa4846e6e 100644 --- a/sdk/storage/azure-storage-blobs/vcpkg.json +++ b/sdk/storage/azure-storage-blobs/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-storage-blobs-cpp", - "version-semver": "12.4.0", + "version-semver": "12.5.0-beta.1", "description": [ "Microsoft Azure Storage Blobs SDK for C++", "This library provides Azure Storage Blobs SDK." @@ -11,7 +11,7 @@ { "name": "azure-storage-common-cpp", "default-features": false, - "version>=": "12.2.3" + "version>=": "12.2.4" }, { "name": "vcpkg-cmake", diff --git a/sdk/storage/azure-storage-blobs/vcpkg/Config.cmake.in b/sdk/storage/azure-storage-blobs/vcpkg/Config.cmake.in index e2692f288..a6e782faf 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.2.3") +find_dependency(azure-storage-common-cpp "12.2.4") 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 648b9f508..bb78077f9 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.2.3" + "version>=": "12.2.4" }, { "name": "vcpkg-cmake", diff --git a/sdk/storage/azure-storage-common/CHANGELOG.md b/sdk/storage/azure-storage-common/CHANGELOG.md index 637f3f7ed..f3a1fbec1 100644 --- a/sdk/storage/azure-storage-common/CHANGELOG.md +++ b/sdk/storage/azure-storage-common/CHANGELOG.md @@ -1,17 +1,11 @@ # Release History -## 12.3.0-beta.1 (Unreleased) - -### Features Added - -### Breaking Changes +## 12.2.4 (2022-06-07) ### Bugs Fixed - Fixed a bug where text of XML element cannot be empty. -### Other Changes - ## 12.2.3 (2022-04-06) ### 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 c1ddc0472..e536019d7 100644 --- a/sdk/storage/azure-storage-common/src/private/package_version.hpp +++ b/sdk/storage/azure-storage-common/src/private/package_version.hpp @@ -11,9 +11,9 @@ #include #define AZURE_STORAGE_COMMON_VERSION_MAJOR 12 -#define AZURE_STORAGE_COMMON_VERSION_MINOR 3 -#define AZURE_STORAGE_COMMON_VERSION_PATCH 0 -#define AZURE_STORAGE_COMMON_VERSION_PRERELEASE "beta.1" +#define AZURE_STORAGE_COMMON_VERSION_MINOR 2 +#define AZURE_STORAGE_COMMON_VERSION_PATCH 4 +#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-common/vcpkg.json b/sdk/storage/azure-storage-common/vcpkg.json index cc7651dd6..448f7f7bc 100644 --- a/sdk/storage/azure-storage-common/vcpkg.json +++ b/sdk/storage/azure-storage-common/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-storage-common-cpp", - "version-semver": "12.2.3", + "version-semver": "12.2.4", "description": [ "Microsoft Azure Common Storage SDK for C++", "This library provides common Azure Storage-related abstractions for Azure SDK."