Merge pull request Azure#260 from WindowsAzure/dev

Windows Azure Storage Client Library 2.1.0.2
joeg · Oct 7, 2013 · eb043d5 · eb043d5
2 parents 3722158 + 98f2472
commit eb043d5
Show file tree

Hide file tree

Showing 48 changed files with 1,231 additions and 935 deletions.
diff --git a/microsoft-azure-api/Services/Storage/Lib/Common/Blob/BlobReadStreamBase.cs b/microsoft-azure-api/Services/Storage/Lib/Common/Blob/BlobReadStreamBase.cs
@@ -44,7 +44,7 @@ internal abstract class BlobReadStreamBase : Stream
         /// </summary>
         /// <param name="blob">Blob reference to read from</param>
         /// <param name="accessCondition">An object that represents the access conditions for the blob. If null, no condition is used.</param>
-        /// <param name="options">An object that specifies any additional options for the request.</param>
+        /// <param name="options">An object that specifies additional options for the request.</param>
         /// <param name="operationContext">An <see cref="OperationContext"/> object for tracking the current operation.</param>
         protected BlobReadStreamBase(ICloudBlob blob, AccessCondition accessCondition, BlobRequestOptions options, OperationContext operationContext)
         {
@@ -203,11 +203,10 @@ public override void Write(byte[] buffer, int offset, int count)
         }
 
         /// <summary>
-        /// This operation is not supported in BlobReadStreamBase.
+        /// This operation is a no-op in BlobReadStreamBase.
         /// </summary>
         public override void Flush()
         {
-            throw new NotSupportedException();
         }
 
         /// <summary>

diff --git a/microsoft-azure-api/Services/Storage/Lib/Common/Blob/BlobWriteStreamBase.cs b/microsoft-azure-api/Services/Storage/Lib/Common/Blob/BlobWriteStreamBase.cs
@@ -61,7 +61,7 @@ internal abstract class BlobWriteStreamBase :
         /// </summary>
         /// <param name="serviceClient">The service client.</param>        
         /// <param name="accessCondition">An object that represents the access conditions for the blob. If null, no condition is used.</param>
-        /// <param name="options">An object that specifies any additional options for the request.</param>
+        /// <param name="options">An object that specifies additional options for the request.</param>
         /// <param name="operationContext">An <see cref="OperationContext" /> object for tracking the current operation.</param>
         private BlobWriteStreamBase(CloudBlobClient serviceClient, AccessCondition accessCondition, BlobRequestOptions options, OperationContext operationContext)
             : base()
