[9.1.1] Release (#665)

* [NET] Fix support for double.Nan, double.PositiveInfinity, double.NegativeInfinity. Expand tests around the various EDM types. * [NET] Fix case where JSON serialization gets inadvertently overridden * Adding missing copyright notice * Fix non-table settings * Address CR comments, fix bug introduced in 9.0 where doubles were not marked with EdmType when sent to server. * Remove quotes from normal double values. * Fix NetCore support of NaN * Cap language use to C#5 * Further NetCore test fixes * Remove incorrect project nuget dependency, fix test * Test fixes * Revert serializer settings changes for encryption cases * [9.1.1]Update assembly versions for release * [9.1.1] Completed the reverts related to encryption SerializerSetting changes
Azure · Apr 4, 2018 · 3331c60 · 3331c60
1 parent e01de1b
commit 3331c60
Show file tree

Hide file tree

Showing 27 changed files with 57 additions and 48 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
@@ -256,7 +256,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 9.1.0";
+        public const string AgentMetadataValue = ".NET 9.1.1";
     }
 }
 

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 9.1.0";
+    public const string AgentMetadataValue = ".NET 9.1.1";
 }
 
 }
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/9.1.0 ";
+    public static readonly string UserAgent = "Azure-Storage/9.1.1 ";
     public const string UserAgentProductName = "Azure-Storage";
-    public const string UserAgentProductVersion = "9.1.0";
+    public const string UserAgentProductVersion = "9.1.1";
     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("9.1.0.0")]
