diff --git a/src/Microsoft.AspNetCore.Routing/Properties/Resources.Designer.cs b/src/Microsoft.AspNetCore.Routing/Properties/Resources.Designer.cs index efc7928b7c..caea8a3ab1 100644 --- a/src/Microsoft.AspNetCore.Routing/Properties/Resources.Designer.cs +++ b/src/Microsoft.AspNetCore.Routing/Properties/Resources.Designer.cs @@ -363,7 +363,7 @@ namespace Microsoft.AspNetCore.Routing } /// - /// In a route parameter, '{' and '}' must be escaped with '{{' and '}}' + /// In a route parameter, '{' and '}' must be escaped with '{{' and '}}'. /// internal static string TemplateRoute_UnescapedBrace { @@ -371,7 +371,7 @@ namespace Microsoft.AspNetCore.Routing } /// - /// In a route parameter, '{' and '}' must be escaped with '{{' and '}}' + /// In a route parameter, '{' and '}' must be escaped with '{{' and '}}'. /// internal static string FormatTemplateRoute_UnescapedBrace() { diff --git a/src/Microsoft.AspNetCore.Routing/Resources.resx b/src/Microsoft.AspNetCore.Routing/Resources.resx index 6c3fcc582b..52b22d6962 100644 --- a/src/Microsoft.AspNetCore.Routing/Resources.resx +++ b/src/Microsoft.AspNetCore.Routing/Resources.resx @@ -1,17 +1,17 @@  - @@ -184,7 +184,7 @@ The constraint entry '{0}' - '{1}' on the route '{2}' could not be resolved by the constraint resolver of type '{3}'. - In a route parameter, '{' and '}' must be escaped with '{{' and '}}' + In a route parameter, '{' and '}' must be escaped with '{{' and '}}'. In the segment '{0}', the optional parameter '{1}' is preceded by an invalid segment '{2}'. Only a period (.) can precede an optional parameter. diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Template/TemplateParserTests.cs b/test/Microsoft.AspNetCore.Routing.Tests/Template/TemplateParserTests.cs index d43b279c97..507dc07d0c 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/Template/TemplateParserTests.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/Template/TemplateParserTests.cs @@ -521,7 +521,7 @@ namespace Microsoft.AspNetCore.Routing.Template.Tests // Act and Assert ExceptionAssert.Throws( () => TemplateParser.Parse(template), - "In a route parameter, '{' and '}' must be escaped with '{{' and '}}'" + Environment.NewLine + + "In a route parameter, '{' and '}' must be escaped with '{{' and '}}'." + Environment.NewLine + "Parameter name: routeTemplate"); } @@ -532,8 +532,8 @@ namespace Microsoft.AspNetCore.Routing.Template.Tests [InlineData("{p1}.{p2?})", "p2", ")")] [InlineData("{foorb?}-bar-{z}", "foorb", "-bar-")] public void Parse_ComplexSegment_OptionalParameter_NotTheLastPart( - string template, - string parameter, + string template, + string parameter, string invalid) { // Act and Assert @@ -554,8 +554,8 @@ namespace Microsoft.AspNetCore.Routing.Template.Tests // Act and Assert ExceptionAssert.Throws( () => TemplateParser.Parse(template), - "In the complex segment '"+ template +"', the optional parameter 'p2' is preceded by an invalid " + - "segment '" + parameter +"'. Only valid literal to precede an optional parameter is a period (.)." + + "In the complex segment '"+ template +"', the optional parameter 'p2' is preceded by an invalid " + + "segment '" + parameter +"'. Only valid literal to precede an optional parameter is a period (.)." + Environment.NewLine + "Parameter name: routeTemplate"); } @@ -708,7 +708,7 @@ namespace Microsoft.AspNetCore.Routing.Template.Tests { ExceptionAssert.Throws( () => TemplateParser.Parse("{a}/{a{aa}/{z}"), - "In a route parameter, '{' and '}' must be escaped with '{{' and '}}'" + Environment.NewLine + + "In a route parameter, '{' and '}' must be escaped with '{{' and '}}'." + Environment.NewLine + "Parameter name: routeTemplate"); }