Change .Result into .GetAwaiter().GetResult()

RestAssured.Net.Tests/JsonSchemaValidationTests.cs

@@ -15,6 +15,7 @@
 // </copyright>
 namespace RestAssured.Tests
 {
+    using System.Threading.Tasks;
     using NJsonSchema;
     using NUnit.Framework;
     using RestAssured.Response.Exceptions;
@@ -70,11 +71,11 @@ public void JsonSchemaCanBeSuppliedAndVerifiedAsStringPointingToFile()
         /// against a JSON schema supplied as a JsonSchema.
         /// </summary>
         [Test]
-        public void JsonSchemaCanBeSuppliedAndVerifiedAsJsonSchema()
+        public async Task JsonSchemaCanBeSuppliedAndVerifiedAsJsonSchema()
         {
             this.CreateStubForJsonSchemaValidation();
 
-            JsonSchema parsedSchema = JsonSchema.FromJsonAsync(JsonSchemaDefinitions.MatchingJsonSchema).Result;
+            JsonSchema parsedSchema = await JsonSchema.FromJsonAsync(JsonSchemaDefinitions.MatchingJsonSchema);
 
             Given()
                 .When()

RestAssured.Net/Logging/RequestResponseLogger.cs

@@ -173,7 +173,7 @@ private static void LogRequestBody(HttpRequestMessage request)
                 return;
             }
 
-            string requestBodyAsString = request.Content.ReadAsStringAsync().Result;
+            string requestBodyAsString = request.Content.ReadAsStringAsync().GetAwaiter().GetResult();
 
             if (requestBodyAsString.Equals(string.Empty))
             {
@@ -250,7 +250,7 @@ private static void LogResponseBody(HttpResponseMessage response)
                 return;
             }
 
-            string responseBodyAsString = response.Content.ReadAsStringAsync().Result;
+            string responseBodyAsString = response.Content.ReadAsStringAsync().GetAwaiter().GetResult();
 
             if (responseBodyAsString.Equals(string.Empty))
             {

RestAssured.Net/Request/ExecutableRequest.cs

@@ -66,12 +66,12 @@
         /// <summary>
         /// The request logging level for this request.
         /// </summary>
         internal Logging.RequestLogLevel RequestLoggingLevel { get; set; }
 
         /// <summary>
         /// The response logging level for this request.
         /// </summary>
         internal Response.Logging.ResponseLogLevel ResponseLoggingLevel { get; set; }
 
         /// <summary>
         /// The configuration settings to use when logging request and response details.
@@ -774,19 +774,17 @@
 
             try
             {
-                Task<VerifiableResponse> task = httpRequestProcessor.Send(this.request, this.cookieCollection, this.httpCompletionOption);
-                VerifiableResponse verifiableResponse = task.Result;
+                VerifiableResponse verifiableResponse = httpRequestProcessor.Send(this.request, this.cookieCollection, this.httpCompletionOption).GetAwaiter().GetResult();
                 verifiableResponse = logger.LogResponse(verifiableResponse);
                 return verifiableResponse;
             }
-            catch (AggregateException ae)
+            catch (TaskCanceledException)
             {
-                if (ae.InnerException?.GetType() == typeof(TaskCanceledException))
-                {
-                    throw new HttpRequestProcessorException($"Request timeout of {this.timeout ?? this.requestSpecification?.Timeout ?? TimeSpan.FromSeconds(100)} exceeded.");
-                }
-
-                throw new HttpRequestProcessorException($"Unhandled exception {ae.Message}");
+                throw new HttpRequestProcessorException($"Request timeout of {this.timeout ?? this.requestSpecification?.Timeout ?? TimeSpan.FromSeconds(100)} exceeded.");
+            }
+            catch (Exception ex)
+            {
+                throw new HttpRequestProcessorException($"Unhandled exception {ex.Message}");
             }
         }
 

RestAssured.Net/Request/Logging/RequestLogger.cs

@@ -35,20 +35,20 @@
         /// <param name="requestLogLevel">The <see cref="RequestLogLevel"/> to use when logging request details.</param>
         /// <param name="cookieCollection">The <see cref="CookieCollection"/> associated with this request.</param>
         /// <param name="sensitiveRequestHeadersAndCookies">A list of sensitive request headers and cookies to be masked when logging.</param>
         internal static void LogToConsole(HttpRequestMessage request, RequestLogLevel requestLogLevel, CookieCollection cookieCollection, List<string> sensitiveRequestHeadersAndCookies)
         {
             if (requestLogLevel >= RequestLogLevel.Endpoint)
             {
                 Console.WriteLine($"{request.Method} {request.RequestUri}");
             }
 
             if (requestLogLevel == RequestLogLevel.Headers)
             {
                 LogHeaders(request, sensitiveRequestHeadersAndCookies);
                 LogCookies(cookieCollection, sensitiveRequestHeadersAndCookies);
             }
 
             if (requestLogLevel == RequestLogLevel.Body)
             {
                 LogBody(request);
             }
@@ -104,7 +104,7 @@
                 return;
             }
 
-            string requestBodyAsString = request.Content.ReadAsStringAsync().Result;
+            string requestBodyAsString = request.Content.ReadAsStringAsync().GetAwaiter().GetResult();
 
             if (requestBodyAsString.Equals(string.Empty))
             {

RestAssured.Net/Response/ExtractableResponse.cs

@@ -56,7 +56,7 @@ public ExtractableResponse(HttpResponseMessage response, CookieContainer cookieC
         [Obsolete("Please use BodyAsString(), BodyAsByteArray() or BodyAsStream() instead. This method is obsolete and will be removed in RestAssured.Net 5.0.0")]
         public string Body()
         {
-            return this.response.Content.ReadAsStringAsync().Result;
+            return this.response.Content.ReadAsStringAsync().GetAwaiter().GetResult();
         }
 
         /// <summary>
@@ -65,7 +65,7 @@ public string Body()
         /// <returns>The response body as a string.</returns>
         public string BodyAsString()
         {
-            return this.response.Content.ReadAsStringAsync().Result;
+            return this.response.Content.ReadAsStringAsync().GetAwaiter().GetResult();
         }
 
         /// <summary>
@@ -74,7 +74,7 @@ public string BodyAsString()
         /// <returns>The response body as a byte array.</returns>
         public byte[] BodyAsByteArray()
         {
-            return this.response.Content.ReadAsByteArrayAsync().Result;
+            return this.response.Content.ReadAsByteArrayAsync().GetAwaiter().GetResult();
         }
 
         /// <summary>
@@ -83,7 +83,7 @@ public byte[] BodyAsByteArray()
         /// <returns>The response body as a <see cref="Stream"/>.</returns>
         public Stream BodyAsStream()
         {
-            return this.response.Content.ReadAsStreamAsync().Result;
+            return this.response.Content.ReadAsStreamAsync().GetAwaiter().GetResult();
         }
 
         /// <summary>
@@ -96,7 +96,7 @@ public Stream BodyAsStream()
         /// <exception cref="ExtractionException">Thrown when evaluating the JsonPath did not yield any results.</exception>
         public object Body(string path, ExtractAs extractAs = ExtractAs.UseResponseContentTypeHeaderValue, ReturnAs returnAs = ReturnAs.Singular)
         {
-            string responseBodyAsString = this.response.Content.ReadAsStringAsync().Result;
+            string responseBodyAsString = this.response.Content.ReadAsStringAsync().GetAwaiter().GetResult();
 
             string responseMediaType = this.response.Content.Headers.ContentType?.MediaType ?? string.Empty;
 

RestAssured.Net/Response/Logging/ResponseLogger.cs

@@ -36,7 +36,7 @@
         /// <param name="responseLogLevel">The <see cref="ResponseLogLevel"/> to use.</param>
         /// <param name="sensitiveResponseHeadersAndCookies">A list of sensitive response headers and cookies to be masked when logging.</param>
         /// <param name="elapsedTime">The time elapsed between sending a request and returning a response.</param>
         internal static void Log(HttpResponseMessage response, CookieContainer cookieContainer, ResponseLogLevel responseLogLevel, List<string> sensitiveResponseHeadersAndCookies, TimeSpan elapsedTime)
         {
             if (responseLogLevel == ResponseLogLevel.OnVerificationFailure)
             {
@@ -139,7 +139,7 @@
                 return;
             }
 
-            string responseBodyAsString = response.Content.ReadAsStringAsync().Result;
+            string responseBodyAsString = response.Content.ReadAsStringAsync().GetAwaiter().GetResult();
 
             if (responseBodyAsString.Equals(string.Empty))
             {

RestAssured.Net/Response/VerifiableResponse.cs

@@ -284,7 +284,7 @@ public VerifiableResponse Cookie(string name, IMatcher<string> matcher)
         /// <exception cref="ResponseVerificationException">Thrown when the actual response body does not match the expected one.</exception>
         public VerifiableResponse Body(string expectedResponseBody)
         {
-            string actualResponseBody = this.Response.Content.ReadAsStringAsync().Result;
+            string actualResponseBody = this.Response.Content.ReadAsStringAsync().GetAwaiter().GetResult();
 
             if (!actualResponseBody.Equals(expectedResponseBody))
             {
@@ -302,7 +302,7 @@ public VerifiableResponse Body(string expectedResponseBody)
         /// <exception cref="ResponseVerificationException">Thrown when the actual response body does not match the expected one.</exception>
         public VerifiableResponse Body(IMatcher<string> matcher)
         {
-            string actualResponseBody = this.Response.Content.ReadAsStringAsync().Result;
+            string actualResponseBody = this.Response.Content.ReadAsStringAsync().GetAwaiter().GetResult();
 
             if (!matcher.Matches(actualResponseBody))
             {
@@ -322,7 +322,7 @@ public VerifiableResponse Body(IMatcher<string> matcher)
         /// <returns>The current <see cref="VerifiableResponse"/> object.</returns>
         public VerifiableResponse Body<T>(string path, IMatcher<T> matcher, VerifyAs verifyAs = VerifyAs.UseResponseContentTypeHeaderValue)
         {
-            string responseBodyAsString = this.Response.Content.ReadAsStringAsync().Result;
+            string responseBodyAsString = this.Response.Content.ReadAsStringAsync().GetAwaiter().GetResult();
 
             string? responseMediaType = string.Empty;
 
@@ -449,7 +449,7 @@ public VerifiableResponse Body<T>(string path, IMatcher<IEnumerable<T>> matcher,
         {
             List<T> elementValues = new List<T>();
 
-            string responseBodyAsString = this.Response.Content.ReadAsStringAsync().Result;
+            string responseBodyAsString = this.Response.Content.ReadAsStringAsync().GetAwaiter().GetResult();
 
             string responseMediaType = this.Response.Content.Headers.ContentType?.MediaType ?? string.Empty;
 
@@ -538,15 +538,12 @@ public VerifiableResponse MatchesJsonSchema(string jsonSchema)
 
             try
             {
-                JsonSchema parsedSchema = JsonSchema.FromJsonAsync(jsonSchema).Result;
+                JsonSchema parsedSchema = JsonSchema.FromJsonAsync(jsonSchema).GetAwaiter().GetResult();
                 return this.MatchesJsonSchema(parsedSchema);
             }
-            catch (AggregateException ae)
+            catch (JsonException je)
             {
-                foreach (Exception ex in ae.InnerExceptions)
-                {
-                    this.FailVerification($"Could not parse supplied JSON schema. Error: {ex.Message}");
-                }
+                this.FailVerification($"Could not parse supplied JSON schema. Error: {je.Message}");
             }
 
             return this;
@@ -567,7 +564,7 @@ public VerifiableResponse MatchesJsonSchema(JsonSchema jsonSchema)
                 this.FailVerification($"Expected response Content-Type header to contain 'json', but was '{responseMediaType}'");
             }
 
-            string responseBodyAsString = this.Response.Content.ReadAsStringAsync().Result;
+            string responseBodyAsString = this.Response.Content.ReadAsStringAsync().GetAwaiter().GetResult();
 
             ICollection<ValidationError> schemaValidationErrors = jsonSchema.Validate(responseBodyAsString);
 
@@ -618,7 +615,7 @@ public VerifiableResponse MatchesXsd(XmlSchemaSet schemas)
             settings.ValidationType = ValidationType.Schema;
             settings.Schemas = schemas;
 
-            string responseXmlAsString = this.Response.Content.ReadAsStringAsync().Result;
+            string responseXmlAsString = this.Response.Content.ReadAsStringAsync().GetAwaiter().GetResult();
             XmlReader reader = XmlReader.Create(new StringReader(responseXmlAsString), settings);
 
             try
@@ -652,7 +649,7 @@ public VerifiableResponse MatchesInlineDtd()
             settings.DtdProcessing = DtdProcessing.Parse;
             settings.ValidationType = ValidationType.DTD;
 
-            string responseXmlAsString = this.Response.Content.ReadAsStringAsync().Result;
+            string responseXmlAsString = this.Response.Content.ReadAsStringAsync().GetAwaiter().GetResult();
             XmlReader reader = XmlReader.Create(new StringReader(responseXmlAsString), settings);
 
             try
@@ -691,7 +688,7 @@ public VerifiableResponse ResponseTime(IMatcher<TimeSpan> matcher)
         /// <returns>The current <see cref="VerifiableResponse"/> object.</returns>
         public VerifiableResponse ResponseBodyLength(IMatcher<int> matcher)
         {
-            string responseContentAsString = this.Response.Content.ReadAsStringAsync().Result;
+            string responseContentAsString = this.Response.Content.ReadAsStringAsync().GetAwaiter().GetResult();
 
             if (!matcher.Matches(responseContentAsString.Length))
             {