Merge pull request #589 from erezvani1529/master

[8.7] Release
Azure · Dec 14, 2017 · d40ee0e · d40ee0e
2 parents bdeb107 + ff2ce0c
commit d40ee0e
Show file tree

Hide file tree

Showing 68 changed files with 5,494 additions and 178 deletions.
diff --git a/...zure.Storage.Facade/FacadeLib/Microsoft.WindowsAzure.Storage.Shared.Protocol.Constants.cs b/...zure.Storage.Facade/FacadeLib/Microsoft.WindowsAzure.Storage.Shared.Protocol.Constants.cs
@@ -249,7 +249,7 @@ public static class EncryptionConstants
         public const string TableEncryptionKeyDetails = "_ClientEncryptionMetadata1";
         public const string TableEncryptionPropertyDetails = "_ClientEncryptionMetadata2";
         public const string AgentMetadataKey = "EncryptionLibrary";
-        public const string AgentMetadataValue = ".NET 8.6.0";
+        public const string AgentMetadataValue = ".NET 8.7.0";
     }
 }
 

diff --git a/...ge.Facade/FacadeLib/Microsoft.WindowsAzure.Storage.Shared.Protocol.EncryptionConstants.cs b/...ge.Facade/FacadeLib/Microsoft.WindowsAzure.Storage.Shared.Protocol.EncryptionConstants.cs
@@ -10,7 +10,7 @@ public static class EncryptionConstants
     public const string TableEncryptionKeyDetails = "_ClientEncryptionMetadata1";
     public const string TableEncryptionPropertyDetails = "_ClientEncryptionMetadata2";
     public const string AgentMetadataKey = "EncryptionLibrary";
-    public const string AgentMetadataValue = ".NET 8.6.0";
+    public const string AgentMetadataValue = ".NET 8.7.0";
 }
 
 }
