Cleanup

Author: javiercn

src/Components/Forms/src/EditContextDataAnnotationsExtensions.cs

@@ -75,7 +75,7 @@ private sealed partial class DataAnnotationsEventSubscriptions : IDisposable
 #pragma warning restore ASP0029 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
         private readonly Dictionary<string, FieldIdentifier> _validationPathToFieldIdentifierMapping = new();
 
-
+        [UnconditionalSuppressMessage("Trimming", "IL2066", Justification = "Model types are expected to be defined in assemblies that do not get trimmed.")]
         public DataAnnotationsEventSubscriptions(EditContext editContext, IServiceProvider serviceProvider)
         {
             _editContext = editContext ?? throw new ArgumentNullException(nameof(editContext));

src/Validation/src/ValidatablePropertyInfo.cs

@@ -92,7 +92,7 @@ public virtual async Task ValidateAsync(object? value, ValidateContext context,
         }
 
         // Validate any other attributes
-        ValidateValue(propertyValue, context.CurrentValidationPath, validationAttributes, value);
+        ValidateValue(propertyValue, Name, context.CurrentValidationPath, validationAttributes, value);
 
         // Check if we've reached the maximum depth before validating complex properties
         if (context.CurrentDepth >= context.ValidationOptions.MaxDepth)
@@ -150,7 +150,7 @@ public virtual async Task ValidateAsync(object? value, ValidateContext context,
             context.CurrentValidationPath = originalPrefix;
         }
 
-        void ValidateValue(object? val, string errorPrefix, ValidationAttribute[] validationAttributes, object? container)
+        void ValidateValue(object? val, string name, string errorPrefix, ValidationAttribute[] validationAttributes, object? container)
         {
             for (var i = 0; i < validationAttributes.Length; i++)
             {
@@ -161,13 +161,13 @@ void ValidateValue(object? val, string errorPrefix, ValidationAttribute[] valida
                     if (result is not null && result != ValidationResult.Success && result.ErrorMessage is not null)
                     {
                         var key = errorPrefix.TrimStart('.');
-                        context.AddOrExtendValidationErrors(string.Empty, key, [result.ErrorMessage], container);
+                        context.AddOrExtendValidationErrors(name, key, [result.ErrorMessage], container);
                     }
                 }
                 catch (Exception ex)
                 {
                     var key = errorPrefix.TrimStart('.');
-                    context.AddOrExtendValidationErrors(string.Empty, key, [ex.Message], container);
+                    context.AddOrExtendValidationErrors(name, key, [ex.Message], container);
                 }
             }
         }

src/Validation/src/ValidateContext.cs

@@ -70,7 +70,13 @@ internal void AddValidationError(string propertyName, string key, string[] error
         ValidationErrors ??= [];
 
         ValidationErrors[key] = error;
-        OnValidationError?.Invoke(new(propertyName, key, error, container));
+        OnValidationError?.Invoke(new ValidationErrorContext
+        {
+            Name = propertyName,
+            Path = key,
+            Errors = error,
+            Container = container
+        });
     }
 
     internal void AddOrExtendValidationErrors(string propertyName, string key, string[] errors, object? container)
@@ -89,7 +95,13 @@ internal void AddOrExtendValidationErrors(string propertyName, string key, strin
             ValidationErrors[key] = errors;
         }
 
-        OnValidationError?.Invoke(new(propertyName, key, errors, container));
+        OnValidationError?.Invoke(new ValidationErrorContext
+        {
+            Name = propertyName,
+            Path = key,
+            Errors = errors,
+            Container = container
+        });
     }
 
     internal void AddOrExtendValidationError(string name, string key, string error, object? container)
@@ -105,6 +117,12 @@ internal void AddOrExtendValidationError(string name, string key, string error,
             ValidationErrors[key] = [error];
         }
 
-        OnValidationError?.Invoke(new(name, key, [error], container));
+        OnValidationError?.Invoke(new ValidationErrorContext
+        {
+            Name = name,
+            Path = key,
+            Errors = [error],
+            Container = container
+        });
     }
 }

src/Validation/src/ValidationErrorContext.cs

@@ -6,29 +6,25 @@ namespace Microsoft.Extensions.Validation;
 /// <summary>
 /// Represents the context of a validation error.
 /// </summary>
-/// <param name="name">The name of the property or parameter that caused the validation error.</param>
-/// <param name="key">The full path from the root object to the property or parameter that caused the validation error.</param>
-/// <param name="errors">The list of error messages associated with the validation error.</param>
-/// <param name="container">The container object of the validated property.</param>
-public readonly struct ValidationErrorContext(string name, string key, IReadOnlyList<string> errors, object? container)
+public readonly struct ValidationErrorContext
 {
     /// <summary>
     /// Gets the name of the property or parameter that caused the validation error.
     /// </summary>
-    public string Name { get; } = name;
+    public required string Name { get; init; }
 
     /// <summary>
     /// Gets the full path from the root object to the property or parameter that caused the validation error.
     /// </summary>
-    public string Path { get; } = key;
+    public required string Path { get; init; }
 
     /// <summary>
     /// Gets the list of error messages associated with the validation error.
     /// </summary>
-    public IReadOnlyList<string> Errors { get; } = errors;
+    public required IReadOnlyList<string> Errors { get; init; }
 
     /// <summary>
     /// Gets a reference to the container object of the validated property.
     /// </summary>
-    public object? Container { get; } = container;
+    public required object? Container { get; init; }
 }