Ensure Single DI Registration For IStartupValidator (#102235)

* Ensure Single DI Registration For IStartupValidator * Address the feedback
dotnet · May 16, 2024 · f4eba6b · f4eba6b
1 parent 60edf5b
commit f4eba6b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/libraries/Microsoft.Extensions.Options/src/OptionsBuilderExtensions.cs b/src/libraries/Microsoft.Extensions.Options/src/OptionsBuilderExtensions.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Diagnostics.CodeAnalysis;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Options;
 
 namespace Microsoft.Extensions.DependencyInjection
@@ -25,7 +26,7 @@ public static class OptionsBuilderExtensions
         {
             ThrowHelper.ThrowIfNull(optionsBuilder);
 
-            optionsBuilder.Services.AddTransient<IStartupValidator, StartupValidator>();
+            optionsBuilder.Services.TryAddTransient<IStartupValidator, StartupValidator>();
             optionsBuilder.Services.AddOptions<StartupValidatorOptions>()
                 .Configure<IOptionsMonitor<TOptions>>((vo, options) =>
                 {

diff --git a/...ries/Microsoft.Extensions.Options/tests/Microsoft.Extensions.Options.Tests/OptionsTest.cs b/...ries/Microsoft.Extensions.Options/tests/Microsoft.Extensions.Options.Tests/OptionsTest.cs
@@ -167,6 +167,18 @@ public void PostConfiguresInRegistrationOrderAfterConfigures()
             Assert.Equal("_-ABC", option.Message);
         }
 
+        [Fact]
+        public void SingleValidateOnStartRegistrationTest()
+        {
+            ServiceCollection sc = new();
+            sc.AddOptions<FakeOptions>("name1").Configure(o => o.Message += "1").Validate(o => o.Message.Length > 0).ValidateOnStart();
+            sc.AddOptions<FakeOptions>("name2").Configure(o => o.Message += "2").Validate(o => o.Message.Length > 0).ValidateOnStart();
+            sc.AddOptions<FakeOptions>("name3").Configure(o => o.Message += "3").Validate(o => o.Message.Length > 0).ValidateOnStart();
+            sc.AddOptions<FakeOptions>("name4").Configure(o => o.Message += "4").Validate(o => o.Message.Length > 0).ValidateOnStart();
+
+            Assert.Equal(1, sc.Count(sd => sd.ServiceType == typeof(IStartupValidator)));
+        }
+
         public static TheoryData Configure_GetsNullableOptionsFromConfiguration_Data
         {
             get