Merge branch 'master' into master

Author: tamram

.gitignore

@@ -9,4 +9,4 @@ BlobStorage/StyleCop.cache
 *.nupkg
 packages/*
 *.ps1
-.vs/*
+.vs/*

BlobStorage/Advanced.cs

@@ -16,6 +16,11 @@
 
 namespace BlobStorage
 {
+    using Microsoft.Azure;
+    using Microsoft.Azure.Storage;
+    using Microsoft.Azure.Storage.Blob;
+    using Microsoft.Azure.Storage.RetryPolicies;
+    using Microsoft.Azure.Storage.Shared.Protocol;
     using System;
     using System.Collections.Generic;
     using System.IO;
@@ -88,6 +93,12 @@ public static async Task CallBlobAdvancedSamples()
 
                 // Call shared access signature samples (both container and blob).
                 await CallSasSamples(container);
+
+                // CORS Rules
+                await CorsSample(blobClient);
+
+                // Page Blob Ranges
+                await PageRangesSample(container);
             }
             catch (StorageException e)
             {
@@ -106,7 +117,6 @@ public static async Task CallBlobAdvancedSamples()
                 // The sample code deletes any containers it created if it runs completely. However, if you need to delete containers 
                 // created by previous sessions (for example, if you interrupted the running code before it completed), 
                 // you can uncomment and run the following line to delete them.
-
                 //await DeleteContainersWithPrefix(blobClient, ContainerPrefix);
 
                 // Return the service properties/storage analytics settings to their original values.
@@ -132,9 +142,6 @@ private static async Task CallBlobClientSamples(CloudBlobClient blobClient)
             // Configure storage analytics (metrics and logging) on Blob storage.
             await ConfigureBlobAnalyticsAsync(blobClient);
 
-            // Get geo-replication stats for Blob storage.
-            await GetServiceStatsForSecondaryAsync(blobClient);
-
             // List all containers in the storage account.
             ListAllContainers(blobClient, "sample-");
 
@@ -323,7 +330,7 @@ private static async Task ConfigureBlobAnalyticsAsync(CloudBlobClient blobClient
                 serviceProperties.MinuteMetrics.Version = "1.0";
 
                 // Set the default service version to be used for anonymous requests.
-                serviceProperties.DefaultServiceVersion = "2015-04-05";
+                serviceProperties.DefaultServiceVersion = "2018-11-09";
 
                 // Set the service properties.
                 await blobClient.SetServicePropertiesAsync(serviceProperties);            
@@ -336,50 +343,6 @@ private static async Task ConfigureBlobAnalyticsAsync(CloudBlobClient blobClient
             }
         }
 
-        /// <summary>
-        /// Gets the Blob service stats for the secondary endpoint for an RA-GRS (read-access geo-redundant) storage account.
-        /// </summary>
-        /// <param name="blobClient">The Blob service client.</param>
-        /// <returns>A Task object.</returns>
-        private static async Task GetServiceStatsForSecondaryAsync(CloudBlobClient blobClient)
-        {
-            try
-            {
-                // Get the URI for the secondary endpoint for Blob storage.
-                Uri secondaryUri = blobClient.StorageUri.SecondaryUri;
-
-                // Create a new service client based on the secondary endpoint.
-                CloudBlobClient blobClientSecondary = new CloudBlobClient(secondaryUri, blobClient.Credentials);
-
-                // Get the current stats for the secondary.
-                // The call will fail if your storage account does not have RA-GRS enabled.
-                // Change the retry policy for this call so that if it fails, it fails quickly.
-                BlobRequestOptions requestOptions = new BlobRequestOptions() { RetryPolicy = new NoRetry() };
-                ServiceStats blobStats = await blobClientSecondary.GetServiceStatsAsync(requestOptions, null);
-
-                Console.WriteLine("Geo-replication status: {0}", blobStats.GeoReplication.Status);
-                Console.WriteLine("Last geo-replication sync time: {0}", blobStats.GeoReplication.LastSyncTime);
-                Console.WriteLine();
-            }
-            catch (StorageException e)
-            {
-                // In this case, we do not re-throw the exception, so that the sample will continue to run even if RA-GRS is not enabled
-                // for this storage account.
-                if (e.RequestInformation.HttpStatusCode == 403)
-                {
-                    Console.WriteLine("This storage account does not appear to support RA-GRS.");
-                    Console.WriteLine("More information: {0}", e.Message);
-                    Console.WriteLine();
-                }
-                else
-                {
-                    Console.WriteLine(e.Message);
-                    Console.ReadLine();
-                    throw;
-                }
-            }
-        }
-
         /// <summary>
         /// Lists all containers in the storage account.
         /// Note that the ListContainers method is called synchronously, for the purposes of the sample. However, in a real-world
@@ -2058,5 +2021,81 @@ private static async Task UploadByteArrayAsync(CloudBlobContainer container, lon
         }
 
         #endregion
+
+        /// <summary>
+        /// Query the Cross-Origin Resource Sharing (CORS) rules for the Queue service
+        /// </summary>
+        /// <param name="blobClient"></param>
+        private static async Task CorsSample(CloudBlobClient blobClient)
+        {
+            // Get CORS rules
+            Console.WriteLine("Get CORS rules");
+
+            ServiceProperties serviceProperties = await blobClient.GetServicePropertiesAsync();
+
+            // Add CORS rule
+            Console.WriteLine("Add CORS rule");
+
+            CorsRule corsRule = new CorsRule
+            {
+                AllowedHeaders = new List<string> { "*" },
+                AllowedMethods = CorsHttpMethods.Get,
+                AllowedOrigins = new List<string> { "*" },
+                ExposedHeaders = new List<string> { "*" },
+                MaxAgeInSeconds = 3600
+            };
+
+            serviceProperties.Cors.CorsRules.Add(corsRule);
+            await blobClient.SetServicePropertiesAsync(serviceProperties);
+            Console.WriteLine();
+        }
+
+        /// <summary>
+        /// Get a list of valid page ranges for a page blob
+        /// </summary>
+        /// <param name="container"></param>
+        /// <returns>A Task object.</returns>
+        private static async Task PageRangesSample(CloudBlobContainer container)
+        {
+            BlobRequestOptions requestOptions = new BlobRequestOptions { RetryPolicy = new ExponentialRetry(TimeSpan.FromSeconds(1), 3) };
+            await container.CreateIfNotExistsAsync(requestOptions, null);
+
+            Console.WriteLine("Create Page Blob");
+            CloudPageBlob pageBlob = container.GetPageBlobReference("blob1");
+            pageBlob.Create(4 * 1024);
+
+            Console.WriteLine("Write Pages to Blob");
+            byte[] buffer = GetRandomBuffer(1024);
+            using (MemoryStream memoryStream = new MemoryStream(buffer))
+            {
+                pageBlob.WritePages(memoryStream, 512);
+            }
+
+            using (MemoryStream memoryStream = new MemoryStream(buffer))
+            {
+                pageBlob.WritePages(memoryStream, 3 * 1024);
+            }
+
+            Console.WriteLine("Get Page Ranges");
+            IEnumerable<PageRange> pageRanges = pageBlob.GetPageRanges();
+            foreach (PageRange pageRange in pageRanges)
+            {
+                Console.WriteLine(pageRange.ToString());
+            }
+
+            // Clean up after the demo. This line is not strictly necessary as the container is deleted in the next call.
+            // It is included for the purposes of the example. 
+            Console.WriteLine("Delete page blob");
+            await pageBlob.DeleteIfExistsAsync();
+            Console.WriteLine();
+        }
+
+        private static byte[] GetRandomBuffer(int size)
+        {
+            byte[] buffer = new byte[size];
+            Random random = new Random();
+            random.NextBytes(buffer);
+            return buffer;
+        }
     }
 }

BlobStorage/App.config

@@ -33,4 +33,5 @@
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+  <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" /></startup>
+</configuration>

BlobStorage/BlobStorage.csproj

@@ -9,9 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BlobStorage</RootNamespace>
     <AssemblyName>BlobStorage</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -54,9 +55,6 @@
     <Reference Include="Microsoft.Data.Services.Client, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Data.Services.Client.5.8.4\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.WindowsAzure.Storage, Version=9.3.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\WindowsAzure.Storage.9.3.3\lib\net45\Microsoft.WindowsAzure.Storage.dll</HintPath>
-    </Reference>
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>

BlobStorage/packages.config

@@ -9,5 +9,4 @@
   <package id="Microsoft.Data.Services.Client" version="5.8.4" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net452" />
   <package id="System.Spatial" version="5.8.4" targetFramework="net452" />
-  <package id="WindowsAzure.Storage" version="9.3.3" targetFramework="net452" />
 </packages>

README.md

@@ -1,28 +1,28 @@
 ---
 services: storage
 platforms: dotnet
-author: perrysk-msft
+author: tamram
 ---
 
-# Getting Started with Azure Blob Service in .NET
+# Azure Blob Storage Samples for .NET
 
 Demonstrates how to use the Blob Storage service.
 Blob storage stores unstructured data such as text, binary data, documents or media files.
 Blobs can be accessed from anywhere in the world via HTTP or HTTPS.
 
-Note: This sample uses the .NET 4.5 asynchronous programming model to demonstrate how to call the Storage Service using the
-storage client libraries asynchronous API's. When used in real applications this approach enables you to improve the
-responsiveness of your application. Calls to the storage service are prefixed by the await keyword.
-If you don't have a Microsoft Azure subscription you can
-get a FREE trial account [here](http://go.microsoft.com/fwlink/?LinkId=330212)
+Note: This sample uses the .NET 4.5 asynchronous programming model to demonstrate how to call Azure Storage using asynchronous API calls. When used in real applications, this approach enables you to improve the
+responsiveness of your application. Calls to Azure Storage are prefixed by the `await` keyword. For more information about asynchronous programming using the Async/Await pattern, see [Asynchronous Programming with Async and Await (C# and Visual Basic)](https://msdn.microsoft.com/library/hh191443.aspx).
+
+If you don't already have a Microsoft Azure subscription, you can
+get a FREE trial account [here](http://go.microsoft.com/fwlink/?LinkId=330212).
 
 ## Running this sample
 
 This sample can be run using either the Azure Storage Emulator that installs as part of this SDK - or by
 updating the App.Config file with your AccountName and Key.
 To run the sample using the Storage Emulator (default option):
 
-1. Download and Install the Azure Storage Emulator [here](http://azure.microsoft.com/en-us/downloads/).
+1. Download and Install the Azure Storage Emulator [here](http://azure.microsoft.com/downloads/).
 2. Start the Azure Storage Emulator (once only) by pressing the Start button or the Windows key and searching for it by typing "Azure Storage Emulator". Select it from the list of applications to start it.
 3. Set breakpoints and run the project using F10.
 
@@ -33,8 +33,8 @@ To run the sample using the Storage Service
 3. Set breakpoints and run the project using F10.
 
 ## More information
-- [What is a Storage Account](http://azure.microsoft.com/en-us/documentation/articles/storage-whatis-account/)
-- [Getting Started with Blobs](http://azure.microsoft.com/en-us/documentation/articles/storage-dotnet-how-to-use-blobs/)
+- [How to create, manage, or delete a storage account in the Azure Portal](https://azure.microsoft.com/en-us/documentation/articles/storage-create-storage-account/)
+- [Get started with Azure Blob storage (object storage) using .NET](https://azure.microsoft.com/documentation/articles/storage-dotnet-how-to-use-blobs/)
 - [Blob Service Concepts](http://msdn.microsoft.com/en-us/library/dd179376.aspx)
 - [Blob Service REST API](http://msdn.microsoft.com/en-us/library/dd135733.aspx)
 - [Blob Service C# API](http://go.microsoft.com/fwlink/?LinkID=398944)