#59 - Use Task.GetAwaiter().GetResult() instead of Task.Result.

Author: Tratcher

src/Microsoft.AspNet.Security.Cookies/CookieAuthenticationHandler.cs

@@ -36,7 +36,7 @@ public CookieAuthenticationHandler([NotNull] ILogger logger)
 
         protected override AuthenticationTicket AuthenticateCore()
         {
-            return AuthenticateCoreAsync().Result;
+            return AuthenticateCoreAsync().GetAwaiter().GetResult();
         }
 
         protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()
@@ -124,7 +124,7 @@ protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()
 
         protected override void ApplyResponseGrant()
         {
-            ApplyResponseGrantAsync().Wait();
+            ApplyResponseGrantAsync().GetAwaiter().GetResult();
         }
 
         protected override async Task ApplyResponseGrantAsync()

src/Microsoft.AspNet.Security.OAuth/OAuthAuthenticationHandler.cs

@@ -84,7 +84,7 @@ public async Task<bool> InvokeReturnPathAsync()
 
         protected override AuthenticationTicket AuthenticateCore()
         {
-            return AuthenticateCoreAsync().Result;
+            return AuthenticateCoreAsync().GetAwaiter().GetResult();
         }
 
         protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()

src/Microsoft.AspNet.Security.OAuth/OAuthBearerAuthenticationHandler.cs

@@ -21,7 +21,7 @@ public OAuthBearerAuthenticationHandler(ILogger logger, string challenge)
 
         protected override AuthenticationTicket AuthenticateCore()
         {
-            return AuthenticateCoreAsync().Result;
+            return AuthenticateCoreAsync().GetAwaiter().GetResult();
         }
 
         protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()

src/Microsoft.AspNet.Security.Twitter/TwitterAuthenticationHandler.cs

@@ -46,7 +46,7 @@ public override async Task<bool> InvokeAsync()
 
         protected override AuthenticationTicket AuthenticateCore()
         {
-            return AuthenticateCoreAsync().Result;
+            return AuthenticateCoreAsync().GetAwaiter().GetResult();
         }
 
         protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()
@@ -124,7 +124,7 @@ protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()
         }
         protected override void ApplyResponseChallenge()
         {
-            ApplyResponseChallengeAsync().Wait();
+            ApplyResponseChallengeAsync().GetAwaiter().GetResult();
         }
 
         protected override async Task ApplyResponseChallengeAsync()

src/Microsoft.AspNet.Security/DefaultAuthorizationService.cs

@@ -84,7 +84,7 @@ public async Task<bool> AuthorizeAsync(IEnumerable<Claim> claims, ClaimsPrincipa
 
         public bool Authorize(IEnumerable<Claim> claims, ClaimsPrincipal user, object resource)
         {
-            return AuthorizeAsync(claims, user, resource).Result;
+            return AuthorizeAsync(claims, user, resource).GetAwaiter().GetResult();
         }
 
         private bool ClaimsMatch([NotNull] IEnumerable<Claim> x, [NotNull] IEnumerable<Claim> y)

src/Microsoft.AspNet.Security/Infrastructure/AuthenticationHandler.cs

@@ -183,7 +183,7 @@ public AuthenticationTicket Authenticate()
                 () =>
                 {
                     return Task.FromResult(AuthenticateCore());
-                }).Result;
+                }).GetAwaiter().GetResult();
         }
 
         protected abstract AuthenticationTicket AuthenticateCore();
@@ -225,7 +225,7 @@ private void ApplyResponse()
                 {
                     ApplyResponseCore();
                     return Task.FromResult(0);
-                }).Wait(); // Block if the async version is in progress.
+                }).GetAwaiter().GetResult(); // Block if the async version is in progress.
         }
 
         protected virtual void ApplyResponseCore()

test/Microsoft.AspNet.Security.Test/DefaultAuthorizationServiceTests.cs

@@ -242,7 +242,7 @@ public void Check_ShouldThrowWhenPoliciesDontStop()
 
             // Act
             // Assert
-            Exception ex = Assert.Throws<AggregateException>(() => authorizationService.Authorize(Enumerable.Empty<Claim>(), null));
+            Exception ex = Assert.Throws<InvalidOperationException>(() => authorizationService.Authorize(Enumerable.Empty<Claim>(), null));
         }
 
         [Fact]