New TryParseModelBinder

src/Http/Http.Extensions/src/RequestDelegateFactory.cs

@@ -992,7 +992,7 @@ private static Expression BindParameterFromValue(ParameterInfo parameter, Expres
                 HttpContextExpr, parameterTypeNameConstant, parameterNameConstant,
                 TempSourceStringExpr, Expression.Constant(factoryContext.ThrowOnBadRequest)));
 
-        var tryParseCall = tryParseMethodCall(parsedValue);
+        var tryParseCall = tryParseMethodCall(parsedValue, Expression.Constant(CultureInfo.InvariantCulture));
 
         // The following code is generated if the parameter is required and
         // the method should not be matched.

src/Http/Http.Extensions/test/ParameterBindingMethodCacheTests.cs

@@ -30,7 +30,7 @@ public void FindTryParseStringMethod_ReturnsTheExpectedTryParseMethodWithInvaria
 
         Assert.NotNull(methodFound);
 
-        var call = methodFound!(Expression.Variable(type, "parsedValue")) as MethodCallExpression;
+        var call = methodFound!(Expression.Variable(type, "parsedValue"), Expression.Constant(CultureInfo.InvariantCulture)) as MethodCallExpression;
         Assert.NotNull(call);
         var parameters = call!.Method.GetParameters();
 
@@ -53,7 +53,7 @@ public void FindTryParseStringMethod_ReturnsTheExpectedTryParseMethodWithInvaria
 
         Assert.NotNull(methodFound);
 
-        var call = methodFound!(Expression.Variable(type, "parsedValue")) as MethodCallExpression;
+        var call = methodFound!(Expression.Variable(type, "parsedValue"), Expression.Constant(CultureInfo.InvariantCulture)) as MethodCallExpression;
         Assert.NotNull(call);
         var parameters = call!.Method.GetParameters();
 
@@ -85,7 +85,7 @@ public void FindTryParseStringMethod_ReturnsTheExpectedTryParseMethodWithInvaria
 
         Assert.NotNull(methodFound);
 
-        var call = methodFound!(Expression.Variable(type, "parsedValue")) as MethodCallExpression;
+        var call = methodFound!(Expression.Variable(type, "parsedValue"), Expression.Constant(CultureInfo.InvariantCulture)) as MethodCallExpression;
         Assert.NotNull(call);
         var parameters = call!.Method.GetParameters();
 
@@ -109,7 +109,7 @@ public void FindTryParseMethod_WithNoFormatProvider(Type type)
         var methodFound = new ParameterBindingMethodCache().FindTryParseMethod(@type);
         Assert.NotNull(methodFound);
 
-        var call = methodFound!(Expression.Variable(type, "parsedValue")) as MethodCallExpression;
+        var call = methodFound!(Expression.Variable(type, "parsedValue"), Expression.Constant(CultureInfo.InvariantCulture)) as MethodCallExpression;
         Assert.NotNull(call);
         var parameters = call!.Method.GetParameters();
 
@@ -155,7 +155,7 @@ public void FindTryParseStringMethod_WorksForEnums()
 
         Assert.NotNull(methodFound);
 
-        var call = methodFound!(Expression.Variable(type, "parsedValue")) as MethodCallExpression;
+        var call = methodFound!(Expression.Variable(type, "parsedValue"), Expression.Constant(CultureInfo.InvariantCulture)) as MethodCallExpression;
         Assert.NotNull(call);
         var method = call!.Method;
         var parameters = method.GetParameters();
