Follow-ups from #43182 (#43309)

Author: MackinnonBuck

src/Mvc/Mvc.Core/src/ModelBinding/FormValueHelper.cs

@@ -0,0 +1,9 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding;
+
+internal static class FormValueHelper
+{
+    public const string CultureInvariantFieldName = "__Invariant";
+}

src/Mvc/Mvc.Core/src/ModelBinding/FormValueProvider.cs

@@ -13,8 +13,6 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding;
 /// </summary>
 public class FormValueProvider : BindingSourceValueProvider, IEnumerableValueProvider
 {
-    internal const string CultureInvariantFieldName = "__Invariant";
-
     private readonly IFormCollection _values;
     private readonly HashSet<string?>? _invariantValueKeys;
     private PrefixContainer? _prefixContainer;
@@ -43,7 +41,7 @@ public FormValueProvider(
 
         _values = values;
 
-        if (_values.TryGetValue(CultureInvariantFieldName, out var invariantKeys) && invariantKeys.Count > 0)
+        if (_values.TryGetValue(FormValueHelper.CultureInvariantFieldName, out var invariantKeys) && invariantKeys.Count > 0)
         {
             _invariantValueKeys = new(invariantKeys, StringComparer.OrdinalIgnoreCase);
         }

src/Mvc/Mvc.Core/src/ModelBinding/JQueryFormValueProvider.cs

@@ -27,7 +27,7 @@ public JQueryFormValueProvider(
         CultureInfo? culture)
         : base(bindingSource, values, culture)
     {
-        if (values.TryGetValue(FormValueProvider.CultureInvariantFieldName, out var invariantKeys) && invariantKeys.Count > 0)
+        if (values.TryGetValue(FormValueHelper.CultureInvariantFieldName, out var invariantKeys) && invariantKeys.Count > 0)
         {
             _invariantValueKeys = new(invariantKeys, StringComparer.OrdinalIgnoreCase);
         }

src/Mvc/Mvc.Core/test/ModelBinding/FormValueProviderTest.cs

@@ -18,7 +18,7 @@ public void GetValue_ReturnsInvariantCulture_IfInvariantEntryExists()
         var currentCultureKey = "some";
         var values = new Dictionary<string, StringValues>(BackingStore)
         {
-            { FormValueProvider.CultureInvariantFieldName, new(invariantCultureKey) },
+            { FormValueHelper.CultureInvariantFieldName, new(invariantCultureKey) },
         };
         var valueProvider = GetEnumerableValueProvider(BindingSource.Query, values, culture);
 

src/Mvc/Mvc.Core/test/ModelBinding/JQueryFormValueProviderTest.cs

@@ -56,7 +56,7 @@ public void GetValue_ReturnsInvariantCulture_IfInvariantEntryExists()
         var currentCultureKey = "some";
         var values = new Dictionary<string, StringValues>(BackingStore)
         {
-            { FormValueProvider.CultureInvariantFieldName, new(invariantCultureKey) },
+            { FormValueHelper.CultureInvariantFieldName, new(invariantCultureKey) },
         };
         var valueProvider = GetEnumerableValueProvider(BindingSource.Query, values, culture);
 

src/Mvc/Mvc.TagHelpers/src/InputTagHelper.cs

@@ -423,7 +423,7 @@ private TagBuilder GenerateTextBox(
     private static void GenerateInvariantCultureMetadata(string propertyName, TagHelperContent builder)
         => builder
             .AppendHtml("<input name=\"")
-            .Append(FormValueProvider.CultureInvariantFieldName)
+            .Append(FormValueHelper.CultureInvariantFieldName)
             .AppendHtml("\" type=\"hidden\" value=\"")
             .Append(propertyName)
             .AppendHtml("\" />");

src/Mvc/Mvc.ViewFeatures/src/DefaultHtmlGenerator.cs

@@ -1351,13 +1351,12 @@ protected virtual TagBuilder GenerateInput(
                     string.Equals(suppliedTypeString, "image", StringComparison.OrdinalIgnoreCase))
                 {
                     // 'value' attribute is not needed for 'file' and 'image' input types.
+                    break;
                 }
-                else
-                {
-                    var attributeValue = (string)GetModelStateValue(viewContext, fullName, typeof(string));
-                    attributeValue ??= useViewData ? EvalString(viewContext, expression, format) : valueParameter;
-                    tagBuilder.MergeAttribute("value", attributeValue, replaceExisting: isExplicitValue);
-                }
+
+                var attributeValue = (string)GetModelStateValue(viewContext, fullName, typeof(string));
+                attributeValue ??= useViewData ? EvalString(viewContext, expression, format) : valueParameter;
+                tagBuilder.MergeAttribute("value", attributeValue, replaceExisting: isExplicitValue);
 
                 break;
         }