diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Properties/Resources.Designer.cs b/src/Microsoft.AspNetCore.Mvc.Abstractions/Properties/Resources.Designer.cs
index 17436ce59e..f19e063180 100644
--- a/src/Microsoft.AspNetCore.Mvc.Abstractions/Properties/Resources.Designer.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Abstractions/Properties/Resources.Designer.cs
@@ -15,304 +15,266 @@ namespace Microsoft.AspNetCore.Mvc.Abstractions
         /// </summary>
         internal static string ArgumentCannotBeNullOrEmpty
         {
-            get { return GetString("ArgumentCannotBeNullOrEmpty"); }
+            get => GetString("ArgumentCannotBeNullOrEmpty");
         }
 
         /// <summary>
         /// Value cannot be null or empty.
         /// </summary>
         internal static string FormatArgumentCannotBeNullOrEmpty()
-        {
-            return GetString("ArgumentCannotBeNullOrEmpty");
-        }
+            => GetString("ArgumentCannotBeNullOrEmpty");
 
         /// <summary>
         /// The ModelMetadata property must be set before accessing this property.
         /// </summary>
         internal static string ModelBindingContext_ModelMetadataMustBeSet
         {
-            get { return GetString("ModelBindingContext_ModelMetadataMustBeSet"); }
+            get => GetString("ModelBindingContext_ModelMetadataMustBeSet");
         }
 
         /// <summary>
         /// The ModelMetadata property must be set before accessing this property.
         /// </summary>
         internal static string FormatModelBindingContext_ModelMetadataMustBeSet()
-        {
-            return GetString("ModelBindingContext_ModelMetadataMustBeSet");
-        }
+            => GetString("ModelBindingContext_ModelMetadataMustBeSet");
 
         /// <summary>
         /// A field previously marked invalid should not be marked valid.
         /// </summary>
         internal static string Validation_InvalidFieldCannotBeReset
         {
-            get { return GetString("Validation_InvalidFieldCannotBeReset"); }
+            get => GetString("Validation_InvalidFieldCannotBeReset");
         }
 
         /// <summary>
         /// A field previously marked invalid should not be marked valid.
         /// </summary>
         internal static string FormatValidation_InvalidFieldCannotBeReset()
-        {
-            return GetString("Validation_InvalidFieldCannotBeReset");
-        }
+            => GetString("Validation_InvalidFieldCannotBeReset");
 
         /// <summary>
         /// A field previously marked invalid should not be marked skipped.
         /// </summary>
         internal static string Validation_InvalidFieldCannotBeReset_ToSkipped
         {
-            get { return GetString("Validation_InvalidFieldCannotBeReset_ToSkipped"); }
+            get => GetString("Validation_InvalidFieldCannotBeReset_ToSkipped");
         }
 
         /// <summary>
         /// A field previously marked invalid should not be marked skipped.
         /// </summary>
         internal static string FormatValidation_InvalidFieldCannotBeReset_ToSkipped()
-        {
-            return GetString("Validation_InvalidFieldCannotBeReset_ToSkipped");
-        }
+            => GetString("Validation_InvalidFieldCannotBeReset_ToSkipped");
 
         /// <summary>
         /// The maximum number of allowed model errors has been reached.
         /// </summary>
         internal static string ModelStateDictionary_MaxModelStateErrors
         {
-            get { return GetString("ModelStateDictionary_MaxModelStateErrors"); }
+            get => GetString("ModelStateDictionary_MaxModelStateErrors");
         }
 
         /// <summary>
         /// The maximum number of allowed model errors has been reached.
         /// </summary>
         internal static string FormatModelStateDictionary_MaxModelStateErrors()
-        {
-            return GetString("ModelStateDictionary_MaxModelStateErrors");
-        }
+            => GetString("ModelStateDictionary_MaxModelStateErrors");
 
         /// <summary>
         /// Body
         /// </summary>
         internal static string BindingSource_Body
         {
-            get { return GetString("BindingSource_Body"); }
+            get => GetString("BindingSource_Body");
         }
 
         /// <summary>
         /// Body
         /// </summary>
         internal static string FormatBindingSource_Body()
-        {
-            return GetString("BindingSource_Body");
-        }
+            => GetString("BindingSource_Body");
 
         /// <summary>
         /// Custom
         /// </summary>
         internal static string BindingSource_Custom
         {
-            get { return GetString("BindingSource_Custom"); }
+            get => GetString("BindingSource_Custom");
         }
 
         /// <summary>
         /// Custom
         /// </summary>
         internal static string FormatBindingSource_Custom()
-        {
-            return GetString("BindingSource_Custom");
-        }
+            => GetString("BindingSource_Custom");
 
         /// <summary>
         /// Form
         /// </summary>
         internal static string BindingSource_Form
         {
-            get { return GetString("BindingSource_Form"); }
+            get => GetString("BindingSource_Form");
         }
 
         /// <summary>
         /// Form
         /// </summary>
         internal static string FormatBindingSource_Form()
-        {
-            return GetString("BindingSource_Form");
-        }
+            => GetString("BindingSource_Form");
 
         /// <summary>
         /// Header
         /// </summary>
         internal static string BindingSource_Header
         {
-            get { return GetString("BindingSource_Header"); }
+            get => GetString("BindingSource_Header");
         }
 
         /// <summary>
         /// Header
         /// </summary>
         internal static string FormatBindingSource_Header()
