Change template -> pattern for MVC

Author: rynowak

src/Http/Routing/test/testassets/RoutingSandbox/HelloExtension/EndpointRouteBuilderExtensions.cs

@@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.Builder
 {
     public static class EndpointRouteBuilderExtensions
     {
-        public static IEndpointConventionBuilder MapHello(this IEndpointRouteBuilder routes, string template, string greeter)
+        public static IEndpointConventionBuilder MapHello(this IEndpointRouteBuilder routes, string pattern, string greeter)
         {
             if (routes == null)
             {
@@ -25,7 +25,7 @@ public static IEndpointConventionBuilder MapHello(this IEndpointRouteBuilder rou
                .Build();
 
             return routes.Map(
-                template,
+                pattern,
                 "Hello " + greeter,
                 pipeline);
         }

src/Mvc/Mvc.Core/src/Builder/ControllerEndpointRouteBuilderExtensions.cs

@@ -62,12 +62,12 @@ public static IEndpointConventionBuilder MapDefaultControllerRoute(this IEndpoin
 
         /// <summary>
         /// Adds endpoints for controller actions to the <see cref="IEndpointRouteBuilder"/> and specifies a route
-        /// with the given <paramref name="name"/>, <paramref name="template"/>, 
+        /// with the given <paramref name="name"/>, <paramref name="pattern"/>,
         /// <paramref name="defaults"/>, <paramref name="constraints"/>, and <paramref name="dataTokens"/>.
         /// </summary>
         /// <param name="routes">The <see cref="IEndpointRouteBuilder"/> to add the route to.</param>
         /// <param name="name">The name of the route.</param>
-        /// <param name="template">The URL pattern of the route.</param>
+        /// <param name="pattern">The URL pattern of the route.</param>
         /// <param name="defaults">
         /// An object that contains default values for route parameters. The object's properties represent the
         /// names and values of the default values.
@@ -83,7 +83,7 @@ public static IEndpointConventionBuilder MapDefaultControllerRoute(this IEndpoin
         public static void MapControllerRoute(
             this IEndpointRouteBuilder routes,
             string name,
-            string template,
+            string pattern,
             object defaults = null,
             object constraints = null,
             object dataTokens = null)
@@ -98,21 +98,21 @@ public static void MapControllerRoute(
             var dataSource = GetOrCreateDataSource(routes);
             dataSource.AddRoute(new ConventionalRouteEntry(
                 name,
-                template,
+                pattern,
                 new RouteValueDictionary(defaults),
                 new RouteValueDictionary(constraints),
                 new RouteValueDictionary(dataTokens)));
         }
 
         /// <summary>
         /// Adds endpoints for controller actions to the <see cref="IEndpointRouteBuilder"/> and specifies a route
-        /// with the given <paramref name="name"/>, <paramref name="areaName"/>, <paramref name="template"/>, 
+        /// with the given <paramref name="name"/>, <paramref name="areaName"/>, <paramref name="pattern"/>,
         /// <paramref name="defaults"/>, <paramref name="constraints"/>, and <paramref name="dataTokens"/>.
         /// </summary>
         /// <param name="routes">The <see cref="IEndpointRouteBuilder"/> to add the route to.</param>
         /// <param name="name">The name of the route.</param>
         /// <param name="areaName">The area name.</param>
-        /// <param name="template">The URL pattern of the route.</param>
+        /// <param name="pattern">The URL pattern of the route.</param>
         /// <param name="defaults">
         /// An object that contains default values for route parameters. The object's properties represent the
         /// names and values of the default values.
@@ -129,7 +129,7 @@ public static void MapAreaControllerRoute(
             this IEndpointRouteBuilder routes,
             string name,
             string areaName,
-            string template,
+            string pattern,
             object defaults = null,
             object constraints = null,
             object dataTokens = null)
@@ -150,7 +150,7 @@ public static void MapAreaControllerRoute(
             var constraintsDictionary = new RouteValueDictionary(constraints);
             constraintsDictionary["area"] = constraintsDictionary["area"] ?? new StringRouteConstraint(areaName);
 
-            routes.MapControllerRoute(name, template, defaultsDictionary, constraintsDictionary, dataTokens);
+            routes.MapControllerRoute(name, pattern, defaultsDictionary, constraintsDictionary, dataTokens);
         }
 
         /// <summary>
@@ -175,7 +175,7 @@ public static void MapAreaControllerRoute(
         /// <para>
         /// <see cref="MapFallbackToController(IEndpointRouteBuilder, string, string)"/> does not re-execute routing, and will
         /// not generate route values based on routes defined elsewhere. When using this overload, the <c>path</c> route value
-        /// will be available. 
+        /// will be available.
         /// </para>
         /// <para>
         /// <see cref="MapFallbackToController(IEndpointRouteBuilder, string, string)"/> does not attempt to disambiguate between
@@ -184,8 +184,8 @@ public static void MapAreaControllerRoute(
         /// </para>
         /// </remarks>
         public static void MapFallbackToController(
-            this IEndpointRouteBuilder routes, 
-            string action, 
+            this IEndpointRouteBuilder routes,
+            string action,
             string controller)
         {
             if (routes == null)
@@ -209,7 +209,7 @@ public static void MapFallbackToController(
             GetOrCreateDataSource(routes);
 
             // Maps a fallback endpoint with an empty delegate. This is OK because
-            // we don't expect the delegate to run. 
+            // we don't expect the delegate to run.
             routes.MapFallback(context => Task.CompletedTask).Add(b =>
             {
                 // MVC registers a policy that looks for this metadata.
@@ -228,8 +228,8 @@ public static void MapFallbackToController(
         /// <param name="controller">The controller name.</param>
         /// <remarks>
         /// <para>
-        /// <see cref="MapFallbackToController(IEndpointRouteBuilder, string, string, string)"/> is intended to handle cases 
-        /// where URL path of the request does not contain a file name, and no other endpoint has matched. This is convenient 
+        /// <see cref="MapFallbackToController(IEndpointRouteBuilder, string, string, string)"/> is intended to handle cases
+        /// where URL path of the request does not contain a file name, and no other endpoint has matched. This is convenient
         /// for routing requests for dynamic content to a SPA framework, while also allowing requests for non-existent files to
         /// result in an HTTP 404.
         /// </para>
@@ -242,8 +242,8 @@ public static void MapFallbackToController(
         /// </para>
         /// <para>
         /// <see cref="MapFallbackToController(IEndpointRouteBuilder, string, string, string)"/> does not re-execute routing, and will
-        /// not generate route values based on routes defined elsewhere. When using this overload, the route values provided by matching 
-        /// <paramref name="pattern"/> will be available. 
+        /// not generate route values based on routes defined elsewhere. When using this overload, the route values provided by matching
+        /// <paramref name="pattern"/> will be available.
         /// </para>
         /// <para>
         /// <see cref="MapFallbackToController(IEndpointRouteBuilder, string, string, string)"/> does not attempt to disambiguate between
@@ -283,7 +283,7 @@ public static void MapFallbackToController(
             GetOrCreateDataSource(routes);
 
             // Maps a fallback endpoint with an empty delegate. This is OK because
-            // we don't expect the delegate to run. 
+            // we don't expect the delegate to run.
             routes.MapFallback(pattern, context => Task.CompletedTask).Add(b =>
             {
                 // MVC registers a policy that looks for this metadata.
@@ -314,7 +314,7 @@ public static void MapFallbackToController(
         /// <para>
         /// <see cref="MapFallbackToAreaController(IEndpointRouteBuilder, string, string, string)"/> does not re-execute routing, and will
         /// not generate route values based on routes defined elsewhere. When using this overload, the <c>path</c> route value
-        /// will be available. 
+        /// will be available.
         /// </para>
         /// <para>
         /// <see cref="MapFallbackToAreaController(IEndpointRouteBuilder, string, string, string)"/> does not attempt to disambiguate between
@@ -349,7 +349,7 @@ public static void MapFallbackToAreaController(
             GetOrCreateDataSource(routes);
 
             // Maps a fallback endpoint with an empty delegate. This is OK because
-            // we don't expect the delegate to run. 
+            // we don't expect the delegate to run.
             routes.MapFallback(context => Task.CompletedTask).Add(b =>
             {
                 // MVC registers a policy that looks for this metadata.
@@ -369,8 +369,8 @@ public static void MapFallbackToAreaController(
         /// <param name="area">The area name.</param>
         /// <remarks>
         /// <para>
-        /// <see cref="MapFallbackToAreaController(IEndpointRouteBuilder, string, string, string, string)"/> is intended to handle 
-        /// cases where URL path of the request does not contain a file name, and no other endpoint has matched. This is 
+        /// <see cref="MapFallbackToAreaController(IEndpointRouteBuilder, string, string, string, string)"/> is intended to handle
+        /// cases where URL path of the request does not contain a file name, and no other endpoint has matched. This is
         /// convenient for routing requests for dynamic content to a SPA framework, while also allowing requests for non-existent files to
         /// result in an HTTP 404.
         /// </para>
@@ -383,7 +383,7 @@ public static void MapFallbackToAreaController(
         /// </para>
         /// <para>
         /// <see cref="MapFallbackToAreaController(IEndpointRouteBuilder, string, string, string, string)"/> does not re-execute routing, and will
-        /// not generate route values based on routes defined elsewhere. When using this overload, the route values provided by matching 
+        /// not generate route values based on routes defined elsewhere. When using this overload, the route values provided by matching
         /// <paramref name="pattern"/> will be available.
         /// </para>
         /// <para>
@@ -425,7 +425,7 @@ public static void MapFallbackToAreaController(
             GetOrCreateDataSource(routes);
 
             // Maps a fallback endpoint with an empty delegate. This is OK because
-            // we don't expect the delegate to run. 
+            // we don't expect the delegate to run.
             routes.MapFallback(pattern, context => Task.CompletedTask).Add(b =>
             {
                 // MVC registers a policy that looks for this metadata.

src/Mvc/Mvc.Core/src/Builder/MvcAreaRouteBuilderExtensions.cs

@@ -59,7 +59,7 @@ public static IRouteBuilder MapAreaRoute(
 
         /// <summary>
         /// Adds a route to the <see cref="IRouteBuilder"/> with the given MVC area with the specified
-        /// <paramref name="name"/>, <paramref name="areaName"/>, <paramref name="template"/>, 
+        /// <paramref name="name"/>, <paramref name="areaName"/>, <paramref name="template"/>,
         /// <paramref name="defaults"/>, and <paramref name="constraints"/>.
         /// </summary>
         /// <param name="routeBuilder">The <see cref="IRouteBuilder"/> to add the route to.</param>
@@ -89,7 +89,7 @@ public static IRouteBuilder MapAreaRoute(
 
         /// <summary>
         /// Adds a route to the <see cref="IRouteBuilder"/> with the given MVC area with the specified
-        /// <paramref name="name"/>, <paramref name="areaName"/>, <paramref name="template"/>, 
+        /// <paramref name="name"/>, <paramref name="areaName"/>, <paramref name="template"/>,
         /// <paramref name="defaults"/>, <paramref name="constraints"/>, and <paramref name="dataTokens"/>.
         /// </summary>
         /// <param name="routeBuilder">The <see cref="IRouteBuilder"/> to add the route to.</param>

src/Mvc/samples/MvcSandbox/Startup.cs

@@ -43,11 +43,11 @@ public void Configure(IApplicationBuilder app)
 
                 builder.MapControllerRoute(
                     name: "default",
-                    template: "{controller=Home}/{action=Index}/{id?}");
+                    pattern: "{controller=Home}/{action=Index}/{id?}");
 
                 builder.MapControllerRoute(
                     name: "transform",
-                    template: "Transform/{controller:slugify=Home}/{action:slugify=Index}/{id?}",
+                    pattern: "Transform/{controller:slugify=Home}/{action:slugify=Index}/{id?}",
                     defaults: null,
                     constraints: new { controller = "Home" });
 

src/Mvc/test/WebSites/ApplicationModelWebSite/Startup.cs

@@ -29,8 +29,8 @@ public void Configure(IApplicationBuilder app)
         {
             app.UseRouting(routes =>
             {
-                routes.MapControllerRoute(name: "areaRoute", template: "{area:exists}/{controller=Home}/{action=Index}");
-                routes.MapControllerRoute(name: "default", template: "{controller}/{action}/{id?}");
+                routes.MapControllerRoute(name: "areaRoute", pattern: "{area:exists}/{controller=Home}/{action=Index}");
+                routes.MapControllerRoute(name: "default", pattern: "{controller}/{action}/{id?}");
 
                 routes.MapRazorPages();
             });

src/Mvc/test/WebSites/BasicWebSite/Startup.cs

@@ -39,12 +39,12 @@ public void Configure(IApplicationBuilder app)
             {
                 routes.MapControllerRoute(
                     name: "ActionAsMethod",
-                    template: "{controller}/{action}",
+                    pattern: "{controller}/{action}",
                     defaults: new { controller = "Home", action = "Index" });
 
                 routes.MapControllerRoute(
-                    name: "PageRoute", 
-                    template: "{controller}/{action}/{page}");
+                    name: "PageRoute",
+                    pattern: "{controller}/{action}/{page}");
             });
         }
     }

src/Mvc/test/WebSites/HtmlGenerationWebSite/Startup.cs

@@ -34,15 +34,15 @@ public virtual void Configure(IApplicationBuilder app)
             {
                 routes.MapControllerRoute(
                     name: "areaRoute",
-                    template: "{area:exists}/{controller}/{action}/{id?}",
+                    pattern: "{area:exists}/{controller}/{action}/{id?}",
                     defaults: new { action = "Index" });
                 routes.MapControllerRoute(
                     name: "productRoute",
-                    template: "Product/{action}",
+                    pattern: "Product/{action}",
                     defaults: new { controller = "Product" });
                 routes.MapControllerRoute(
                     name: "default",
-                    template: "{controller}/{action}/{id?}",
+                    pattern: "{controller}/{action}/{id?}",
                     defaults: new { controller = "HtmlGeneration_Home", action = "Index" });
 
                 routes.MapRazorPages();

src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Startup.cs

@@ -161,7 +161,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             {
                 routes.MapControllerRoute(
                     name: "default",
-                    template: "{controller=Home}/{action=Index}/{id?}");
+                    pattern: "{controller=Home}/{action=Index}/{id?}");
                 routes.MapRazorPages();
             });
 

src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/Startup.fs

@@ -44,7 +44,7 @@ type Startup private () =
         app.UseRouting(fun routes ->
             routes.MapControllerRoute(
                 name = "default",
-                template = "{controller=Home}/{action=Index}/{id?}") |> ignore
+                pattern = "{controller=Home}/{action=Index}/{id?}") |> ignore
             routes.MapRazorPages() |> ignore) |> ignore
 
         app.UseAuthorization() |> ignore