From cc83a0dc731af15c953ed334498176187550f23f Mon Sep 17 00:00:00 2001 From: Jocelyn Schreppler Date: Mon, 22 Jul 2024 13:55:44 -0400 Subject: [PATCH 1/2] block blob fix --- sdk/storage/Azure.Storage.Blobs/src/BlockBlobClient.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/sdk/storage/Azure.Storage.Blobs/src/BlockBlobClient.cs b/sdk/storage/Azure.Storage.Blobs/src/BlockBlobClient.cs index b4e902b7126f1..77804591ce4ac 100644 --- a/sdk/storage/Azure.Storage.Blobs/src/BlockBlobClient.cs +++ b/sdk/storage/Azure.Storage.Blobs/src/BlockBlobClient.cs @@ -882,7 +882,6 @@ internal virtual async Task> UploadInternal( if (content != null && validationOptions != null && validationOptions.ChecksumAlgorithm.ResolveAuto() == StorageChecksumAlgorithm.StorageCrc64 && - validationOptions.PrecalculatedChecksum.IsEmpty && ClientSideEncryption == null) // don't allow feature combination { // report progress in terms of caller bytes, not encoded bytes From 8884750df08ae8e228eaafbeb66b6a0c5a9c39d2 Mon Sep 17 00:00:00 2001 From: Jocelyn Schreppler Date: Tue, 23 Jul 2024 11:31:47 -0400 Subject: [PATCH 2/2] testproxy --- sdk/storage/Azure.Storage.Blobs/assets.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/storage/Azure.Storage.Blobs/assets.json b/sdk/storage/Azure.Storage.Blobs/assets.json index 09896c972bfe9..45749c782345c 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_d0c9efbfaf" + "Tag": "net/storage/Azure.Storage.Blobs_6a63d70288" }