-        {
-            return GetString("BindingSource_Header");
-        }
+            => GetString("BindingSource_Header");
 
         /// <summary>
         /// Services
         /// </summary>
         internal static string BindingSource_Services
         {
-            get { return GetString("BindingSource_Services"); }
+            get => GetString("BindingSource_Services");
         }
 
         /// <summary>
         /// Services
         /// </summary>
         internal static string FormatBindingSource_Services()
-        {
-            return GetString("BindingSource_Services");
-        }
+            => GetString("BindingSource_Services");
 
         /// <summary>
         /// ModelBinding
         /// </summary>
         internal static string BindingSource_ModelBinding
         {
-            get { return GetString("BindingSource_ModelBinding"); }
+            get => GetString("BindingSource_ModelBinding");
         }
 
         /// <summary>
         /// ModelBinding
         /// </summary>
         internal static string FormatBindingSource_ModelBinding()
-        {
-            return GetString("BindingSource_ModelBinding");
-        }
+            => GetString("BindingSource_ModelBinding");
 
         /// <summary>
         /// Path
         /// </summary>
         internal static string BindingSource_Path
         {
-            get { return GetString("BindingSource_Path"); }
+            get => GetString("BindingSource_Path");
         }
 
         /// <summary>
         /// Path
         /// </summary>
         internal static string FormatBindingSource_Path()
-        {
-            return GetString("BindingSource_Path");
-        }
+            => GetString("BindingSource_Path");
 
         /// <summary>
         /// Query
         /// </summary>
         internal static string BindingSource_Query
         {
-            get { return GetString("BindingSource_Query"); }
+            get => GetString("BindingSource_Query");
         }
 
         /// <summary>
         /// Query
         /// </summary>
         internal static string FormatBindingSource_Query()
-        {
-            return GetString("BindingSource_Query");
-        }
+            => GetString("BindingSource_Query");
 
         /// <summary>
         /// The provided binding source '{0}' is a composite. '{1}' requires that the source must represent a single type of input.
         /// </summary>
         internal static string BindingSource_CannotBeComposite
         {
-            get { return GetString("BindingSource_CannotBeComposite"); }
+            get => GetString("BindingSource_CannotBeComposite");
         }
 
         /// <summary>
         /// The provided binding source '{0}' is a composite. '{1}' requires that the source must represent a single type of input.
         /// </summary>
         internal static string FormatBindingSource_CannotBeComposite(object p0, object p1)
-        {
-            return string.Format(CultureInfo.CurrentCulture, GetString("BindingSource_CannotBeComposite"), p0, p1);
-        }
+            => string.Format(CultureInfo.CurrentCulture, GetString("BindingSource_CannotBeComposite"), p0, p1);
 
         /// <summary>
         /// The provided binding source '{0}' is not a request-based binding source. '{1}' requires that the source must represent data from an HTTP request.
         /// </summary>
         internal static string BindingSource_MustBeFromRequest
         {
-            get { return GetString("BindingSource_MustBeFromRequest"); }
+            get => GetString("BindingSource_MustBeFromRequest");
         }
 
         /// <summary>
         /// The provided binding source '{0}' is not a request-based binding source. '{1}' requires that the source must represent data from an HTTP request.
         /// </summary>
         internal static string FormatBindingSource_MustBeFromRequest(object p0, object p1)
-        {
-            return string.Format(CultureInfo.CurrentCulture, GetString("BindingSource_MustBeFromRequest"), p0, p1);
-        }
+            => string.Format(CultureInfo.CurrentCulture, GetString("BindingSource_MustBeFromRequest"), p0, p1);
 
         /// <summary>
         /// The provided binding source '{0}' is a greedy data source. '{1}' does not support greedy data sources.
         /// </summary>
         internal static string BindingSource_CannotBeGreedy
         {
-            get { return GetString("BindingSource_CannotBeGreedy"); }
+            get => GetString("BindingSource_CannotBeGreedy");
         }
 
         /// <summary>
         /// The provided binding source '{0}' is a greedy data source. '{1}' does not support greedy data sources.
         /// </summary>
         internal static string FormatBindingSource_CannotBeGreedy(object p0, object p1)
-        {
-            return string.Format(CultureInfo.CurrentCulture, GetString("BindingSource_CannotBeGreedy"), p0, p1);
-        }
+            => string.Format(CultureInfo.CurrentCulture, GetString("BindingSource_CannotBeGreedy"), p0, p1);
 
         /// <summary>
         /// The provided binding source '{0}' is not a greedy data source. '{1}' only supports greedy data sources.
         /// </summary>
         internal static string BindingSource_MustBeGreedy
         {
-            get { return GetString("BindingSource_MustBeGreedy"); }
+            get => GetString("BindingSource_MustBeGreedy");
         }
 
         /// <summary>
         /// The provided binding source '{0}' is not a greedy data source. '{1}' only supports greedy data sources.
         /// </summary>
         internal static string FormatBindingSource_MustBeGreedy(object p0, object p1)
-        {
-            return string.Format(CultureInfo.CurrentCulture, GetString("BindingSource_MustBeGreedy"), p0, p1);
-        }
+            => string.Format(CultureInfo.CurrentCulture, GetString("BindingSource_MustBeGreedy"), p0, p1);
 
         /// <summary>
         /// Special
         /// </summary>
         internal static string BindingSource_Special
         {
-            get { return GetString("BindingSource_Special"); }
+            get => GetString("BindingSource_Special");
         }
 
         /// <summary>
         /// Special
         /// </summary>
         internal static string FormatBindingSource_Special()
