Merge pull request #5 from sendgrid/async-fix

Async fix
sendgrid · Jun 16, 2016 · 150b93f · 150b93f
2 parents b435c4c + 34ecf4a
commit 150b93f
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,5 +12,5 @@ CSharpHTTPClient/*/obj/
 CSharpHTTPClient/CSharpHTTPClient.userprefs
 CSharpHTTPClient/packages/
 CSharpHTTPClient/CSharpHTTPClient.sln.VisualState.xml
-*.pfx
-*.PublicKey
+*.PublicKey
+*.pfx
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.
 
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.0.2] - 2016-06-16
+### Added
+- Fix async, per https://github.com/sendgrid/sendgrid-csharp/issues/235
+
 ## [2.0.1] - 2016-06-03
 ### Added
 - Sign assembly with a strong name

diff --git a/CSharpHTTPClient/Client.cs b/CSharpHTTPClient/Client.cs
@@ -162,7 +162,7 @@ private Client BuildClient(string name = null)
         /// <summary>
         ///     Add the authorization header, override to customize
         /// </summary>
-        /// <param name="header">Authoriztion header</param>
+        /// <param name="header">Authorization header</param>
         /// <returns>Authorization value to add to the header</returns>
         public virtual AuthenticationHeaderValue AddAuthorization(KeyValuePair<string, string> header)
         {
@@ -261,7 +261,7 @@ public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, o
         /// <returns>Response object</returns>
         public async virtual Task<Response> MakeRequest(HttpClient client, HttpRequestMessage request)
         {
-            HttpResponseMessage response = await client.SendAsync(request);
+            HttpResponseMessage response = await client.SendAsync(request).ConfigureAwait(false);
             return new Response(response.StatusCode, response.Content, response.Headers);
         }
 
@@ -318,7 +318,7 @@ private async Task<Response> RequestAsync(string method, String requestBody = nu
                         RequestUri = new Uri(endpoint),
                         Content = content
                     };
-                    return await MakeRequest(client, request);
+                    return await MakeRequest(client, request).ConfigureAwait(false);
 
                 }
                 catch (Exception ex)

diff --git a/CSharpHTTPClient/Properties/AssemblyInfo.cs b/CSharpHTTPClient/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // 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.0.1")]
-[assembly: AssemblyFileVersion("2.0.1")]
+[assembly: AssemblyVersion("2.0.2")]
+[assembly: AssemblyFileVersion("2.0.2")]
diff --git a/Example/Example.cs b/Example/Example.cs
@@ -27,7 +27,7 @@ static void Main(string[] args)
             }";
             Dictionary<String, String> requestHeaders = new Dictionary<String, String>();
             requestHeaders.Add("X-Test", "test");
-            dynamic response = client.version("v3").api_keys.get(queryParams: queryParams, requestHeaders: requestHeaders);
+            dynamic response = client.api_keys.get(queryParams: queryParams, requestHeaders: requestHeaders);
             // Console.WriteLine(response.StatusCode);
             // Console.WriteLine(response.Body.ReadAsStringAsync().Result);
             // Console.WriteLine(response.Headers.ToString());

diff --git a/Example/Properties/AssemblyInfo.cs b/Example/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 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.0.1.0")]
-[assembly: AssemblyFileVersion("2.0.1.0")]
+[assembly: AssemblyVersion("2.0.2")]
+[assembly: AssemblyFileVersion("2.0.2")]
diff --git a/UnitTest/Properties/AssemblyInfo.cs b/UnitTest/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 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.0.1.0")]
-[assembly: AssemblyFileVersion("2.0.1.0")]
+[assembly: AssemblyVersion("2.0.2")]
+[assembly: AssemblyFileVersion("2.0.2")]