diff --git a/...torage.Facade/FacadeLib/Microsoft.WindowsAzure.Storage.Shared.Protocol.HeaderConstants.cs b/...torage.Facade/FacadeLib/Microsoft.WindowsAzure.Storage.Shared.Protocol.HeaderConstants.cs
@@ -4,9 +4,9 @@ namespace Microsoft.WindowsAzure.Storage.Shared.Protocol
 
 public static class HeaderConstants
 {
-    public static readonly string UserAgent = "Azure-Storage/8.6.0 ";
+    public static readonly string UserAgent = "Azure-Storage/8.7.0 ";
     public const string UserAgentProductName = "Azure-Storage";
-    public const string UserAgentProductVersion = "8.6.0";
+    public const string UserAgentProductVersion = "8.7.0";
     public const string PrefixForStorageHeader = "x-ms-";
     public const string TrueHeader = "true";
     public const string FalseHeader = "false";

diff --git a/Lib/AspNet/Microsoft.WindowsAzure.Storage.Facade/Properties/AssemblyInfo.cs b/Lib/AspNet/Microsoft.WindowsAzure.Storage.Facade/Properties/AssemblyInfo.cs
@@ -31,8 +31,8 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("8.6.0.0")]
-[assembly: AssemblyFileVersion("8.6.0.0")]
+[assembly: AssemblyVersion("8.7.0.0")]
+[assembly: AssemblyFileVersion("8.7.0.0")]
 
 [assembly: InternalsVisibleTo(
     "Microsoft.WindowsAzure.Storage.Facade.Portable, PublicKey=" +

diff --git a/Lib/AspNet/Microsoft.WindowsAzure.Storage.Facade/project.json b/Lib/AspNet/Microsoft.WindowsAzure.Storage.Facade/project.json
@@ -1,6 +1,6 @@
 {
     "title": "Microsoft.WindowsAzure.Storage",
-    "version": "8.6.0.0",
+    "version": "8.7.0.0",
 
     "authors": [ "Microsoft Corporation" ],
     "description": "Azure Storage SDK for NetCore",

diff --git a/Lib/AspNet/Microsoft.WindowsAzure.Storage/AssemblyInfo.cs b/Lib/AspNet/Microsoft.WindowsAzure.Storage/AssemblyInfo.cs
@@ -13,7 +13,7 @@
 [assembly: AssemblyProduct("Microsoft Azure Storage")]
 [assembly: AssemblyCopyright("Copyright © 2014 Microsoft Corp.")]
 [assembly: AssemblyTrademark("Microsoft ® is a registered trademark of Microsoft Corporation.")]
-[assembly: AssemblyCulture("")]
+[assembly: AssemblyCulture("")] 
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
@@ -34,9 +34,9 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("8.6.0.0")]
-[assembly: AssemblyFileVersion("8.6.0.0")]
-[assembly: AssemblyInformationalVersion("8.6.0.0")]
+[assembly: AssemblyVersion("8.7.0.0")]
+[assembly: AssemblyFileVersion("8.7.0.0")]
+[assembly: AssemblyInformationalVersion("8.7.0.0")]
 
 
 [assembly: InternalsVisibleTo(

diff --git a/Lib/AspNet/Microsoft.WindowsAzure.Storage/WindowsAzure.StorageK.nuspec b/Lib/AspNet/Microsoft.WindowsAzure.Storage/WindowsAzure.StorageK.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata minClientVersion="2.12">
     <id>WindowsAzure.Storage</id>
-    <version>8.6.0</version>
+    <version>8.7.0</version>
     <title>Windows Azure Storage</title>
     <authors>Microsoft</authors>
     <owners>Microsoft</owners>

diff --git a/Lib/AspNet/Microsoft.WindowsAzure.Storage/project.json b/Lib/AspNet/Microsoft.WindowsAzure.Storage/project.json
@@ -1,5 +1,5 @@
 {
-    "version": "8.6.0.0",
+    "version": "8.7.0.0",
 
     "authors": [ "Microsoft Corporation" ],
     "description": "Azure Storage SDK for NetCore",

diff --git a/Lib/ClassLibraryCommon/Blob/BlobEncryptionPolicy.cs b/Lib/ClassLibraryCommon/Blob/BlobEncryptionPolicy.cs
@@ -243,7 +243,7 @@ internal ICryptoTransform CreateAndSetEncryptionContext(IDictionary<string, stri
                 encryptionData.KeyWrappingMetadata = new Dictionary<string, string>();
                 encryptionData.KeyWrappingMetadata[Constants.EncryptionConstants.AgentMetadataKey] = Constants.EncryptionConstants.AgentMetadataValue;
                 encryptionData.ContentEncryptionIV = aesProvider.IV;
-                metadata[Constants.EncryptionConstants.BlobEncryptionData] = JsonConvert.SerializeObject(encryptionData);
+                metadata[Constants.EncryptionConstants.BlobEncryptionData] = JsonConvert.SerializeObject(encryptionData, Formatting.None);
                 return aesProvider.CreateEncryptor();
             }
         }

diff --git a/Lib/ClassLibraryCommon/Blob/CloudAppendBlob.cs b/Lib/ClassLibraryCommon/Blob/CloudAppendBlob.cs
diff --git a/Lib/ClassLibraryCommon/Blob/CloudBlob.cs b/Lib/ClassLibraryCommon/Blob/CloudBlob.cs
diff --git a/Lib/ClassLibraryCommon/Blob/CloudBlockBlob.cs b/Lib/ClassLibraryCommon/Blob/CloudBlockBlob.cs
diff --git a/Lib/ClassLibraryCommon/Blob/CloudPageBlob.cs b/Lib/ClassLibraryCommon/Blob/CloudPageBlob.cs
diff --git a/Lib/ClassLibraryCommon/Core/Util/AsyncExtensions.cs b/Lib/ClassLibraryCommon/Core/Util/AsyncExtensions.cs
@@ -58,10 +58,13 @@ private static AsyncCallback CreateCallback<TResult>(TaskCompletionSource<TResul
             {
                 try
                 {
-                    if (registration.HasValue)
+                    Task.Run(() =>
                     {
-                        registration.Value.Dispose();
-                    }
+                        if (registration.HasValue)
+                        {
+                            registration.Value.Dispose();
+                        }
+                    });
 
                     TResult result = endMethod(ar);
                     taskCompletionSource.TrySetResult(result);
@@ -106,10 +109,13 @@ private static AsyncCallback CreateCallbackVoid(TaskCompletionSource<object> tas
             {
                 try
                 {
-                    if (registration.HasValue)
+                    Task.Run(() =>
                     {
-                        registration.Value.Dispose();
-                    }
+                        if (registration.HasValue)
+                        {
+                            registration.Value.Dispose();
+                        }
+                    });
 
                     endMethod(ar);
                     taskCompletionSource.TrySetResult(null);

diff --git a/Lib/ClassLibraryCommon/Core/Util/AsyncStreamCopier.cs b/Lib/ClassLibraryCommon/Core/Util/AsyncStreamCopier.cs
@@ -182,6 +182,8 @@ protected virtual void Dispose(bool disposing)
                     this.state = null;
                 }
             }
+
+            disposed = true;
         }
 
         /// <summary>

diff --git a/Lib/ClassLibraryCommon/Core/Util/TaskExtensions.cs b/Lib/ClassLibraryCommon/Core/Util/TaskExtensions.cs
@@ -28,7 +28,7 @@ internal static class TaskExtensions
         /// <summary>
         ///  Extension method to add cancellation logic to non-cancellable operations.
         /// </summary>
-        /// <param name="cancellationToken" the cancellation token which will be used to cancel the combined task </param>
+        /// <param name="cancellationToken"> the cancellation token which will be used to cancel the combined task </param>
         /// <remarks>Please refer to this post for more information: https://blogs.msdn.microsoft.com/pfxteam/2012/10/05/how-do-i-cancel-non-cancelable-async-operations/ </remarks>
         internal static async Task<T> WithCancellation<T>(this Task<T> task, CancellationToken cancellationToken)
         {
-Original file line number
+Diff line change
@@ Expand Up / @@ -182,6 +182,8 @@ protected virtual void Dispose(bool disposing) @@
                         this.state = null;
                     }
                 }
+                disposed = true;
             }
             /// <summary>
@@ Expand Down @@