diff --git a/src/Microsoft.AspNetCore.Routing.Abstractions/Properties/Resources.Designer.cs b/src/Microsoft.AspNetCore.Routing.Abstractions/Properties/Resources.Designer.cs
index b73bfdaea2..8fdf6b8715 100644
--- a/src/Microsoft.AspNetCore.Routing.Abstractions/Properties/Resources.Designer.cs
+++ b/src/Microsoft.AspNetCore.Routing.Abstractions/Properties/Resources.Designer.cs
@@ -15,32 +15,28 @@ namespace Microsoft.AspNetCore.Routing.Abstractions
///
internal static string RouteValueDictionary_DuplicateKey
{
- get { return GetString("RouteValueDictionary_DuplicateKey"); }
+ get => GetString("RouteValueDictionary_DuplicateKey");
}
///
/// An element with the key '{0}' already exists in the {1}.
///
internal static string FormatRouteValueDictionary_DuplicateKey(object p0, object p1)
- {
- return string.Format(CultureInfo.CurrentCulture, GetString("RouteValueDictionary_DuplicateKey"), p0, p1);
- }
+ => string.Format(CultureInfo.CurrentCulture, GetString("RouteValueDictionary_DuplicateKey"), p0, p1);
///
/// The type '{0}' defines properties '{1}' and '{2}' which differ only by casing. This is not supported by {3} which uses case-insensitive comparisons.
///
internal static string RouteValueDictionary_DuplicatePropertyName
{
- get { return GetString("RouteValueDictionary_DuplicatePropertyName"); }
+ get => GetString("RouteValueDictionary_DuplicatePropertyName");
}
///
/// The type '{0}' defines properties '{1}' and '{2}' which differ only by casing. This is not supported by {3} which uses case-insensitive comparisons.
///
internal static string FormatRouteValueDictionary_DuplicatePropertyName(object p0, object p1, object p2, object p3)
- {
- return string.Format(CultureInfo.CurrentCulture, GetString("RouteValueDictionary_DuplicatePropertyName"), p0, p1, p2, p3);
- }
+ => string.Format(CultureInfo.CurrentCulture, GetString("RouteValueDictionary_DuplicatePropertyName"), p0, p1, p2, p3);
private static string GetString(string name, params string[] formatterNames)
{
diff --git a/src/Microsoft.AspNetCore.Routing/Properties/Resources.Designer.cs b/src/Microsoft.AspNetCore.Routing/Properties/Resources.Designer.cs
index caea8a3ab1..5cb82620c1 100644
--- a/src/Microsoft.AspNetCore.Routing/Properties/Resources.Designer.cs
+++ b/src/Microsoft.AspNetCore.Routing/Properties/Resources.Designer.cs
@@ -15,448 +15,392 @@ namespace Microsoft.AspNetCore.Routing
///
internal static string ArgumentMustBeGreaterThanOrEqualTo
{
- get { return GetString("ArgumentMustBeGreaterThanOrEqualTo"); }
+ get => GetString("ArgumentMustBeGreaterThanOrEqualTo");
}
///
/// Value must be greater than or equal to {0}.
///
internal static string FormatArgumentMustBeGreaterThanOrEqualTo(object p0)
- {
- return string.Format(CultureInfo.CurrentCulture, GetString("ArgumentMustBeGreaterThanOrEqualTo"), p0);
- }
+ => string.Format(CultureInfo.CurrentCulture, GetString("ArgumentMustBeGreaterThanOrEqualTo"), p0);
///
/// The value for argument '{0}' should be less than or equal to the value for the argument '{1}'.
///
internal static string RangeConstraint_MinShouldBeLessThanOrEqualToMax
{
- get { return GetString("RangeConstraint_MinShouldBeLessThanOrEqualToMax"); }
+ get => GetString("RangeConstraint_MinShouldBeLessThanOrEqualToMax");
}
///
/// The value for argument '{0}' should be less than or equal to the value for the argument '{1}'.
///
internal static string FormatRangeConstraint_MinShouldBeLessThanOrEqualToMax(object p0, object p1)
- {
- return string.Format(CultureInfo.CurrentCulture, GetString("RangeConstraint_MinShouldBeLessThanOrEqualToMax"), p0, p1);
- }
+ => string.Format(CultureInfo.CurrentCulture, GetString("RangeConstraint_MinShouldBeLessThanOrEqualToMax"), p0, p1);
///
/// The '{0}' property of '{1}' must not be null.
///
internal static string PropertyOfTypeCannotBeNull
{
- get { return GetString("PropertyOfTypeCannotBeNull"); }
+ get => GetString("PropertyOfTypeCannotBeNull");
}
///
/// The '{0}' property of '{1}' must not be null.
///
internal static string FormatPropertyOfTypeCannotBeNull(object p0, object p1)
- {
- return string.Format(CultureInfo.CurrentCulture, GetString("PropertyOfTypeCannotBeNull"), p0, p1);
- }
+ => string.Format(CultureInfo.CurrentCulture, GetString("PropertyOfTypeCannotBeNull"), p0, p1);
///
/// The supplied route name '{0}' is ambiguous and matched more than one route.
///
internal static string NamedRoutes_AmbiguousRoutesFound
{
- get { return GetString("NamedRoutes_AmbiguousRoutesFound"); }
+ get => GetString("NamedRoutes_AmbiguousRoutesFound");
}
///
/// The supplied route name '{0}' is ambiguous and matched more than one route.
///
internal static string FormatNamedRoutes_AmbiguousRoutesFound(object p0)
- {
- return string.Format(CultureInfo.CurrentCulture, GetString("NamedRoutes_AmbiguousRoutesFound"), p0);
- }
+ => string.Format(CultureInfo.CurrentCulture, GetString("NamedRoutes_AmbiguousRoutesFound"), p0);
///
/// A default handler must be set on the {0}.
///
internal static string DefaultHandler_MustBeSet
{
- get { return GetString("DefaultHandler_MustBeSet"); }
+ get => GetString("DefaultHandler_MustBeSet");
}
///
/// A default handler must be set on the {0}.
///
internal static string FormatDefaultHandler_MustBeSet(object p0)
- {
- return string.Format(CultureInfo.CurrentCulture, GetString("DefaultHandler_MustBeSet"), p0);
- }
+ => string.Format(CultureInfo.CurrentCulture, GetString("DefaultHandler_MustBeSet"), p0);
///
/// The constructor to use for activating the constraint type '{0}' is ambiguous. Multiple constructors were found with the following number of parameters: {1}.
///
internal static string DefaultInlineConstraintResolver_AmbiguousCtors
{
- get { return GetString("DefaultInlineConstraintResolver_AmbiguousCtors"); }
+ get => GetString("DefaultInlineConstraintResolver_AmbiguousCtors");
}
///
/// The constructor to use for activating the constraint type '{0}' is ambiguous. Multiple constructors were found with the following number of parameters: {1}.
///
internal static string FormatDefaultInlineConstraintResolver_AmbiguousCtors(object p0, object p1)
- {
- return string.Format(CultureInfo.CurrentCulture, GetString("DefaultInlineConstraintResolver_AmbiguousCtors"), p0, p1);
- }
+ => string.Format(CultureInfo.CurrentCulture, GetString("DefaultInlineConstraintResolver_AmbiguousCtors"), p0, p1);
///
/// Could not find a constructor for constraint type '{0}' with the following number of parameters: {1}.
///
internal static string DefaultInlineConstraintResolver_CouldNotFindCtor
{
- get { return GetString("DefaultInlineConstraintResolver_CouldNotFindCtor"); }
+ get => GetString("DefaultInlineConstraintResolver_CouldNotFindCtor");
}
///
/// Could not find a constructor for constraint type '{0}' with the following number of parameters: {1}.
///
internal static string FormatDefaultInlineConstraintResolver_CouldNotFindCtor(object p0, object p1)
- {
- return string.Format(CultureInfo.CurrentCulture, GetString("DefaultInlineConstraintResolver_CouldNotFindCtor"), p0, p1);
- }
+ => string.Format(CultureInfo.CurrentCulture, GetString("DefaultInlineConstraintResolver_CouldNotFindCtor"), p0, p1);
///
/// The constraint type '{0}' which is mapped to constraint key '{1}' must implement the '{2}' interface.
///
internal static string DefaultInlineConstraintResolver_TypeNotConstraint
{
- get { return GetString("DefaultInlineConstraintResolver_TypeNotConstraint"); }
+ get => GetString("DefaultInlineConstraintResolver_TypeNotConstraint");
}
///
/// The constraint type '{0}' which is mapped to constraint key '{1}' must implement the '{2}' interface.
///
internal static string FormatDefaultInlineConstraintResolver_TypeNotConstraint(object p0, object p1, object p2)
- {
- return string.Format(CultureInfo.CurrentCulture, GetString("DefaultInlineConstraintResolver_TypeNotConstraint"), p0, p1, p2);
- }
+ => string.Format(CultureInfo.CurrentCulture, GetString("DefaultInlineConstraintResolver_TypeNotConstraint"), p0, p1, p2);
///
/// A path segment that contains more than one section, such as a literal section or a parameter, cannot contain a catch-all parameter.
///
internal static string TemplateRoute_CannotHaveCatchAllInMultiSegment
{
- get { return GetString("TemplateRoute_CannotHaveCatchAllInMultiSegment"); }
+ get => GetString("TemplateRoute_CannotHaveCatchAllInMultiSegment");
}
///
/// A path segment that contains more than one section, such as a literal section or a parameter, cannot contain a catch-all parameter.
///
internal static string FormatTemplateRoute_CannotHaveCatchAllInMultiSegment()
- {
- return GetString("TemplateRoute_CannotHaveCatchAllInMultiSegment");
- }
+ => GetString("TemplateRoute_CannotHaveCatchAllInMultiSegment");
///
/// The route parameter '{0}' has both an inline default value and an explicit default value specified. A route parameter cannot contain an inline default value when a default value is specified explicitly. Consider removing one of them.
///
internal static string TemplateRoute_CannotHaveDefaultValueSpecifiedInlineAndExplicitly
{
- get { return GetString("TemplateRoute_CannotHaveDefaultValueSpecifiedInlineAndExplicitly"); }
+ get => GetString("TemplateRoute_CannotHaveDefaultValueSpecifiedInlineAndExplicitly");
}
///
/// The route parameter '{0}' has both an inline default value and an explicit default value specified. A route parameter cannot contain an inline default value when a default value is specified explicitly. Consider removing one of them.
///
internal static string FormatTemplateRoute_CannotHaveDefaultValueSpecifiedInlineAndExplicitly(object p0)
- {
- return string.Format(CultureInfo.CurrentCulture, GetString("TemplateRoute_CannotHaveDefaultValueSpecifiedInlineAndExplicitly"), p0);
- }
+ => string.Format(CultureInfo.CurrentCulture, GetString("TemplateRoute_CannotHaveDefaultValueSpecifiedInlineAndExplicitly"), p0);
///
/// A path segment cannot contain two consecutive parameters. They must be separated by a '/' or by a literal string.
///
internal static string TemplateRoute_CannotHaveConsecutiveParameters
{
- get { return GetString("TemplateRoute_CannotHaveConsecutiveParameters"); }
+ get => GetString("TemplateRoute_CannotHaveConsecutiveParameters");
}
///
/// A path segment cannot contain two consecutive parameters. They must be separated by a '/' or by a literal string.
///
internal static string FormatTemplateRoute_CannotHaveConsecutiveParameters()
- {
- return GetString("TemplateRoute_CannotHaveConsecutiveParameters");
- }
+ => GetString("TemplateRoute_CannotHaveConsecutiveParameters");
///
/// The route template separator character '/' cannot appear consecutively. It must be separated by either a parameter or a literal value.
///
internal static string TemplateRoute_CannotHaveConsecutiveSeparators
{
- get { return GetString("TemplateRoute_CannotHaveConsecutiveSeparators"); }
+ get => GetString("TemplateRoute_CannotHaveConsecutiveSeparators");
}
///
/// The route template separator character '/' cannot appear consecutively. It must be separated by either a parameter or a literal value.
///
internal static string FormatTemplateRoute_CannotHaveConsecutiveSeparators()
- {
- return GetString("TemplateRoute_CannotHaveConsecutiveSeparators");
- }
+ => GetString("TemplateRoute_CannotHaveConsecutiveSeparators");
///
/// A catch-all parameter cannot be marked optional.
///
internal static string TemplateRoute_CatchAllCannotBeOptional
{
- get { return GetString("TemplateRoute_CatchAllCannotBeOptional"); }
+ get => GetString("TemplateRoute_CatchAllCannotBeOptional");
}
///
/// A catch-all parameter cannot be marked optional.
///
internal static string FormatTemplateRoute_CatchAllCannotBeOptional()
- {
- return GetString("TemplateRoute_CatchAllCannotBeOptional");
- }
+ => GetString("TemplateRoute_CatchAllCannotBeOptional");
///
/// An optional parameter cannot have default value.
///
internal static string TemplateRoute_OptionalCannotHaveDefaultValue
{
- get { return GetString("TemplateRoute_OptionalCannotHaveDefaultValue"); }
+ get => GetString("TemplateRoute_OptionalCannotHaveDefaultValue");
}
///
/// An optional parameter cannot have default value.
///
internal static string FormatTemplateRoute_OptionalCannotHaveDefaultValue()
- {
- return GetString("TemplateRoute_OptionalCannotHaveDefaultValue");
- }
+ => GetString("TemplateRoute_OptionalCannotHaveDefaultValue");
///
/// A catch-all parameter can only appear as the last segment of the route template.
///
internal static string TemplateRoute_CatchAllMustBeLast
{
- get { return GetString("TemplateRoute_CatchAllMustBeLast"); }
+ get => GetString("TemplateRoute_CatchAllMustBeLast");
}
///
/// A catch-all parameter can only appear as the last segment of the route template.
///
internal static string FormatTemplateRoute_CatchAllMustBeLast()
- {
- return GetString("TemplateRoute_CatchAllMustBeLast");
- }
+ => GetString("TemplateRoute_CatchAllMustBeLast");
///
/// The literal section '{0}' is invalid. Literal sections cannot contain the '?' character.
///
internal static string TemplateRoute_InvalidLiteral
{
- get { return GetString("TemplateRoute_InvalidLiteral"); }
+ get => GetString("TemplateRoute_InvalidLiteral");
}
///
/// The literal section '{0}' is invalid. Literal sections cannot contain the '?' character.
///
internal static string FormatTemplateRoute_InvalidLiteral(object p0)
- {
- return string.Format(CultureInfo.CurrentCulture, GetString("TemplateRoute_InvalidLiteral"), p0);
- }
+ => string.Format(CultureInfo.CurrentCulture, GetString("TemplateRoute_InvalidLiteral"), p0);
///
/// The route parameter name '{0}' is invalid. Route parameter names must be non-empty and cannot contain these characters: '{{', '}}', '/'. The '?' character marks a parameter as optional, and can occur only at the end of the parameter. The '*' character marks a parameter as catch-all, and can occur only at the start of the parameter.
///
internal static string TemplateRoute_InvalidParameterName
{
- get { return GetString("TemplateRoute_InvalidParameterName"); }
+ get => GetString("TemplateRoute_InvalidParameterName");
}
///
/// The route parameter name '{0}' is invalid. Route parameter names must be non-empty and cannot contain these characters: '{{', '}}', '/'. The '?' character marks a parameter as optional, and can occur only at the end of the parameter. The '*' character marks a parameter as catch-all, and can occur only at the start of the parameter.
///
internal static string FormatTemplateRoute_InvalidParameterName(object p0)
- {
- return string.Format(CultureInfo.CurrentCulture, GetString("TemplateRoute_InvalidParameterName"), p0);
- }
+ => string.Format(CultureInfo.CurrentCulture, GetString("TemplateRoute_InvalidParameterName"), p0);
///
/// The route template cannot start with a '/' or '~' character.
///
internal static string TemplateRoute_InvalidRouteTemplate
{
- get { return GetString("TemplateRoute_InvalidRouteTemplate"); }
+ get => GetString("TemplateRoute_InvalidRouteTemplate");
}
///
/// The route template cannot start with a '/' or '~' character.
///
internal static string FormatTemplateRoute_InvalidRouteTemplate()
- {
- return GetString("TemplateRoute_InvalidRouteTemplate");
- }
+ => GetString("TemplateRoute_InvalidRouteTemplate");
///
/// There is an incomplete parameter in the route template. Check that each '{' character has a matching '}' character.
///
internal static string TemplateRoute_MismatchedParameter
{
- get { return GetString("TemplateRoute_MismatchedParameter"); }
+ get => GetString("TemplateRoute_MismatchedParameter");
}
///
/// There is an incomplete parameter in the route template. Check that each '{' character has a matching '}' character.
///
internal static string FormatTemplateRoute_MismatchedParameter()
- {
- return GetString("TemplateRoute_MismatchedParameter");
- }
+ => GetString("TemplateRoute_MismatchedParameter");
///
/// The route parameter name '{0}' appears more than one time in the route template.
///
internal static string TemplateRoute_RepeatedParameter
{
- get { return GetString("TemplateRoute_RepeatedParameter"); }
+ get => GetString("TemplateRoute_RepeatedParameter");
}
///
/// The route parameter name '{0}' appears more than one time in the route template.
///
internal static string FormatTemplateRoute_RepeatedParameter(object p0)
- {
- return string.Format(CultureInfo.CurrentCulture, GetString("TemplateRoute_RepeatedParameter"), p0);
- }
+ => string.Format(CultureInfo.CurrentCulture, GetString("TemplateRoute_RepeatedParameter"), p0);
///
/// The constraint entry '{0}' - '{1}' on the route '{2}' must have a string value or be of a type which implements '{3}'.
///
internal static string RouteConstraintBuilder_ValidationMustBeStringOrCustomConstraint
{
- get { return GetString("RouteConstraintBuilder_ValidationMustBeStringOrCustomConstraint"); }
+ get => GetString("RouteConstraintBuilder_ValidationMustBeStringOrCustomConstraint");
}
///
/// The constraint entry '{0}' - '{1}' on the route '{2}' must have a string value or be of a type which implements '{3}'.
///
internal static string FormatRouteConstraintBuilder_ValidationMustBeStringOrCustomConstraint(object p0, object p1, object p2, object p3)
- {
- return string.Format(CultureInfo.CurrentCulture, GetString("RouteConstraintBuilder_ValidationMustBeStringOrCustomConstraint"), p0, p1, p2, p3);
- }
+ => string.Format(CultureInfo.CurrentCulture, GetString("RouteConstraintBuilder_ValidationMustBeStringOrCustomConstraint"), p0, p1, p2, p3);
///
/// The constraint entry '{0}' - '{1}' on the route '{2}' could not be resolved by the constraint resolver of type '{3}'.
///
internal static string RouteConstraintBuilder_CouldNotResolveConstraint
{
- get { return GetString("RouteConstraintBuilder_CouldNotResolveConstraint"); }
+ get => GetString("RouteConstraintBuilder_CouldNotResolveConstraint");
}
///
/// The constraint entry '{0}' - '{1}' on the route '{2}' could not be resolved by the constraint resolver of type '{3}'.
///
internal static string FormatRouteConstraintBuilder_CouldNotResolveConstraint(object p0, object p1, object p2, object p3)
- {
- return string.Format(CultureInfo.CurrentCulture, GetString("RouteConstraintBuilder_CouldNotResolveConstraint"), p0, p1, p2, p3);
- }
+ => string.Format(CultureInfo.CurrentCulture, GetString("RouteConstraintBuilder_CouldNotResolveConstraint"), p0, p1, p2, p3);
///
/// In a route parameter, '{' and '}' must be escaped with '{{' and '}}'.
///
internal static string TemplateRoute_UnescapedBrace
{
- get { return GetString("TemplateRoute_UnescapedBrace"); }
+ get => GetString("TemplateRoute_UnescapedBrace");
}
///
/// In a route parameter, '{' and '}' must be escaped with '{{' and '}}'.
///
internal static string FormatTemplateRoute_UnescapedBrace()
- {
- return GetString("TemplateRoute_UnescapedBrace");
- }
+ => GetString("TemplateRoute_UnescapedBrace");
///
- /// In the segment '{0}', the optional parameter '{1}' is preceded by an invalid segment '{2}'. Only a period (.) can precede an optional parameter.
+ /// In the segment '{0}', the optional parameter '{1}' is preceded by an invalid segment '{2}'. Only a period (.) can precede an optional parameter.
///
internal static string TemplateRoute_OptionalParameterCanbBePrecededByPeriod
{
- get { return GetString("TemplateRoute_OptionalParameterCanbBePrecededByPeriod"); }
+ get => GetString("TemplateRoute_OptionalParameterCanbBePrecededByPeriod");
}
///
- /// In the segment '{0}', the optional parameter '{1}' is preceded by an invalid segment '{2}'. Only a period (.) can precede an optional parameter.
+ /// In the segment '{0}', the optional parameter '{1}' is preceded by an invalid segment '{2}'. Only a period (.) can precede an optional parameter.
///
internal static string FormatTemplateRoute_OptionalParameterCanbBePrecededByPeriod(object p0, object p1, object p2)
- {
- return string.Format(CultureInfo.CurrentCulture, GetString("TemplateRoute_OptionalParameterCanbBePrecededByPeriod"), p0, p1, p2);
- }
+ => string.Format(CultureInfo.CurrentCulture, GetString("TemplateRoute_OptionalParameterCanbBePrecededByPeriod"), p0, p1, p2);
///
/// An optional parameter must be at the end of the segment. In the segment '{0}', optional parameter '{1}' is followed by '{2}'.
///
internal static string TemplateRoute_OptionalParameterHasTobeTheLast
{
- get { return GetString("TemplateRoute_OptionalParameterHasTobeTheLast"); }
+ get => GetString("TemplateRoute_OptionalParameterHasTobeTheLast");
}
///
/// An optional parameter must be at the end of the segment. In the segment '{0}', optional parameter '{1}' is followed by '{2}'.
///
internal static string FormatTemplateRoute_OptionalParameterHasTobeTheLast(object p0, object p1, object p2)
- {
- return string.Format(CultureInfo.CurrentCulture, GetString("TemplateRoute_OptionalParameterHasTobeTheLast"), p0, p1, p2);
- }
+ => string.Format(CultureInfo.CurrentCulture, GetString("TemplateRoute_OptionalParameterHasTobeTheLast"), p0, p1, p2);
///
/// Two or more routes named '{0}' have different templates.
///
internal static string AttributeRoute_DifferentLinkGenerationEntries_SameName
{
- get { return GetString("AttributeRoute_DifferentLinkGenerationEntries_SameName"); }
+ get => GetString("AttributeRoute_DifferentLinkGenerationEntries_SameName");
}
///
/// Two or more routes named '{0}' have different templates.
///
internal static string FormatAttributeRoute_DifferentLinkGenerationEntries_SameName(object p0)
- {
- return string.Format(CultureInfo.CurrentCulture, GetString("AttributeRoute_DifferentLinkGenerationEntries_SameName"), p0);
- }
+ => string.Format(CultureInfo.CurrentCulture, GetString("AttributeRoute_DifferentLinkGenerationEntries_SameName"), p0);
///
/// Unable to find the required services. Please add all the required services by calling '{0}.{1}' inside the call to '{2}' in the application startup code.
///
internal static string UnableToFindServices
{
- get { return GetString("UnableToFindServices"); }
+ get => GetString("UnableToFindServices");
}
///
/// Unable to find the required services. Please add all the required services by calling '{0}.{1}' inside the call to '{2}' in the application startup code.
///
internal static string FormatUnableToFindServices(object p0, object p1, object p2)
- {
- return string.Format(CultureInfo.CurrentCulture, GetString("UnableToFindServices"), p0, p1, p2);
- }
+ => string.Format(CultureInfo.CurrentCulture, GetString("UnableToFindServices"), p0, p1, p2);
///
/// An error occurred while creating the route with name '{0}' and template '{1}'.
///
internal static string TemplateRoute_Exception
{
- get { return GetString("TemplateRoute_Exception"); }
+ get => GetString("TemplateRoute_Exception");
}
///
/// An error occurred while creating the route with name '{0}' and template '{1}'.
///
internal static string FormatTemplateRoute_Exception(object p0, object p1)
- {
- return string.Format(CultureInfo.CurrentCulture, GetString("TemplateRoute_Exception"), p0, p1);
- }
+ => string.Format(CultureInfo.CurrentCulture, GetString("TemplateRoute_Exception"), p0, p1);
private static string GetString(string name, params string[] formatterNames)
{