[#495] [add] impl

Author: i4004

src/Simplify.DI.Integration.Microsoft.Extensions.DependencyInjection.Tester/Program.cs

@@ -1,13 +1,40 @@
-using Microsoft.AspNetCore;
-using Microsoft.AspNetCore.Hosting;
+using DryIoc;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.DependencyInjection;
+using Simplify.DI;
+using Simplify.DI.Integration.Microsoft.Extensions.DependencyInjection;
+using Simplify.DI.Integration.Microsoft.Extensions.DependencyInjection.Tester.Setup;
+using Simplify.DI.Provider.DryIoc;
 
-namespace Simplify.DI.Integration.Microsoft.Extensions.DependencyInjection.Tester;
+var builder = WebApplication.CreateBuilder(args);
 
-public class Program
+// DryIoc specific workaround
+DIContainer.Current = new DryIocDIProvider
 {
-	public static void Main(string[] args) => CreateWebHostBuilder(args).Build().Run();
+	Container = new Container()
+		.With(rules =>
+			rules.With(FactoryMethod.ConstructorWithResolvableArguments)
+				.WithoutThrowOnRegisteringDisposableTransient())
+};
 
-	public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-		WebHost.CreateDefaultBuilder(args)
-			.UseStartup<Startup>();
-}
+// Registrations using Microsoft.Extensions.DependencyInjection
+builder.Services.RegisterAll();
+
+// Registrations using Simplify.DI
+DIContainer.Current.RegisterAll();
+
+// Unresolved types fix
+DIContainer.Current.Register<IHttpContextAccessor, HttpContextAccessor>(LifetimeType.Singleton);
+
+builder.Host.UseServiceProviderFactory(new DIServiceProviderFactory(DIContainer.Current));
+
+var app = builder.Build();
+
+if (app.Environment.IsDevelopment())
+	app.UseDeveloperExceptionPage();
+
+app.Run(x => x.Response.WriteAsync("Hello World!"));
+
+await app.RunAsync();

src/Simplify.DI.Integration.Microsoft.Extensions.DependencyInjection.Tester/Startup.cs

@@ -1,5 +1,11 @@
 # Changelog
 
+## [1.5] - 2026-03-07
+
+### Dependencies
+
+- Microsoft.Extensions.DependencyInjection bump to 10.0.3
+
 ## [1.4] - 2025-10-10
 
 ### Removed

src/Simplify.DI.Integration.Microsoft.Extensions.DependencyInjection/CHANGELOG.md

@@ -23,23 +23,13 @@ public static void RegisterFromServiceCollection(this IDIRegistrator registrator
 			RegisterServiceDescriptor(registrator, item, GetLifetime(item.Lifetime));
 	}
 
-	private static LifetimeType GetLifetime(ServiceLifetime lifetime)
+	private static LifetimeType GetLifetime(ServiceLifetime lifetime) => lifetime switch
 	{
-		switch (lifetime)
-		{
-			case ServiceLifetime.Scoped:
-				return LifetimeType.PerLifetimeScope;
-
-			case ServiceLifetime.Singleton:
-				return LifetimeType.Singleton;
-
-			case ServiceLifetime.Transient:
-				return LifetimeType.Transient;
-
-			default:
-				throw new ArgumentOutOfRangeException();
-		}
-	}
+		ServiceLifetime.Scoped => LifetimeType.PerLifetimeScope,
+		ServiceLifetime.Singleton => LifetimeType.Singleton,
+		ServiceLifetime.Transient => LifetimeType.Transient,
+		_ => throw new ArgumentOutOfRangeException(),
+	};
 
 	private static void RegisterServiceDescriptor(IDIRegistrator registrator, ServiceDescriptor item, LifetimeType lifetime)
 	{

src/Simplify.DI.Integration.Microsoft.Extensions.DependencyInjection/DIRegistratorExtensions.cs

@@ -6,22 +6,18 @@ namespace Simplify.DI.Integration.Microsoft.Extensions.DependencyInjection;
 /// Simplify.DI based service provider for Microsoft.Extensions.DependencyInjection
 /// </summary>
 /// <seealso cref="IServiceProvider" />
-public class DIServiceProvider : IServiceProvider
+/// <remarks>
+/// Initializes a new instance of the <see cref="DIServiceProvider"/> class.
+/// </remarks>
+/// <param name="resolver">The registrator.</param>
+public class DIServiceProvider(IDIResolver resolver) : IServiceProvider
 {
-	private readonly IDIResolver _resolver;
-
-	/// <summary>
-	/// Initializes a new instance of the <see cref="DIServiceProvider"/> class.
-	/// </summary>
-	/// <param name="resolver">The registrator.</param>
-	public DIServiceProvider(IDIResolver resolver) => _resolver = resolver;
-
 	/// <summary>
 	/// Gets the service object of the specified type.
 	/// </summary>
 	/// <param name="serviceType">An object that specifies the type of service object to get.</param>
 	/// <returns>
 	/// A service object of type <paramref name="serviceType">serviceType</paramref>.   -or-  null if there is no service object of type <paramref name="serviceType">serviceType</paramref>.
 	/// </returns>
-	public object GetService(Type serviceType) => _resolver.Resolve(serviceType);
+	public object GetService(Type serviceType) => resolver.Resolve(serviceType);
 }

src/Simplify.DI.Integration.Microsoft.Extensions.DependencyInjection/DIServiceProvider.cs

@@ -0,0 +1,34 @@
+using System;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Simplify.DI.Integration.Microsoft.Extensions.DependencyInjection;
+
+/// <summary>
+/// Provides IServiceProviderFactory implementation for Simplify.DI integration with Microsoft.Extensions.DependencyInjection hosting model
+/// </summary>
+/// <remarks>
+/// Initializes a new instance of <see cref="DIServiceProviderFactory"/>.
+/// </remarks>
+/// <param name="provider">The DI container provider.</param>
+public class DIServiceProviderFactory(IDIContainerProvider provider) : IServiceProviderFactory<IDIContainerProvider>
+{
+	private readonly IDIContainerProvider _provider = provider ?? throw new ArgumentNullException(nameof(provider));
+
+	/// <inheritdoc/>
+	public IDIContainerProvider CreateBuilder(IServiceCollection services)
+	{
+		_provider.RegisterFromServiceCollection(services);
+
+		return _provider;
+	}
+
+	/// <inheritdoc/>
+	public IServiceProvider CreateServiceProvider(IDIContainerProvider containerBuilder)
+	{
+		var serviceProvider = containerBuilder.CreateServiceProvider();
+
+		containerBuilder.Verify();
+
+		return serviceProvider;
+	}
+}

src/Simplify.DI.Integration.Microsoft.Extensions.DependencyInjection/DIServiceProviderFactory.cs

@@ -29,8 +29,5 @@ public DIServiceScope(IDIContextHandler contextHandler)
 	/// <summary>
 	/// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
 	/// </summary>
-	public void Dispose()
-	{
-		_scope.Dispose();
-	}
+	public void Dispose() => _scope.Dispose();
 }

