Merge pull request #9 from CamSoper/master

Reconciled multiple PRs that conflict with recent changes

Author: tamram

WebApp-Storage-DotNet/Controllers/HomeController.cs

@@ -23,6 +23,7 @@ namespace WebApp_Storage_DotNet.Controllers
     using Microsoft.WindowsAzure.Storage;
     using Microsoft.WindowsAzure.Storage.Blob;
     using Microsoft.Azure;
+    using System.Configuration;
 
     /// <summary> 
     /// Azure Blob Storage Photo Gallery - Demonstrates how to use the Blob Storage service.  
@@ -62,7 +63,7 @@ public async Task<ActionResult> Index()
             {
                 // Retrieve storage account information from connection string
                 // How to create a storage connection string - http://msdn.microsoft.com/en-us/library/azure/ee758697.aspx
-                CloudStorageAccount storageAccount = CloudStorageAccount.Parse(CloudConfigurationManager.GetSetting("StorageConnectionString"));
+                CloudStorageAccount storageAccount = CloudStorageAccount.Parse(ConfigurationManager.AppSettings["StorageConnectionString"].ToString());
 
                 // Create a blob client for interacting with the blob service.
                 blobClient = storageAccount.CreateCloudBlobClient();
@@ -111,7 +112,7 @@ public async Task<ActionResult> UploadAsync()
                     for (int i = 0; i < fileCount; i++)
                     {
                         CloudBlockBlob blob = blobContainer.GetBlockBlobReference(GetRandomBlobName(files[i].FileName));
-                        await blob.UploadFromFileAsync(files[i].FileName);
+                        await blob.UploadFromFileAsync(files[i].FileName, FileMode.Open);
                     }
                 }
                 return RedirectToAction("Index");