OptionsBuilder support.

Author: juner

Diff for: Directory.Build.props

@@ -6,8 +6,8 @@
 		<RepoRoot>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\'))</RepoRoot>
 		<PathMap>$(RepoRoot)=.</PathMap>
 		<LangVersion>latest</LangVersion>
-		<AssemblyVersion>1.0.0.0</AssemblyVersion>
-		<FileVersion>1.0.0.0</FileVersion>
-		<Version>1.0.0.0</Version>
+		<AssemblyVersion>1.0.0.1</AssemblyVersion>
+		<FileVersion>1.0.0.1</FileVersion>
+		<Version>1.0.0.1</Version>
 	</PropertyGroup>
 </Project>

Diff for: Directory.Build.targets

@@ -2,6 +2,7 @@
 	<ItemGroup>
 		<PackageReference Update="DryIoc.Microsoft.DependencyInjection" Version="4.1.0" />
 		<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="3.1.6" />
+		<PackageReference Update="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.6" />
 		<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.5.0" />
 		<PackageReference Update="MSTest.TestAdapter" Version="2.1.0" />
 		<PackageReference Update="MSTest.TestFramework" Version="2.1.0" />

Diff for: DryIoc.Microsoft.DependencyInjection.Extension/ServiceCollectionExtensions.cs

@@ -63,7 +63,7 @@ static void RegisterDescriptorMany(IContainer container, ServiceDescriptor descr
                     ServiceLifetime.Scoped => Reuse.ScopedOrSingleton,
                     _ => Reuse.Transient
                 };
-                container.Register(descriptor.ServiceType, descriptor.ImplementationType, reuse, ifAlreadyRegistered: IfAlreadyRegistered.AppendNewImplementation);
+                container.Register(descriptor.ServiceType, descriptor.ImplementationType, reuse, ifAlreadyRegistered: IfAlreadyRegistered.AppendNotKeyed);
             }
             else if (descriptor.ImplementationFactory is { })
             {
@@ -73,11 +73,11 @@ static void RegisterDescriptorMany(IContainer container, ServiceDescriptor descr
                     ServiceLifetime.Scoped => Reuse.ScopedOrSingleton,
                     _ => Reuse.Transient
                 };
-                container.RegisterDelegate(true, descriptor.ServiceType, descriptor.ImplementationFactory, reuse, ifAlreadyRegistered: IfAlreadyRegistered.AppendNewImplementation);
+                container.RegisterDelegate(true, descriptor.ServiceType, descriptor.ImplementationFactory, reuse, ifAlreadyRegistered: IfAlreadyRegistered.AppendNotKeyed);
             }
             else
             {
-                container.RegisterInstance(true, descriptor.ServiceType, descriptor.ImplementationInstance, ifAlreadyRegistered: IfAlreadyRegistered.AppendNewImplementation);
+                container.RegisterInstance(true, descriptor.ServiceType, descriptor.ImplementationInstance, ifAlreadyRegistered: IfAlreadyRegistered.AppendNotKeyed);
             }
         }
         static void RegisterDescriptor(IContainer container, ServiceDescriptor descriptor)

Diff for: DryIoc.Microsoft.DependencyInjection.Tests/DryIoc.Microsoft.DependencyInjection.Extension.Tests.csproj

@@ -11,6 +11,7 @@
 		<PackageReference Include="MSTest.TestAdapter" />
 		<PackageReference Include="MSTest.TestFramework" />
 		<PackageReference Include="coverlet.collector"/>
+		<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions"/>
 	</ItemGroup>
 
 	<ItemGroup>

Diff for: DryIoc.Microsoft.DependencyInjection.Tests/ServiceCollectionExtensionsTests.cs

@@ -1,4 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.Collections.Generic;
 using System.Linq;
@@ -225,5 +226,27 @@ class B2<T> : IB<T>
             public T Value { get; set; } = default!;
 
         }
+        [TestMethod()]
+        public void RegisterServices_Options_Test()
+        {
+            var Container = CreateContainer();
+            Container.RegisterServices(v =>
+            {
+                v.AddOptions<Config>()
+                    .Configure(config => config.Value1 = "test1")
+                    .Configure(config => config.Value2 = "test2")
+                    .PostConfigure(config => config.Value3 = "test3");
+            });
+            var Config = Container.Resolve<IOptions<Config>>();
+            Assert.AreEqual(Config.Value.Value1, "test1");
+            Assert.AreEqual(Config.Value.Value2, "test2");
+            Assert.AreEqual(Config.Value.Value3, "test3");
+        }
+        class Config
+        {
+            public string Value1 { get; set; } = string.Empty;
+            public string Value2 { get; set; } = string.Empty;
+            public string Value3 { get; set; } = string.Empty;
+        }
     }
 }

Diff for: Prism.DryIoc.Tests/DryIoc.Microsoft.DependencyInjection.Extension.Prism.DryIoc.Tests.csproj

@@ -12,6 +12,7 @@
 		<PackageReference Include="MSTest.TestFramework" />
 		<PackageReference Include="coverlet.collector" />
 		<PackageReference Include="Prism.DryIoc" />
+		<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions"/>
 	</ItemGroup>
 
 	<ItemGroup>

Diff for: Prism.DryIoc.Tests/ServiceCollectionExtensionsTests.cs

@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using DryIoc.Microsoft.DependencyInjection.Extension;
+using Microsoft.Extensions.Options;
 
 namespace DryIoc.Microsoft.DependencyInjection.Extension.Prism.Dryioc.Tests
 {
@@ -242,5 +243,28 @@ class B2<T> : IB<T>
         {
             public T Value { get; set; } = default!;
         }
+        [TestMethod()]
+        public void RegisterServices_Options_Test()
+        {
+            var Container = CreateContainerExtension();
+            IContainerRegistry Registry = Container;
+            Registry.GetContainer().RegisterServices(v =>
+            {
+                v.AddOptions<Config>()
+                    .Configure(config => config.Value1 = "test1")
+                    .Configure(config => config.Value2 = "test2")
+                    .PostConfigure(config => config.Value3 = "test3");
+            });
+            var Config = Container.Resolve<IOptions<Config>>();
+            Assert.AreEqual(Config.Value.Value1, "test1");
+            Assert.AreEqual(Config.Value.Value2, "test2");
+            Assert.AreEqual(Config.Value.Value3, "test3");
+        }
+        class Config
+        {
+            public string Value1 { get; set; } = string.Empty;
+            public string Value2 { get; set; } = string.Empty;
+            public string Value3 { get; set; } = string.Empty;
+        }
     }
 }