src/Simplify.DI.Integration.Microsoft.Extensions.DependencyInjection/DIServiceScope.cs

@@ -6,19 +6,12 @@ namespace Simplify.DI.Integration.Microsoft.Extensions.DependencyInjection;
 /// Simplify.DI based service scope factory for Microsoft.Extensions.DependencyInjection
 /// </summary>
 /// <seealso cref="IServiceScopeFactory" />
-public class DIServiceScopeFactory : IServiceScopeFactory
+/// <remarks>
+/// Initializes a new instance of the <see cref="DIServiceScopeFactory"/> class.
+/// </remarks>
+/// <param name="contextHandler">The context handler.</param>
+public class DIServiceScopeFactory(IDIContextHandler contextHandler) : IServiceScopeFactory
 {
-	private readonly IDIContextHandler _contextHandler;
-
-	/// <summary>
-	/// Initializes a new instance of the <see cref="DIServiceScopeFactory"/> class.
-	/// </summary>
-	/// <param name="contextHandler">The context handler.</param>
-	public DIServiceScopeFactory(IDIContextHandler contextHandler)
-	{
-		_contextHandler = contextHandler;
-	}
-
 	/// <summary>
 	/// Create an <see cref="T:Microsoft.Extensions.DependencyInjection.IServiceScope" /> which
 	/// contains an <see cref="T:System.IServiceProvider" /> used to resolve dependencies from a
@@ -30,8 +23,5 @@ public DIServiceScopeFactory(IDIContextHandler contextHandler)
 	/// from the <see cref="P:Microsoft.Extensions.DependencyInjection.IServiceScope.ServiceProvider" />
 	/// will also be disposed.
 	/// </returns>
-	public IServiceScope CreateScope()
-	{
-		return new DIServiceScope(_contextHandler);
-	}
+	public IServiceScope CreateScope() => new DIServiceScope(contextHandler);
 }

src/Simplify.DI.Integration.Microsoft.Extensions.DependencyInjection/DIServiceScopeFactory.cs

@@ -7,7 +7,7 @@
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 
-		<Version>1.4</Version>
+		<Version>1.5</Version>
 
 		<Description>Provides ability to use Simplify.DI as IOC container instead of Microsoft.Extensions.DependencyInjection</Description>
 		<Product>Simplify</Product>
@@ -22,7 +22,7 @@
 		<PackageReleaseNotes>See https://github.com/SimplifyNet/Simplify/tree/master/src/Simplify.DI.Integration.Microsoft.Extensions.DependencyInjection/CHANGELOG.md for details</PackageReleaseNotes>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.9" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.3" />
 		<PackageReference Include="Simplify.DI" Version="4.2.11" />
 	</ItemGroup>
 	<ItemGroup>