-[assembly: AssemblyFileVersion("9.1.0.0")]
+[assembly: AssemblyVersion("9.1.1.0")]
+[assembly: AssemblyFileVersion("9.1.1.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": "9.1.0.0",
+    "version": "9.1.1.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
@@ -34,9 +34,9 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("9.1.0.0")]
-[assembly: AssemblyFileVersion("9.1.0.0")]
-[assembly: AssemblyInformationalVersion("9.1.0.0")]
+[assembly: AssemblyVersion("9.1.1.0")]
+[assembly: AssemblyFileVersion("9.1.1.0")]
+[assembly: AssemblyInformationalVersion("9.1.1.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>9.1.0</version>
+    <version>9.1.1</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": "9.1.0.0",
+    "version": "9.1.1.0",
 
     "authors": [ "Microsoft Corporation" ],
     "description": "Azure Storage SDK for NetCore",

diff --git a/Lib/ClassLibraryCommon/Blob/CloudBlob.cs b/Lib/ClassLibraryCommon/Blob/CloudBlob.cs
@@ -389,7 +389,7 @@ public virtual void RotateEncryptionKey(AccessCondition accessCondition = null,
             // Update the encryption metadata with the newly wrapped CEK and call SetMetadata.
             encryptionData.WrappedContentKey = new WrappedKey(modifiedOptions.EncryptionPolicy.Key.Kid, wrappedKey.encryptedKey, wrappedKey.algorithm);
 
-            this.Metadata[Constants.EncryptionConstants.BlobEncryptionData] = Newtonsoft.Json.JsonConvert.SerializeObject(encryptionData, DefaultSerializerSettings.Create());
+            this.Metadata[Constants.EncryptionConstants.BlobEncryptionData] = Newtonsoft.Json.JsonConvert.SerializeObject(encryptionData, Newtonsoft.Json.Formatting.None);
 
             if (accessCondition == null)
             {
@@ -569,7 +569,7 @@ public virtual async Task RotateEncryptionKeyAsync(AccessCondition accessConditi
 
             encryptionData.WrappedContentKey = new WrappedKey(modifiedOptions.EncryptionPolicy.Key.Kid, wrappedKey.encryptedKey, wrappedKey.algorithm);
 
-            this.Metadata[Constants.EncryptionConstants.BlobEncryptionData] = Newtonsoft.Json.JsonConvert.SerializeObject(encryptionData, DefaultSerializerSettings.Create());
+            this.Metadata[Constants.EncryptionConstants.BlobEncryptionData] = Newtonsoft.Json.JsonConvert.SerializeObject(encryptionData, Newtonsoft.Json.Formatting.None);
 
             if (accessCondition == null)
             {
@@ -4109,12 +4109,12 @@ private async Task<WrappedKeyData> RotateEncryptionHelper(AccessCondition access
             this.ValidateKeyRotationArguments(accessCondition, modifiedOptions, encryptionMetadataAvailable);
 
             // Deserialize the old encryption data and validate:
-            BlobEncryptionData encryptionData = Newtonsoft.Json.JsonConvert.DeserializeObject<BlobEncryptionData>(encryptionDataString, DefaultSerializerSettings.Create());
+            BlobEncryptionData encryptionData = Newtonsoft.Json.JsonConvert.DeserializeObject<BlobEncryptionData>(encryptionDataString);
             if (encryptionData.WrappedContentKey.EncryptedKey == null)
             {
                 throw new InvalidOperationException(SR.KeyRotationNoKeyID);
             }
-
+            
             // Use the key resolver to resolve the old KEK.
             Azure.KeyVault.Core.IKey oldKey = await modifiedOptions.EncryptionPolicy.KeyResolver.ResolveKeyAsync(encryptionData.WrappedContentKey.KeyId, cancellationToken).ConfigureAwait(false);
             if (oldKey == null)

diff --git a/Lib/ClassLibraryCommon/Queue/QueueEncryptionPolicy.cs b/Lib/ClassLibraryCommon/Queue/QueueEncryptionPolicy.cs
@@ -112,7 +112,7 @@ internal byte[] DecryptMessage(string inputMessage, bool? requireEncryption)
 
             try
             {
-                CloudQueueEncryptedMessage encryptedMessage = JsonConvert.DeserializeObject<CloudQueueEncryptedMessage>(inputMessage, DefaultSerializerSettings.Create());
+                CloudQueueEncryptedMessage encryptedMessage = JsonConvert.DeserializeObject<CloudQueueEncryptedMessage>(inputMessage);
 
                 if (requireEncryption.HasValue && requireEncryption.Value && encryptedMessage.EncryptionData == null)
                 {

diff --git a/Lib/Common/Shared/Protocol/Constants.cs b/Lib/Common/Shared/Protocol/Constants.cs
@@ -908,7 +908,7 @@ static HeaderConstants()
             /// <summary>
             /// Specifies the value to use for UserAgent header.
             /// </summary>
-            public const string UserAgentProductVersion = "9.1.0";
+            public const string UserAgentProductVersion = "9.1.1";
 
             /// <summary>
             /// Master Microsoft Azure Storage header prefix.

diff --git a/Lib/WindowsDesktop/Properties/AssemblyInfo.cs b/Lib/WindowsDesktop/Properties/AssemblyInfo.cs
@@ -35,8 +35,8 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("9.1.0.0")]
-[assembly: AssemblyFileVersion("9.1.0.0")]
+[assembly: AssemblyVersion("9.1.1.0")]
+[assembly: AssemblyFileVersion("9.1.1.0")]
 
 #if SIGN
 [assembly: InternalsVisibleTo(

diff --git a/Lib/WindowsDesktop/WindowsAzure.Storage.nuspec b/Lib/WindowsDesktop/WindowsAzure.Storage.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>9.1.0</version>
+    <version>9.1.1</version>
     <title>Windows Azure Storage</title>
     <authors>Microsoft</authors>
     <owners>Microsoft</owners>

diff --git a/Lib/WindowsPhone/Properties/AssemblyInfo.cs b/Lib/WindowsPhone/Properties/AssemblyInfo.cs
@@ -33,8 +33,8 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("9.1.0.0")]
-[assembly: AssemblyFileVersion("9.1.0.0")]
+[assembly: AssemblyVersion("9.1.1.0")]
+[assembly: AssemblyFileVersion("9.1.1.0")]
 
 [assembly: NeutralResourcesLanguageAttribute("en-US")]
 

diff --git a/Lib/WindowsPhoneRT/Properties/AssemblyInfo.cs b/Lib/WindowsPhoneRT/Properties/AssemblyInfo.cs
@@ -24,8 +24,8 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("9.1.0.0")]
-[assembly: AssemblyFileVersion("9.1.0.0")]
+[assembly: AssemblyVersion("9.1.1.0")]
+[assembly: AssemblyFileVersion("9.1.1.0")]
 
 [assembly: NeutralResourcesLanguageAttribute("en-US")]
 [assembly: ComVisible(false)]

diff --git a/Lib/WindowsRuntime/Properties/AssemblyInfo.cs b/Lib/WindowsRuntime/Properties/AssemblyInfo.cs
@@ -26,8 +26,8 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("9.1.0.0")]
-[assembly: AssemblyFileVersion("9.1.0.0")]
+[assembly: AssemblyVersion("9.1.1.0")]
+[assembly: AssemblyFileVersion("9.1.1.0")]
 
 [assembly: ComVisible(false)]
 

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Microsoft Azure Storage SDK for .NET (9.1.0)
+# Microsoft Azure Storage SDK for .NET (9.1.1)
 
 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/AspNet/Facade/Microsoft.WindowsAzure.Storage.Facade.NetCore.Test/project.json b/Test/AspNet/Facade/Microsoft.WindowsAzure.Storage.Facade.NetCore.Test/project.json
@@ -1,13 +1,13 @@
 {
   "title": "Microsoft.WindowsAzure.Storage.Facade.NetCore.Test",
-  "version": "9.1.0.0",
+  "version": "9.1.1.0",
   "testRunner": "xunit",
 
   "dependencies": {
     "xunit": "2.1.0",
     "dotnet-test-xunit": "2.2.0-preview2-build1029",
     "XUnitForMsTest": "1.0.0.0",
-    "WindowsAzure.Storage": "9.1.0"
+    "WindowsAzure.Storage": "9.1.1"
   },
 
   "frameworks": {

diff --git a/Test/AspNet/Facade/Microsoft.WindowsAzure.Storage.Facade.Portable/project.json b/Test/AspNet/Facade/Microsoft.WindowsAzure.Storage.Facade.Portable/project.json
@@ -1,8 +1,8 @@
 {
-  "version": "9.1.0.0",
+  "version": "9.1.1.0",
   "supports": {},
   "dependencies": {
-    "WindowsAzure.Storage": "9.1.0"
+    "WindowsAzure.Storage": "9.1.1"
   },
   "frameworks": {
     ".NETPortable,Version=v4.5,Profile=Profile259": {}

diff --git a/Test/AspNet/Microsoft.WindowsAzure.Storage.Test/project.json b/Test/AspNet/Microsoft.WindowsAzure.Storage.Test/project.json
@@ -1,11 +1,11 @@
 {
-    "version": "9.1.0.0",
+    "version": "9.1.1.0",
     "testRunner": "xunit",
 
     "dependencies": {
         "xunit": "2.1.0",
         "dotnet-test-xunit": "2.2.0-preview2-build1029",
-        "Microsoft.WindowsAzure.Storage": "9.1.0.0",
+        "Microsoft.WindowsAzure.Storage": "9.1.1.0",
         "XUnitForMsTest": "1.0.0-*"
     },
 

diff --git a/Test/ClassLibraryCommon/Table/SAS/TableSasUnitTests.cs b/Test/ClassLibraryCommon/Table/SAS/TableSasUnitTests.cs
@@ -1064,8 +1064,10 @@ public void TableUpdateSasTestSync()
                 string sasToken = table.GetSharedAccessSignature(policy);
                 StorageCredentials creds = new StorageCredentials(sasToken);
                 CloudTable sasTable = new CloudTable(table.Uri, creds);
+                BaseEntity entity2 = new BaseEntity("PK", "RK2");
+                entity2.Populate();
                 TestHelper.ExpectedException(
-                    () => sasTable.Execute(TableOperation.Insert(new BaseEntity("PK", "RK2"))),
+                    () => sasTable.Execute(TableOperation.Insert(entity2)),
                     "Try to insert an entity when SAS doesn't allow inserts",
                     HttpStatusCode.Forbidden);
 
@@ -1082,8 +1084,9 @@ public void TableUpdateSasTestSync()
                 creds.UpdateSASToken(sasToken2);
 
                 sasTable = new CloudTable(table.Uri, creds);
-
-                sasTable.Execute(TableOperation.Insert(new BaseEntity("PK", "RK2")));
+                BaseEntity entity3 = new BaseEntity("PK", "RK2");
+                entity3.Populate();
+                sasTable.Execute(TableOperation.Insert(entity3));
 
             }
             finally
@@ -1182,10 +1185,12 @@ public void TableSasUriPkRkTestSync()
 
                 Action<BaseEntity, CloudTable, OperationContext> insertDelegate = (tableEntity, sasTable1, ctx) =>
                 {
+                    tableEntity.Populate();
                     sasTable1.Execute(TableOperation.Insert(tableEntity), null, ctx);
                 };
 
                 pkrkEnt = new BaseEntity("tables_batch_2", "00");
+                pkrkEnt.Populate();
                 TestHelper.ExpectedException(
                     (ctx) => insertDelegate(pkrkEnt, sasTableTransformed, ctx),
                     string.Format("Inserted entity without appropriate SAS permissions."),

diff --git a/Test/WindowsDesktop/Properties/AssemblyInfo.cs b/Test/WindowsDesktop/Properties/AssemblyInfo.cs
@@ -33,6 +33,6 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("9.1.0.0")]
-[assembly: AssemblyFileVersion("9.1.0.0")]
+[assembly: AssemblyVersion("9.1.1.0")]
+[assembly: AssemblyFileVersion("9.1.1.0")]
 
diff --git a/Test/WindowsPhone/Properties/AssemblyInfo.cs b/Test/WindowsPhone/Properties/AssemblyInfo.cs
@@ -33,7 +33,7 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("9.1.0.0")]
-[assembly: AssemblyFileVersion("9.1.0.0")]
+[assembly: AssemblyVersion("9.1.1.0")]
+[assembly: AssemblyFileVersion("9.1.1.0")]
 
 [assembly: NeutralResourcesLanguageAttribute("en-US")]
diff --git a/Test/WindowsPhone81/Properties/AssemblyInfo.cs b/Test/WindowsPhone81/Properties/AssemblyInfo.cs
@@ -34,7 +34,7 @@
 // by using the '*' as shown below:
 
 
-[assembly: AssemblyVersion("9.1.0.0")]
-[assembly: AssemblyFileVersion("9.1.0.0")]
+[assembly: AssemblyVersion("9.1.1.0")]
+[assembly: AssemblyFileVersion("9.1.1.0")]
 
 [assembly: NeutralResourcesLanguageAttribute("en-US")]
diff --git a/Test/WindowsPhoneRT.Test/Properties/AssemblyInfo.cs b/Test/WindowsPhoneRT.Test/Properties/AssemblyInfo.cs
@@ -25,7 +25,7 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("9.1.0.0")]
-[assembly: AssemblyFileVersion("9.1.0.0")]
+[assembly: AssemblyVersion("9.1.1.0")]
+[assembly: AssemblyFileVersion("9.1.1.0")]
 
 [assembly: ComVisible(false)]
diff --git a/Test/WindowsRuntime/Properties/AssemblyInfo.cs b/Test/WindowsRuntime/Properties/AssemblyInfo.cs
@@ -25,7 +25,7 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("9.1.0.0")]
-[assembly: AssemblyFileVersion("9.1.0.0")]
+[assembly: AssemblyVersion("9.1.1.0")]
+[assembly: AssemblyFileVersion("9.1.1.0")]
 
 [assembly: ComVisible(false)]
diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,8 @@
-Change in 9.1.0:
+Changes in 9.1.1:
+- Table: Updated Table related APIs to use the default Json Serializer settings.
+- Table: Fixed a bug introduced after OData dependencies were removed, where support for double.NaN, double.PositiveInfinity and double.NegativeInfinity were lost.
+
+Changes in 9.1.0:
 - All: Updated Get*BlobReference APIs to inherit the existing ServiceClient instance.
 - All: Removed the un-necessary stream wrapping when progress tracking is not requested.
 - Blob(RT/NetCore): Removed Task.Run from CloudBlob Undelete API.