-        {
-            return GetString("BindingSource_Special");
-        }
+            => GetString("BindingSource_Special");
 
         /// <summary>
         /// FormFile
         /// </summary>
         internal static string BindingSource_FormFile
         {
-            get { return GetString("BindingSource_FormFile"); }
+            get => GetString("BindingSource_FormFile");
         }
 
         /// <summary>
         /// FormFile
         /// </summary>
         internal static string FormatBindingSource_FormFile()
-        {
-            return GetString("BindingSource_FormFile");
-        }
+            => GetString("BindingSource_FormFile");
 
         private static string GetString(string name, params string[] formatterNames)
         {
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Properties/Resources.Designer.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/Properties/Resources.Designer.cs
index c74d002493..cd6c6a8aa1 100644
--- a/src/Microsoft.AspNetCore.Mvc.RazorPages/Properties/Resources.Designer.cs
+++ b/src/Microsoft.AspNetCore.Mvc.RazorPages/Properties/Resources.Designer.cs
@@ -15,128 +15,112 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages
         /// </summary>
         internal static string PageActionDescriptorProvider_RouteTemplateCannotBeOverrideable
         {
-            get { return GetString("PageActionDescriptorProvider_RouteTemplateCannotBeOverrideable"); }
+            get => GetString("PageActionDescriptorProvider_RouteTemplateCannotBeOverrideable");
         }
 
         /// <summary>
         /// The route for the page at '{0}' cannot start with / or ~/. Pages do not support overriding the file path of the page.
         /// </summary>
         internal static string FormatPageActionDescriptorProvider_RouteTemplateCannotBeOverrideable(object p0)
-        {
-            return string.Format(CultureInfo.CurrentCulture, GetString("PageActionDescriptorProvider_RouteTemplateCannotBeOverrideable"), p0);
-        }
+            => string.Format(CultureInfo.CurrentCulture, GetString("PageActionDescriptorProvider_RouteTemplateCannotBeOverrideable"), p0);
 
         /// <summary>
         /// The '{0}' property of '{1}' must not be null.
         /// </summary>
         internal static string PropertyOfTypeCannotBeNull
         {
-            get { return GetString("PropertyOfTypeCannotBeNull"); }
+            get => GetString("PropertyOfTypeCannotBeNull");
         }
 
         /// <summary>
         /// The '{0}' property of '{1}' must not be null.
         /// </summary>
         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);
 
         /// <summary>
         /// Page created by '{0}' must be an instance of '{1}'.
         /// </summary>
         internal static string ActivatedInstance_MustBeAnInstanceOf
         {
-            get { return GetString("ActivatedInstance_MustBeAnInstanceOf"); }
+            get => GetString("ActivatedInstance_MustBeAnInstanceOf");
         }
 
         /// <summary>
         /// Page created by '{0}' must be an instance of '{1}'.
         /// </summary>
         internal static string FormatActivatedInstance_MustBeAnInstanceOf(object p0, object p1)
-        {
-            return string.Format(CultureInfo.CurrentCulture, GetString("ActivatedInstance_MustBeAnInstanceOf"), p0, p1);
-        }
+            => string.Format(CultureInfo.CurrentCulture, GetString("ActivatedInstance_MustBeAnInstanceOf"), p0, p1);
 
         /// <summary>
         /// Argument '{0}' is not the same instance used to create '{1}'.
         /// </summary>
         internal static string PageViewResult_ContextIsInvalid
         {
-            get { return GetString("PageViewResult_ContextIsInvalid"); }
+            get => GetString("PageViewResult_ContextIsInvalid");
         }
 
         /// <summary>
         /// Argument '{0}' is not the same instance used to create '{1}'.
         /// </summary>
         internal static string FormatPageViewResult_ContextIsInvalid(object p0, object p1)
-        {
-            return string.Format(CultureInfo.CurrentCulture, GetString("PageViewResult_ContextIsInvalid"), p0, p1);
-        }
+            => string.Format(CultureInfo.CurrentCulture, GetString("PageViewResult_ContextIsInvalid"), p0, p1);
 
         /// <summary>
         /// Value cannot be null or empty.
         /// </summary>
         internal static string ArgumentCannotBeNullOrEmpty
         {
-            get { return GetString("ArgumentCannotBeNullOrEmpty"); }
+            get => GetString("ArgumentCannotBeNullOrEmpty");
         }
 
         /// <summary>
         /// Value cannot be null or empty.
         /// </summary>
         internal static string FormatArgumentCannotBeNullOrEmpty()
-        {
-            return GetString("ArgumentCannotBeNullOrEmpty");
-        }
+            => GetString("ArgumentCannotBeNullOrEmpty");
 
         /// <summary>
         /// Unsupported handler method return type '{0}'.
         /// </summary>
         internal static string UnsupportedHandlerMethodType
         {
-            get { return GetString("UnsupportedHandlerMethodType"); }
+            get => GetString("UnsupportedHandlerMethodType");
         }
 
         /// <summary>
         /// Unsupported handler method return type '{0}'.
         /// </summary>
         internal static string FormatUnsupportedHandlerMethodType(object p0)
-        {
-            return string.Format(CultureInfo.CurrentCulture, GetString("UnsupportedHandlerMethodType"), p0);
-        }
+            => string.Format(CultureInfo.CurrentCulture, GetString("UnsupportedHandlerMethodType"), p0);
 
         /// <summary>
         /// Multiple handlers matched. The following handlers matched route data and had all constraints satisfied:{0}{0}{1}
         /// </summary>
         internal static string AmbiguousHandler
         {
-            get { return GetString("AmbiguousHandler"); }
+            get => GetString("AmbiguousHandler");
         }
 
         /// <summary>
         /// Multiple handlers matched. The following handlers matched route data and had all constraints satisfied:{0}{0}{1}
         /// </summary>
         internal static string FormatAmbiguousHandler(object p0, object p1)
