Merge branch 'master' into release-2021-04-13

Author: dingmeng-xue

appveyor.yml

@@ -18,6 +18,8 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Fixed an issue that delete immutable blob will prompt incorrect message.
+    - `Remove-AzStorageAccount`
 
 ## Version 3.5.1
 * Fixed copy blob fail with source context as Oauth [#14662]

src/Storage/Storage.Management/ChangeLog.md

@@ -181,7 +181,7 @@ internal async Task RemoveAzureBlob(long taskId, IStorageBlobManagement localCha
             }
             catch (StorageException e)
             {
-                if (e.IsConflictException() && retryDeleteSnapshot)
+                if (e.IsConflictException() && e.RequestInformation.ErrorCode.Equals("SnapshotsPresent", StringComparison.InvariantCultureIgnoreCase) && retryDeleteSnapshot)
                 {
                     //If x-ms-delete-snapshots is not specified on the request and the blob has associated snapshots, the Blob service returns status code 409 (Conflict).
                     retryDeleteSnapshot = true;