return to canonical usage

broken/ef
Paul Schneider 3 years ago
parent 9289b3af91
commit 2f4ff1e774
2 changed files with 11 additions and 12 deletions

@ -16,7 +16,7 @@ namespace nuget_cli
/// <summary> /// <summary>
/// Creates HTTP POST request & uploads database to server. Author : Farhan Ghumra /// Creates HTTP POST request & uploads database to server. Author : Farhan Ghumra
/// </summary> /// </summary>
static internal void UploadFilesToServer( static internal async Task UploadFilesToServer(
this PushReport report, Uri uri, this PushReport report, Uri uri,
FileInfo fi, string apikey) FileInfo fi, string apikey)
{ {
@ -48,22 +48,21 @@ namespace nuget_cli
// content.Add(formdata); // content.Add(formdata);
client.BaseAddress = uri; client.BaseAddress = uri;
HttpRequestMessage put = new HttpRequestMessage(HttpMethod.Put, uri); HttpRequestMessage put = new HttpRequestMessage(HttpMethod.Put, uri)
put.Content = formdata; {
Content = formdata
};
put.Headers.Add("X-NuGet-Client-Version", clientVersion); put.Headers.Add("X-NuGet-Client-Version", clientVersion);
put.Headers.Add("X-NuGet-ApiKey", apikey); put.Headers.Add("X-NuGet-ApiKey", apikey);
put.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); put.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
HttpResponseMessage response = await client.SendAsync(put);
Task<HttpResponseMessage> response = client.SendAsync(put);
response.RunSynchronously();
response.Result.EnsureSuccessStatusCode(); response.EnsureSuccessStatusCode();
report.StatusCode = response.Result.StatusCode.ToString(); report.StatusCode = response.StatusCode.ToString();
var respstream = response.Result.Content.ReadAsStreamAsync().Result; var respstream = await response.Content.ReadAsStreamAsync();
var sr = new StreamReader(respstream); var sr = new StreamReader(respstream);
report.Message = await sr.ReadToEndAsync();
report.Message = sr.ReadToEndAsync().Result;
} }
} }

@ -25,7 +25,7 @@ namespace nuget_cli
try try
{ {
await Task.Run(() => report.UploadFilesToServer(new Uri(source), fi, apikey)); await report.UploadFilesToServer(new Uri(source), fi, apikey);
} }
catch (WebException ex) catch (WebException ex)
{ {

Loading…