Dont mangle ActionNameAttribute

Author: pranavkm

src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/DefaultApplicationModelProvider.cs

@@ -22,7 +22,6 @@ internal class DefaultApplicationModelProvider : IApplicationModelProvider
         private readonly IModelMetadataProvider _modelMetadataProvider;
         private readonly Func<ActionContext, bool> _supportsAllRequests;
         private readonly Func<ActionContext, bool> _supportsNonGetRequests;
-        private readonly List<IActionModelConvention> _actionModelConventions;
 
         public DefaultApplicationModelProvider(
             IOptions<MvcOptions> mvcOptionsAccessor,
@@ -33,12 +32,6 @@ public DefaultApplicationModelProvider(
 
             _supportsAllRequests = _ => true;
             _supportsNonGetRequests = context => !string.Equals(context.HttpContext.Request.Method, "GET", StringComparison.OrdinalIgnoreCase);
-
-            _actionModelConventions = new List<IActionModelConvention>();
-            if (_mvcOptions.SuppressAsyncSuffixInActionNames)
-            {
-                _actionModelConventions.Add(new SuppressAsyncSuffixInActionNameConvention());
-            }
         }
 
         /// <inheritdoc />
@@ -99,11 +92,6 @@ public void OnProvidersExecuting(ApplicationModelProviderContext context)
                             actionModel.Parameters.Add(parameterModel);
                         }
                     }
-
-                    foreach (var convention in _actionModelConventions)
-                    {
-                        convention.Apply(actionModel);
-                    }
                 }
             }
         }
@@ -308,7 +296,7 @@ internal ActionModel CreateActionModel(
             }
             else
             {
-                actionModel.ActionName = methodInfo.Name;
+                actionModel.ActionName = CanonicalizeActionName(methodInfo.Name);
             }
 
             var apiVisibility = attributes.OfType<IApiDescriptionVisibilityProvider>().FirstOrDefault();
@@ -383,6 +371,19 @@ internal ActionModel CreateActionModel(
             return actionModel;
         }
 
+        private string CanonicalizeActionName(string actionName)
+        {
+            const string Suffix = "Async";
+
+            if (_mvcOptions.SuppressAsyncSuffixInActionNames &&
+                actionName.EndsWith(Suffix, StringComparison.Ordinal))
+            {
+                actionName = actionName.Substring(0, actionName.Length - Suffix.Length);
+            }
+
+            return actionName;
+        }
+
         /// <summary>
         /// Returns <c>true</c> if the <paramref name="methodInfo"/> is an action. Otherwise <c>false</c>.
         /// </summary>

src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/SuppressAsyncSuffixInActionNameConvention.cs

@@ -4,7 +4,9 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Abstractions;
 using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.Controllers;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.AspNetCore.Mvc.Formatters;
 using Microsoft.AspNetCore.Mvc.Infrastructure;
@@ -214,13 +216,17 @@ public int? MaxValidationDepth
         /// controller action names.
         /// <para>
         /// When <see langword="true"/>, MVC will strip action names of the Async suffix.
-        /// Action names are used for routing as well as view lookup. For example, the action
-        /// action <c>ProductsController.ListProductsAsync</c> will be routeable at <c>/Products/ListProducts</c>
+        /// <see cref="ControllerActionDescriptor.ActionName"/> is used to construct the route to the action as 
+        /// well as in view lookup. For example, the action <c>ProductsController.ListProductsAsync</c> will 
+        /// be routeable at <c>/Products/ListProducts</c>
         /// with views looked up at <c>/Views/Products/ListProducts.cshtml</c>.
         /// </para>
+        /// <para>
+        /// This option does not affect values specified using using <see cref="ActionNameAttribute"/>.
+        /// </para>
         /// </summary>
         /// <value>
-        /// The default value is <c>true</c>.
+        /// The default value is <see langword="true"/>.
         /// </value>
         public bool SuppressAsyncSuffixInActionNames { get; set; } = true;
 

src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/MvcOptions.cs

@@ -300,6 +300,7 @@ public void OnProvidersExecuting_RemovesAsyncSuffix_WhenOptionIsSet()
             var options = new MvcOptions();
             var provider = new TestApplicationModelProvider(options, new EmptyModelMetadataProvider());
             var typeInfo = typeof(AsyncActionController).GetTypeInfo();
+            var methodInfo = typeInfo.GetMethod(nameof(AsyncActionController.GetPersonAsync));
 
             var context = new ApplicationModelProviderContext(new[] { typeInfo });
 
@@ -308,7 +309,7 @@ public void OnProvidersExecuting_RemovesAsyncSuffix_WhenOptionIsSet()
 
             // Assert
             var controllerModel = Assert.Single(context.Result.Controllers);
-            var action = Assert.Single(controllerModel.Actions);
+            var action = Assert.Single(controllerModel.Actions, a => a.ActionMethod == methodInfo);
             Assert.Equal("GetPerson", action.ActionName);
         }
 
@@ -319,6 +320,7 @@ public void OnProvidersExecuting_DoesNotRemoveAsyncSuffix_WhenOptionIsDisabled()
             var options = new MvcOptions { SuppressAsyncSuffixInActionNames = false };
             var provider = new TestApplicationModelProvider(options, new EmptyModelMetadataProvider());
             var typeInfo = typeof(AsyncActionController).GetTypeInfo();
+            var methodInfo = typeInfo.GetMethod(nameof(AsyncActionController.GetPersonAsync));
 
             var context = new ApplicationModelProviderContext(new[] { typeInfo });
 
@@ -327,10 +329,30 @@ public void OnProvidersExecuting_DoesNotRemoveAsyncSuffix_WhenOptionIsDisabled()
 
             // Assert
             var controllerModel = Assert.Single(context.Result.Controllers);
-            var action = Assert.Single(controllerModel.Actions);
+            var action = Assert.Single(controllerModel.Actions, a => a.ActionMethod == methodInfo);
             Assert.Equal(nameof(AsyncActionController.GetPersonAsync), action.ActionName);
         }
 
+        [Fact]
+        public void OnProvidersExecuting_DoesNotRemoveAsyncSuffix_WhenActionNameIsSpecifiedUsingActionNameAttribute()
+        {
+            // Arrange
+            var options = new MvcOptions();
+            var provider = new TestApplicationModelProvider(options, new EmptyModelMetadataProvider());
+            var typeInfo = typeof(AsyncActionController).GetTypeInfo();
+            var methodInfo = typeInfo.GetMethod(nameof(AsyncActionController.GetAddressAsync));
+
+            var context = new ApplicationModelProviderContext(new[] { typeInfo });
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            var controllerModel = Assert.Single(context.Result.Controllers);
+            var action = Assert.Single(controllerModel.Actions, a => a.ActionMethod == methodInfo);
+            Assert.Equal("GetRealAddressAsync", action.ActionName);
+        }
+
         [Fact]
         public void CreateControllerModel_DerivedFromControllerClass_HasFilter()
         {
@@ -1814,7 +1836,10 @@ public void Edit() { }
 
         private class AsyncActionController : Controller
         {
-            public IActionResult GetPersonAsync() => null;
+            public Task<IActionResult> GetPersonAsync() => null;
+
+            [ActionName("GetRealAddressAsync")]
+            public Task<IActionResult> GetAddressAsync() => null;
         }
 
         private class TestApplicationModelProvider : DefaultApplicationModelProvider