Merge pull request #181 from pemari-msft/master

Storage Client Library 6.0.0
Azure · Sep 29, 2015 · 0e819b7 · 0e819b7
2 parents 823de43 + aa2e7a0
commit 0e819b7
Show file tree

Hide file tree

Showing 125 changed files with 7,485 additions and 1,729 deletions.
diff --git a/BreakingChanges.txt b/BreakingChanges.txt
@@ -1,3 +1,10 @@
+Tracking Breaking Changes since 5.0
+
+- All: Certain error messages returned by the Azure Storage Services have changed in the 2015-04-05 service version. 
+- All: Removed deprecated Shared Access Signature methods that take version as a parameter. 
+- Tables: Altered default settings for echoContent and payloadFormat. AtomPub payloadFormat is now obsolete.
+- Tables: Changed the client error message for batch transactions to be more clear.
+
 Tracking Breaking Changes since 4.0
 
 - All: Removed dependency on Microsoft.WindowsAzure.ConfigurationManager.

diff --git a/BuildAspNetK.cmd b/BuildAspNetK.cmd
@@ -1,8 +1,8 @@
 pushd %~dp0
-call Tools\nuget.exe install dnx-coreclr-win-x86 -Version 1.0.0-beta5 -Prerelease
-call Tools\nuget.exe install dnx-clr-win-x86 -Version 1.0.0-beta5 -Prerelease
-call dnx-coreclr-win-x86.1.0.0-beta5\bin\dnu restore
-call dnx-clr-win-x86.1.0.0-beta5\bin\dnu restore
+call Tools\nuget.exe install dnx-coreclr-win-x86 -Version 1.0.0-beta7 -Prerelease
+call Tools\nuget.exe install dnx-clr-win-x86 -Version 1.0.0-beta7 -Prerelease
+call dnx-coreclr-win-x86.1.0.0-beta7\bin\dnu restore
+call dnx-clr-win-x86.1.0.0-beta7\bin\dnu restore
 cd Lib\AspNet\Microsoft.WindowsAzure.Storage
-call ..\..\..\dnx-coreclr-win-x86.1.0.0-beta5\bin\dnu build --configuration release
+call ..\..\..\dnx-coreclr-win-x86.1.0.0-beta7\bin\dnu build --configuration release
 popd