@@ -177,7 +177,7 @@ public void FindTryParseStringMethod_WorksForEnumsWhenNonGenericEnumParseIsUsed(
         Assert.NotNull(methodFound);
 
         var parsedValue = Expression.Variable(type, "parsedValue");
-        var block = methodFound!(parsedValue) as BlockExpression;
+        var block = methodFound!(parsedValue, Expression.Constant(CultureInfo.InvariantCulture)) as BlockExpression;
         Assert.NotNull(block);
         Assert.Equal(typeof(bool), block!.Type);
 

src/Mvc/Mvc.Abstractions/src/Microsoft.AspNetCore.Mvc.Abstractions.csproj

@@ -13,6 +13,8 @@ Microsoft.AspNetCore.Mvc.IActionResult</Description>
 
   <ItemGroup>
     <Compile Include="$(SharedSourceRoot)ClosedGenericMatcher\*.cs" />
+    <Compile Include="$(SharedSourceRoot)\ParameterBindingMethodCache.cs" Link="ModelBinding\ParameterBindingMethodCache.cs" />
+    <Compile Include="$(SharedSourceRoot)\TypeNameHelper\TypeNameHelper.cs" Link="ModelBinding\TypeNameHelper.cs" />
   </ItemGroup>
 
   <ItemGroup>

src/Mvc/Mvc.Abstractions/src/ModelBinding/ModelMetadata.cs

@@ -6,7 +6,9 @@
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using System.Linq.Expressions;
 using System.Reflection;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Abstractions;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
@@ -25,6 +27,8 @@ public abstract class ModelMetadata : IEquatable<ModelMetadata?>, IModelMetadata
     /// </summary>
     public static readonly int DefaultOrder = 10000;
 
+    private static readonly ParameterBindingMethodCache ParameterBindingMethodCache = new();
+
     private int? _hashCode;
     private IReadOnlyList<ModelMetadata>? _boundProperties;
     private IReadOnlyDictionary<ModelMetadata, ModelMetadata>? _parameterMapping;
@@ -434,10 +438,10 @@ internal IReadOnlyDictionary<ModelMetadata, ModelMetadata> BoundConstructorPrope
     /// </summary>
     /// <remarks>
     /// A complex type is defined as a <see cref="Type"/> without a <see cref="TypeConverter"/> that can convert
-    /// from <see cref="string"/>. Most POCO and <see cref="IEnumerable"/> types are therefore complex. Most, if
-    /// not all, BCL value types are simple types.
+    /// from <see cref="string"/> and without a <c>TryParse</c> method. Most POCO and <see cref="IEnumerable"/> types are therefore complex.
+    /// Most, if not all, BCL value types are simple types.
     /// </remarks>
-    public bool IsComplexType { get; private set; }
+    public bool IsComplexType => !IsConvertibleType && !IsParseableType;
 
     /// <summary>
     /// Gets a value indicating whether or not <see cref="ModelType"/> is a <see cref="Nullable{T}"/>.
@@ -475,6 +479,17 @@ internal IReadOnlyDictionary<ModelMetadata, ModelMetadata> BoundConstructorPrope
     /// </remarks>
     public Type UnderlyingOrModelType { get; private set; } = default!;
 
+    /// <summary>
+    /// Gets a value indicating whether or not <see cref="ModelType"/> has a TryParse method.
+    /// </summary>
+    internal virtual bool IsParseableType { get; private set; }
+
+    /// <summary>
+    /// Gets a value indicating whether or not <see cref="ModelType"/> has a <see cref="TypeConverter"/>
+    /// from <see cref="string"/>.
+    /// </summary>
+    internal bool IsConvertibleType { get; private set; }
+
     /// <summary>
     /// Gets a value indicating the NullabilityState of the value or reference type.
     /// </summary>
@@ -521,6 +536,22 @@ internal void ThrowIfRecordTypeHasValidationOnProperties()
         }
     }
 
