Cleanup invoker code

Author: javiercn

src/Mvc/Mvc.Core/src/Infrastructure/ResourceInvoker.cs

@@ -84,41 +84,22 @@ public virtual Task InvokeAsync()
             }
 
             Exception? releaseException = null;
+            ValueTask releaseResult = default;
             try
             {
-                ReleaseResources();
+                releaseResult = ReleaseResources();
             }
             catch (Exception exception)
             {
                 releaseException = exception;
             }
 
-            Exception? scopeException = null;
-            try
-            {
-                scope?.Dispose();
-            }
-            catch (Exception exception)
+            if (releaseException == null && !releaseResult.IsCompletedSuccessfully)
             {
-                scopeException = exception;
+                return HandleAsyncReleaseErrors(releaseResult, scope);
             }
 
-            if (releaseException == null && scopeException == null)
-            {
-                return Task.CompletedTask;
-            }
-            else if (releaseException != null && scopeException != null)
-            {
-                return Task.FromException(new AggregateException(releaseException, scopeException));
-            }
-            else if (releaseException != null)
-            {
-                return Task.FromException(releaseException);
-            }
-            else
-            {
-                return Task.FromException(scopeException!);
-            }
+            return HandleReleaseErrors(scope, releaseException);
 
             static async Task Awaited(ResourceInvoker invoker, Task task, IDisposable? scope)
             {
@@ -185,6 +166,51 @@ static async Task Logged(ResourceInvoker invoker)
                         actionContext.RouteData);
                 }
             }
+
+            static async Task HandleAsyncReleaseErrors(ValueTask releaseResult, IDisposable? scope)
+            {
+                Exception? releaseException = null;
+                try
+                {
+                    await releaseResult;
+                }
+                catch (Exception exception)
+                {
+                    releaseException = exception;
+                }
+
+                await HandleReleaseErrors(scope, releaseException);
+            }
+
+            static Task HandleReleaseErrors(IDisposable? scope, Exception? releaseException)
+            {
+                Exception? scopeException = null;
+                try
+                {
+                    scope?.Dispose();
+                }
+                catch (Exception exception)
+                {
+                    scopeException = exception;
+                }
+
+                if (releaseException == null && scopeException == null)
+                {
+                    return Task.CompletedTask;
+                }
+                else if (releaseException != null && scopeException != null)
+                {
+                    return Task.FromException(new AggregateException(releaseException, scopeException));
+                }
+                else if (releaseException != null)
+                {
+                    return Task.FromException(releaseException);
+                }
+                else
+                {
+                    return Task.FromException(scopeException!);
+                }
+            }
         }
 
         /// <summary>