diff --git a/Lib/AspNet/Microsoft.WindowsAzure.Storage/AssemblyInfo.cs b/Lib/AspNet/Microsoft.WindowsAzure.Storage/AssemblyInfo.cs
@@ -33,8 +33,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("5.0.3.0")]
-[assembly: AssemblyFileVersion("5.0.3.0")]
-[assembly: AssemblyInformationalVersion("5.0.3.0-preview")]
+[assembly: AssemblyVersion("6.0.1.0")]
+[assembly: AssemblyFileVersion("6.0.1.0")]
+[assembly: AssemblyInformationalVersion("6.0.1.0-preview")]
 
 [assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Storage.Test")]
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/2011/08/nuspec.xsd">
   <metadata minClientVersion="2.8.3">
     <id>WindowsAzure.Storage</id>
-    <version>5.0.3-preview</version>
+    <version>6.0.1-preview</version>
     <title>Windows Azure Storage</title>
     <authors>Microsoft</authors>
     <owners>Microsoft</owners>
@@ -16,55 +16,56 @@ Microsoft Azure Storage team's blog - http://blogs.msdn.com/b/windowsazurestorag
     <summary>A client library for working with Microsoft Azure storage services including blobs, files, tables, and queues.</summary>
     <tags>Microsoft, Azure, Storage, Table, Blob, File, Queue, Scalable, windowsazureofficial</tags>
     <dependencies>
-      <group targetFramework="ASP.NetCore5.0">
-        <dependency id="Microsoft.Data.OData" version="5.6.3" />
-        <dependency id="Microsoft.Data.Services.Client" version="5.6.3" />
-        <dependency id="System.Spatial" version="5.6.3" />
-        <dependency id="System.Collections" version="4.0.10-beta-22231" />
-        <dependency id="System.Collections.Concurrent" version="4.0.0-beta-22231" />
-        <dependency id="System.Collections.Specialized" version="4.0.0-beta-22231" />
-        <dependency id="System.Diagnostics.Debug" version="4.0.10-beta-22231" />
-        <dependency id="System.Diagnostics.Tools" version="4.0.0-beta-22231" />
-        <dependency id="System.Diagnostics.TraceSource" version="4.0.0-beta-22231" />
-        <dependency id="System.Diagnostics.Tracing" version="4.0.10-beta-22231" />
-        <dependency id="System.Dynamic.Runtime" version="4.0.0-beta-22231" />
-        <dependency id="System.Globalization" version="4.0.10-beta-22231" />
-        <dependency id="System.IO" version="4.0.10-beta-22231" />
-        <dependency id="System.IO.FileSystem" version="4.0.0-beta-22231" />
-        <dependency id="System.IO.FileSystem.Primitives" version="4.0.0-beta-22231" />
-        <dependency id="System.Linq" version="4.0.0-beta-22231" />
-        <dependency id="System.Linq.Expressions" version="4.0.0-beta-22231" />
-        <dependency id="System.Linq.Queryable" version="4.0.0-beta-22231" />
-        <dependency id="System.Net.Http" version="4.0.0-beta-22231" />
-        <dependency id="System.Net.Primitives" version="4.0.10-beta-22231" />
-        <dependency id="System.Reflection" version="4.0.10-beta-22231" />
-        <dependency id="System.Reflection.Extensions" version="4.0.0-beta-22231" />
-        <dependency id="System.Reflection.TypeExtensions" version="4.0.0-beta-22231" />
-        <dependency id="System.Runtime" version="4.0.20-beta-22231" />
-        <dependency id="System.Runtime.Extensions" version="4.0.10-beta-22231" />
-        <dependency id="System.Runtime.InteropServices" version="4.0.20-beta-22231" />
-        <dependency id="System.Runtime.Serialization.Primitives" version="4.0.0-beta-22231" />
-        <dependency id="System.Runtime.Serialization.Xml" version="4.0.10-beta-22231" />
-        <dependency id="System.Security.Cryptography.Encoding" version="4.0.0-beta-22231" />
-        <dependency id="System.Security.Cryptography.Encryption" version="4.0.0-beta-22231" />
-        <dependency id="System.Security.Cryptography.Hashing" version="4.0.0-beta-22231" />
-        <dependency id="System.Security.Cryptography.Hashing.Algorithms" version="4.0.0-beta-22231" />
-        <dependency id="System.Text.Encoding" version="4.0.10-beta-22231" />
-        <dependency id="System.Text.Encoding.Extensions" version="4.0.10-beta-22231" />
-        <dependency id="System.Text.RegularExpressions" version="4.0.10-beta-22231" />
-        <dependency id="System.Threading" version="4.0.0-beta-22231" />
-        <dependency id="System.Threading.Tasks" version="4.0.10-beta-22231" />
-        <dependency id="System.Threading.Thread" version="4.0.0-beta-22231" />
-        <dependency id="System.Threading.ThreadPool" version="4.0.10-beta-22231" />
-        <dependency id="System.Threading.Timer" version="4.0.0-beta-22231" />
-        <dependency id="System.Xml.ReaderWriter" version="4.0.10-beta-22231" />
-        <dependency id="System.Xml.XDocument" version="4.0.0-beta-22231" />
-        <dependency id="System.Xml.XmlSerializer" version="4.0.0-beta-22231" />
+      <group targetFramework="DNXCore5.0">
+        <dependency id="Microsoft.Data.OData" version="5.6.4" />
+        <dependency id="Microsoft.Data.Services.Client" version="5.6.4" />
+        <dependency id="System.Spatial" version="5.6.4" />
+        <dependency id="Newtonsoft.Json" version="6.0.8" />
+        <dependency id="System.Collections" version="4.0.11-beta-23225" />
+        <dependency id="System.Collections.Concurrent" version="4.0.11-beta-23225" />
+        <dependency id="System.Collections.Specialized" version="4.0.0-beta-23109" />
+        <dependency id="System.Diagnostics.Debug" version="4.0.11-beta-23225" />
+        <dependency id="System.Diagnostics.Tools" version="4.0.1-beta-23225" />
+        <dependency id="System.Diagnostics.TraceSource" version="4.0.0-beta-23225" />
+        <dependency id="System.Diagnostics.Tracing" version="4.0.21-beta-23225" />
+        <dependency id="System.Dynamic.Runtime" version="4.0.11-beta-23225" />
+        <dependency id="System.Globalization" version="4.0.11-beta-23225" />
+        <dependency id="System.IO" version="4.0.11-beta-23225" />
+        <dependency id="System.IO.FileSystem" version="4.0.1-beta-23225" />
+        <dependency id="System.IO.FileSystem.Primitives" version="4.0.1-beta-23225" />
+        <dependency id="System.Linq" version="4.0.1-beta-23225" />
+        <dependency id="System.Linq.Expressions" version="4.0.11-beta-23225" />
+        <dependency id="System.Linq.Queryable" version="4.0.0-beta-23109" />
+        <dependency id="System.Net.Http" version="4.0.1-beta-23225" />
+        <dependency id="System.Net.Primitives" version="4.0.11-beta-23225" />
+        <dependency id="System.Reflection" version="4.1.0-beta-23225" />
+        <dependency id="System.Reflection.Extensions" version="4.0.1-beta-23225" />
+        <dependency id="System.Reflection.TypeExtensions" version="4.0.1-beta-23225" />
+        <dependency id="System.Runtime" version="4.0.20-beta-23109" />
+        <dependency id="System.Runtime.Extensions" version="4.0.11-beta-23225" />
+        <dependency id="System.Runtime.InteropServices" version="4.0.21-beta-23225" />
+        <dependency id="System.Runtime.Serialization.Primitives" version="4.0.0-beta-23109" />
+        <dependency id="System.Runtime.Serialization.Xml" version="4.0.10-beta-23109" />
+        <dependency id="System.Security.Cryptography.Encoding" version="4.0.0-beta-23225" />
+        <dependency id="System.Security.Cryptography.Primitives" version="4.0.0-beta-23225" />
+        <dependency id="System.Security.Cryptography.Algorithms" version="4.0.0-beta-23225" />
+        <dependency id="System.Text.Encoding" version="4.0.11-beta-23225" />
+        <dependency id="System.Text.Encoding.Extensions" version="4.0.11-beta-23225" />
+        <dependency id="System.Text.RegularExpressions" version="4.0.11-beta-23225" />
+        <dependency id="System.Threading" version="4.0.11-beta-23225" />
+        <dependency id="System.Threading.Tasks" version="4.0.11-beta-23225" />
+        <dependency id="System.Threading.Thread" version="4.0.0-beta-23225" />
+        <dependency id="System.Threading.ThreadPool" version="4.0.10-beta-23225" />
+        <dependency id="System.Threading.Timer" version="4.0.1-beta-23225" />
+        <dependency id="System.Xml.ReaderWriter" version="4.0.11-beta-23225" />
+        <dependency id="System.Xml.XDocument" version="4.0.11-beta-23225" />
+        <dependency id="System.Xml.XmlSerializer" version="4.0.0-beta-23109" />
       </group>
-      <group targetFramework="ASP.Net5.0">
+      <group targetFramework="DNX4.5.1">
         <dependency id="Microsoft.Data.OData" version="5.6.4" />
         <dependency id="Microsoft.Data.Services.Client" version="5.6.4" />
         <dependency id="System.Spatial" version="5.6.4" />
+        <dependency id="Newtonsoft.Json" version="6.0.8" />
       </group>
       <group targetFramework="net40-client">
         <dependency id="Microsoft.Data.OData" version="5.6.4" />
@@ -74,9 +75,11 @@ Microsoft Azure Storage team's blog - http://blogs.msdn.com/b/windowsazurestorag
       </group>
       <group targetFramework="win8">
         <dependency id="Microsoft.Data.OData" version="5.6.4" />
+        <dependency id="Newtonsoft.Json" version="6.0.8" />
       </group>
       <group targetFramework="wpa">
         <dependency id="Microsoft.Data.OData" version="5.6.4" />
+        <dependency id="Newtonsoft.Json" version="6.0.8" />
       </group>
       <group targetFramework="wp8">
         <dependency id="Microsoft.Data.OData" version="5.6.4" />
@@ -85,6 +88,7 @@ Microsoft Azure Storage team's blog - http://blogs.msdn.com/b/windowsazurestorag
       </group> 
 	  <group targetFramework="portable-net45+netcore45+wpa81+MonoAndroid1+MonoTouch1">
         <dependency id="Microsoft.Data.OData" version="5.6.4" />
+        <dependency id="Newtonsoft.Json" version="6.0.8" />
       </group> 
     </dependencies>
     <frameworkAssemblies>

diff --git a/Lib/AspNet/Microsoft.WindowsAzure.Storage/project.json b/Lib/AspNet/Microsoft.WindowsAzure.Storage/project.json
@@ -1,54 +1,54 @@
 {
-    "version": "5.0.3.0",
+    "version": "6.0.1.0",
     "authors": [ "Microsoft Corporation" ],
     "description": "Azure Storage SDK for ASP.NET 5 Preview",
     "dependencies": {
-        "Microsoft.Data.OData": "5.6.3",
-        "Microsoft.Data.Services.Client": "5.6.3",
-        "System.Spatial": "5.6.3"
+        "Microsoft.Data.OData": "5.6.4",
+        "Microsoft.Data.Services.Client": "5.6.4",
+        "System.Spatial": "5.6.4",
+        "Newtonsoft.Json":  "6.0.8"
     },
     "frameworks": {
         "dnxcore50": {
             "dependencies": {
-                "System.Collections": "4.0.10-beta-*",
-                "System.Collections.Concurrent": "4.0.0-beta-*",
+                "System.Collections": "4.0.11-beta-*",
+                "System.Collections.Concurrent": "4.0.11-beta-*",
                 "System.Collections.Specialized": "4.0.0-beta-*",
-                "System.Diagnostics.Debug": "4.0.10-beta-*",
-                "System.Diagnostics.Tools": "4.0.0-beta-*",
+                "System.Diagnostics.Debug": "4.0.11-beta-*",
+                "System.Diagnostics.Tools": "4.0.1-beta-*",
                 "System.Diagnostics.TraceSource": "4.0.0-beta-*",
-                "System.Diagnostics.Tracing": "4.0.10-beta-*",
-                "System.Dynamic.Runtime": "4.0.0-beta-*",
-                "System.Globalization": "4.0.10-beta-*",
-                "System.IO": "4.0.10-beta-*",
-                "System.IO.FileSystem": "4.0.0-beta-*",
-                "System.IO.FileSystem.Primitives": "4.0.0-beta-*",
-                "System.Linq": "4.0.0-beta-*",
-                "System.Linq.Expressions": "4.0.0-beta-*",
+                "System.Diagnostics.Tracing": "4.0.21-beta-*",
+                "System.Dynamic.Runtime": "4.0.11-beta-*",
+                "System.Globalization": "4.0.11-beta-*",
+                "System.IO": "4.0.11-beta-*",
+                "System.IO.FileSystem": "4.0.1-beta-*",
+                "System.IO.FileSystem.Primitives": "4.0.1-beta-*",
+                "System.Linq": "4.0.1-beta-*",
+                "System.Linq.Expressions": "4.0.11-beta-*",
                 "System.Linq.Queryable": "4.0.0-beta-*",
-                "System.Net.Http": "4.0.0-beta-*",
-                "System.Net.Primitives": "4.0.10-beta-*",
-                "System.Reflection": "4.0.10-beta-*",
-                "System.Reflection.Extensions": "4.0.0-beta-*",
-                "System.Reflection.TypeExtensions": "4.0.0-beta-*",
+                "System.Net.Http": "4.0.1-beta-*",
+                "System.Net.Primitives": "4.0.11-beta-*",
+                "System.Reflection": "4.1.0-beta-*",
+                "System.Reflection.Extensions": "4.0.1-beta-*",
+                "System.Reflection.TypeExtensions": "4.0.1-beta-*",
                 "System.Runtime": "4.0.20-beta-*",
-                "System.Runtime.Extensions": "4.0.10-beta-*",
-                "System.Runtime.InteropServices": "4.0.20-beta-*",
+                "System.Runtime.Extensions": "4.0.11-beta-*",
+                "System.Runtime.InteropServices": "4.0.21-beta-*",
                 "System.Runtime.Serialization.Primitives": "4.0.0-beta-*",
                 "System.Runtime.Serialization.Xml": "4.0.10-beta-*",
                 "System.Security.Cryptography.Encoding": "4.0.0-beta-*",
-                "System.Security.Cryptography.Encryption": "4.0.0-beta-*",
-                "System.Security.Cryptography.Hashing": "4.0.0-beta-*",
-                "System.Security.Cryptography.Hashing.Algorithms": "4.0.0-beta-*",
-                "System.Text.Encoding": "4.0.10-beta-*",
-                "System.Text.Encoding.Extensions": "4.0.10-beta-*",
-                "System.Text.RegularExpressions": "4.0.10-beta-*",
-                "System.Threading": "4.0.0-beta-*",
-                "System.Threading.Tasks": "4.0.10-beta-*",
+                "System.Security.Cryptography.Primitives": "4.0.0-beta-*",
+                "System.Security.Cryptography.Algorithms": "4.0.0-beta-*",
+                "System.Text.Encoding": "4.0.11-beta-*",
+                "System.Text.Encoding.Extensions": "4.0.11-beta-*",
+                "System.Text.RegularExpressions": "4.0.11-beta-*",
+                "System.Threading": "4.0.11-beta-*",
+                "System.Threading.Tasks": "4.0.11-beta-*",
                 "System.Threading.Thread": "4.0.0-beta-*",
                 "System.Threading.ThreadPool": "4.0.10-beta-*",
-                "System.Threading.Timer": "4.0.0-beta-*",
-                "System.Xml.ReaderWriter": "4.0.10-beta-*",
-                "System.Xml.XDocument": "4.0.0-beta-*",
+                "System.Threading.Timer": "4.0.1-beta-*",
+                "System.Xml.ReaderWriter": "4.0.11-beta-*",
+                "System.Xml.XDocument": "4.0.11-beta-*",
                 "System.Xml.XmlSerializer": "4.0.0-beta-*"
             }
         },

diff --git a/Lib/ClassLibraryCommon/Analytics/CloudAnalyticsClient.cs b/Lib/ClassLibraryCommon/Analytics/CloudAnalyticsClient.cs
@@ -121,6 +121,16 @@ public CloudTable GetHourMetricsTable(StorageService service, StorageLocation lo
                         return this.tableClient.GetTableReference(Constants.AnalyticsConstants.MetricsHourSecondaryTransactionsTable);
                     }
 
+                case StorageService.File:
+                    if (location == StorageLocation.Primary)
+                    {
+                        return this.tableClient.GetTableReference(Constants.AnalyticsConstants.MetricsHourPrimaryTransactionsFile);
+                    }
+                    else
+                    {
+                        return this.tableClient.GetTableReference(Constants.AnalyticsConstants.MetricsHourSecondaryTransactionsFile);
+                    }
+
                 default:
                     throw new ArgumentException(SR.InvalidStorageService);
             }
@@ -176,6 +186,16 @@ public CloudTable GetMinuteMetricsTable(StorageService service, StorageLocation
                         return this.tableClient.GetTableReference(Constants.AnalyticsConstants.MetricsMinuteSecondaryTransactionsTable);
                     }
 
+                case StorageService.File:
+                    if (location == StorageLocation.Primary)
+                    {
+                        return this.tableClient.GetTableReference(Constants.AnalyticsConstants.MetricsMinutePrimaryTransactionsFile);
+                    }
+                    else
+                    {
+                        return this.tableClient.GetTableReference(Constants.AnalyticsConstants.MetricsMinuteSecondaryTransactionsFile);
+                    }
+
                 default:
                     throw new ArgumentException(SR.InvalidStorageService);
             }

diff --git a/Lib/ClassLibraryCommon/Analytics/LogRecordStreamReader.cs b/Lib/ClassLibraryCommon/Analytics/LogRecordStreamReader.cs
@@ -180,7 +180,7 @@ public void EndCurrentRecord()
                 bool parsed = DateTimeOffset.TryParseExact(
                     temp,
                     format,
-                    null /* provider */,
+                    CultureInfo.InvariantCulture,
                     DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal,
                     out tempDateTime);
                 if (parsed)

diff --git a/Lib/ClassLibraryCommon/Blob/CloudPageBlob.cs b/Lib/ClassLibraryCommon/Blob/CloudPageBlob.cs
@@ -66,7 +66,7 @@ public CloudBlobStream OpenWrite(long? size, AccessCondition accessCondition = n
 
             if (modifiedOptions.EncryptionPolicy != null)
             {
-                transform = options.EncryptionPolicy.CreateAndSetEncryptionContext(this.Metadata, true /* noPadding */);
+                transform = modifiedOptions.EncryptionPolicy.CreateAndSetEncryptionContext(this.Metadata, true /* noPadding */);
             }
 #endif
 

diff --git a/Lib/ClassLibraryCommon/Shared/Protocol/HttpWebRequestFactory.cs b/Lib/ClassLibraryCommon/Shared/Protocol/HttpWebRequestFactory.cs
@@ -52,7 +52,7 @@ internal static HttpWebRequest CreateWebRequest(string method, Uri uri, int? tim
                 builder.Add("timeout", timeout.Value.ToString(CultureInfo.InvariantCulture));
             }
 
-#if WINDOWS_PHONE
+#if !WINDOWS_DESKTOP
             // Windows Phone does not allow the caller to disable caching, so a random GUID
             // is added to every URI to make it look a different request.
             builder.Add("randomguid", Guid.NewGuid().ToString("N"));

diff --git a/Lib/ClassLibraryCommon/Shared/Protocol/StorageService.cs b/Lib/ClassLibraryCommon/Shared/Protocol/StorageService.cs
@@ -36,5 +36,10 @@ public enum StorageService
         /// Table Service.
         /// </summary>
         Table,
+
+        /// <summary>
+        /// File Service.
+        /// </summary>
+        File,
     }
 }