Merge branch 'master' of https://github.com/twilio/twilio-csharp into alpha

Author: jingming

CHANGES.md

@@ -2,6 +2,11 @@ twilio-csharp Changelog
 =======================
 
 
+[2017-02-24] Version 5.0.3-alpha1
+--------------------------
+ - Fix async/await for MVC/WPF apps
+
+
 [2017-02-24] Version 5.0.2-alpha1
 --------------------------
  - URL encode all parameters

src/Twilio/Http/SystemNetHttpClient.cs

@@ -57,15 +57,15 @@ public override async Task<Response> MakeRequestAysnc(Request request)
             HttpResponseMessage response = null;
             try
             {
-                response = await _httpClient.SendAsync(httpRequest); 
-                var reader = new StreamReader(await response.Content.ReadAsStreamAsync());
-                return new Response(response.StatusCode, await reader.ReadToEndAsync());
+                response = await _httpClient.SendAsync(httpRequest).ConfigureAwait(false); 
+                var reader = new StreamReader(await response.Content.ReadAsStreamAsync().ConfigureAwait(false));
+                return new Response(response.StatusCode, await reader.ReadToEndAsync().ConfigureAwait(false));
             }
             catch (AggregateException ae)
             {
                 if (ae.InnerExceptions.OfType<HttpRequestException>().Any() && response != null)
                 {
-                    throw await HandleErrorResponse(response);
+                    throw await HandleErrorResponse(response).ConfigureAwait(false);
                 }
             }
             return null;
@@ -79,7 +79,7 @@ private async Task<Exception> HandleErrorResponse(HttpResponseMessage errorRespo
                 return new TwilioException("Internal Server error: " + errorResponse.StatusCode);
             }
 
-            var responseStream = await errorResponse.Content.ReadAsStreamAsync();
+            var responseStream = await errorResponse.Content.ReadAsStreamAsync().ConfigureAwait(false);
             var errorReader = new StreamReader(responseStream);
             var errorContent = errorReader.ReadToEnd();
 

src/Twilio/Twilio.csproj

@@ -15,7 +15,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>Twilio</AssemblyName>
     <PackageTags>REST;SMS;voice;telephony;phone;twilio;twiml;video;wireless;api</PackageTags>
-    <PackageIconUrl>http://www.twilio.com/packages/company/img/logos_downloadable_round.png</PackageIconUrl>
+    <PackageIconUrl>https://www.twilio.com/marketing/bundles/marketing/img/favicons/favicon.ico</PackageIconUrl>
     <PackageProjectUrl>http://github.com/twilio/twilio-csharp</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/twilio/twilio-csharp/blob/master/LICENSE.txt</PackageLicenseUrl>
     <RepositoryUrl>http://github.com/twilio/twilio-csharp</RepositoryUrl>