Fixed issue where exceptions in validators would unexpectedly be converted into AggregateException

Author: icnocop

Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
     <PropertyGroup>
         <Nullable>enable</Nullable>
-        <LangVersion>8.0</LangVersion>
+        <LangVersion>9.0</LangVersion>
         <NoWarn>NU1701</NoWarn>
         <EmbedUntrackedSources>true</EmbedUntrackedSources>
         <IncludeSymbols>true</IncludeSymbols>

FluentValidation.AutoValidation.Mvc/src/Validation/FluentValidationAutoValidationValidationVisitor.cs

@@ -30,19 +30,19 @@ public override bool Validate(ModelMetadata? metadata, string? key, object? mode
         {
             // If built in model validation is disabled return true for later validation in the action filter.
             bool isBaseValid = disableBuiltInModelValidation || base.Validate(metadata, key, model, alwaysValidateAtTopLevel);
-            return ValidateAsync(isBaseValid, key, model).Result;
+            return Validate(isBaseValid, key, model);
         }
 
 #if !NETCOREAPP3_1
         public override bool Validate(ModelMetadata? metadata, string? key, object? model, bool alwaysValidateAtTopLevel, object? container)
         {
             // If built in model validation is disabled return true for later validation in the action filter.
             bool isBaseValid = disableBuiltInModelValidation || base.Validate(metadata, key, model, alwaysValidateAtTopLevel, container);
-            return ValidateAsync(isBaseValid, key, model).Result;
+            return Validate(isBaseValid, key, model);
         }
 #endif
 
-        private async Task<bool> ValidateAsync(
+        private bool Validate(
             bool defaultValue,
             string? key,
             object? model)
@@ -58,7 +58,7 @@ private async Task<bool> ValidateAsync(
                 new Dictionary<string, object>(),
                 null);
 
-            var validationResult = await FluentValidationHelper.ValidateWithFluentValidationAsync(
+            var validationResult = FluentValidationHelper.ValidateWithFluentValidation(
                 actionContext.HttpContext.RequestServices,
                 model,
                 actionExecutingContext);

FluentValidation.AutoValidation.Mvc/src/Validation/FluentValidationHelper.cs

@@ -11,10 +11,35 @@ namespace SharpGrip.FluentValidation.AutoValidation.Mvc.Validation
 {
     public static class FluentValidationHelper
     {
+        public static ValidationResult? ValidateWithFluentValidation(
+            IServiceProvider serviceProvider,
+            object? model,
+            ActionExecutingContext actionExecutingContext)
+        {
+            return ExecuteValidation(
+                serviceProvider,
+                model,
+                actionExecutingContext,
+                (validator, validationContext) => Task.FromResult(validator.Validate(validationContext))).GetAwaiter().GetResult();
+        }
+
         public static async Task<ValidationResult?> ValidateWithFluentValidationAsync(
             IServiceProvider serviceProvider,
             object? model,
             ActionExecutingContext actionExecutingContext)
+        {
+            return await ExecuteValidation(
+                serviceProvider,
+                model,
+                actionExecutingContext,
+                async (validator, validationContext) => await validator.ValidateAsync(validationContext, actionExecutingContext.HttpContext.RequestAborted));
+        }
+
+        private static async Task<ValidationResult?> ExecuteValidation(
+            IServiceProvider serviceProvider,
+            object? model,
+            ActionExecutingContext actionExecutingContext,
+            Func<IValidator, IValidationContext, Task<ValidationResult?>> validationFunc)
         {
             if (model == null)
             {
@@ -52,7 +77,7 @@ public static class FluentValidationHelper
                 validationContext = globalValidationInterceptor.BeforeValidation(actionExecutingContext, validationContext) ?? validationContext;
             }
 
-            var validationResult = await validator.ValidateAsync(validationContext, actionExecutingContext.HttpContext.RequestAborted);
+            var validationResult = await validationFunc(validator, validationContext);
 
             if (validatorInterceptor != null)
             {