Change template -> pattern for MVC

This commit is contained in:
Ryan Nowak 2019-03-12 14:03:25 -07:00
parent e78a6521b9
commit 4b4614635f
9 changed files with 39 additions and 39 deletions

View File

@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.Builder
{ {
public static class EndpointRouteBuilderExtensions 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) if (routes == null)
{ {
@ -25,7 +25,7 @@ namespace Microsoft.AspNetCore.Builder
.Build(); .Build();
return routes.Map( return routes.Map(
template, pattern,
"Hello " + greeter, "Hello " + greeter,
pipeline); pipeline);
} }

View File

@ -62,12 +62,12 @@ namespace Microsoft.AspNetCore.Builder
/// <summary> /// <summary>
/// Adds endpoints for controller actions to the <see cref="IEndpointRouteBuilder"/> and specifies a route /// 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"/>. /// <paramref name="defaults"/>, <paramref name="constraints"/>, and <paramref name="dataTokens"/>.
/// </summary> /// </summary>
/// <param name="routes">The <see cref="IEndpointRouteBuilder"/> to add the route to.</param> /// <param name="routes">The <see cref="IEndpointRouteBuilder"/> to add the route to.</param>
/// <param name="name">The name of the route.</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"> /// <param name="defaults">
/// An object that contains default values for route parameters. The object's properties represent the /// An object that contains default values for route parameters. The object's properties represent the
/// names and values of the default values. /// names and values of the default values.
@ -83,7 +83,7 @@ namespace Microsoft.AspNetCore.Builder
public static void MapControllerRoute( public static void MapControllerRoute(
this IEndpointRouteBuilder routes, this IEndpointRouteBuilder routes,
string name, string name,
string template, string pattern,
object defaults = null, object defaults = null,
object constraints = null, object constraints = null,
object dataTokens = null) object dataTokens = null)
@ -98,7 +98,7 @@ namespace Microsoft.AspNetCore.Builder
var dataSource = GetOrCreateDataSource(routes); var dataSource = GetOrCreateDataSource(routes);
dataSource.AddRoute(new ConventionalRouteEntry( dataSource.AddRoute(new ConventionalRouteEntry(
name, name,
template, pattern,
new RouteValueDictionary(defaults), new RouteValueDictionary(defaults),
new RouteValueDictionary(constraints), new RouteValueDictionary(constraints),
new RouteValueDictionary(dataTokens))); new RouteValueDictionary(dataTokens)));
@ -106,13 +106,13 @@ namespace Microsoft.AspNetCore.Builder
/// <summary> /// <summary>
/// Adds endpoints for controller actions to the <see cref="IEndpointRouteBuilder"/> and specifies a route /// 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"/>. /// <paramref name="defaults"/>, <paramref name="constraints"/>, and <paramref name="dataTokens"/>.
/// </summary> /// </summary>
/// <param name="routes">The <see cref="IEndpointRouteBuilder"/> to add the route to.</param> /// <param name="routes">The <see cref="IEndpointRouteBuilder"/> to add the route to.</param>
/// <param name="name">The name of the route.</param> /// <param name="name">The name of the route.</param>
/// <param name="areaName">The area name.</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"> /// <param name="defaults">
/// An object that contains default values for route parameters. The object's properties represent the /// An object that contains default values for route parameters. The object's properties represent the
/// names and values of the default values. /// names and values of the default values.
@ -129,7 +129,7 @@ namespace Microsoft.AspNetCore.Builder
this IEndpointRouteBuilder routes, this IEndpointRouteBuilder routes,
string name, string name,
string areaName, string areaName,
string template, string pattern,
object defaults = null, object defaults = null,
object constraints = null, object constraints = null,
object dataTokens = null) object dataTokens = null)
@ -150,7 +150,7 @@ namespace Microsoft.AspNetCore.Builder
var constraintsDictionary = new RouteValueDictionary(constraints); var constraintsDictionary = new RouteValueDictionary(constraints);
constraintsDictionary["area"] = constraintsDictionary["area"] ?? new StringRouteConstraint(areaName); constraintsDictionary["area"] = constraintsDictionary["area"] ?? new StringRouteConstraint(areaName);
routes.MapControllerRoute(name, template, defaultsDictionary, constraintsDictionary, dataTokens); routes.MapControllerRoute(name, pattern, defaultsDictionary, constraintsDictionary, dataTokens);
} }
/// <summary> /// <summary>

View File

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

View File

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

View File

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

View File

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

View File

@ -161,7 +161,7 @@ namespace Company.WebApplication1
{ {
routes.MapControllerRoute( routes.MapControllerRoute(
name: "default", name: "default",
template: "{controller=Home}/{action=Index}/{id?}"); pattern: "{controller=Home}/{action=Index}/{id?}");
routes.MapRazorPages(); routes.MapRazorPages();
}); });

View File

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