Fix IServiceProvider resolution for DataAnnotations validation on Options

src/libraries/Microsoft.Extensions.Options.DataAnnotations/ref/Microsoft.Extensions.Options.DataAnnotations.cs

@@ -18,6 +18,8 @@ public partial class DataAnnotationValidateOptions<[System.Diagnostics.CodeAnaly
     {
         [System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute("The implementation of Validate method on this type will walk through all properties of the passed in options object, and its type cannot be statically analyzed so its members may be trimmed.")]
         public DataAnnotationValidateOptions(string? name) { }
+        [System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute("The implementation of Validate method on this type will walk through all properties of the passed in options object, and its type cannot be statically analyzed so its members may be trimmed.")]
+        public DataAnnotationValidateOptions(string? name, System.IServiceProvider? serviceProvider) { }
         public string? Name { get { throw null; } }
         public Microsoft.Extensions.Options.ValidateOptionsResult Validate(string? name, TOptions options) { throw null; }
     }

src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/DataAnnotationValidateOptions.cs

@@ -26,15 +26,30 @@ public class DataAnnotationValidateOptions<[DynamicallyAccessedMembers(Dynamical
         [RequiresUnreferencedCode("The implementation of Validate method on this type will walk through all properties of the passed in options object, and its type cannot be " +
             "statically analyzed so its members may be trimmed.")]
         public DataAnnotationValidateOptions(string? name)
+            : this(name, serviceProvider: null)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="DataAnnotationValidateOptions{TOptions}"/> .
+        /// </summary>
+        /// <param name="name">The name of the option.</param>
+        /// <param name="serviceProvider">An <see cref="IServiceProvider"/> to be used for resolving services in <see cref="ValidationContext"/>.</param>
+        [RequiresUnreferencedCode("The implementation of Validate method on this type will walk through all properties of the passed in options object, and its type cannot be " +
+            "statically analyzed so its members may be trimmed.")]
+        public DataAnnotationValidateOptions(string? name, IServiceProvider? serviceProvider)
         {
             Name = name;
+            _serviceProvider = serviceProvider;
         }
 
         /// <summary>
         /// Gets the options name.
         /// </summary>
         public string? Name { get; }
 
+        private readonly IServiceProvider? _serviceProvider;
+
         /// <summary>
         /// Validates a specific named options instance (or all when <paramref name="name"/> is null).
         /// </summary>
@@ -59,7 +74,7 @@ public ValidateOptionsResult Validate(string? name, TOptions options)
             HashSet<object>? visited = null;
             List<string>? errors = null;
 
-            if (TryValidateOptions(options, options.GetType().Name, validationResults, ref errors, ref visited))
+            if (TryValidateOptions(options, options.GetType().Name, validationResults, ref errors, ref visited, _serviceProvider))
             {
                 return ValidateOptionsResult.Success;
             }
@@ -71,7 +86,7 @@ public ValidateOptionsResult Validate(string? name, TOptions options)
 
         [RequiresUnreferencedCode("This method on this type will walk through all properties of the passed in options object, and its type cannot be " +
             "statically analyzed so its members may be trimmed.")]
-        private static bool TryValidateOptions(object options, string qualifiedName, List<ValidationResult> results, ref List<string>? errors, ref HashSet<object>? visited)
+        private static bool TryValidateOptions(object options, string qualifiedName, List<ValidationResult> results, ref List<string>? errors, ref HashSet<object>? visited, IServiceProvider? serviceProvider)
         {
             Debug.Assert(options is not null);
 
@@ -82,7 +97,7 @@ private static bool TryValidateOptions(object options, string qualifiedName, Lis
 
             results.Clear();
 
-            bool res = Validator.TryValidateObject(options, new ValidationContext(options), results, validateAllProperties: true);
+            bool res = Validator.TryValidateObject(options, new ValidationContext(options, serviceProvider, null), results, validateAllProperties: true);
             if (!res)
             {
                 errors ??= new List<string>();
@@ -114,7 +129,7 @@ private static bool TryValidateOptions(object options, string qualifiedName, Lis
                     visited.Add(options);
 
                     results ??= new List<ValidationResult>();
-                    res = TryValidateOptions(value, $"{qualifiedName}.{propertyInfo.Name}", results, ref errors, ref visited) && res;
+                    res = TryValidateOptions(value, $"{qualifiedName}.{propertyInfo.Name}", results, ref errors, ref visited, serviceProvider) && res;
                 }
                 else if (value is IEnumerable enumerable &&
                          propertyInfo.GetCustomAttribute<ValidateEnumeratedItemsAttribute>() is not null)
@@ -126,7 +141,7 @@ private static bool TryValidateOptions(object options, string qualifiedName, Lis
                     int index = 0;
                     foreach (object item in enumerable)
                     {
-                        res = TryValidateOptions(item, $"{qualifiedName}.{propertyInfo.Name}[{index++}]", results, ref errors, ref visited) && res;
+                        res = TryValidateOptions(item, $"{qualifiedName}.{propertyInfo.Name}[{index++}]", results, ref errors, ref visited, serviceProvider) && res;
                     }
                 }
             }

src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/OptionsBuilderDataAnnotationsExtensions.cs

@@ -21,7 +21,8 @@ public static class OptionsBuilderDataAnnotationsExtensions
             " members may be trimmed.")]
         public static OptionsBuilder<TOptions> ValidateDataAnnotations<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties | DynamicallyAccessedMemberTypes.NonPublicProperties)] TOptions>(this OptionsBuilder<TOptions> optionsBuilder) where TOptions : class
         {
-            optionsBuilder.Services.AddSingleton<IValidateOptions<TOptions>>(new DataAnnotationValidateOptions<TOptions>(optionsBuilder.Name));
+            optionsBuilder.Services.AddSingleton<IValidateOptions<TOptions>>(
+                sp => new DataAnnotationValidateOptions<TOptions>(optionsBuilder.Name, sp));
             return optionsBuilder;
         }
     }

