Addressed feedback

Author: javiercn

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

@@ -83,7 +83,7 @@ public virtual Task InvokeAsync()
                 return Awaited(this, task, scope);
             }
 
-            return ReleaseResourcesCore(scope);
+            return ReleaseResourcesCore(scope).AsTask();
 
             static async Task Awaited(ResourceInvoker invoker, Task task, IDisposable? scope)
             {
@@ -143,27 +143,26 @@ static async Task Logged(ResourceInvoker invoker)
             }
         }
 
-        internal Task ReleaseResourcesCore(IDisposable? scope)
+        internal ValueTask ReleaseResourcesCore(IDisposable? scope)
         {
             Exception? releaseException = null;
             ValueTask releaseResult = default;
             try
             {
                 releaseResult = ReleaseResources();
+                if (!releaseResult.IsCompletedSuccessfully)
+                {
+                    return HandleAsyncReleaseErrors(releaseResult, scope);
+                }
             }
             catch (Exception exception)
             {
                 releaseException = exception;
             }
 
-            if (releaseException == null && !releaseResult.IsCompletedSuccessfully)
-            {
-                return HandleAsyncReleaseErrors(releaseResult, scope);
-            }
-
             return HandleReleaseErrors(scope, releaseException);
 
-            static async Task HandleAsyncReleaseErrors(ValueTask releaseResult, IDisposable? scope)
+            static async ValueTask HandleAsyncReleaseErrors(ValueTask releaseResult, IDisposable? scope)
             {
                 Exception? releaseException = null;
                 try
@@ -178,7 +177,7 @@ static async Task HandleAsyncReleaseErrors(ValueTask releaseResult, IDisposable?
                 await HandleReleaseErrors(scope, releaseException);
             }
 
-            static Task HandleReleaseErrors(IDisposable? scope, Exception? releaseException)
+            static ValueTask HandleReleaseErrors(IDisposable? scope, Exception? releaseException)
             {
                 Exception? scopeException = null;
                 try
@@ -192,19 +191,19 @@ static Task HandleReleaseErrors(IDisposable? scope, Exception? releaseException)
 
                 if (releaseException == null && scopeException == null)
                 {
-                    return Task.CompletedTask;
+                    return default;
                 }
                 else if (releaseException != null && scopeException != null)
                 {
-                    return Task.FromException(new AggregateException(releaseException, scopeException));
+                    return ValueTask.FromException(new AggregateException(releaseException, scopeException));
                 }
                 else if (releaseException != null)
                 {
-                    return Task.FromException(releaseException);
+                    return ValueTask.FromException(releaseException);
                 }
                 else
                 {
-                    return Task.FromException(scopeException!);
+                    return ValueTask.FromException(scopeException!);
                 }
             }
         }

src/Mvc/Mvc.Core/src/Resources.resx

@@ -537,4 +537,4 @@
   <data name="TryUpdateModel_RecordTypeNotSupported" xml:space="preserve">
     <value>{0} cannot update a record type model. If a '{1}' must be updated, include it in an object type.</value>
   </data>
-</root>
+</root>

src/Mvc/Mvc.Razor/src/RazorViewEngine.cs

@@ -486,7 +486,7 @@ private ViewEngineResult CreateViewEngineResult(ViewLocationCacheResult result,
             var view = new RazorView(this, _pageActivator, viewStarts, page, _htmlEncoder, _diagnosticListener);
             if (view is IAsyncDisposable)
             {
-                throw new InvalidOperationException("Async disposable views are not supported.");
+                throw new InvalidOperationException(Resources.FormatAsyncDisposableViewsNotSupported(typeof(IAsyncDisposable).FullName));
             }
 
             return ViewEngineResult.Found(viewName, view);

src/Mvc/Mvc.Razor/src/Resources.resx

@@ -200,4 +200,7 @@
   <data name="CompiledViewDescriptor_NoData" xml:space="preserve">
     <value>At least one of the '{0}' or '{1}' values must be non-null.</value>
   </data>
+  <data name="AsyncDisposableViewsNotSupported" xml:space="preserve">
+    <value>Views implementing '{0}' are not supported.</value>
+  </data>
 </root>

src/Mvc/Mvc.RazorPages/src/IPageModelActivatorProvider.cs

@@ -30,7 +30,7 @@ public interface IPageModelActivatorProvider
         /// </summary>
         /// <param name="descriptor">The <see cref="CompiledPageActionDescriptor"/>.</param>
         /// <returns>The delegate used to dispose the activated Razor Page model asynchronously.</returns>
-        Func<PageContext, object,ValueTask> CreateAsyncReleaser(CompiledPageActionDescriptor descriptor)
+        Func<PageContext, object, ValueTask> CreateAsyncReleaser(CompiledPageActionDescriptor descriptor)
         {
             var releaser = CreateReleaser(descriptor);
             return (context, model) =>

src/Mvc/Mvc.RazorPages/test/Infrastructure/DefaultPageFactoryProviderTest.cs

@@ -119,7 +119,7 @@ public void PageFactorySetsPath()
             {
                 ActionDescriptor = descriptor
             };
-            
+
             var viewContext = new ViewContext();
 
             // Act
@@ -404,14 +404,19 @@ private static IPageActivatorProvider CreateActivator()
                 .Setup(a => a.CreateAsyncReleaser(It.IsAny<CompiledPageActionDescriptor>()))
                 .Returns((CompiledPageActionDescriptor descriptor) =>
                 {
-                    return (context, viewContext, instance) => instance switch {
+                    return (context, viewContext, instance) => instance switch
+                    {
                         IAsyncDisposable asyncDisposable => asyncDisposable.DisposeAsync(),
                         IDisposable disposable => SyncDispose(disposable),
                         _ => default
                     };
                 });
 
-            ValueTask SyncDispose(IDisposable disposable) { disposable.Dispose(); return default; }
+            ValueTask SyncDispose(IDisposable disposable)
+            {
+                disposable.Dispose();
+                return default;
+            }
 
             return activator.Object;
         }

src/Mvc/Mvc.RazorPages/test/Infrastructure/PageActionInvokerTest.cs

@@ -1400,8 +1400,8 @@ public async Task InvokeAction_ForPage_Logs(bool hasPageModel)
             var loggerFactory = new TestLoggerFactory(testSink, enabled: true);
             var logger = loggerFactory.CreateLogger("test");
 
-            var actionDescriptor = hasPageModel 
-                ? CreateDescriptorForPageModelPage() 
+            var actionDescriptor = hasPageModel
+                ? CreateDescriptorForPageModelPage()
                 : CreateDescriptorForSimplePage();
             actionDescriptor.ViewEnginePath = "/Pages/Foo";
             actionDescriptor.RouteValues.Add("page", "foo");

src/Mvc/Mvc.ViewFeatures/src/Resources.resx

@@ -298,4 +298,7 @@
   <data name="UnsupportedRenderMode" xml:space="preserve">
     <value>Unsupported RenderMode '{0}'.</value>
   </data>
+  <data name="AsyncDisposableViewsNotSupported" xml:space="preserve">
+    <value>Views implementing '{0}' are not supported.</value>
+  </data>
 </root>

src/Mvc/Mvc.ViewFeatures/src/ViewComponents/DefaultViewComponentInvoker.cs

@@ -176,7 +176,7 @@ private IViewComponentResult InvokeSyncCore(ObjectMethodExecutor executor, objec
                 var stopwatch = ValueStopwatch.StartNew();
                 object? result;
 
-                    result = executor.Execute(component, arguments);
+                result = executor.Execute(component, arguments);
 
                 var viewComponentResult = CoerceToViewComponentResult(result);
                 _logger.ViewComponentExecuted(context, stopwatch.GetElapsedTime(), viewComponentResult);

src/Mvc/Mvc.ViewFeatures/src/ViewEngines/CompositeViewEngine.cs

@@ -55,7 +55,7 @@ public ViewEngineResult FindView(ActionContext context, string viewName, bool is
                 {
                     if (result.View is IAsyncDisposable)
                     {
-                        throw new InvalidOperationException("Async disposable views are not supported.");
+                        throw new InvalidOperationException(Resources.FormatAsyncDisposableViewsNotSupported(typeof(IAsyncDisposable).FullName));
                     }
                     return result;
                 }

src/Mvc/test/Mvc.FunctionalTests/PageAsyncDisposalTest.cs

@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Linq;