From 03169de2eb8f3b8768bcbad40bbe7eb59e3efcc0 Mon Sep 17 00:00:00 2001 From: Ziya SARIKAYA Date: Sun, 15 Mar 2015 04:30:15 +0200 Subject: [PATCH] Remove ConfigureAwait(false) --- FireSharp.sln | 26 +++++++++++++++++++ FireSharp/FirebaseClient.cs | 22 ++++++++-------- FireSharp/RequestManager.cs | 8 +++--- .../FireSharp.Sample.Windows8App.csproj | 14 +++++++--- 4 files changed, 51 insertions(+), 19 deletions(-) diff --git a/FireSharp.sln b/FireSharp.sln index 1387fb5..761381f 100644 --- a/FireSharp.sln +++ b/FireSharp.sln @@ -22,6 +22,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FireSharp.Serialization.Jso EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FireSharp.Serialization.ServiceStack", "FireSharp.Serialization.ServiceStack\FireSharp.Serialization.ServiceStack.csproj", "{7B0E3BC1-4C1D-4748-B678-3197E8E194FC}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FireSharp.Sample.Windows8App", "Samples\FireSharp.Sample.Windows8App\FireSharp.Sample.Windows8App.csproj", "{DEE14420-0A35-4E47-BB42-33C3EC691A8E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -94,6 +96,30 @@ Global {7B0E3BC1-4C1D-4748-B678-3197E8E194FC}.Release|ARM.ActiveCfg = Release|Any CPU {7B0E3BC1-4C1D-4748-B678-3197E8E194FC}.Release|x64.ActiveCfg = Release|Any CPU {7B0E3BC1-4C1D-4748-B678-3197E8E194FC}.Release|x86.ActiveCfg = Release|Any CPU + {DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Debug|ARM.ActiveCfg = Debug|ARM + {DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Debug|ARM.Build.0 = Debug|ARM + {DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Debug|ARM.Deploy.0 = Debug|ARM + {DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Debug|x64.ActiveCfg = Debug|x64 + {DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Debug|x64.Build.0 = Debug|x64 + {DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Debug|x64.Deploy.0 = Debug|x64 + {DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Debug|x86.ActiveCfg = Debug|x86 + {DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Debug|x86.Build.0 = Debug|x86 + {DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Debug|x86.Deploy.0 = Debug|x86 + {DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Release|Any CPU.Build.0 = Release|Any CPU + {DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Release|Any CPU.Deploy.0 = Release|Any CPU + {DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Release|ARM.ActiveCfg = Release|ARM + {DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Release|ARM.Build.0 = Release|ARM + {DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Release|ARM.Deploy.0 = Release|ARM + {DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Release|x64.ActiveCfg = Release|x64 + {DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Release|x64.Build.0 = Release|x64 + {DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Release|x64.Deploy.0 = Release|x64 + {DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Release|x86.ActiveCfg = Release|x86 + {DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Release|x86.Build.0 = Release|x86 + {DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Release|x86.Deploy.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/FireSharp/FirebaseClient.cs b/FireSharp/FirebaseClient.cs index 098f25d..f9a2827 100644 --- a/FireSharp/FirebaseClient.cs +++ b/FireSharp/FirebaseClient.cs @@ -43,7 +43,7 @@ public FirebaseResponse Get(string path) try { HttpResponseMessage response = _requestManager.Get(path); - string content = response.Content.ReadAsStringAsync().ConfigureAwait(false).GetAwaiter().GetResult(); + string content = response.Content.ReadAsStringAsync().Result; HandleIfErrorResponse(response.StatusCode, content); return new FirebaseResponse(content, response.StatusCode); } @@ -58,7 +58,7 @@ public SetResponse Set(string path, T data) try { HttpResponseMessage response = _requestManager.Put(path, data); - string content = response.Content.ReadAsStringAsync().ConfigureAwait(false).GetAwaiter().GetResult(); + string content = response.Content.ReadAsStringAsync().Result; HandleIfErrorResponse(response.StatusCode, content); return new SetResponse(content, response.StatusCode); } @@ -73,7 +73,7 @@ public PushResponse Push(string path, T data) try { HttpResponseMessage response = _requestManager.Post(path, data); - string content = response.Content.ReadAsStringAsync().ConfigureAwait(false).GetAwaiter().GetResult(); + string content = response.Content.ReadAsStringAsync().Result; HandleIfErrorResponse(response.StatusCode, content); return new PushResponse(content, response.StatusCode); } @@ -88,7 +88,7 @@ public DeleteResponse Delete(string path) try { HttpResponseMessage response = _requestManager.Delete(path); - string content = response.Content.ReadAsStringAsync().ConfigureAwait(false).GetAwaiter().GetResult(); + string content = response.Content.ReadAsStringAsync().Result; HandleIfErrorResponse(response.StatusCode, content); return new DeleteResponse(content, response.StatusCode); } @@ -103,7 +103,7 @@ public FirebaseResponse Update(string path, T data) try { HttpResponseMessage response = _requestManager.Patch(path, data); - string content = response.Content.ReadAsStringAsync().ConfigureAwait(false).GetAwaiter().GetResult(); + string content = response.Content.ReadAsStringAsync().Result; HandleIfErrorResponse(response.StatusCode, content); return new FirebaseResponse(content, response.StatusCode); } @@ -118,7 +118,7 @@ public async Task GetAsync(string path) try { HttpResponseMessage response = await _requestManager.GetAsync(path); - string content = await response.Content.ReadAsStringAsync().ConfigureAwait(false); + string content = await response.Content.ReadAsStringAsync(); HandleIfErrorResponse(response.StatusCode, content); return new FirebaseResponse(content, response.StatusCode); } @@ -133,7 +133,7 @@ public async Task SetAsync(string path, T data) try { HttpResponseMessage response = await _requestManager.PutAsync(path, data); - string content = await response.Content.ReadAsStringAsync().ConfigureAwait(false); + string content = await response.Content.ReadAsStringAsync(); HandleIfErrorResponse(response.StatusCode, content); return new SetResponse(content, response.StatusCode); } @@ -148,7 +148,7 @@ public async Task PushAsync(string path, T data) try { HttpResponseMessage response = await _requestManager.PostAsync(path, data); - string content = await response.Content.ReadAsStringAsync().ConfigureAwait(false); + string content = await response.Content.ReadAsStringAsync(); HandleIfErrorResponse(response.StatusCode, content); return new PushResponse(content, response.StatusCode); } @@ -163,7 +163,7 @@ public async Task DeleteAsync(string path) try { HttpResponseMessage response = await _requestManager.DeleteAsync(path); - string content = await response.Content.ReadAsStringAsync().ConfigureAwait(false); + string content = await response.Content.ReadAsStringAsync(); HandleIfErrorResponse(response.StatusCode, content); return new DeleteResponse(content, response.StatusCode); } @@ -178,7 +178,7 @@ public async Task UpdateAsync(string path, T data) try { HttpResponseMessage response = await _requestManager.PatchAsync(path, data); - string content = await response.Content.ReadAsStringAsync().ConfigureAwait(false); + string content = await response.Content.ReadAsStringAsync(); HandleIfErrorResponse(response.StatusCode, content); return new FirebaseResponse(content, response.StatusCode); } @@ -204,7 +204,7 @@ public async Task> OnChangeGetAsync(string path, ValueRo public async Task OnAsync(string path, ValueAddedEventHandler added = null, ValueChangedEventHandler changed = null, ValueRemovedEventHandler removed = null) { - return new EventStreamResponse(await _requestManager.ListenAsync(path).ConfigureAwait(false), added, changed, removed); + return new EventStreamResponse(await _requestManager.ListenAsync(path), added, changed, removed); } private void HandleIfErrorResponse(HttpStatusCode statusCode, string content, Action errorHandler = null) diff --git a/FireSharp/RequestManager.cs b/FireSharp/RequestManager.cs index c8060ac..1df4f81 100644 --- a/FireSharp/RequestManager.cs +++ b/FireSharp/RequestManager.cs @@ -52,7 +52,7 @@ public async Task PostAsync(string path, T data) public async Task DeleteAsync(string path) { - return await ProcessRequestAsync(HttpMethod.Delete, path, null, HttpCompletionOption.ResponseHeadersRead); + return await ProcessRequestAsync(HttpMethod.Delete, path, null); } public async Task PatchAsync(string path, T data) @@ -118,7 +118,7 @@ public async Task ListenAsync(string path) var request = new HttpRequestMessage(HttpMethod.Get, uri); request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("text/event-stream")); - var response = await client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead).ConfigureAwait(false); + var response = await client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead); response.EnsureSuccessStatusCode(); return response; @@ -130,7 +130,7 @@ private async Task ProcessRequestAsync(HttpMethod method, s { var request = PrepareRequest(method, path, payload); - return await GetClient().SendAsync(request, httpCompletionOption).ConfigureAwait(false); + return await GetClient().SendAsync(request, httpCompletionOption); } catch (Exception ex) { @@ -145,7 +145,7 @@ private HttpResponseMessage ProcessRequest(HttpMethod method, string path, objec { var request = PrepareRequest(method, path, payload); - return _client.SendAsync(request, httpCompletionOption).ConfigureAwait(false).GetAwaiter().GetResult(); + return _client.SendAsync(request, httpCompletionOption).Result; } catch (Exception ex) { diff --git a/Samples/FireSharp.Sample.Windows8App/FireSharp.Sample.Windows8App.csproj b/Samples/FireSharp.Sample.Windows8App/FireSharp.Sample.Windows8App.csproj index fc98bed..ee37c20 100644 --- a/Samples/FireSharp.Sample.Windows8App/FireSharp.Sample.Windows8App.csproj +++ b/Samples/FireSharp.Sample.Windows8App/FireSharp.Sample.Windows8App.csproj @@ -16,6 +16,8 @@ {BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} FireSharp.Test.Windows8App_TemporaryKey.pfx 75865d56 + ..\..\ + true AnyCPU @@ -135,10 +137,6 @@ - - False - ..\packages\FireSharp.2.0.1-beta3\lib\portable-net45+sl5+wp8+win8\FireSharp.dll - False ..\packages\Microsoft.Bcl.Async.1.0.168\lib\win8\Microsoft.Threading.Tasks.dll @@ -158,6 +156,12 @@ ..\packages\Microsoft.Net.Http.2.2.29\lib\win8\System.Net.Http.Primitives.dll + + + {67b7ea6f-dc34-4f48-8331-58df137d78c9} + FireSharp + + 12.0 @@ -168,7 +172,9 @@ This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + +