From 2f4ff1e77494de34493685071827edddfb69761a Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Sat, 15 May 2021 04:45:54 +0100 Subject: [PATCH] return to canonical usage --- src/nuget-cli/Helpers.cs | 21 ++++++++++----------- src/nuget-cli/PushCommand.cs | 2 +- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/nuget-cli/Helpers.cs b/src/nuget-cli/Helpers.cs index 1060d16..b8443b3 100644 --- a/src/nuget-cli/Helpers.cs +++ b/src/nuget-cli/Helpers.cs @@ -16,7 +16,7 @@ namespace nuget_cli /// /// Creates HTTP POST request & uploads database to server. Author : Farhan Ghumra /// - static internal void UploadFilesToServer( + static internal async Task UploadFilesToServer( this PushReport report, Uri uri, FileInfo fi, string apikey) { @@ -48,22 +48,21 @@ namespace nuget_cli // content.Add(formdata); client.BaseAddress = uri; - HttpRequestMessage put = new HttpRequestMessage(HttpMethod.Put, uri); - put.Content = formdata; + HttpRequestMessage put = new HttpRequestMessage(HttpMethod.Put, uri) + { + Content = formdata + }; put.Headers.Add("X-NuGet-Client-Version", clientVersion); put.Headers.Add("X-NuGet-ApiKey", apikey); put.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); - - Task response = client.SendAsync(put); - response.RunSynchronously(); + HttpResponseMessage response = await client.SendAsync(put); - response.Result.EnsureSuccessStatusCode(); - report.StatusCode = response.Result.StatusCode.ToString(); - var respstream = response.Result.Content.ReadAsStreamAsync().Result; + response.EnsureSuccessStatusCode(); + report.StatusCode = response.StatusCode.ToString(); + var respstream = await response.Content.ReadAsStreamAsync(); var sr = new StreamReader(respstream); - - report.Message = sr.ReadToEndAsync().Result; + report.Message = await sr.ReadToEndAsync(); } } diff --git a/src/nuget-cli/PushCommand.cs b/src/nuget-cli/PushCommand.cs index 7e6a866..6a84d0b 100644 --- a/src/nuget-cli/PushCommand.cs +++ b/src/nuget-cli/PushCommand.cs @@ -25,7 +25,7 @@ namespace nuget_cli try { - await Task.Run(() => report.UploadFilesToServer(new Uri(source), fi, apikey)); + await report.UploadFilesToServer(new Uri(source), fi, apikey); } catch (WebException ex) {