Merge pull request #1013 from EmmaZhu/releasebranch

vinjiang · web-flow · commit 81cb4aea9903 · 2020-07-23T19:43:15.000-07:00
Version 11.2.0 release
diff --git a/Blob/Changelog.txt b/Blob/Changelog.txt
@@ -1,3 +1,8 @@
+Changes in 11.2.0:
+
+- Updated REST version to 2019-07-07.
+- Added support for encryption scope.
+
 Changes in 11.1.7:
 
 - None.
diff --git a/Blob/README.md b/Blob/README.md
@@ -1,4 +1,4 @@
-# Microsoft Azure Storage Blob SDK for .NET (11.1.7)
+# Microsoft Azure Storage Blob SDK for .NET (11.2.0)
 
 The Microsoft Azure Storage Blob SDK for .NET allows you to build Azure applications that take advantage of scalable cloud computing resources.
 
diff --git a/Common/README.md b/Common/README.md
@@ -1,4 +1,4 @@
-# Microsoft Azure Storage Common SDK for .NET (11.1.7)
+# Microsoft Azure Storage Common SDK for .NET (11.2.0)
 
 The Microsoft Azure Storage Common SDK for .NET is referenced by Azure Storage Blob/Queue/File SDKs and Azure CosmosDB Table SDK
 and should not be referenced directly by your application.
diff --git a/Common/changelog.txt b/Common/changelog.txt
@@ -1,3 +1,7 @@
+Changes in 11.2.0:
+
+- Updated REST version to 2019-07-07..
+
 Changes in 11.1.7:
 
 - None.
diff --git a/File/Changelog.txt b/File/Changelog.txt
@@ -1,3 +1,8 @@
+Changes in 11.2.0:
+
+- Updated REST version to 2019-07-07.
+- Added support for preserving SMB permissions and properties in file copying.
+
 Changes in 11.1.7:
 
 - None.
diff --git a/File/README.md b/File/README.md
@@ -1,4 +1,4 @@
-# Microsoft Azure Storage File SDK for .NET (11.1.7)
+# Microsoft Azure Storage File SDK for .NET (11.2.0)
 
 The Microsoft Azure Storage File SDK for .NET allows you to build Azure applications that take advantage of scalable cloud computing resources.
 
diff --git a/Lib/Common.Split/NetFx/Properties/AssemblyInfo.cs b/Lib/Common.Split/NetFx/Properties/AssemblyInfo.cs
@@ -35,9 +35,9 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("11.1.7.0")]
-[assembly: AssemblyFileVersion("11.1.7.0")]
-[assembly: AssemblyInformationalVersion("11.1.7.0")]
+[assembly: AssemblyVersion("11.2.0.0")]
+[assembly: AssemblyFileVersion("11.2.0.0")]
+[assembly: AssemblyInformationalVersion("11.2.0.0")]
 
 #if SIGN
 [assembly: InternalsVisibleTo(
diff --git a/Lib/Common.Split/NetStandard/Microsoft.Azure.Storage.Common/Properties/AssemblyInfo.cs b/Lib/Common.Split/NetStandard/Microsoft.Azure.Storage.Common/Properties/AssemblyInfo.cs
@@ -34,9 +34,9 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("11.1.7.0")]
-[assembly: AssemblyFileVersion("11.1.7.0")]
-[assembly: AssemblyInformationalVersion("11.1.7.0")]
+[assembly: AssemblyVersion("11.2.0.0")]
+[assembly: AssemblyFileVersion("11.2.0.0")]
+[assembly: AssemblyInformationalVersion("11.2.0.0")]
 
 #if SIGN
 [assembly: InternalsVisibleTo(
diff --git a/Lib/Common.Split/NetStandard2/Properties/AssemblyInfo.cs b/Lib/Common.Split/NetStandard2/Properties/AssemblyInfo.cs
@@ -35,9 +35,9 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("11.1.7.0")]
-[assembly: AssemblyFileVersion("11.1.7.0")]
-[assembly: AssemblyInformationalVersion("11.1.7.0")]
+[assembly: AssemblyVersion("11.2.0.0")]
+[assembly: AssemblyFileVersion("11.2.0.0")]
+[assembly: AssemblyInformationalVersion("11.2.0.0")]
 
 
 #if SIGN
diff --git a/Lib/Common/Shared/Protocol/Constants.cs b/Lib/Common/Shared/Protocol/Constants.cs
@@ -1060,7 +1060,7 @@ static HeaderConstants()
             /// <summary>
             /// Specifies the value to use for UserAgent header.
             /// </summary>
-            public const string UserAgentProductVersion = "11.1.7";
+            public const string UserAgentProductVersion = "11.2.0";
 
             /// <summary>
             /// Master Microsoft Azure Storage header prefix.
diff --git a/Lib/NetStandard2.Split/Blob/Properties/AssemblyInfo.cs b/Lib/NetStandard2.Split/Blob/Properties/AssemblyInfo.cs
@@ -35,9 +35,9 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("11.1.7.0")]
-[assembly: AssemblyFileVersion("11.1.7.0")]
-[assembly: AssemblyInformationalVersion("11.1.7.0")]
+[assembly: AssemblyVersion("11.2.0.0")]
+[assembly: AssemblyFileVersion("11.2.0.0")]
+[assembly: AssemblyInformationalVersion("11.2.0.0")]
 
 #if SIGN
 [assembly: InternalsVisibleTo(
diff --git a/Lib/NetStandard2.Split/File/Properties/AssemblyInfo.cs b/Lib/NetStandard2.Split/File/Properties/AssemblyInfo.cs
@@ -35,9 +35,9 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("11.1.7.0")]
-[assembly: AssemblyFileVersion("11.1.7.0")]
-[assembly: AssemblyInformationalVersion("11.1.7.0")]
+[assembly: AssemblyVersion("11.2.0.0")]
+[assembly: AssemblyFileVersion("11.2.0.0")]
+[assembly: AssemblyInformationalVersion("11.2.0.0")]
 
 #if SIGN
 [assembly: InternalsVisibleTo("Microsoft.Azure.Storage.Test, PublicKey=" +
diff --git a/Lib/NetStandard2.Split/Queue/Properties/AssemblyInfo.cs b/Lib/NetStandard2.Split/Queue/Properties/AssemblyInfo.cs
@@ -35,9 +35,9 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("11.1.7.0")]
-[assembly: AssemblyFileVersion("11.1.7.0")]
-[assembly: AssemblyInformationalVersion("11.1.7.0")]
+[assembly: AssemblyVersion("11.2.0.0")]
+[assembly: AssemblyFileVersion("11.2.0.0")]
+[assembly: AssemblyInformationalVersion("11.2.0.0")]
 
 #if SIGN
 [assembly: InternalsVisibleTo(
diff --git a/Lib/Netstandard.Split/Microsoft.Azure.Storage.Blob/Properties/AssemblyInfo.cs b/Lib/Netstandard.Split/Microsoft.Azure.Storage.Blob/Properties/AssemblyInfo.cs
@@ -34,9 +34,9 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("11.1.7")]
-[assembly: AssemblyFileVersion("11.1.7")]
-[assembly: AssemblyInformationalVersion("11.1.7.0")]
+[assembly: AssemblyVersion("11.2.0")]
+[assembly: AssemblyFileVersion("11.2.0")]
+[assembly: AssemblyInformationalVersion("11.2.0.0")]
 
 #if SIGN
 [assembly: InternalsVisibleTo(
diff --git a/Lib/Netstandard.Split/Microsoft.Azure.Storage.File/Properties/AssemblyInfo.cs b/Lib/Netstandard.Split/Microsoft.Azure.Storage.File/Properties/AssemblyInfo.cs
@@ -34,9 +34,9 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("11.1.7")]
-[assembly: AssemblyFileVersion("11.1.7")]
-[assembly: AssemblyInformationalVersion("11.1.7.0")]
+[assembly: AssemblyVersion("11.2.0")]
+[assembly: AssemblyFileVersion("11.2.0")]
+[assembly: AssemblyInformationalVersion("11.2.0.0")]
 
 [assembly: InternalsVisibleTo(
     "Microsoft.Azure.Storage.Test, PublicKey=" +
diff --git a/Lib/Netstandard.Split/Microsoft.Azure.Storage.Queue/Properties/AssemblyInfo.cs b/Lib/Netstandard.Split/Microsoft.Azure.Storage.Queue/Properties/AssemblyInfo.cs
@@ -22,9 +22,9 @@
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("9d154050-0b01-4f70-afa3-8e2176e9cd73")]
 
-[assembly: AssemblyVersion("11.1.7")]
-[assembly: AssemblyFileVersion("11.1.7")]
-[assembly: AssemblyInformationalVersion("11.1.7.0")]
+[assembly: AssemblyVersion("11.2.0")]
+[assembly: AssemblyFileVersion("11.2.0")]
+[assembly: AssemblyInformationalVersion("11.2.0.0")]
 
 [assembly: InternalsVisibleTo(
     "Microsoft.Azure.Storage.Test, PublicKey=" +
diff --git a/Lib/WindowsDesktop.Split/Blob/Properties/AssemblyInfo.cs b/Lib/WindowsDesktop.Split/Blob/Properties/AssemblyInfo.cs
@@ -35,9 +35,9 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("11.1.7")]
-[assembly: AssemblyFileVersion("11.1.7")]
-[assembly: AssemblyInformationalVersion("11.1.7.0")]
+[assembly: AssemblyVersion("11.2.0")]
+[assembly: AssemblyFileVersion("11.2.0")]
+[assembly: AssemblyInformationalVersion("11.2.0.0")]
 
 #if SIGN
 [assembly: InternalsVisibleTo(
diff --git a/Lib/WindowsDesktop.Split/File/Properties/AssemblyInfo.cs b/Lib/WindowsDesktop.Split/File/Properties/AssemblyInfo.cs
@@ -35,9 +35,9 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("11.1.7")]
-[assembly: AssemblyFileVersion("11.1.7")]
-[assembly: AssemblyInformationalVersion("11.1.7.0")]
+[assembly: AssemblyVersion("11.2.0")]
+[assembly: AssemblyFileVersion("11.2.0")]
+[assembly: AssemblyInformationalVersion("11.2.0.0")]
 
 #if SIGN
 [assembly: InternalsVisibleTo(
diff --git a/Lib/WindowsDesktop.Split/Queue/Properties/AssemblyInfo.cs b/Lib/WindowsDesktop.Split/Queue/Properties/AssemblyInfo.cs
@@ -35,9 +35,9 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("11.1.7")]
-[assembly: AssemblyFileVersion("11.1.7")]
-[assembly: AssemblyInformationalVersion("11.1.7.0")]
+[assembly: AssemblyVersion("11.2.0")]
+[assembly: AssemblyFileVersion("11.2.0")]
+[assembly: AssemblyInformationalVersion("11.2.0.0")]
 
 #if SIGN
 [assembly: InternalsVisibleTo(
diff --git a/Nuspecs/CreatePackages/CreatePackages.csproj b/Nuspecs/CreatePackages/CreatePackages.csproj
@@ -1,7 +1,7 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="BuildPackage" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <VersionNumber>11.1.7</VersionNumber>
+    <VersionNumber>11.2.0</VersionNumber>
     <MasterBranch>origin/master</MasterBranch>
     <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <TargetFrameworkProfile />
diff --git a/Queue/Changelog.txt b/Queue/Changelog.txt
@@ -1,3 +1,7 @@
+Changes in 11.2.0:
+
+- Updated REST version to 2019-07-07.
+
 Changes in 11.1.7:
 
 - GitHub Issue #999 - NetworkTimeout not applied correctly in QueueRequestOptions.
diff --git a/Queue/README.md b/Queue/README.md
@@ -1,4 +1,4 @@
-# Microsoft Azure Storage Queue SDK for .NET (11.1.7)
+# Microsoft Azure Storage Queue SDK for .NET (11.2.0)
 
 The Microsoft Azure Storage Queue SDK for .NET allows you to build Azure applications that take advantage of scalable cloud computing resources.
 
diff --git a/README.md b/README.md
@@ -21,9 +21,9 @@
     
 We have engineered a highly performant and scalable SDK with our V12 releases. We encourage all our customers to give it a try.
 
-# Microsoft Azure Storage SDK for .NET (11.1.7)
+# Microsoft Azure Storage SDK for .NET (11.2.0)
 
-> Server Version: 2019-02-02
+> Server Version: 2019-07-07
 
 The Microsoft Azure Storage SDK for .NET allows you to build Azure applications 
 that take advantage of scalable cloud computing resources.
diff --git a/Test/ClassLibraryCommon/Blob/BlobCancellationUnitTests.cs b/Test/ClassLibraryCommon/Blob/BlobCancellationUnitTests.cs
@@ -92,7 +92,7 @@ public void CloudBlockBlobDownloadToStreamAPMCancel()
                             }
                             catch (StorageException ex)
                             {
-                                Assert.AreEqual("The operation was canceled.", ex.Message);
+                                Assert.AreEqual("A task was canceled.", ex.Message);
                                 Assert.AreEqual(ex.RequestInformation.HttpStatusCode, 306);
                                 Assert.AreEqual(ex.RequestInformation.HttpStatusMessage, null);
                             }
diff --git a/Test/ClassLibraryCommon/Blob/CloudAppendBlobTest.cs b/Test/ClassLibraryCommon/Blob/CloudAppendBlobTest.cs
@@ -2208,10 +2208,10 @@ public void CloudAppendBlobSnapshot()
 
                 List<IListBlobItem> blobs = container.ListBlobs(null, true, BlobListingDetails.All, null, null).ToList();
                 Assert.AreEqual(4, blobs.Count);
-                AssertAreEqual(snapshot1, (CloudBlob)blobs[0]);
-                AssertAreEqual(snapshot2, (CloudBlob)blobs[1]);
-                AssertAreEqual(blob, (CloudBlob)blobs[2]);
-                AssertAreEqual(snapshotCopy, (CloudBlob)blobs[3]);
+                AssertAreEqual(snapshotCopy, (CloudBlob)blobs[0]);
+                AssertAreEqual(snapshot1, (CloudBlob)blobs[1]);
+                AssertAreEqual(snapshot2, (CloudBlob)blobs[2]);
+                AssertAreEqual(blob, (CloudBlob)blobs[3]);
             }
             finally
             {
@@ -2301,10 +2301,11 @@ public void CloudAppendBlobSnapshotAPM()
 
                     List<IListBlobItem> blobs = container.ListBlobs(null, true, BlobListingDetails.All, null, null).ToList();
                     Assert.AreEqual(4, blobs.Count);
-                    AssertAreEqual(snapshot1, (CloudBlob)blobs[0]);
-                    AssertAreEqual(snapshot2, (CloudBlob)blobs[1]);
-                    AssertAreEqual(blob, (CloudBlob)blobs[2]);
-                    AssertAreEqual(snapshotCopy, (CloudBlob)blobs[3]);
+
+                    AssertAreEqual(snapshotCopy, (CloudBlob)blobs[0]);
+                    AssertAreEqual(snapshot1, (CloudBlob)blobs[1]);
+                    AssertAreEqual(snapshot2, (CloudBlob)blobs[2]);
+                    AssertAreEqual(blob, (CloudBlob)blobs[3]);
                 }
             }
             finally
@@ -2385,10 +2386,10 @@ public async Task CloudAppendBlobSnapshotTask()
                              .Results
                              .ToList();
                 Assert.AreEqual(4, blobs.Count);
-                AssertAreEqual(snapshot1, (CloudBlob)blobs[0]);
-                AssertAreEqual(snapshot2, (CloudBlob)blobs[1]);
-                AssertAreEqual(blob, (CloudBlob)blobs[2]);
-                AssertAreEqual(snapshotCopy, (CloudBlob)blobs[3]);
+                AssertAreEqual(snapshotCopy, (CloudBlob)blobs[0]);
+                AssertAreEqual(snapshot1, (CloudBlob)blobs[1]);
+                AssertAreEqual(snapshot2, (CloudBlob)blobs[2]);
+                AssertAreEqual(blob, (CloudBlob)blobs[3]);
             }
             finally
             {
diff --git a/Test/ClassLibraryCommon/Blob/CloudBlobTest.cs b/Test/ClassLibraryCommon/Blob/CloudBlobTest.cs
@@ -129,10 +129,10 @@ public void CloudBlobSnapshot()
 
                 List<IListBlobItem> blobs = container.ListBlobs(null, true, BlobListingDetails.All, null, null).ToList();
                 Assert.AreEqual(4, blobs.Count);
-                AssertAreEqual(snapshot1, (CloudBlob)blobs[0]);
-                AssertAreEqual(snapshot2, (CloudBlob)blobs[1]);
-                AssertAreEqual(blob, (CloudBlob)blobs[2]);
-                AssertAreEqual(snapshotCopy, (CloudBlob)blobs[3]);
+                AssertAreEqual(snapshotCopy, (CloudBlob)blobs[0]);
+                AssertAreEqual(snapshot1, (CloudBlob)blobs[1]);
+                AssertAreEqual(snapshot2, (CloudBlob)blobs[2]);
+                AssertAreEqual(blob, (CloudBlob)blobs[3]);
             }
             finally
             {
@@ -217,10 +217,10 @@ public void CloudBlobSnapshotAPM()
 
                     List<IListBlobItem> blobs = container.ListBlobs(null, true, BlobListingDetails.All, null, null).ToList();
                     Assert.AreEqual(4, blobs.Count);
-                    AssertAreEqual(snapshot1, (CloudBlob)blobs[0]);
-                    AssertAreEqual(snapshot2, (CloudBlob)blobs[1]);
-                    AssertAreEqual(blob, (CloudBlob)blobs[2]);
-                    AssertAreEqual(snapshotCopy, (CloudBlob)blobs[3]);
+                    AssertAreEqual(snapshotCopy, (CloudBlob)blobs[0]);
+                    AssertAreEqual(snapshot1, (CloudBlob)blobs[1]);
+                    AssertAreEqual(snapshot2, (CloudBlob)blobs[2]);
+                    AssertAreEqual(blob, (CloudBlob)blobs[3]);
                 }
             }
             finally
@@ -302,11 +302,10 @@ public async Task CloudBlobSnapshotTask()
                              .Results
                              .ToList();
                 Assert.AreEqual(4, blobs.Count);
-                AssertAreEqual(snapshot1, (CloudBlob)blobs[0]);
-                AssertAreEqual(snapshot2, (CloudBlob)blobs[1]);
-                Assert.IsTrue(((CloudBlob)blobs[2]).IsDeleted);
+                AssertAreEqual(snapshotCopy, (CloudBlob)blobs[0]);
+                AssertAreEqual(snapshot1, (CloudBlob)blobs[1]);
+                AssertAreEqual(snapshot2, (CloudBlob)blobs[2]);
                 AssertAreEqual(blob, (CloudBlob)blobs[3]);
-                AssertAreEqual(snapshotCopy, (CloudBlob)blobs[4]);
             }
             finally
             {
diff --git a/Test/ClassLibraryCommon/Blob/CloudBlockBlobTest.cs b/Test/ClassLibraryCommon/Blob/CloudBlockBlobTest.cs
@@ -3340,10 +3340,10 @@ public void CloudBlockBlobSnapshotAPM()
 
                     List<IListBlobItem> blobs = container.ListBlobs(null, true, BlobListingDetails.All, null, null).ToList();
                     Assert.AreEqual(4, blobs.Count);
-                    AssertAreEqual(snapshot1, (CloudBlob)blobs[0]);
-                    AssertAreEqual(snapshot2, (CloudBlob)blobs[1]);
-                    AssertAreEqual(blob, (CloudBlob)blobs[2]);
-                    AssertAreEqual(snapshotCopy, (CloudBlob)blobs[3]);
+                    AssertAreEqual(snapshotCopy, (CloudBlob)blobs[0]);
+                    AssertAreEqual(snapshot1, (CloudBlob)blobs[1]);
+                    AssertAreEqual(snapshot2, (CloudBlob)blobs[2]);
+                    AssertAreEqual(blob, (CloudBlob)blobs[3]);
                 }
             }
             finally
diff --git a/Test/ClassLibraryCommon/Blob/CloudPageBlobTest.cs b/Test/ClassLibraryCommon/Blob/CloudPageBlobTest.cs
diff --git a/Test/WindowsRuntime/Blob/CloudPageBlobTest.cs b/Test/WindowsRuntime/Blob/CloudPageBlobTest.cs

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Microsoft Azure Storage Blob SDK for .NET (11.1.7)`
	`1`	`+# Microsoft Azure Storage Blob SDK for .NET (11.2.0)`
`2`	`2`
`3`	`3`	`The Microsoft Azure Storage Blob SDK for .NET allows you to build Azure applications that take advantage of scalable cloud computing resources.`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Microsoft Azure Storage Common SDK for .NET (11.1.7)`
	`1`	`+# Microsoft Azure Storage Common SDK for .NET (11.2.0)`
`2`	`2`
`3`	`3`	`The Microsoft Azure Storage Common SDK for .NET is referenced by Azure Storage Blob/Queue/File SDKs and Azure CosmosDB Table SDK`
`4`	`4`	`and should not be referenced directly by your application.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Microsoft Azure Storage File SDK for .NET (11.1.7)`
	`1`	`+# Microsoft Azure Storage File SDK for .NET (11.2.0)`
`2`	`2`
`3`	`3`	`The Microsoft Azure Storage File SDK for .NET allows you to build Azure applications that take advantage of scalable cloud computing resources.`
`4`	`4`