Merge pull request #75 from vinaysh-msft/master

Storage Client Library - 4.3.0

Author: vinaysh-msft

.gitignore

@@ -110,6 +110,7 @@ UpgradeLog*.XML
 
 # NuGet
 AppPackages/
+Packages/
 
 # Test Results
 TestResults/

CustomDictionary.xml

@@ -47,8 +47,8 @@
       <Word>EntityProperty</Word>
       <Word>Etag</Word>
       <Word>OData</Word>
-    <Word>Cors</Word>
-    <Word>MaxAgeInSeconds</Word>
+      <Word>Cors</Word>
+      <Word>MaxAgeInSeconds</Word>
     </Recognized>
     <Compound>
       <Term CompoundAlternate="TableQuery">Tablequery</Term>
@@ -65,6 +65,6 @@
     <DiscreteExceptions>
       <Term>etag</Term>
       <Term>Etag</Term>
-  </DiscreteExceptions>
+    </DiscreteExceptions>
   </Words>
-</Dictionary>
+</Dictionary>

Lib/ClassLibraryCommon/Auth/Protocol/SharedKeyAuthenticationHandler.cs

@@ -67,17 +67,16 @@ public void SignRequest(HttpWebRequest request, OperationContext operationContex
 
             if (this.credentials.IsSharedKey)
             {
-                string message = this.canonicalizer.CanonicalizeHttpRequest(request, this.accountName);
-                Logger.LogVerbose(operationContext, SR.TraceStringToSign, message);
-
                 StorageAccountKey accountKey = this.credentials.Key;
-                string signature = CryptoUtility.ComputeHmac256(accountKey.KeyValue, message);
-
                 if (!string.IsNullOrEmpty(accountKey.KeyName))
                 {
                     request.Headers.Add(Constants.HeaderConstants.KeyNameHeader, accountKey.KeyName);
                 }
 
+                string message = this.canonicalizer.CanonicalizeHttpRequest(request, this.accountName);
+                Logger.LogVerbose(operationContext, SR.TraceStringToSign, message);
+                string signature = CryptoUtility.ComputeHmac256(accountKey.KeyValue, message);
+                
                 request.Headers.Add(
                     "Authorization",
                     string.Format(CultureInfo.InvariantCulture, "{0} {1}:{2}", this.canonicalizer.AuthorizationScheme, this.credentials.AccountName, signature));

Lib/ClassLibraryCommon/Core/Executor/TableCommand.cs

@@ -17,7 +17,7 @@
 
 namespace Microsoft.WindowsAzure.Storage.Core.Executor
 {
-#if WINDOWS_DESKTOP && ! WINDOWS_PHONE
+#if WINDOWS_DESKTOP && !WINDOWS_PHONE
     using Microsoft.WindowsAzure.Storage.Table.DataServices;
     using System;
     using System.Diagnostics.CodeAnalysis;

Lib/ClassLibraryCommon/Core/Executor/TableExecutor.cs

@@ -17,7 +17,7 @@
 
 namespace Microsoft.WindowsAzure.Storage.Core.Executor
 {
-#if WINDOWS_DESKTOP && ! WINDOWS_PHONE
+#if WINDOWS_DESKTOP && !WINDOWS_PHONE
     using Microsoft.WindowsAzure.Storage.Core.Util;
     using Microsoft.WindowsAzure.Storage.RetryPolicies;
     using Microsoft.WindowsAzure.Storage.Shared.Protocol;

Lib/ClassLibraryCommon/Core/Logger.cs

@@ -23,20 +23,20 @@ namespace Microsoft.WindowsAzure.Storage.Core
 
     internal static partial class Logger
     {
-#if !WINDOWS_PHONE
+#if WINDOWS_DESKTOP && !WINDOWS_PHONE
         private static TraceSource traceSource = new TraceSource(Constants.LogSourceName);
         private static volatile bool isClosed = false;
 #endif
 
-#if !WINDOWS_PHONE
+#if WINDOWS_DESKTOP && !WINDOWS_PHONE
         static Logger()
         {
             AppDomain.CurrentDomain.DomainUnload += new EventHandler(Logger.AppDomainUnloadEvent);
             AppDomain.CurrentDomain.ProcessExit += new EventHandler(Logger.ProcessExitEvent);
         }
 #endif
 
-#if !WINDOWS_PHONE
+#if WINDOWS_DESKTOP && !WINDOWS_PHONE
         private static void Close()
         {
             Logger.isClosed = true;

Lib/ClassLibraryCommon/Core/Util/AsyncStreamCopier.cs

@@ -322,7 +322,7 @@ private static void ForceAbort(AsyncStreamCopier<T> copier, bool timedOut)
                     try
                     {
                         state.ReqTimedOut = timedOut;
-#if !WINDOWS_PHONE
+#if WINDOWS_DESKTOP && !WINDOWS_PHONE
                         state.Req.Abort();
 #endif
                     }