+    internal static Func<ParameterExpression, Expression, Expression>? FindTryParseMethod(Type modelType)
+    {
+        try
+        {
+            modelType = Nullable.GetUnderlyingType(modelType) ?? modelType;
+            return ParameterBindingMethodCache.FindTryParseMethod(modelType);
+        }
+        catch (InvalidOperationException)
+        {
+            // The ParameterBindingMethodCache.FindTryParseMethod throws an exception
+            // when an wrong try/parse method is detected
+            // but we don't need this behavior here and return null is enough
+            return null;
+        }
+    }
+
     [MemberNotNull(nameof(_parameterMapping), nameof(_boundConstructorPropertyMapping))]
     private void CalculateRecordTypeConstructorDetails()
     {
@@ -616,7 +647,8 @@ private void InitializeTypeInformation()
     {
         Debug.Assert(ModelType != null);
 
-        IsComplexType = !TypeDescriptor.GetConverter(ModelType).CanConvertFrom(typeof(string));
+        IsConvertibleType = TypeDescriptor.GetConverter(ModelType).CanConvertFrom(typeof(string));
+        IsParseableType = ModelMetadata.FindTryParseMethod(ModelType) is not null;
         IsNullableValueType = Nullable.GetUnderlyingType(ModelType) != null;
         IsReferenceOrNullableType = !ModelType.IsValueType || IsNullableValueType;
         UnderlyingOrModelType = Nullable.GetUnderlyingType(ModelType) ?? ModelType;

src/Mvc/Mvc.Abstractions/test/ModelBinding/ModelStateDictionaryTest.cs

@@ -994,7 +994,7 @@ public void ModelStateDictionary_AddsCustomErrorMessage_WhenModelStateNotSet()
         var expected = "Hmm, the supplied value is not valid for Length.";
         var dictionary = new ModelStateDictionary();
 
-        var bindingMetadataProvider = new DefaultBindingMetadataProvider();
+        var bindingMetadataProvider = CreateBindingMetadataProvider();
         var compositeProvider = new DefaultCompositeMetadataDetailsProvider(new[] { bindingMetadataProvider });
         var optionsAccessor = new OptionsAccessor();
         optionsAccessor.Value.ModelBindingMessageProvider.SetUnknownValueIsInvalidAccessor(
@@ -1020,7 +1020,7 @@ public void ModelStateDictionary_AddsCustomErrorMessage_WhenModelStateNotSet_Wit
         var expected = "Hmm, the supplied value is not valid.";
         var dictionary = new ModelStateDictionary();
 
-        var bindingMetadataProvider = new DefaultBindingMetadataProvider();
+        var bindingMetadataProvider = CreateBindingMetadataProvider();
         var compositeProvider = new DefaultCompositeMetadataDetailsProvider(new[] { bindingMetadataProvider });
         var optionsAccessor = new OptionsAccessor();
         optionsAccessor.Value.ModelBindingMessageProvider.SetNonPropertyUnknownValueIsInvalidAccessor(
@@ -1048,7 +1048,7 @@ public void ModelStateDictionary_AddsCustomErrorMessage_WhenModelStateNotSet_Wit
         var expected = "Hmm, the supplied value is not valid.";
         var dictionary = new ModelStateDictionary();
 
-        var bindingMetadataProvider = new DefaultBindingMetadataProvider();
+        var bindingMetadataProvider = CreateBindingMetadataProvider();
         var compositeProvider = new DefaultCompositeMetadataDetailsProvider(new[] { bindingMetadataProvider });
         var optionsAccessor = new OptionsAccessor();
         optionsAccessor.Value.ModelBindingMessageProvider.SetNonPropertyUnknownValueIsInvalidAccessor(
@@ -1109,7 +1109,7 @@ public void ModelStateDictionary_AddsCustomErrorMessage_WhenModelStateSet()
         var dictionary = new ModelStateDictionary();
         dictionary.SetModelValue("key", new string[] { "some value" }, "some value");
 
-        var bindingMetadataProvider = new DefaultBindingMetadataProvider();
+        var bindingMetadataProvider = CreateBindingMetadataProvider();
         var compositeProvider = new DefaultCompositeMetadataDetailsProvider(new[] { bindingMetadataProvider });
         var optionsAccessor = new OptionsAccessor();
         optionsAccessor.Value.ModelBindingMessageProvider.SetAttemptedValueIsInvalidAccessor(
@@ -1136,7 +1136,7 @@ public void ModelStateDictionary_AddsCustomErrorMessage_WhenModelStateSet_WithPa
         var dictionary = new ModelStateDictionary();
         dictionary.SetModelValue("key", new string[] { "some value" }, "some value");
 
-        var bindingMetadataProvider = new DefaultBindingMetadataProvider();
+        var bindingMetadataProvider = CreateBindingMetadataProvider();
         var compositeProvider = new DefaultCompositeMetadataDetailsProvider(new[] { bindingMetadataProvider });
         var optionsAccessor = new OptionsAccessor();
         optionsAccessor.Value.ModelBindingMessageProvider.SetNonPropertyAttemptedValueIsInvalidAccessor(
@@ -1165,7 +1165,7 @@ public void ModelStateDictionary_AddsCustomErrorMessage_WhenModelStateSet_WithTy
         var dictionary = new ModelStateDictionary();
         dictionary.SetModelValue("key", new string[] { "some value" }, "some value");
 
-        var bindingMetadataProvider = new DefaultBindingMetadataProvider();
+        var bindingMetadataProvider = CreateBindingMetadataProvider();
         var compositeProvider = new DefaultCompositeMetadataDetailsProvider(new[] { bindingMetadataProvider });
         var optionsAccessor = new OptionsAccessor();
         optionsAccessor.Value.ModelBindingMessageProvider.SetNonPropertyAttemptedValueIsInvalidAccessor(
@@ -1599,6 +1599,9 @@ public void GetModelStateForProperty_ReturnsModelStateForIndexedChildren()
         Assert.Equal("value1", property.RawValue);
     }
 
+    private DefaultBindingMetadataProvider CreateBindingMetadataProvider()
+        => new DefaultBindingMetadataProvider();
+
     private class OptionsAccessor : IOptions<MvcOptions>
     {
         public MvcOptions Value { get; } = new MvcOptions();

src/Mvc/Mvc.ApiExplorer/src/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj

@@ -10,7 +10,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="$(SharedSourceRoot)ParameterBindingMethodCache.cs" />
     <Compile Include="$(SharedSourceRoot)RoslynUtils\TypeHelper.cs" />
   </ItemGroup>
 

src/Mvc/Mvc.Core/src/Infrastructure/MvcCoreMvcOptionsSetup.cs

@@ -63,6 +63,7 @@ public void Configure(MvcOptions options)
         options.ModelBinderProviders.Add(new FloatingPointTypeModelBinderProvider());
         options.ModelBinderProviders.Add(new EnumTypeModelBinderProvider(options));
         options.ModelBinderProviders.Add(new DateTimeModelBinderProvider());
+        options.ModelBinderProviders.Add(new TryParseModelBinderProvider());
         options.ModelBinderProviders.Add(new SimpleTypeModelBinderProvider());
         options.ModelBinderProviders.Add(new CancellationTokenModelBinderProvider());
         options.ModelBinderProviders.Add(new ByteArrayModelBinderProvider());

src/Mvc/Mvc.Core/src/Microsoft.AspNetCore.Mvc.Core.csproj

@@ -58,7 +58,6 @@ Microsoft.AspNetCore.Mvc.RouteAttribute</Description>
   <ItemGroup Label="Sources packages">
     <Compile Include="$(SharedSourceRoot)ValueStopwatch\*.cs" />
     <Compile Include="$(SharedSourceRoot)ParameterDefaultValue\*.cs" />
-    <Compile Include="$(SharedSourceRoot)TypeNameHelper\*.cs" />
   </ItemGroup>
 
 </Project>