Move SerializerOptions property to ValidationOptions

Author: captainsafia

src/Http/Http.Abstractions/src/PublicAPI.Unshipped.txt

@@ -28,13 +28,13 @@ Microsoft.AspNetCore.Http.Validation.ValidateContext.ValidationContext.get -> Sy
 Microsoft.AspNetCore.Http.Validation.ValidateContext.ValidationContext.set -> void
 Microsoft.AspNetCore.Http.Validation.ValidateContext.ValidationErrors.get -> System.Collections.Generic.Dictionary<string!, string![]!>?
 Microsoft.AspNetCore.Http.Validation.ValidateContext.ValidationErrors.set -> void
-Microsoft.AspNetCore.Http.Validation.ValidateContext.SerializerOptions.get -> System.Text.Json.JsonSerializerOptions?
-Microsoft.AspNetCore.Http.Validation.ValidateContext.SerializerOptions.set -> void
 Microsoft.AspNetCore.Http.Validation.ValidateContext.ValidationOptions.get -> Microsoft.AspNetCore.Http.Validation.ValidationOptions!
 Microsoft.AspNetCore.Http.Validation.ValidateContext.ValidationOptions.set -> void
 Microsoft.AspNetCore.Http.Validation.ValidationOptions
 Microsoft.AspNetCore.Http.Validation.ValidationOptions.MaxDepth.get -> int
 Microsoft.AspNetCore.Http.Validation.ValidationOptions.MaxDepth.set -> void
+Microsoft.AspNetCore.Http.Validation.ValidationOptions.SerializerOptions.get -> System.Text.Json.JsonSerializerOptions?
+Microsoft.AspNetCore.Http.Validation.ValidationOptions.SerializerOptions.set -> void
 Microsoft.AspNetCore.Http.Validation.ValidationOptions.Resolvers.get -> System.Collections.Generic.IList<Microsoft.AspNetCore.Http.Validation.IValidatableInfoResolver!>!
 Microsoft.AspNetCore.Http.Validation.ValidationOptions.TryGetValidatableParameterInfo(System.Reflection.ParameterInfo! parameterInfo, out Microsoft.AspNetCore.Http.Validation.IValidatableInfo? validatableInfo) -> bool
 Microsoft.AspNetCore.Http.Validation.ValidationOptions.TryGetValidatableTypeInfo(System.Type! type, out Microsoft.AspNetCore.Http.Validation.IValidatableInfo? validatableTypeInfo) -> bool

src/Http/Http.Abstractions/src/Validation/ValidatablePropertyInfo.cs

@@ -32,7 +32,7 @@ protected ValidatablePropertyInfo(
         PropertyType = propertyType;
         Name = name;
         DisplayName = displayName;
-        
+
         // Cache the HasDisplayAttribute result to avoid repeated reflection calls
         var property = DeclaringType.GetProperty(Name);
         _hasDisplayAttribute = property is not null && HasDisplayAttribute(property);
@@ -73,7 +73,7 @@ public virtual async Task ValidateAsync(object? value, ValidateContext context,
         var validationAttributes = GetValidationAttributes();
 
         // Calculate and save the current path
-        var memberName = GetJsonPropertyName(Name, property, context.SerializerOptions?.PropertyNamingPolicy);
+        var memberName = GetJsonPropertyName(Name, property, context.ValidationOptions.SerializerOptions?.PropertyNamingPolicy);
         var originalPrefix = context.CurrentValidationPath;
         if (string.IsNullOrEmpty(originalPrefix))
         {
@@ -88,7 +88,7 @@ public virtual async Task ValidateAsync(object? value, ValidateContext context,
         // If the property has a [Display] attribute (either on property or record parameter), use DisplayName directly without formatting
         context.ValidationContext.DisplayName = _hasDisplayAttribute
             ? DisplayName
-            : GetJsonPropertyName(DisplayName, property, context.SerializerOptions?.PropertyNamingPolicy);
+            : GetJsonPropertyName(DisplayName, property, context.ValidationOptions.SerializerOptions?.PropertyNamingPolicy);
         context.ValidationContext.MemberName = memberName;
 
         // Check required attribute first

src/Http/Http.Abstractions/src/Validation/ValidatableTypeInfo.cs

@@ -109,9 +109,9 @@ public virtual async Task ValidateAsync(object? value, ValidateContext context,
                             // Format the member name using JsonSerializerOptions naming policy if available
                             // Note: we don't respect [JsonPropertyName] here because we have no context of the property being validated.
                             var formattedMemberName = memberName;
-                            if (context.SerializerOptions?.PropertyNamingPolicy != null)
+                            if (context.ValidationOptions.SerializerOptions?.PropertyNamingPolicy != null)
                             {
-                                formattedMemberName = context.SerializerOptions.PropertyNamingPolicy.ConvertName(memberName);
+                                formattedMemberName = context.ValidationOptions.SerializerOptions.PropertyNamingPolicy.ConvertName(memberName);
                             }
 
                             var key = string.IsNullOrEmpty(originalPrefix) ?

src/Http/Http.Abstractions/src/Validation/ValidateContext.cs

@@ -4,7 +4,6 @@
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using System.Text.Json;
 
 namespace Microsoft.AspNetCore.Http.Validation;
 
@@ -62,13 +61,6 @@ public sealed class ValidateContext
     /// </summary>
     public int CurrentDepth { get; set; }
 
-    /// <summary>
-    /// Gets or sets the JSON serializer options to use for property name formatting.
-    /// When available, property names in validation errors will be formatted according to the
-    /// PropertyNamingPolicy and JsonPropertyName attributes.
-    /// </summary>
-    public JsonSerializerOptions? SerializerOptions { get; set; }
-
     internal void AddValidationError(string key, string[] errors)
     {
         ValidationErrors ??= [];

src/Http/Http.Abstractions/src/Validation/ValidationOptions.cs

@@ -3,6 +3,7 @@
 
 using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
+using System.Text.Json;
 
 namespace Microsoft.AspNetCore.Http.Validation;
 
@@ -29,6 +30,13 @@ public class ValidationOptions
     /// </summary>
     public int MaxDepth { get; set; } = 32;
 
+    /// <summary>
+    /// Gets or sets the JSON serializer options to use for property name formatting.
+    /// When available, property names in validation errors will be formatted according to the
+    /// PropertyNamingPolicy and JsonPropertyName attributes.
+    /// </summary>
+    public JsonSerializerOptions? SerializerOptions { get; set; }
+
     /// <summary>
     /// Attempts to get validation information for the specified type.
     /// </summary>