From 683411baa904f0cfba4c3888d1ba95b6481ba5f1 Mon Sep 17 00:00:00 2001 From: Sean McCullough Date: Tue, 19 Sep 2023 21:07:12 -0500 Subject: [PATCH 1/2] Added STG 92 service version --- sdk/storage/Azure.Storage.Blobs.Batch/assets.json | 2 +- .../tests/ChangeFeedTestBase.cs | 1 + sdk/storage/Azure.Storage.Blobs/assets.json | 2 +- sdk/storage/Azure.Storage.Blobs/src/BlobClientOptions.cs | 7 ++++++- .../tests/BlobsClientTestFixtureAttribute.cs | 1 + .../src/Shared/StorageVersionExtensions.cs | 6 +++++- sdk/storage/Azure.Storage.Common/tests/CommonTestBase.cs | 3 ++- sdk/storage/Azure.Storage.Files.DataLake/assets.json | 2 +- .../src/DataLakeClientOptions.cs | 7 ++++++- .../tests/DataLakeClientTestFixtureAttribute.cs | 1 + sdk/storage/Azure.Storage.Files.Shares/assets.json | 2 +- .../Azure.Storage.Files.Shares/src/ShareClientOptions.cs | 7 ++++++- .../tests/ShareClientTestFixtureAttribute.cs | 1 + sdk/storage/Azure.Storage.Queues/assets.json | 2 +- sdk/storage/Azure.Storage.Queues/src/QueueClientOptions.cs | 7 ++++++- 15 files changed, 40 insertions(+), 11 deletions(-) diff --git a/sdk/storage/Azure.Storage.Blobs.Batch/assets.json b/sdk/storage/Azure.Storage.Blobs.Batch/assets.json index ab931d503199..0189929fde98 100644 --- a/sdk/storage/Azure.Storage.Blobs.Batch/assets.json +++ b/sdk/storage/Azure.Storage.Blobs.Batch/assets.json @@ -2,5 +2,5 @@ "AssetsRepo": "Azure/azure-sdk-assets", "AssetsRepoPrefixPath": "net", "TagPrefix": "net/storage/Azure.Storage.Blobs.Batch", - "Tag": "net/storage/Azure.Storage.Blobs.Batch_2e81e3676c" + "Tag": "net/storage/Azure.Storage.Blobs.Batch_2d436425b3" } diff --git a/sdk/storage/Azure.Storage.Blobs.ChangeFeed/tests/ChangeFeedTestBase.cs b/sdk/storage/Azure.Storage.Blobs.ChangeFeed/tests/ChangeFeedTestBase.cs index ad65e56b1e10..902617ebe947 100644 --- a/sdk/storage/Azure.Storage.Blobs.ChangeFeed/tests/ChangeFeedTestBase.cs +++ b/sdk/storage/Azure.Storage.Blobs.ChangeFeed/tests/ChangeFeedTestBase.cs @@ -28,6 +28,7 @@ namespace Azure.Storage.Blobs.ChangeFeed.Tests BlobClientOptions.ServiceVersion.V2023_05_03, BlobClientOptions.ServiceVersion.V2023_08_03, BlobClientOptions.ServiceVersion.V2023_11_03, + BlobClientOptions.ServiceVersion.V2024_02_04, StorageVersionExtensions.LatestVersion, StorageVersionExtensions.MaxVersion, RecordingServiceVersion = StorageVersionExtensions.MaxVersion, diff --git a/sdk/storage/Azure.Storage.Blobs/assets.json b/sdk/storage/Azure.Storage.Blobs/assets.json index f5115469d3cd..66de44d36a91 100644 --- a/sdk/storage/Azure.Storage.Blobs/assets.json +++ b/sdk/storage/Azure.Storage.Blobs/assets.json @@ -2,5 +2,5 @@ "AssetsRepo": "Azure/azure-sdk-assets", "AssetsRepoPrefixPath": "net", "TagPrefix": "net/storage/Azure.Storage.Blobs", - "Tag": "net/storage/Azure.Storage.Blobs_2af1298628" + "Tag": "net/storage/Azure.Storage.Blobs_7a3b810a8b" } diff --git a/sdk/storage/Azure.Storage.Blobs/src/BlobClientOptions.cs b/sdk/storage/Azure.Storage.Blobs/src/BlobClientOptions.cs index bac2e18cde80..5e03defc5d45 100644 --- a/sdk/storage/Azure.Storage.Blobs/src/BlobClientOptions.cs +++ b/sdk/storage/Azure.Storage.Blobs/src/BlobClientOptions.cs @@ -131,7 +131,12 @@ public enum ServiceVersion /// /// The 2023-11-03 service version. /// - V2023_11_03 = 20 + V2023_11_03 = 20, + + /// + /// The 2024-02-04 service version. + /// + V2024_02_04 = 21 #pragma warning restore CA1707 // Identifiers should not contain underscores } diff --git a/sdk/storage/Azure.Storage.Blobs/tests/BlobsClientTestFixtureAttribute.cs b/sdk/storage/Azure.Storage.Blobs/tests/BlobsClientTestFixtureAttribute.cs index 1a03a51fdb87..22b15845babd 100644 --- a/sdk/storage/Azure.Storage.Blobs/tests/BlobsClientTestFixtureAttribute.cs +++ b/sdk/storage/Azure.Storage.Blobs/tests/BlobsClientTestFixtureAttribute.cs @@ -31,6 +31,7 @@ public BlobsClientTestFixtureAttribute(params object[] additionalParameters) BlobClientOptions.ServiceVersion.V2023_05_03, BlobClientOptions.ServiceVersion.V2023_08_03, BlobClientOptions.ServiceVersion.V2023_11_03, + BlobClientOptions.ServiceVersion.V2024_02_04, StorageVersionExtensions.LatestVersion, StorageVersionExtensions.MaxVersion }, diff --git a/sdk/storage/Azure.Storage.Common/src/Shared/StorageVersionExtensions.cs b/sdk/storage/Azure.Storage.Common/src/Shared/StorageVersionExtensions.cs index 47f97ad7e75d..3cd7d7b17396 100644 --- a/sdk/storage/Azure.Storage.Common/src/Shared/StorageVersionExtensions.cs +++ b/sdk/storage/Azure.Storage.Common/src/Shared/StorageVersionExtensions.cs @@ -50,7 +50,7 @@ internal static class StorageVersionExtensions /// internal const ServiceVersion MaxVersion = #if BlobSDK || QueueSDK || FileSDK || DataLakeSDK || ChangeFeedSDK || DataMovementSDK|| BlobDataMovementSDK - ServiceVersion.V2023_11_03; + ServiceVersion.V2024_02_04; #else ERROR_STORAGE_SERVICE_NOT_DEFINED; #endif @@ -84,6 +84,7 @@ public static string ToVersionString(this ServiceVersion version) => ServiceVersion.V2023_05_03 => "2023-05-03", ServiceVersion.V2023_08_03 => "2023-08-03", ServiceVersion.V2023_11_03 => "2023-11-03", + ServiceVersion.V2024_02_04 => "2024-02-04", #elif QueueSDK // Queues just bumped the version number without changing the swagger ServiceVersion.V2019_02_02 => "2018-11-09", @@ -106,6 +107,7 @@ public static string ToVersionString(this ServiceVersion version) => ServiceVersion.V2023_05_03 => "2018-11-09", ServiceVersion.V2023_08_03 => "2018-11-09", ServiceVersion.V2023_11_03 => "2018-11-09", + ServiceVersion.V2024_02_04 => "2018-11-09", #endif _ => throw Errors.VersionNotSupported(nameof(version)) }; @@ -159,6 +161,8 @@ public static Azure.Storage.Blobs.BlobClientOptions.ServiceVersion AsBlobsVersio Azure.Storage.Blobs.BlobClientOptions.ServiceVersion.V2023_08_03, Azure.Storage.Files.DataLake.DataLakeClientOptions.ServiceVersion.V2023_11_03 => Azure.Storage.Blobs.BlobClientOptions.ServiceVersion.V2023_11_03, + Azure.Storage.Files.DataLake.DataLakeClientOptions.ServiceVersion.V2024_02_04 => + Azure.Storage.Blobs.BlobClientOptions.ServiceVersion.V2024_02_04, _ => throw Errors.VersionNotSupported(nameof(version)) }; #endif diff --git a/sdk/storage/Azure.Storage.Common/tests/CommonTestBase.cs b/sdk/storage/Azure.Storage.Common/tests/CommonTestBase.cs index ad92fd97bd34..4494ce22ae72 100644 --- a/sdk/storage/Azure.Storage.Common/tests/CommonTestBase.cs +++ b/sdk/storage/Azure.Storage.Common/tests/CommonTestBase.cs @@ -30,7 +30,8 @@ namespace Azure.Storage.Test BlobClientOptions.ServiceVersion.V2023_05_03, BlobClientOptions.ServiceVersion.V2023_08_03, BlobClientOptions.ServiceVersion.V2023_11_03, - RecordingServiceVersion = BlobClientOptions.ServiceVersion.V2023_11_03, + BlobClientOptions.ServiceVersion.V2024_02_04, + RecordingServiceVersion = BlobClientOptions.ServiceVersion.V2024_02_04, LiveServiceVersions = new object[] { BlobClientOptions.ServiceVersion.V2023_08_03 })] public abstract class CommonTestBase : StorageTestBase { diff --git a/sdk/storage/Azure.Storage.Files.DataLake/assets.json b/sdk/storage/Azure.Storage.Files.DataLake/assets.json index 9fcbaf9b5f7a..0f7481666689 100644 --- a/sdk/storage/Azure.Storage.Files.DataLake/assets.json +++ b/sdk/storage/Azure.Storage.Files.DataLake/assets.json @@ -2,5 +2,5 @@ "AssetsRepo": "Azure/azure-sdk-assets", "AssetsRepoPrefixPath": "net", "TagPrefix": "net/storage/Azure.Storage.Files.DataLake", - "Tag": "net/storage/Azure.Storage.Files.DataLake_6bcfabcd30" + "Tag": "net/storage/Azure.Storage.Files.DataLake_9a05acfd65" } diff --git a/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakeClientOptions.cs b/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakeClientOptions.cs index 1bfe42794cc5..a6b9425057d4 100644 --- a/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakeClientOptions.cs +++ b/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakeClientOptions.cs @@ -131,7 +131,12 @@ public enum ServiceVersion /// /// The 2023-11-03 service version. /// - V2023_11_03 = 20 + V2023_11_03 = 20, + + /// + /// The 2024-02-04 service version. + /// + V2024_02_04 = 21 #pragma warning restore CA1707 // Identifiers should not contain underscores } diff --git a/sdk/storage/Azure.Storage.Files.DataLake/tests/DataLakeClientTestFixtureAttribute.cs b/sdk/storage/Azure.Storage.Files.DataLake/tests/DataLakeClientTestFixtureAttribute.cs index 158fec987b59..6f1047aafd1e 100644 --- a/sdk/storage/Azure.Storage.Files.DataLake/tests/DataLakeClientTestFixtureAttribute.cs +++ b/sdk/storage/Azure.Storage.Files.DataLake/tests/DataLakeClientTestFixtureAttribute.cs @@ -29,6 +29,7 @@ public DataLakeClientTestFixtureAttribute() DataLakeClientOptions.ServiceVersion.V2023_05_03, DataLakeClientOptions.ServiceVersion.V2023_08_03, DataLakeClientOptions.ServiceVersion.V2023_11_03, + DataLakeClientOptions.ServiceVersion.V2024_02_04, StorageVersionExtensions.LatestVersion, StorageVersionExtensions.MaxVersion) { diff --git a/sdk/storage/Azure.Storage.Files.Shares/assets.json b/sdk/storage/Azure.Storage.Files.Shares/assets.json index 6ca5a9d8dc59..77872b1bedaa 100644 --- a/sdk/storage/Azure.Storage.Files.Shares/assets.json +++ b/sdk/storage/Azure.Storage.Files.Shares/assets.json @@ -2,5 +2,5 @@ "AssetsRepo": "Azure/azure-sdk-assets", "AssetsRepoPrefixPath": "net", "TagPrefix": "net/storage/Azure.Storage.Files.Shares", - "Tag": "net/storage/Azure.Storage.Files.Shares_29361a65db" + "Tag": "net/storage/Azure.Storage.Files.Shares_80f67510e2" } diff --git a/sdk/storage/Azure.Storage.Files.Shares/src/ShareClientOptions.cs b/sdk/storage/Azure.Storage.Files.Shares/src/ShareClientOptions.cs index 4b59326f885d..031b7486d706 100644 --- a/sdk/storage/Azure.Storage.Files.Shares/src/ShareClientOptions.cs +++ b/sdk/storage/Azure.Storage.Files.Shares/src/ShareClientOptions.cs @@ -128,7 +128,12 @@ public enum ServiceVersion /// /// The 2023-11-03 service version. /// - V2023_11_03 = 20 + V2023_11_03 = 20, + + /// + /// The 2024-02-04 service version. + /// + V2024_02_04 = 21 #pragma warning restore CA1707 // Identifiers should not contain underscores } diff --git a/sdk/storage/Azure.Storage.Files.Shares/tests/ShareClientTestFixtureAttribute.cs b/sdk/storage/Azure.Storage.Files.Shares/tests/ShareClientTestFixtureAttribute.cs index 69ebba530e77..646f5d1cdd44 100644 --- a/sdk/storage/Azure.Storage.Files.Shares/tests/ShareClientTestFixtureAttribute.cs +++ b/sdk/storage/Azure.Storage.Files.Shares/tests/ShareClientTestFixtureAttribute.cs @@ -29,6 +29,7 @@ public ShareClientTestFixtureAttribute() ShareClientOptions.ServiceVersion.V2023_05_03, ShareClientOptions.ServiceVersion.V2023_08_03, ShareClientOptions.ServiceVersion.V2023_11_03, + ShareClientOptions.ServiceVersion.V2024_02_04, StorageVersionExtensions.LatestVersion, StorageVersionExtensions.MaxVersion) { diff --git a/sdk/storage/Azure.Storage.Queues/assets.json b/sdk/storage/Azure.Storage.Queues/assets.json index cc1d07dd5f0f..5b1f3a6fdd8f 100644 --- a/sdk/storage/Azure.Storage.Queues/assets.json +++ b/sdk/storage/Azure.Storage.Queues/assets.json @@ -2,5 +2,5 @@ "AssetsRepo": "Azure/azure-sdk-assets", "AssetsRepoPrefixPath": "net", "TagPrefix": "net/storage/Azure.Storage.Queues", - "Tag": "net/storage/Azure.Storage.Queues_55be873687" + "Tag": "net/storage/Azure.Storage.Queues_433065f86d" } diff --git a/sdk/storage/Azure.Storage.Queues/src/QueueClientOptions.cs b/sdk/storage/Azure.Storage.Queues/src/QueueClientOptions.cs index e12e8ab5e5c4..4620f2b2a584 100644 --- a/sdk/storage/Azure.Storage.Queues/src/QueueClientOptions.cs +++ b/sdk/storage/Azure.Storage.Queues/src/QueueClientOptions.cs @@ -134,7 +134,12 @@ public enum ServiceVersion /// /// The 2023-11-03 service version. /// - V2023_11_03 = 20 + V2023_11_03 = 20, + + /// + /// The 2024-02-04 service version. + /// + V2024_02_04 = 21 #pragma warning restore CA1707 // Identifiers should not contain underscores } From cf49d19a3ca126d9b311405945851e7b9ff58f09 Mon Sep 17 00:00:00 2001 From: Sean McCullough Date: Tue, 19 Sep 2023 21:11:19 -0500 Subject: [PATCH 2/2] Export API --- .../Azure.Storage.Blobs/api/Azure.Storage.Blobs.net6.0.cs | 1 + .../api/Azure.Storage.Blobs.netstandard2.0.cs | 1 + .../api/Azure.Storage.Blobs.netstandard2.1.cs | 1 + .../api/Azure.Storage.Files.DataLake.net6.0.cs | 1 + .../api/Azure.Storage.Files.DataLake.netstandard2.0.cs | 1 + .../api/Azure.Storage.Files.Shares.net6.0.cs | 1 + .../api/Azure.Storage.Files.Shares.netstandard2.0.cs | 1 + .../Azure.Storage.Queues/api/Azure.Storage.Queues.net6.0.cs | 1 + .../api/Azure.Storage.Queues.netstandard2.0.cs | 1 + .../api/Azure.Storage.Queues.netstandard2.1.cs | 1 + 10 files changed, 10 insertions(+) diff --git a/sdk/storage/Azure.Storage.Blobs/api/Azure.Storage.Blobs.net6.0.cs b/sdk/storage/Azure.Storage.Blobs/api/Azure.Storage.Blobs.net6.0.cs index 94cdda9583b3..29a9964d7bb9 100644 --- a/sdk/storage/Azure.Storage.Blobs/api/Azure.Storage.Blobs.net6.0.cs +++ b/sdk/storage/Azure.Storage.Blobs/api/Azure.Storage.Blobs.net6.0.cs @@ -82,6 +82,7 @@ public enum ServiceVersion V2023_05_03 = 18, V2023_08_03 = 19, V2023_11_03 = 20, + V2024_02_04 = 21, } } public partial class BlobContainerClient diff --git a/sdk/storage/Azure.Storage.Blobs/api/Azure.Storage.Blobs.netstandard2.0.cs b/sdk/storage/Azure.Storage.Blobs/api/Azure.Storage.Blobs.netstandard2.0.cs index 94cdda9583b3..29a9964d7bb9 100644 --- a/sdk/storage/Azure.Storage.Blobs/api/Azure.Storage.Blobs.netstandard2.0.cs +++ b/sdk/storage/Azure.Storage.Blobs/api/Azure.Storage.Blobs.netstandard2.0.cs @@ -82,6 +82,7 @@ public enum ServiceVersion V2023_05_03 = 18, V2023_08_03 = 19, V2023_11_03 = 20, + V2024_02_04 = 21, } } public partial class BlobContainerClient diff --git a/sdk/storage/Azure.Storage.Blobs/api/Azure.Storage.Blobs.netstandard2.1.cs b/sdk/storage/Azure.Storage.Blobs/api/Azure.Storage.Blobs.netstandard2.1.cs index 94cdda9583b3..29a9964d7bb9 100644 --- a/sdk/storage/Azure.Storage.Blobs/api/Azure.Storage.Blobs.netstandard2.1.cs +++ b/sdk/storage/Azure.Storage.Blobs/api/Azure.Storage.Blobs.netstandard2.1.cs @@ -82,6 +82,7 @@ public enum ServiceVersion V2023_05_03 = 18, V2023_08_03 = 19, V2023_11_03 = 20, + V2024_02_04 = 21, } } public partial class BlobContainerClient diff --git a/sdk/storage/Azure.Storage.Files.DataLake/api/Azure.Storage.Files.DataLake.net6.0.cs b/sdk/storage/Azure.Storage.Files.DataLake/api/Azure.Storage.Files.DataLake.net6.0.cs index 83b91d957b41..8d62f63d3e8d 100644 --- a/sdk/storage/Azure.Storage.Files.DataLake/api/Azure.Storage.Files.DataLake.net6.0.cs +++ b/sdk/storage/Azure.Storage.Files.DataLake/api/Azure.Storage.Files.DataLake.net6.0.cs @@ -31,6 +31,7 @@ public enum ServiceVersion V2023_05_03 = 18, V2023_08_03 = 19, V2023_11_03 = 20, + V2024_02_04 = 21, } } public partial class DataLakeDirectoryClient : Azure.Storage.Files.DataLake.DataLakePathClient diff --git a/sdk/storage/Azure.Storage.Files.DataLake/api/Azure.Storage.Files.DataLake.netstandard2.0.cs b/sdk/storage/Azure.Storage.Files.DataLake/api/Azure.Storage.Files.DataLake.netstandard2.0.cs index 83b91d957b41..8d62f63d3e8d 100644 --- a/sdk/storage/Azure.Storage.Files.DataLake/api/Azure.Storage.Files.DataLake.netstandard2.0.cs +++ b/sdk/storage/Azure.Storage.Files.DataLake/api/Azure.Storage.Files.DataLake.netstandard2.0.cs @@ -31,6 +31,7 @@ public enum ServiceVersion V2023_05_03 = 18, V2023_08_03 = 19, V2023_11_03 = 20, + V2024_02_04 = 21, } } public partial class DataLakeDirectoryClient : Azure.Storage.Files.DataLake.DataLakePathClient diff --git a/sdk/storage/Azure.Storage.Files.Shares/api/Azure.Storage.Files.Shares.net6.0.cs b/sdk/storage/Azure.Storage.Files.Shares/api/Azure.Storage.Files.Shares.net6.0.cs index 39fb21ed1ba1..2e29778bceff 100644 --- a/sdk/storage/Azure.Storage.Files.Shares/api/Azure.Storage.Files.Shares.net6.0.cs +++ b/sdk/storage/Azure.Storage.Files.Shares/api/Azure.Storage.Files.Shares.net6.0.cs @@ -126,6 +126,7 @@ public enum ServiceVersion V2023_05_03 = 18, V2023_08_03 = 19, V2023_11_03 = 20, + V2024_02_04 = 21, } } public partial class ShareDirectoryClient diff --git a/sdk/storage/Azure.Storage.Files.Shares/api/Azure.Storage.Files.Shares.netstandard2.0.cs b/sdk/storage/Azure.Storage.Files.Shares/api/Azure.Storage.Files.Shares.netstandard2.0.cs index 39fb21ed1ba1..2e29778bceff 100644 --- a/sdk/storage/Azure.Storage.Files.Shares/api/Azure.Storage.Files.Shares.netstandard2.0.cs +++ b/sdk/storage/Azure.Storage.Files.Shares/api/Azure.Storage.Files.Shares.netstandard2.0.cs @@ -126,6 +126,7 @@ public enum ServiceVersion V2023_05_03 = 18, V2023_08_03 = 19, V2023_11_03 = 20, + V2024_02_04 = 21, } } public partial class ShareDirectoryClient diff --git a/sdk/storage/Azure.Storage.Queues/api/Azure.Storage.Queues.net6.0.cs b/sdk/storage/Azure.Storage.Queues/api/Azure.Storage.Queues.net6.0.cs index d50bacbd7232..d94bad441ee1 100644 --- a/sdk/storage/Azure.Storage.Queues/api/Azure.Storage.Queues.net6.0.cs +++ b/sdk/storage/Azure.Storage.Queues/api/Azure.Storage.Queues.net6.0.cs @@ -99,6 +99,7 @@ public enum ServiceVersion V2023_05_03 = 18, V2023_08_03 = 19, V2023_11_03 = 20, + V2024_02_04 = 21, } } public partial class QueueMessageDecodingFailedEventArgs : Azure.SyncAsyncEventArgs diff --git a/sdk/storage/Azure.Storage.Queues/api/Azure.Storage.Queues.netstandard2.0.cs b/sdk/storage/Azure.Storage.Queues/api/Azure.Storage.Queues.netstandard2.0.cs index d50bacbd7232..d94bad441ee1 100644 --- a/sdk/storage/Azure.Storage.Queues/api/Azure.Storage.Queues.netstandard2.0.cs +++ b/sdk/storage/Azure.Storage.Queues/api/Azure.Storage.Queues.netstandard2.0.cs @@ -99,6 +99,7 @@ public enum ServiceVersion V2023_05_03 = 18, V2023_08_03 = 19, V2023_11_03 = 20, + V2024_02_04 = 21, } } public partial class QueueMessageDecodingFailedEventArgs : Azure.SyncAsyncEventArgs diff --git a/sdk/storage/Azure.Storage.Queues/api/Azure.Storage.Queues.netstandard2.1.cs b/sdk/storage/Azure.Storage.Queues/api/Azure.Storage.Queues.netstandard2.1.cs index d50bacbd7232..d94bad441ee1 100644 --- a/sdk/storage/Azure.Storage.Queues/api/Azure.Storage.Queues.netstandard2.1.cs +++ b/sdk/storage/Azure.Storage.Queues/api/Azure.Storage.Queues.netstandard2.1.cs @@ -99,6 +99,7 @@ public enum ServiceVersion V2023_05_03 = 18, V2023_08_03 = 19, V2023_11_03 = 20, + V2024_02_04 = 21, } } public partial class QueueMessageDecodingFailedEventArgs : Azure.SyncAsyncEventArgs