Merge branch 'master' of https://github.com/Azure-Samples/storage-blob-dotnet-getting-started

Author: Pedro Wood

BlobStorage/Advanced.cs

@@ -63,6 +63,7 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.Spatial, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Spatial.5.7.0\lib\net40\System.Spatial.dll</HintPath>
       <Private>True</Private>
@@ -80,6 +81,7 @@
     <Compile Include="GettingStarted.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="WCFBufferManagerAdapter.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config">

BlobStorage/BlobStorage.csproj

@@ -303,18 +303,7 @@ private static Uri GetContainerUri(string containerName)
             // Retrieve storage account information from connection string
             CloudStorageAccount storageAccount = Common.CreateStorageAccountFromConnectionString();
 
-            Uri containerUri;
-
-            if (storageAccount == CloudStorageAccount.DevelopmentStorageAccount)
-            {
-                containerUri = new Uri(storageAccount.BlobStorageUri.PrimaryUri.OriginalString + "/" + containerName);
-            }
-            else
-            {
-                containerUri = new Uri(storageAccount.BlobStorageUri.PrimaryUri.OriginalString + containerName);
-            }
-
-            return containerUri;
+            return storageAccount.CreateCloudBlobClient().GetContainerReference(containerName).Uri;
         }
 
         /// <summary>

BlobStorage/GettingStarted.cs

@@ -66,8 +66,7 @@ static void Main(string[] args)
             Console.WriteLine("Azure Blob Storage - Getting Started Samples\n");
             GettingStarted.CallBlobGettingStartedSamples();
 
-            // Uncomment the following lines to run the advanced samples.
-            // Console.WriteLine("Azure Blob Storage - Advanced Samples\n ");
+            Console.WriteLine("Azure Blob Storage - Advanced Samples\n ");
             Advanced.CallBlobAdvancedSamples().Wait();
 
             Console.WriteLine();

BlobStorage/Program.cs

@@ -0,0 +1,33 @@
+using System.ServiceModel.Channels;
+using Microsoft.WindowsAzure.Storage;
+
+namespace BlobStorage
+{
+    public class WCFBufferManagerAdapter : IBufferManager
+    {
+        private int defaultBufferSize = 0;
+
+        public WCFBufferManagerAdapter(BufferManager manager, int defaultBufferSize)
+        {
+            this.Manager = manager;
+            this.defaultBufferSize = defaultBufferSize;
+        }
+
+        public BufferManager Manager { get; internal set; }
+
+        public void ReturnBuffer(byte[] buffer)
+        {
+            this.Manager.ReturnBuffer(buffer);
+        }
+
+        public byte[] TakeBuffer(int bufferSize)
+        {
+            return this.Manager.TakeBuffer(bufferSize);
+        }
+
+        public int GetDefaultBufferSize()
+        {
+            return this.defaultBufferSize;
+        }
+    }
+}

BlobStorage/WCFBufferManagerAdapter.cs

@@ -10,11 +10,11 @@ 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