-        {
-            return string.Format(CultureInfo.CurrentCulture, GetString("AmbiguousHandler"), p0, p1);
-        }
+            => string.Format(CultureInfo.CurrentCulture, GetString("AmbiguousHandler"), p0, p1);
 
         /// <summary>
         /// Path must be an application relative path that starts with a forward slash '/'.
         /// </summary>
         internal static string PathMustBeAnAppRelativePath
         {
-            get { return GetString("PathMustBeAnAppRelativePath"); }
+            get => GetString("PathMustBeAnAppRelativePath");
         }
 
         /// <summary>
         /// Path must be an application relative path that starts with a forward slash '/'.
         /// </summary>
         internal static string FormatPathMustBeAnAppRelativePath()
-        {
-            return GetString("PathMustBeAnAppRelativePath");
-        }
+            => GetString("PathMustBeAnAppRelativePath");
 
         private static string GetString(string name, params string[] formatterNames)
         {
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/Properties/Resources.Designer.cs b/src/Microsoft.AspNetCore.Mvc.TagHelpers/Properties/Resources.Designer.cs
index 094e3d2d0a..699ce21a9f 100644
--- a/src/Microsoft.AspNetCore.Mvc.TagHelpers/Properties/Resources.Designer.cs
+++ b/src/Microsoft.AspNetCore.Mvc.TagHelpers/Properties/Resources.Designer.cs
@@ -15,208 +15,182 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
         /// </summary>
         internal static string AnchorTagHelper_CannotDetermineHrefRouteActionOrControllerSpecified
         {
-            get { return GetString("AnchorTagHelper_CannotDetermineHrefRouteActionOrControllerSpecified"); }
+            get => GetString("AnchorTagHelper_CannotDetermineHrefRouteActionOrControllerSpecified");
         }
 
         /// <summary>
         /// Cannot determine an '{4}' attribute for {0}. An {0} with a specified '{1}' must not have an '{2}' or '{3}' attribute.
         /// </summary>
         internal static string FormatAnchorTagHelper_CannotDetermineHrefRouteActionOrControllerSpecified(object p0, object p1, object p2, object p3, object p4)
-        {
-            return string.Format(CultureInfo.CurrentCulture, GetString("AnchorTagHelper_CannotDetermineHrefRouteActionOrControllerSpecified"), p0, p1, p2, p3, p4);
-        }
+            => string.Format(CultureInfo.CurrentCulture, GetString("AnchorTagHelper_CannotDetermineHrefRouteActionOrControllerSpecified"), p0, p1, p2, p3, p4);
 
         /// <summary>
         /// Cannot override the '{9}' attribute for {0}. An {0} with a specified '{9}' must not have attributes starting with '{8}' or an '{1}', '{2}', '{3}', '{4}', '{5}', '{6}', or '{7}' attribute.
         /// </summary>
         internal static string AnchorTagHelper_CannotOverrideHref
         {
-            get { return GetString("AnchorTagHelper_CannotOverrideHref"); }
+            get => GetString("AnchorTagHelper_CannotOverrideHref");
         }
 
         /// <summary>
         /// Cannot override the '{9}' attribute for {0}. An {0} with a specified '{9}' must not have attributes starting with '{8}' or an '{1}', '{2}', '{3}', '{4}', '{5}', '{6}', or '{7}' attribute.
         /// </summary>
         internal static string FormatAnchorTagHelper_CannotOverrideHref(object p0, object p1, object p2, object p3, object p4, object p5, object p6, object p7, object p8, object p9)
-        {
-            return string.Format(CultureInfo.CurrentCulture, GetString("AnchorTagHelper_CannotOverrideHref"), p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
-        }
+            => string.Format(CultureInfo.CurrentCulture, GetString("AnchorTagHelper_CannotOverrideHref"), p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
 
         /// <summary>
         /// Cannot override the '{1}' attribute for {0}. A {0} with a specified '{1}' must not have attributes starting with '{7}' or an '{2}', '{3}', '{4}', '{5}', or '{6}' attribute.
         /// </summary>
         internal static string FormTagHelper_CannotOverrideAction
         {
-            get { return GetString("FormTagHelper_CannotOverrideAction"); }
+            get => GetString("FormTagHelper_CannotOverrideAction");
         }
 
         /// <summary>
         /// Cannot override the '{1}' attribute for {0}. A {0} with a specified '{1}' must not have attributes starting with '{7}' or an '{2}', '{3}', '{4}', '{5}', or '{6}' attribute.
         /// </summary>
         internal static string FormatFormTagHelper_CannotOverrideAction(object p0, object p1, object p2, object p3, object p4, object p5, object p6, object p7)
-        {
-            return string.Format(CultureInfo.CurrentCulture, GetString("FormTagHelper_CannotOverrideAction"), p0, p1, p2, p3, p4, p5, p6, p7);
-        }
+            => string.Format(CultureInfo.CurrentCulture, GetString("FormTagHelper_CannotOverrideAction"), p0, p1, p2, p3, p4, p5, p6, p7);
 
         /// <summary>
         /// Unexpected '{1}' expression result type '{2}' for {0}. '{1}' must be of type '{3}' or '{4}' that can be parsed as a '{3}' if '{5}' is '{6}'.
         /// </summary>
         internal static string InputTagHelper_InvalidExpressionResult
         {
-            get { return GetString("InputTagHelper_InvalidExpressionResult"); }
+            get => GetString("InputTagHelper_InvalidExpressionResult");
         }
 
         /// <summary>
         /// Unexpected '{1}' expression result type '{2}' for {0}. '{1}' must be of type '{3}' or '{4}' that can be parsed as a '{3}' if '{5}' is '{6}'.
         /// </summary>
         internal static string FormatInputTagHelper_InvalidExpressionResult(object p0, object p1, object p2, object p3, object p4, object p5, object p6)
-        {
-            return string.Format(CultureInfo.CurrentCulture, GetString("InputTagHelper_InvalidExpressionResult"), p0, p1, p2, p3, p4, p5, p6);
-        }
+            => string.Format(CultureInfo.CurrentCulture, GetString("InputTagHelper_InvalidExpressionResult"), p0, p1, p2, p3, p4, p5, p6);
 
         /// <summary>
         /// Unexpected expression result value '{1}' for {0}. '{1}' cannot be parsed as a '{2}'.
         /// </summary>
         internal static string InputTagHelper_InvalidStringResult
         {
-            get { return GetString("InputTagHelper_InvalidStringResult"); }
+            get => GetString("InputTagHelper_InvalidStringResult");
         }
 
         /// <summary>
         /// Unexpected expression result value '{1}' for {0}. '{1}' cannot be parsed as a '{2}'.
         /// </summary>
         internal static string FormatInputTagHelper_InvalidStringResult(object p0, object p1, object p2)
-        {
-            return string.Format(CultureInfo.CurrentCulture, GetString("InputTagHelper_InvalidStringResult"), p0, p1, p2);
-        }
+            => string.Format(CultureInfo.CurrentCulture, GetString("InputTagHelper_InvalidStringResult"), p0, p1, p2);
 
         /// <summary>
         /// '{1}' must not be null for {0} if '{2}' is '{3}'.
         /// </summary>
         internal static string InputTagHelper_ValueRequired
         {
-            get { return GetString("InputTagHelper_ValueRequired"); }
+            get => GetString("InputTagHelper_ValueRequired");
         }
 
         /// <summary>
         /// '{1}' must not be null for {0} if '{2}' is '{3}'.
         /// </summary>
         internal static string FormatInputTagHelper_ValueRequired(object p0, object p1, object p2, object p3)
-        {
-            return string.Format(CultureInfo.CurrentCulture, GetString("InputTagHelper_ValueRequired"), p0, p1, p2, p3);
-        }
+            => string.Format(CultureInfo.CurrentCulture, GetString("InputTagHelper_ValueRequired"), p0, p1, p2, p3);
 
         /// <summary>
         /// The {2} was unable to provide metadata about '{1}' expression value '{3}' for {0}.
         /// </summary>
         internal static string TagHelpers_NoProvidedMetadata
         {
-            get { return GetString("TagHelpers_NoProvidedMetadata"); }
+            get => GetString("TagHelpers_NoProvidedMetadata");
         }
 
         /// <summary>
         /// The {2} was unable to provide metadata about '{1}' expression value '{3}' for {0}.
         /// </summary>
         internal static string FormatTagHelpers_NoProvidedMetadata(object p0, object p1, object p2, object p3)
-        {
-            return string.Format(CultureInfo.CurrentCulture, GetString("TagHelpers_NoProvidedMetadata"), p0, p1, p2, p3);
-        }
+            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelpers_NoProvidedMetadata"), p0, p1, p2, p3);
 
         /// <summary>
         /// The value of argument '{0}' ({1}) is invalid for Enum type '{2}'.
         /// </summary>
         internal static string InvalidEnumArgument
         {
-            get { return GetString("InvalidEnumArgument"); }
+            get => GetString("InvalidEnumArgument");
         }
 
         /// <summary>
         /// The value of argument '{0}' ({1}) is invalid for Enum type '{2}'.
         /// </summary>
         internal static string FormatInvalidEnumArgument(object p0, object p1, object p2)
-        {
-            return string.Format(CultureInfo.CurrentCulture, GetString("InvalidEnumArgument"), p0, p1, p2);
-        }
+            => string.Format(CultureInfo.CurrentCulture, GetString("InvalidEnumArgument"), p0, p1, p2);
 
         /// <summary>
         /// The attribute '{0}' does not exist in the {1}.
         /// </summary>
         internal static string TagHelperOutput_AttributeDoesNotExist
         {
-            get { return GetString("TagHelperOutput_AttributeDoesNotExist"); }
+            get => GetString("TagHelperOutput_AttributeDoesNotExist");
         }
 
         /// <summary>
         /// The attribute '{0}' does not exist in the {1}.
         /// </summary>
         internal static string FormatTagHelperOutput_AttributeDoesNotExist(object p0, object p1)
-        {
-            return string.Format(CultureInfo.CurrentCulture, GetString("TagHelperOutput_AttributeDoesNotExist"), p0, p1);
-        }
+            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelperOutput_AttributeDoesNotExist"), p0, p1);
 
         /// <summary>
         /// Cannot determine an '{4}' attribute for {0}. A {0} with a specified '{1}' must not have an '{2}', '{3}', or '{5}' attribute.
         /// </summary>
         internal static string FormTagHelper_CannotDetermineActionWithRouteAndActionOrControllerSpecified
         {
-            get { return GetString("FormTagHelper_CannotDetermineActionWithRouteAndActionOrControllerSpecified"); }
+            get => GetString("FormTagHelper_CannotDetermineActionWithRouteAndActionOrControllerSpecified");
         }
 
         /// <summary>
         /// Cannot determine an '{4}' attribute for {0}. A {0} with a specified '{1}' must not have an '{2}', '{3}', or '{5}' attribute.
         /// </summary>
         internal static string FormatFormTagHelper_CannotDetermineActionWithRouteAndActionOrControllerSpecified(object p0, object p1, object p2, object p3, object p4, object p5)
-        {
-            return string.Format(CultureInfo.CurrentCulture, GetString("FormTagHelper_CannotDetermineActionWithRouteAndActionOrControllerSpecified"), p0, p1, p2, p3, p4, p5);
-        }
+            => string.Format(CultureInfo.CurrentCulture, GetString("FormTagHelper_CannotDetermineActionWithRouteAndActionOrControllerSpecified"), p0, p1, p2, p3, p4, p5);
 
         /// <summary>
         /// The '{0}' property of '{1}' must not be null.
         /// </summary>
         internal static string PropertyOfTypeCannotBeNull
         {
-            get { return GetString("PropertyOfTypeCannotBeNull"); }
+            get => GetString("PropertyOfTypeCannotBeNull");
         }
 
         /// <summary>
         /// The '{0}' property of '{1}' must not be null.
         /// </summary>
         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);
 
         /// <summary>
         /// Cannot override the '{7}' attribute for &lt;{0}&gt;. &lt;{0}&gt; elements with a specified '{7}' must not have attributes starting with '{6}' or an '{1}', '{2}', '{3}', '{4}', or '{5}' attribute.
         /// </summary>
         internal static string FormActionTagHelper_CannotOverrideFormAction
         {
-            get { return GetString("FormActionTagHelper_CannotOverrideFormAction"); }
+            get => GetString("FormActionTagHelper_CannotOverrideFormAction");
         }
 
         /// <summary>
         /// Cannot override the '{7}' attribute for &lt;{0}&gt;. &lt;{0}&gt; elements with a specified '{7}' must not have attributes starting with '{6}' or an '{1}', '{2}', '{3}', '{4}', or '{5}' attribute.
         /// </summary>
         internal static string FormatFormActionTagHelper_CannotOverrideFormAction(object p0, object p1, object p2, object p3, object p4, object p5, object p6, object p7)
-        {
-            return string.Format(CultureInfo.CurrentCulture, GetString("FormActionTagHelper_CannotOverrideFormAction"), p0, p1, p2, p3, p4, p5, p6, p7);
-        }
+            => string.Format(CultureInfo.CurrentCulture, GetString("FormActionTagHelper_CannotOverrideFormAction"), p0, p1, p2, p3, p4, p5, p6, p7);
 
         /// <summary>
         /// Cannot determine a '{4}' attribute for &lt;{0}&gt;. &lt;{0}&gt; elements with a specified '{1}' must not have an '{2}', '{3}', or '{5}' attribute.
         /// </summary>
         internal static string FormActionTagHelper_CannotDetermineFormActionRouteActionOrControllerSpecified
         {
-            get { return GetString("FormActionTagHelper_CannotDetermineFormActionRouteActionOrControllerSpecified"); }
+            get => GetString("FormActionTagHelper_CannotDetermineFormActionRouteActionOrControllerSpecified");
         }
 
         /// <summary>
         /// Cannot determine a '{4}' attribute for &lt;{0}&gt;. &lt;{0}&gt; elements with a specified '{1}' must not have an '{2}', '{3}', or '{5}' attribute.
         /// </summary>
         internal static string FormatFormActionTagHelper_CannotDetermineFormActionRouteActionOrControllerSpecified(object p0, object p1, object p2, object p3, object p4, object p5)
-        {
-            return string.Format(CultureInfo.CurrentCulture, GetString("FormActionTagHelper_CannotDetermineFormActionRouteActionOrControllerSpecified"), p0, p1, p2, p3, p4, p5);
-        }
+            => string.Format(CultureInfo.CurrentCulture, GetString("FormActionTagHelper_CannotDetermineFormActionRouteActionOrControllerSpecified"), p0, p1, p2, p3, p4, p5);
 
         private static string GetString(string name, params string[] formatterNames)
         {
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Properties/Resources.Designer.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Properties/Resources.Designer.cs
index 04f1f32312..19c9606e96 100644
--- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Properties/Resources.Designer.cs
+++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Properties/Resources.Designer.cs
@@ -795,7 +795,7 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures
             => string.Format(CultureInfo.CurrentCulture, GetString("ViewEnginesAreRequired"), p0, p1, p2);
 
         /// <summary>
-        /// TempData property {0} is not declared as a primitive type or string.
+        /// The '{0}.{1}' property with {2} is invalid. A property using {2} must be of primitive or string type.
         /// </summary>
         internal static string TempDataProperties_PrimitiveTypeOrString
         {
@@ -803,13 +803,13 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures
         }
 
         /// <summary>
-        /// TempData property {0} is not declared as a primitive type or string.
+        /// The '{0}.{1}' property with {2} is invalid. A property using {2} must be of primitive or string type.
         /// </summary>
         internal static string FormatTempDataProperties_PrimitiveTypeOrString(object p0, object p1, object p2)
             => string.Format(CultureInfo.CurrentCulture, GetString("TempDataProperties_PrimitiveTypeOrString"), p0, p1, p2);
 
         /// <summary>
-        /// TempData property {0} does not have a public getter or setter.
+        /// The '{0}.{1}' property with {2} is invalid. A property using {2} must have a public getter and setter.
         /// </summary>
         internal static string TempDataProperties_PublicGetterSetter
         {
@@ -817,7 +817,7 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures
         }
 
         /// <summary>
-        /// TempData property {0} does not have a public getter or setter.
+        /// The '{0}.{1}' property with {2} is invalid. A property using {2} must have a public getter and setter.
         /// </summary>
         internal static string FormatTempDataProperties_PublicGetterSetter(object p0, object p1, object p2)
             => string.Format(CultureInfo.CurrentCulture, GetString("TempDataProperties_PublicGetterSetter"), p0, p1, p2);
diff --git a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Properties/Resources.Designer.cs b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Properties/Resources.Designer.cs
index 9d5d5cba39..508a740cb9 100644
--- a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Properties/Resources.Designer.cs
+++ b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Properties/Resources.Designer.cs
@@ -15,176 +15,154 @@ namespace Microsoft.AspNetCore.Mvc.WebApiCompatShim
         /// </summary>
         internal static string HttpError_BadRequest
         {
-            get { return GetString("HttpError_BadRequest"); }
+            get => GetString("HttpError_BadRequest");
         }
 
         /// <summary>
         /// The request is invalid.
         /// </summary>
         internal static string FormatHttpError_BadRequest()
-        {
-            return GetString("HttpError_BadRequest");
-        }
+            => GetString("HttpError_BadRequest");
 
         /// <summary>
         /// An error has occurred.
         /// </summary>
         internal static string HttpError_GenericError
         {
-            get { return GetString("HttpError_GenericError"); }
+            get => GetString("HttpError_GenericError");
         }
 
         /// <summary>
         /// An error has occurred.
         /// </summary>
         internal static string FormatHttpError_GenericError()
-        {
-            return GetString("HttpError_GenericError");
-        }
+            => GetString("HttpError_GenericError");
 
         /// <summary>
         /// The model state is valid.
         /// </summary>
         internal static string HttpError_ValidModelState
         {
-            get { return GetString("HttpError_ValidModelState"); }
+            get => GetString("HttpError_ValidModelState");
         }
 
         /// <summary>
         /// The model state is valid.
         /// </summary>
         internal static string FormatHttpError_ValidModelState()
-        {
-            return GetString("HttpError_ValidModelState");
-        }
+            => GetString("HttpError_ValidModelState");
 
         /// <summary>
         /// Could not find a formatter matching the media type '{0}' that can write an instance of '{1}'.
         /// </summary>
         internal static string HttpRequestMessage_CouldNotFindMatchingFormatter
         {
-            get { return GetString("HttpRequestMessage_CouldNotFindMatchingFormatter"); }
+            get => GetString("HttpRequestMessage_CouldNotFindMatchingFormatter");
         }
 
         /// <summary>
         /// Could not find a formatter matching the media type '{0}' that can write an instance of '{1}'.
         /// </summary>
         internal static string FormatHttpRequestMessage_CouldNotFindMatchingFormatter(object p0, object p1)
-        {
-            return string.Format(CultureInfo.CurrentCulture, GetString("HttpRequestMessage_CouldNotFindMatchingFormatter"), p0, p1);
-        }
+            => string.Format(CultureInfo.CurrentCulture, GetString("HttpRequestMessage_CouldNotFindMatchingFormatter"), p0, p1);
 
         /// <summary>
         /// The {0} instance is not properly initialized. Use {1} to create an {0} for the current request.
         /// </summary>
         internal static string HttpRequestMessage_MustHaveHttpContext
         {
-            get { return GetString("HttpRequestMessage_MustHaveHttpContext"); }
+            get => GetString("HttpRequestMessage_MustHaveHttpContext");
         }
 
         /// <summary>
         /// The {0} instance is not properly initialized. Use {1} to create an {0} for the current request.
         /// </summary>
         internal static string FormatHttpRequestMessage_MustHaveHttpContext(object p0, object p1)
-        {
-            return string.Format(CultureInfo.CurrentCulture, GetString("HttpRequestMessage_MustHaveHttpContext"), p0, p1);
-        }
+            => string.Format(CultureInfo.CurrentCulture, GetString("HttpRequestMessage_MustHaveHttpContext"), p0, p1);
 
         /// <summary>
         /// The {0} only supports writing objects of type {1}.
         /// </summary>
         internal static string HttpResponseMessageFormatter_UnsupportedType
         {
-            get { return GetString("HttpResponseMessageFormatter_UnsupportedType"); }
+            get => GetString("HttpResponseMessageFormatter_UnsupportedType");
         }
 
         /// <summary>
         /// The {0} only supports writing objects of type {1}.
         /// </summary>
         internal static string FormatHttpResponseMessageFormatter_UnsupportedType(object p0, object p1)
-        {
-            return string.Format(CultureInfo.CurrentCulture, GetString("HttpResponseMessageFormatter_UnsupportedType"), p0, p1);
-        }
+            => string.Format(CultureInfo.CurrentCulture, GetString("HttpResponseMessageFormatter_UnsupportedType"), p0, p1);
 
         /// <summary>
         /// The key is invalid JQuery syntax because it is missing a closing bracket.
         /// </summary>
         internal static string JQuerySyntaxMissingClosingBracket
         {
-            get { return GetString("JQuerySyntaxMissingClosingBracket"); }
+            get => GetString("JQuerySyntaxMissingClosingBracket");
         }
 
         /// <summary>
         /// The key is invalid JQuery syntax because it is missing a closing bracket.
         /// </summary>
         internal static string FormatJQuerySyntaxMissingClosingBracket()
-        {
-            return GetString("JQuerySyntaxMissingClosingBracket");
-        }
+            => GetString("JQuerySyntaxMissingClosingBracket");
 
         /// <summary>
         /// The number of keys in a NameValueCollection has exceeded the limit of '{0}'. You can adjust it by modifying the MaxHttpCollectionKeys property on the '{1}' class.
         /// </summary>
         internal static string MaxHttpCollectionKeyLimitReached
         {
-            get { return GetString("MaxHttpCollectionKeyLimitReached"); }
+            get => GetString("MaxHttpCollectionKeyLimitReached");
         }
 
         /// <summary>
         /// The number of keys in a NameValueCollection has exceeded the limit of '{0}'. You can adjust it by modifying the MaxHttpCollectionKeys property on the '{1}' class.
         /// </summary>
         internal static string FormatMaxHttpCollectionKeyLimitReached(object p0, object p1)
-        {
-            return string.Format(CultureInfo.CurrentCulture, GetString("MaxHttpCollectionKeyLimitReached"), p0, p1);
-        }
+            => string.Format(CultureInfo.CurrentCulture, GetString("MaxHttpCollectionKeyLimitReached"), p0, p1);
 
         /// <summary>
         /// Processing of the HTTP request resulted in an exception. Please see the HTTP response returned by the 'Response' property of this exception for details.
         /// </summary>
         internal static string HttpResponseExceptionMessage
         {
-            get { return GetString("HttpResponseExceptionMessage"); }
+            get => GetString("HttpResponseExceptionMessage");
         }
 
         /// <summary>
         /// Processing of the HTTP request resulted in an exception. Please see the HTTP response returned by the 'Response' property of this exception for details.
         /// </summary>
         internal static string FormatHttpResponseExceptionMessage()
-        {
-            return GetString("HttpResponseExceptionMessage");
-        }
+            => GetString("HttpResponseExceptionMessage");
 
         /// <summary>
         /// Failed to generate a URL using route '{0}'.
         /// </summary>
         internal static string CreatedAtRoute_RouteFailed
         {
-            get { return GetString("CreatedAtRoute_RouteFailed"); }
+            get => GetString("CreatedAtRoute_RouteFailed");
         }
 
         /// <summary>
         /// Failed to generate a URL using route '{0}'.
         /// </summary>
         internal static string FormatCreatedAtRoute_RouteFailed(object p0)
-        {
-            return string.Format(CultureInfo.CurrentCulture, GetString("CreatedAtRoute_RouteFailed"), p0);
-        }
+            => string.Format(CultureInfo.CurrentCulture, GetString("CreatedAtRoute_RouteFailed"), p0);
 
         /// <summary>
         /// URL
         /// </summary>
         internal static string BindingSource_URL
         {
-            get { return GetString("BindingSource_URL"); }
+            get => GetString("BindingSource_URL");
         }
 
         /// <summary>
         /// URL
         /// </summary>
         internal static string FormatBindingSource_URL()
-        {
-            return GetString("BindingSource_URL");
-        }
+            => GetString("BindingSource_URL");
 
         private static string GetString(string name, params string[] formatterNames)
         {
diff --git a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Properties/Resources.Designer.cs b/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Properties/Resources.Designer.cs
index 6424bee172..06beda8093 100644
--- a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Properties/Resources.Designer.cs
+++ b/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Properties/Resources.Designer.cs
@@ -15,64 +15,56 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations.Test
         /// </summary>
         internal static string CompareAttributeTestResource
         {
-            get { return GetString("CompareAttributeTestResource"); }
+            get => GetString("CompareAttributeTestResource");
         }
 
         /// <summary>
         /// Comparing {0} to {1}.
         /// </summary>
         internal static string FormatCompareAttributeTestResource(object p0, object p1)
-        {
-            return string.Format(CultureInfo.CurrentCulture, GetString("CompareAttributeTestResource"), p0, p1);
-        }
+            => string.Format(CultureInfo.CurrentCulture, GetString("CompareAttributeTestResource"), p0, p1);
 
         /// <summary>
         /// description from resources
         /// </summary>
         internal static string DisplayAttribute_Description
         {
-            get { return GetString("DisplayAttribute_Description"); }
+            get => GetString("DisplayAttribute_Description");
         }
 
         /// <summary>
         /// description from resources
         /// </summary>
         internal static string FormatDisplayAttribute_Description()
-        {
-            return GetString("DisplayAttribute_Description");
-        }
+            => GetString("DisplayAttribute_Description");
 
         /// <summary>
         /// name from resources
         /// </summary>
         internal static string DisplayAttribute_Name
         {
-            get { return GetString("DisplayAttribute_Name"); }
+            get => GetString("DisplayAttribute_Name");
         }
 
         /// <summary>
         /// name from resources
         /// </summary>
         internal static string FormatDisplayAttribute_Name()
-        {
-            return GetString("DisplayAttribute_Name");
-        }
+            => GetString("DisplayAttribute_Name");
 
         /// <summary>
         /// prompt from resources
         /// </summary>
         internal static string DisplayAttribute_Prompt
         {
-            get { return GetString("DisplayAttribute_Prompt"); }
+            get => GetString("DisplayAttribute_Prompt");
         }
 
         /// <summary>
         /// prompt from resources
         /// </summary>
         internal static string FormatDisplayAttribute_Prompt()
-        {
-            return GetString("DisplayAttribute_Prompt");
-        }
+            => GetString("DisplayAttribute_Prompt");
 
         private static string GetString(string name, params string[] formatterNames)
         {