src/libraries/Microsoft.Extensions.Options/tests/Microsoft.Extensions.Options.Tests/OptionsBuilderTest.cs

@@ -814,5 +814,53 @@ public void ValidateOnStart_ConfigureBasedOnDataAnnotationRestrictions_Validatio
 
             Assert.NotNull(value);
         }
+
+        [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
+        public class RequiresServiceAttribute : ValidationAttribute
+        {
+            protected override ValidationResult IsValid(object value, ValidationContext validationContext)
+            {
+                var service = validationContext.GetService(typeof(SomeService));
+                return service is SomeService someService && someService.Stuff == "stuff"
+                    ? ValidationResult.Success
+                    : new ValidationResult("SomeService not resolved correctly");
+            }
+        }
+
+        private class AnnotatedOptionsWithServiceDependency
+        {
+            [RequiresService]
+            public string Required { get; set; }
+        }
+
+        [Fact]
+        public void ValidateDataAnnotations_ServiceProviderIsAvailableInValidationContext()
+        {
+            var services = new ServiceCollection();
+            services.AddSingleton(new SomeService("stuff"));
+            services.AddOptions<AnnotatedOptionsWithServiceDependency>()
+                .Configure(o => o.Required = "value")
+                .ValidateDataAnnotations();
+
+            var sp = services.BuildServiceProvider();
+
+            var value = sp.GetRequiredService<IOptions<AnnotatedOptionsWithServiceDependency>>().Value;
+            Assert.NotNull(value);
+        }
+
+        [Fact]
+        public void ValidateDataAnnotations_ServiceProviderFailsWhenServiceNotAvailableInValidationContext()
+        {
+            var services = new ServiceCollection();
+            // Don't register SomeService
+            services.AddOptions<AnnotatedOptionsWithServiceDependency>()
+                .Configure(o => o.Required = "value")
+                .ValidateDataAnnotations();
+
+            var sp = services.BuildServiceProvider();
+
+            var error = Assert.Throws<OptionsValidationException>(() => sp.GetRequiredService<IOptions<AnnotatedOptionsWithServiceDependency>>().Value);
+            Assert.Contains("SomeService not resolved correctly", error.Message);
+        }
     }
 }