Merge pull request #63436 from dotnet/merge/release/10.0-to-main

[automated] Merge branch 'release/10.0' => 'main'

Author: wtgodbe

src/Shared/RoslynUtils/WellKnownTypeData.cs

@@ -124,6 +124,7 @@ public enum WellKnownType
         System_ComponentModel_DataAnnotations_ValidationAttribute,
         System_ComponentModel_DataAnnotations_RequiredAttribute,
         System_ComponentModel_DataAnnotations_CustomValidationAttribute,
+        System_ComponentModel_DataAnnotations_IValidatableObject,
         Microsoft_Extensions_Validation_SkipValidationAttribute,
         System_Type,
     }
@@ -247,6 +248,7 @@ public enum WellKnownType
         "System.ComponentModel.DataAnnotations.ValidationAttribute",
         "System.ComponentModel.DataAnnotations.RequiredAttribute",
         "System.ComponentModel.DataAnnotations.CustomValidationAttribute",
+        "System.ComponentModel.DataAnnotations.IValidatableObject",
         "Microsoft.Extensions.Validation.SkipValidationAttribute",
         "System.Type",
     ];

src/Validation/gen/Parsers/ValidationsGenerator.TypesParser.cs

@@ -82,7 +82,7 @@ internal bool TryExtractValidatableType(ITypeSymbol incomingTypeSymbol, WellKnow
 
         visitedTypes.Add(typeSymbol);
 
-        var hasValidationAttributes = HasValidationAttributes(typeSymbol, wellKnownTypes);
+        var hasTypeLevelValidation = HasValidationAttributes(typeSymbol, wellKnownTypes) || HasIValidatableObjectInterface(typeSymbol, wellKnownTypes);
 
         // Extract validatable types discovered in base types of this type and add them to the top-level list.
         var current = typeSymbol.BaseType;
@@ -109,7 +109,7 @@ internal bool TryExtractValidatableType(ITypeSymbol incomingTypeSymbol, WellKnow
         }
 
         // No validatable members or derived types found, so we don't need to add this type.
-        if (members.IsDefaultOrEmpty && !hasValidationAttributes && !hasValidatableBaseType && !hasValidatableDerivedTypes)
+        if (members.IsDefaultOrEmpty && !hasTypeLevelValidation && !hasValidatableBaseType && !hasValidatableDerivedTypes)
         {
             return false;
         }
@@ -301,4 +301,10 @@ internal static bool HasValidationAttributes(ISymbol symbol, WellKnownTypes well
 
         return false;
     }
+
+    internal static bool HasIValidatableObjectInterface(ITypeSymbol typeSymbol, WellKnownTypes wellKnownTypes)
+    {
+        var validatableObjectSymbol = wellKnownTypes.Get(WellKnownTypeData.WellKnownType.System_ComponentModel_DataAnnotations_IValidatableObject);
+        return typeSymbol.ImplementsInterface(validatableObjectSymbol);
+    }
 }

src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGenerator.IValidatableObject.cs

@@ -164,4 +164,145 @@ async Task ValidateForTopLevelInvoked()
             }
         });
     }
+
+    [Fact]
+    public async Task CanValidateIValidatableObject_WithoutPropertyValidations()
+    {
+        var source = """
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Validation;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+
+WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
+
+builder.Services.AddValidation();
+
+WebApplication app = builder. Build();
+
+app.MapPost("/base", (BaseClass model) => Results.Ok(model));
+app.MapPost("/derived", (DerivedClass model) => Results.Ok(model));
+app.MapPost("/complex", (ComplexClass model) => Results.Ok(model));
+
+app.Run();
+
+public class BaseClass : IValidatableObject
+{
+    public string? Value { get; set; }
+
+    public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+    {
+        if (string.IsNullOrEmpty(Value))
+        {
+            yield return new ValidationResult("Value cannot be null or empty.", [nameof(Value)]);
+        }
+    }
+}
+
+public class DerivedClass : BaseClass
+{
+}
+
+public class ComplexClass
+{
+    public NestedClass? NestedObject { get; set; }
+}
+
+public class NestedClass : IValidatableObject
+{
+    public string? Value { get; set; }
+    public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+    {
+        if (string.IsNullOrEmpty(Value))
+        {
+            yield return new ValidationResult("Value cannot be null or empty.", [nameof(Value)]);
+        }
+    }
+}
+""";
+
+        await Verify(source, out var compilation);
+
+        await VerifyEndpoint(compilation, "/base", async (endpoint, serviceProvider) =>
+        {
+            await ValidateMethodCalled();
+
+            async Task ValidateMethodCalled()
+            {
+                var httpContext = CreateHttpContextWithPayload("""
+                {
+                    "Value": ""
+                }
+                """, serviceProvider);
+
+                await endpoint.RequestDelegate(httpContext);
+
+                var problemDetails = await AssertBadRequest(httpContext);
+                Assert.Collection(problemDetails.Errors,
+                    error =>
+                    {
+                        Assert.Equal("Value", error.Key);
+                        Assert.Collection(error.Value,
+                            msg => Assert.Equal("Value cannot be null or empty.", msg));
+                    });
+            }
+        });
+
+        await VerifyEndpoint(compilation, "/derived", async (endpoint, serviceProvider) =>
+        {
+            await ValidateMethodCalled();
+
+            async Task ValidateMethodCalled()
+            {
+                var httpContext = CreateHttpContextWithPayload("""
+                {
+                    "Value": ""
+                }
+                """, serviceProvider);
+
+                await endpoint.RequestDelegate(httpContext);
+
+                var problemDetails = await AssertBadRequest(httpContext);
+                Assert.Collection(problemDetails.Errors,
+                    error =>
+                    {
+                        Assert.Equal("Value", error.Key);
+                        Assert.Collection(error.Value,
+                            msg => Assert.Equal("Value cannot be null or empty.", msg));
+                    });
+            }
+        });
+
+        await VerifyEndpoint(compilation, "/complex", async (endpoint, serviceProvider) =>
+        {
+            await ValidateMethodCalled();
+
+            async Task ValidateMethodCalled()
+            {
+                var httpContext = CreateHttpContextWithPayload("""
+                {
+                    "NestedObject": {
+                        "Value": ""
+                    }
+                }
+                """, serviceProvider);
+
+                await endpoint.RequestDelegate(httpContext);
+
+                var problemDetails = await AssertBadRequest(httpContext);
+                Assert.Collection(problemDetails.Errors,
+                    error =>
+                    {
+                        Assert.Equal("NestedObject.Value", error.Key);
+                        Assert.Collection(error.Value,
+                            msg => Assert.Equal("Value cannot be null or empty.", msg));
+                    });
+            }
+        });
+    }
 }