Merge pull request #420 from erezvani1529/master

[.Net][Release 8.1.1] Fix for a problematic OData Reference
Azure · Feb 23, 2017 · 25e44ab · 25e44ab
2 parents 95663c4 + c349ab9
commit 25e44ab
Show file tree

Hide file tree

Showing 25 changed files with 42 additions and 45 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
@@ -245,7 +245,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.1.0";
+        public const string AgentMetadataValue = ".NET 8.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 8.1.0";
+    public const string AgentMetadataValue = ".NET 8.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/8.1.0 ";
+    public static readonly string UserAgent = "Azure-Storage/8.1.1 ";
     public const string UserAgentProductName = "Azure-Storage";
-    public const string UserAgentProductVersion = "8.1.0";
+    public const string UserAgentProductVersion = "8.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("8.1.0.0")]
-[assembly: AssemblyFileVersion("8.1.0.0")]
+[assembly: AssemblyVersion("8.1.1.0")]
+[assembly: AssemblyFileVersion("8.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,11 +1,10 @@
 {
     "title": "Microsoft.WindowsAzure.Storage",
-    "version": "8.1.0.0",
+    "version": "8.1.1.0",
     "authors": [ "Microsoft Corporation" ],
     "description": "Azure Storage SDK for NetCore",
     "dependencies": {
       "Microsoft.Data.OData": "5.8.2",
-      "Microsoft.Data.Services.Client": "5.8.2",
       "System.Spatial": "5.8.2",
       "Newtonsoft.Json": "9.0.1"
   },

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("8.1.0.0")]
-[assembly: AssemblyFileVersion("8.1.0.0")]
-[assembly: AssemblyInformationalVersion("8.1.0.0")]
+[assembly: AssemblyVersion("8.1.1.0")]
+[assembly: AssemblyFileVersion("8.1.1.0")]
+[assembly: AssemblyInformationalVersion("8.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>8.1.0</version>
+    <version>8.1.1</version>
     <title>Windows Azure Storage</title>
     <authors>Microsoft</authors>
     <owners>Microsoft</owners>
@@ -19,14 +19,12 @@
       <group targetFramework=".netstandard1.0">
         <dependency id="NETStandard.Library" version="1.6.0" />
         <dependency id="Microsoft.Data.OData" version="5.8.2" />
-        <dependency id="Microsoft.Data.Services.Client" version="5.8.2" />
         <dependency id="System.Spatial" version="5.8.2" />
         <dependency id="Newtonsoft.Json" version="9.0.1" />
       </group>
       <group targetFramework=".netstandard1.3">
         <dependency id="NETStandard.Library" version="1.6.0" />
         <dependency id="Microsoft.Data.OData" version="5.8.2" />
-        <dependency id="Microsoft.Data.Services.Client" version="5.8.2" />
         <dependency id="System.Spatial" version="5.8.2" />
         <dependency id="Newtonsoft.Json" version="9.0.1" />
       </group>

diff --git a/Lib/AspNet/Microsoft.WindowsAzure.Storage/project.json b/Lib/AspNet/Microsoft.WindowsAzure.Storage/project.json
@@ -1,11 +1,10 @@
 {
-    "version": "8.1.0.0",
+    "version": "8.1.1.0",
 
     "authors": [ "Microsoft Corporation" ],
     "description": "Azure Storage SDK for NetCore",
     "dependencies": {
         "Microsoft.Data.OData": "5.8.2",
-        "Microsoft.Data.Services.Client": "5.8.2",
         "System.Spatial": "5.8.2",
         "Newtonsoft.Json": "9.0.1"
     },

diff --git a/Lib/Common/Shared/Protocol/Constants.cs b/Lib/Common/Shared/Protocol/Constants.cs
@@ -824,7 +824,7 @@ static HeaderConstants()
             /// <summary>
             /// Specifies the value to use for UserAgent header.
             /// </summary>
-            public const string UserAgentProductVersion = "8.1.0";
+            public const string UserAgentProductVersion = "8.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("8.1.0.0")]
-[assembly: AssemblyFileVersion("8.1.0.0")]
+[assembly: AssemblyVersion("8.1.1.0")]
+[assembly: AssemblyFileVersion("8.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>8.1.0</version>
+    <version>8.1.1</version>
     <title>Windows Azure Storage</title>
     <authors>Microsoft</authors>
     <owners>Microsoft</owners>
@@ -19,14 +19,12 @@
       <group targetFramework=".netstandard1.0">
         <dependency id="NETStandard.Library" version="1.6.0" />
         <dependency id="Microsoft.Data.OData" version="5.8.2" />
-        <dependency id="Microsoft.Data.Services.Client" version="5.8.2" />
         <dependency id="System.Spatial" version="5.8.2" />
         <dependency id="Newtonsoft.Json" version="9.0.1" />
       </group>
       <group targetFramework=".netstandard1.3">
         <dependency id="NETStandard.Library" version="1.6.0" />
         <dependency id="Microsoft.Data.OData" version="5.8.2" />
-        <dependency id="Microsoft.Data.Services.Client" version="5.8.2" />
         <dependency id="System.Spatial" version="5.8.2" />
         <dependency id="Newtonsoft.Json" version="9.0.1" />
       </group>

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("8.1.0.0")]
-[assembly: AssemblyFileVersion("8.1.0.0")]
+[assembly: AssemblyVersion("8.1.1.0")]
+[assembly: AssemblyFileVersion("8.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("8.1.0.0")]
-[assembly: AssemblyFileVersion("8.1.0.0")]
+[assembly: AssemblyVersion("8.1.1.0")]
+[assembly: AssemblyFileVersion("8.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("8.1.0.0")]
-[assembly: AssemblyFileVersion("8.1.0.0")]
+[assembly: AssemblyVersion("8.1.1.0")]
+[assembly: AssemblyFileVersion("8.1.1.0")]
 
 [assembly: ComVisible(false)]
 

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Microsoft Azure Storage SDK for .NET (8.1.0)
+# Microsoft Azure Storage SDK for .NET (8.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,6 +1,6 @@
 {
   "title": "Microsoft.WindowsAzure.Storage.Facade.NetCore.Test",
-  "version": "8.1.0.0",
+  "version": "8.1.1.0",
   "testRunner": "xunit",
 
   "dependencies": {
@@ -16,7 +16,7 @@
           "type": "platform",
           "version": "1.0.0"
         },
-        "WindowsAzure.Storage": "8.1.0-test"
+        "WindowsAzure.Storage": "8.1.1"
       },
 
       "imports": "dnxcore50"

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": "8.1.0.0",
+  "version": "8.1.1.0",
   "supports": {},
   "dependencies": {
-    "WindowsAzure.Storage": "8.1.0-test"
+    "WindowsAzure.Storage": "8.1.1-test"
   },
   "frameworks": {
     ".NETPortable,Version=v4.5,Profile=Profile259": {}

diff --git a/Test/AspNet/Microsoft.WindowsAzure.Storage.Test/o_11xtmvop.my2 b/Test/AspNet/Microsoft.WindowsAzure.Storage.Test/o_11xtmvop.my2
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": "8.1.0.0",
+    "version": "8.1.1.0",
     "testRunner": "xunit",
 
     "dependencies": {
         "xunit": "2.1.0",
         "dotnet-test-xunit": "2.2.0-preview2-build1029",
-        "Microsoft.WindowsAzure.Storage": "8.1.0.0",
+        "Microsoft.WindowsAzure.Storage": "8.1.1.0",
         "XUnitForMsTest": "1.0.0-*"
     },
 

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("8.1.0.0")]
-[assembly: AssemblyFileVersion("8.1.0.0")]
+[assembly: AssemblyVersion("8.1.1.0")]
+[assembly: AssemblyFileVersion("8.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("8.1.0.0")]
-[assembly: AssemblyFileVersion("8.1.0.0")]
+[assembly: AssemblyVersion("8.1.1.0")]
+[assembly: AssemblyFileVersion("8.1.1.0")]
 
 [assembly: NeutralResourcesLanguageAttribute("en-US")]
diff --git a/Test/WindowsPhone81/Properties/AssemblyInfo.cs b/Test/WindowsPhone81/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("8.1.0.0")]
-[assembly: AssemblyFileVersion("8.1.0.0")]
+[assembly: AssemblyVersion("8.1.1.0")]
+[assembly: AssemblyFileVersion("8.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("8.1.0.0")]
-[assembly: AssemblyFileVersion("8.1.0.0")]
+[assembly: AssemblyVersion("8.1.1.0")]
+[assembly: AssemblyFileVersion("8.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("8.1.0.0")]
-[assembly: AssemblyFileVersion("8.1.0.0")]
+[assembly: AssemblyVersion("8.1.1.0")]
+[assembly: AssemblyFileVersion("8.1.1.0")]
 
 [assembly: ComVisible(false)]
diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,6 @@
+Changes in 8.1.1 :
+- All (NetStandard/NetCore): Removed Microsoft.Data.Services.Client as a temporary fix to ODataLib dependency incompatibility with NetStandard
+
 Changes in 8.1.0 :
 - All: Updated OData references to the latest Netstandard friendly package version 5.8.2.
 - Queues (WinRT/NetCore): Fixed a bug where connections were not closed after an add message operation.