@@ -85,7 +85,7 @@ private BlobWriteStreamBase(CloudBlobClient serviceClient, AccessCondition acces
         /// </summary>
         /// <param name="blockBlob">Blob reference to write to.</param>
         /// <param name="accessCondition">An object that represents the access conditions for the blob. If null, no condition is used.</param>
-        /// <param name="options">An object that specifies any additional options for the request.</param>
+        /// <param name="options">An object that specifies additional options for the request.</param>
         /// <param name="operationContext">An <see cref="OperationContext"/> object for tracking the current operation.</param>
         protected BlobWriteStreamBase(CloudBlockBlob blockBlob, AccessCondition accessCondition, BlobRequestOptions options, OperationContext operationContext)
             : this(blockBlob.ServiceClient, accessCondition, options, operationContext)
@@ -103,7 +103,7 @@ protected BlobWriteStreamBase(CloudBlockBlob blockBlob, AccessCondition accessCo
         /// <param name="pageBlobSize">Size of the page blob.</param>
         /// <param name="createNew">Use <c>true</c> if the page blob is newly created, <c>false</c> otherwise.</param>
         /// <param name="accessCondition">An object that represents the access conditions for the blob. If null, no condition is used.</param>
-        /// <param name="options">An object that specifies any additional options for the request.</param>
+        /// <param name="options">An object that specifies additional options for the request.</param>
         /// <param name="operationContext">An <see cref="OperationContext"/> object for tracking the current operation.</param>
         protected BlobWriteStreamBase(CloudPageBlob pageBlob, long pageBlobSize, bool createNew, AccessCondition accessCondition, BlobRequestOptions options, OperationContext operationContext)
             : this(pageBlob.ServiceClient, accessCondition, options, operationContext)

diff --git a/microsoft-azure-api/Services/Storage/Lib/Common/Queue/CloudQueueClient.Common.cs b/microsoft-azure-api/Services/Storage/Lib/Common/Queue/CloudQueueClient.Common.cs
@@ -121,9 +121,9 @@ internal CloudQueueClient(bool? usePathStyleUris, Uri baseUri, StorageCredential
         public StorageCredentials Credentials { get; private set; }
 
         /// <summary>
-        /// Gets the base URI for the queue service client.
+        /// Gets the base URI for the Queue service client.
         /// </summary>
-        /// <value>The base URI used to construct the queue service client.</value>
+        /// <value>The base URI used to construct the Queue service client.</value>
         public Uri BaseUri { get; private set; }
 
         /// <summary>

diff --git a/microsoft-azure-api/Services/Storage/Lib/Common/Shared/Protocol/Constants.cs b/microsoft-azure-api/Services/Storage/Lib/Common/Shared/Protocol/Constants.cs
@@ -609,7 +609,7 @@ static HeaderConstants()
             /// <summary>
             /// Specifies the value to use for UserAgent header.
             /// </summary>
-            public const string UserAgentProductVersion = "2.1.0";
+            public const string UserAgentProductVersion = "2.1.0.2";
 
             /// <summary>
             /// Master Windows Azure Storage header prefix.

diff --git a/microsoft-azure-api/Services/Storage/Lib/Common/Table/Queryable/TableQueryableExtensions.cs b/microsoft-azure-api/Services/Storage/Lib/Common/Table/Queryable/TableQueryableExtensions.cs
@@ -50,8 +50,8 @@ static TableQueryableExtensions()
         /// Specifies a set of <see cref="TableRequestOptions"/> on the query.
         /// </summary>
         /// <typeparam name="TElement">The entity type of the query.</typeparam>
-        /// <param name="query">The query.</param>
-        /// <param name="options">The options to specify on the request.</param>
+        /// <param name="query">A query that implements <see cref="IQueryable{TElement}"/>.</param>
+        /// <param name="options">A <see cref="TableRequestOptions"/> object that specifies execution options, such as retry policy and timeout settings, for the operation.</param>
         /// <returns>A <see cref="TableQuery"/> object with the specified request options set.</returns>
         /// <exception cref="System.NotSupportedException"></exception>
         public static TableQuery<TElement> WithOptions<TElement>(this IQueryable<TElement> query, TableRequestOptions options)
@@ -73,8 +73,8 @@ public static TableQuery<TElement> WithOptions<TElement>(this IQueryable<TElemen
         /// Specifies an <see cref="OperationContext"/> for the query.
         /// </summary>
         /// <typeparam name="TElement">The entity type of the query.</typeparam>
-        /// <param name="query">The query.</param>
-        /// <param name="operationContext">The operation context.</param>
+        /// <param name="query">A query that implements <see cref="IQueryable{TElement}"/>.</param>
+        /// <param name="operationContext">An <see cref="OperationContext"/> object for tracking the current operation.</param>
         /// <returns>A <see cref="TableQuery"/> object with the specified operation context.</returns>
         /// <exception cref="System.NotSupportedException"></exception>
         public static TableQuery<TElement> WithContext<TElement>(this IQueryable<TElement> query, OperationContext operationContext)
@@ -97,8 +97,8 @@ public static TableQuery<TElement> WithContext<TElement>(this IQueryable<TElemen
         /// </summary>
         /// <typeparam name="TElement">The entity type of the query.</typeparam>
         /// <typeparam name="TResolved">The type of the resolver.</typeparam>
-        /// <param name="query">The query.</param>
-        /// <param name="resolver">The resolver.</param>
+        /// <param name="query">A query that implements <see cref="IQueryable{TElement}"/>.</param>
+        /// <param name="resolver">The entity resolver, of type <see cref="EntityResolver{TResolved}"/>.</param>
         /// <returns>A <see cref="TableQuery"/> with the specified resolver.</returns>
         /// <exception cref="System.NotSupportedException"></exception>
         public static TableQuery<TResolved> Resolve<TElement, TResolved>(this IQueryable<TElement> query, EntityResolver<TResolved> resolver)
@@ -120,7 +120,7 @@ public static TableQuery<TResolved> Resolve<TElement, TResolved>(this IQueryable
         /// Specifies that a query be returned as a <see cref="TableQuery"/> object.
         /// </summary>
         /// <typeparam name="TElement">The entity type of the query.</typeparam>
-        /// <param name="query">The query.</param>
+        /// <param name="query">A query that implements <see cref="IQueryable{TElement}"/>.</param>
         /// <returns>An object of type <see cref="TableQuery"/>.</returns>
         /// <exception cref="System.NotSupportedException"></exception>
         public static TableQuery<TElement> AsTableQuery<TElement>(this IQueryable<TElement> query)

diff --git a/microsoft-azure-api/Services/Storage/Lib/DotNet40/Properties/AssemblyInfo.cs b/microsoft-azure-api/Services/Storage/Lib/DotNet40/Properties/AssemblyInfo.cs
@@ -34,8 +34,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("2.1.0.0")]
-[assembly: AssemblyFileVersion("2.1.0.1")]
+[assembly: AssemblyVersion("2.1.0.2")]
+[assembly: AssemblyFileVersion("2.1.0.2")]
 
 #if SIGN
 [assembly: InternalsVisibleTo(

diff --git a/microsoft-azure-api/Services/Storage/Lib/DotNet40/WindowsAzure.Storage.nuspec b/microsoft-azure-api/Services/Storage/Lib/DotNet40/WindowsAzure.Storage.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>WindowsAzure.Storage</id>
-    <version>2.1.0.0</version>
+    <version>2.1.0.2</version>
     <title>Windows Azure Storage</title>
     <authors>Microsoft</authors>
     <owners>Microsoft</owners>

diff --git a/microsoft-azure-api/Services/Storage/Lib/DotNetCommon/Blob/BlobReadStream.cs b/microsoft-azure-api/Services/Storage/Lib/DotNetCommon/Blob/BlobReadStream.cs
@@ -32,7 +32,7 @@ internal sealed class BlobReadStream : BlobReadStreamBase
         /// </summary>
         /// <param name="blob">Blob reference to read from</param>
         /// <param name="accessCondition">An object that represents the access conditions for the blob. If null, no condition is used.</param>
-        /// <param name="options">An object that specifies any additional options for the request.</param>
+        /// <param name="options">An object that specifies additional options for the request.</param>
         /// <param name="operationContext">An <see cref="OperationContext"/> object for tracking the current operation.</param>
         internal BlobReadStream(ICloudBlob blob, AccessCondition accessCondition, BlobRequestOptions options, OperationContext operationContext)
             : base(blob, accessCondition, options, operationContext)

diff --git a/microsoft-azure-api/Services/Storage/Lib/DotNetCommon/Blob/BlobWriteStream.cs b/microsoft-azure-api/Services/Storage/Lib/DotNetCommon/Blob/BlobWriteStream.cs
@@ -38,7 +38,7 @@ internal sealed class BlobWriteStream : BlobWriteStreamBase
         /// </summary>
         /// <param name="blockBlob">Blob reference to write to.</param>
         /// <param name="accessCondition">An object that represents the access conditions for the blob. If null, no condition is used.</param>
-        /// <param name="options">An object that specifies any additional options for the request.</param>
+        /// <param name="options">An object that specifies additional options for the request.</param>
         /// <param name="operationContext">An <see cref="OperationContext"/> object for tracking the current operation.</param>
         internal BlobWriteStream(CloudBlockBlob blockBlob, AccessCondition accessCondition, BlobRequestOptions options, OperationContext operationContext)
             : base(blockBlob, accessCondition, options, operationContext)
@@ -52,7 +52,7 @@ internal BlobWriteStream(CloudBlockBlob blockBlob, AccessCondition accessConditi
         /// <param name="pageBlobSize">Size of the page blob.</param>
         /// <param name="createNew">Use <c>true</c> if the page blob is newly created, <c>false</c> otherwise.</param>
         /// <param name="accessCondition">An object that represents the access conditions for the blob. If null, no condition is used.</param>
-        /// <param name="options">An object that specifies any additional options for the request.</param>
+        /// <param name="options">An object that specifies additional options for the request.</param>
         /// <param name="operationContext">An <see cref="OperationContext"/> object for tracking the current operation.</param>
         internal BlobWriteStream(CloudPageBlob pageBlob, long pageBlobSize, bool createNew, AccessCondition accessCondition, BlobRequestOptions options, OperationContext operationContext)
             : base(pageBlob, pageBlobSize, createNew, accessCondition, options, operationContext)