Host Builder - Release 9.x (#200)

* reorg of new Service Injection process

* build issue

* readme updates

* Version cleanup

* upgrade dotnet tools

Author: chrisstraw

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "dotnet-sonarscanner": {
-      "version": "5.13.0",
+      "version": "10.3.0",
       "commands": [
         "dotnet-sonarscanner"
       ]

OLT.Core.sln

@@ -168,6 +168,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".build", ".build", "{A7199F
 		tests\OLT.AspNetCore.Serilog.Tests\Directory.Build.props = tests\OLT.AspNetCore.Serilog.Tests\Directory.Build.props
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OLT.Core.DependencyInjection.Abstractions.Tests", "tests\OLT.Core.DependencyInjection.Abstractions.Tests\OLT.Core.DependencyInjection.Abstractions.Tests.csproj", "{B82AFFA2-A2C5-4A11-9252-DD15EA0E9694}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -390,6 +392,10 @@ Global
 		{BACC3A7F-559E-4B3A-A9AB-27241A68FD59}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BACC3A7F-559E-4B3A-A9AB-27241A68FD59}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BACC3A7F-559E-4B3A-A9AB-27241A68FD59}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B82AFFA2-A2C5-4A11-9252-DD15EA0E9694}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B82AFFA2-A2C5-4A11-9252-DD15EA0E9694}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B82AFFA2-A2C5-4A11-9252-DD15EA0E9694}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B82AFFA2-A2C5-4A11-9252-DD15EA0E9694}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -456,6 +462,7 @@ Global
 		{E84AEAE7-F1C7-417B-8F4B-16B6E516057B} = {0023661F-809B-40D0-9A5A-514B14CB7984}
 		{BACC3A7F-559E-4B3A-A9AB-27241A68FD59} = {0023661F-809B-40D0-9A5A-514B14CB7984}
 		{A7199FB0-3C48-43BA-BCAE-2550A1236DEE} = {9E65BAB1-3581-46E9-BB80-E518A9552167}
+		{B82AFFA2-A2C5-4A11-9252-DD15EA0E9694} = {0023661F-809B-40D0-9A5A-514B14CB7984}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {94B70EDC-6E19-4295-BFA0-9474A97DF56F}

src/OLT.Core.DependencyInjection.Abstractions/Extensions/OltDependencyInjectionExtensions.cs

@@ -0,0 +1,45 @@
+using Microsoft.Extensions.DependencyInjection;
+
+namespace OLT.Core;
+
+/// <summary>
+/// <see cref="IOltInjectableScoped"/>, <see cref="IOltInjectableSingleton"/>, <see cref="IOltInjectableTransient"/> using Scan Utility using Scutor <seealso cref="ServiceCollectionExtensions.Scan(IServiceCollection, Action{Scrutor.ITypeSourceSelector})"/>
+/// </summary>
+public static class OltDependencyInjectionExtensions
+{
+    /// <summary>
+    /// Scans for <see cref="IOltInjectableScoped"/>, <see cref="IOltInjectableSingleton"/>, <see cref="IOltInjectableTransient"/> using Scan Utility using Scutor <seealso cref="ServiceCollectionExtensions.Scan(IServiceCollection, Action{Scrutor.ITypeSourceSelector})"/>
+    /// </summary>
+    /// <remarks>
+    /// uses Scutor <seealso cref="ServiceCollectionExtensions.Scan(IServiceCollection, Action{Scrutor.ITypeSourceSelector})"/>
+    /// </remarks>
+    /// <param name="services">The IServiceCollection to add the services to.</param>
+    /// <param name="action">An action to configure the OltAutoMapperBuilder.</param>
+    /// <returns>The IServiceCollection with the added services.</returns>
+    public static IServiceCollection AddServicesFromAssemblies(this IServiceCollection services, Action<OltScrutorScanBuilder> action)
+    {
+        ArgumentNullException.ThrowIfNull(services);
+        var scanBuilder = new OltScrutorScanBuilder(services);
+        action(scanBuilder);
+        scanBuilder.Scan();
+        return services;
+    }
+
+
+    /// <summary>
+    /// Scans Assemblies to the service collection and scans the specified assemblies.
+    /// </summary>
+    /// <remarks>
+    /// uses Scutor <seealso cref="ServiceCollectionExtensions.Scan(IServiceCollection, Action{Scrutor.ITypeSourceSelector})"/>
+    /// </remarks>
+    /// <param name="builder">The IServiceCollection to add the services to.</param>
+    /// <param name="action">An action to configure the OltAutoMapperBuilder.</param>
+    /// <returns>The IServiceCollection with the added services.</returns>
+    public static TBuilder AddServicesFromAssemblies<TBuilder>(this TBuilder builder, Action<OltScrutorScanBuilder> action) where TBuilder : IOltHostBuilder
+    {
+        ArgumentNullException.ThrowIfNull(builder);
+        AddServicesFromAssemblies(builder.Services, action);
+        return builder;
+    }    
+
+}

src/OLT.Core.DependencyInjection.Abstractions/HostBuilder/IOltHostBuilder.cs

@@ -0,0 +1,11 @@
+using Microsoft.Extensions.DependencyInjection;
+
+namespace OLT.Core;
+
+public interface IOltHostBuilder
+{
+    /// <summary>
+    /// Gets a collection of services for the application to compose. This is useful for adding user provided or framework provided services.
+    /// </summary>
+    IServiceCollection Services { get; }     
+}

src/OLT.Core.DependencyInjection.Abstractions/HostBuilder/OltHostBuilder.cs

@@ -0,0 +1,17 @@
+using Microsoft.Extensions.DependencyInjection;
+
+namespace OLT.Core;
+
+public class OltHostBuilder : IOltHostBuilder
+{
+
+    public OltHostBuilder(IServiceCollection services)
+    {
+        Services = services;
+    }
+
+    public IServiceCollection Services { get; }
+
+}
+
+

src/OLT.Core.DependencyInjection.Abstractions/HostBuilder/OltInjectionScanBuilder.cs

@@ -0,0 +1,64 @@
+using Microsoft.Extensions.DependencyInjection;
+using System.Reflection;
+
+namespace OLT.Core;
+
+public class OltScrutorScanBuilder
+{
+    private List<Assembly> _scanAssemblies = new List<Assembly>();
+
+    /// <summary>
+    /// The service collection for dependency injection.
+    /// </summary>
+    protected readonly IServiceCollection _services;
+
+    public OltScrutorScanBuilder(IServiceCollection services)
+    {
+        _services = services;
+    }
+
+    public virtual OltScrutorScanBuilder IncludeAssembly(Assembly assembly)
+    {
+        _scanAssemblies.Add(assembly);
+        return this;
+    }
+
+
+    public virtual OltScrutorScanBuilder IncludeAssemblies(IEnumerable<Assembly> assembliesToScan)
+    {
+        _scanAssemblies.AddRange(assembliesToScan);
+        return this;
+    }
+
+
+    public virtual OltScrutorScanBuilder IncludeAssemblies(params Assembly[] assembliesToScan)
+    {
+        _scanAssemblies.AddRange(assembliesToScan);
+        return this;
+    }
+
+    /// <summary>
+    /// Scans <see cref="IOltInjectableScoped"/>, <see cref="IOltInjectableSingleton"/>, and <see cref="IOltInjectableTransient"/> to associated DI
+    /// </summary>
+    public virtual void Scan()
+    {
+        ArgumentNullException.ThrowIfNull(_services);
+
+        _services
+            .Scan(sc =>
+                sc.FromAssemblies(_scanAssemblies)
+                    .AddClasses(classes => classes.AssignableTo<IOltInjectableScoped>())
+                    .AsImplementedInterfaces()
+                    .WithScopedLifetime()
+                    .AddClasses(classes => classes.AssignableTo<IOltInjectableTransient>())
+                    .AsImplementedInterfaces()
+                    .WithTransientLifetime()
+                    .AddClasses(classes => classes.AssignableTo<IOltInjectableSingleton>())
+                    .AsImplementedInterfaces()
+                    .WithSingletonLifetime());
+        
+    }
+
+}
+
+

src/OLT.Core.DependencyInjection.Abstractions/OLT.Core.DependencyInjection.Abstractions.csproj

@@ -7,5 +7,9 @@
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
 
+	<ItemGroup>
+	  <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
+		<PackageReference Include="Scrutor" Version="[5.0.2,)" />
+	</ItemGroup>
 
 </Project>

src/OLT.Core.DependencyInjection.Abstractions/README.md

@@ -7,4 +7,80 @@
 _IDisposable abstract class wrapper_
 
 
+## Methods
 
+### AddServicesFromAssemblies(IServiceCollection services, Action<OltScrutorScanBuilder> action)
+
+Scans for services implementing `IOltInjectableScoped`, `IOltInjectableSingleton`, and `IOltInjectableTransient` interfaces and registers them with the provided `IServiceCollection`.
+
+#### Parameters
+- `services` (`IServiceCollection`): The service collection to add the services to.
+- `action` (`Action<OltScrutorScanBuilder>`): An action to configure the `OltScrutorScanBuilder`.
+
+#### Returns
+- `IServiceCollection`: The service collection with the added services.
+
+### AddServicesFromAssemblies<TBuilder>(TBuilder builder, Action<OltScrutorScanBuilder> action) where TBuilder : IOltHostBuilder
+
+Scans assemblies and registers services with the specified `IOltHostBuilder`.
+
+#### Parameters
+- `builder` (`TBuilder`): The host builder to add the services to.
+- `action` (`Action<OltScrutorScanBuilder>`): An action to configure the `OltScrutorScanBuilder`.
+
+#### Returns
+- `TBuilder`: The host builder with the added services.
+
+## Usage
+
+To use the `OltDependencyInjectionExtensions` class, you need to call the `AddServicesFromAssemblies` method on your `IServiceCollection` or `IOltHostBuilder` instance, passing in an action to configure the `OltScrutorScanBuilder`.
+
+### Example
+```csharp
+
+using Microsoft.Extensions.DependencyInjection; 
+using OLT.Core;
+
+public class Startup 
+{ 
+    public void ConfigureServices(IServiceCollection services) 
+    { 
+        services.AddServicesFromAssemblies(scan => scan.IncludeAssembly(typeof(SomeTypeInYourAssembly).Assembly)); 
+    } 
+}
+
+```
+
+In this example, the `AddServicesFromAssemblies` method is used to scan and register services from the specified assembly.
+
+## Remarks
+
+- The `OltDependencyInjectionExtensions` class relies on the Scutor library to perform the scanning and registration of services.
+- The `OltScrutorScanBuilder` class is used to configure the scanning process, including specifying which assemblies to scan.
+
+For more information on the Scutor library, refer to the [Scutor documentation](https://github.com/khellang/Scrutor).
+
+
+### Example Using OltAssemblyScanBuilder
+
+```csharp
+using OLT.Core;
+
+var assemblies = new OltAssemblyScanBuilder()
+    .IncludeFilter("OLT.", "MyApp.")
+    .IncludeAssembly(typeof(LocalServiceCollectionExtenstions).Assembly, typeof(AnotherClassName).Assembly, typeof(IAppInterfaceHere).Assembly)
+    .ExcludeMicrosoft()
+    .ExcludeAutomapper()
+    .DeepScan()
+    .Build();
+
+services.AddServicesFromAssemblies(builder => builder.IncludeAssemblies(assemblies))
+        .AddAppCors()
+        .AddScoped<IAppIdentity, AppIdentity>()
+        .AddScoped<IOltIdentity>(x => x.GetRequiredService<IAppIdentity>())
+        .AddScoped<IOltDbAuditUser>(x => x.GetRequiredService<IAppIdentity>())
+        .AddHttpContextAccessor();
+
+```
+
+For more information on the OltAssemblyScanBuilder library, refer to the [Documentation](https://github.com/OuterlimitsTech/olt-dotnet-utility-libraries/blob/b800cc75911f83332a98e07b5224c86d1ec1066b/src/OLT.Utility.AssemblyScanner/README.md).

…tions/Builders/IOltApplicationBuilder.cs …s/Builders/IOltApplicationHostBuilder.cssrc/OLT.Core.Hosting.Abstractions/Builders/IOltApplicationBuilder.cs renamed to src/OLT.Core.Hosting.Abstractions/Builders/IOltApplicationHostBuilder.cs src/OLT.Core.Hosting.Abstractions/Builders/IOltApplicationBuilder.cs renamed to src/OLT.Core.Hosting.Abstractions/Builders/IOltApplicationHostBuilder.cs

@@ -1,12 +1,11 @@
 using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Diagnostics.Metrics;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
 namespace OLT.Core
 {
-    public interface IOltApplicationBuilder
+    public interface IOltApplicationHostBuilder : IOltHostBuilder
     {
         /// <summary>
         /// Gets the set of key/value configuration properties.
@@ -31,10 +30,6 @@ public interface IOltApplicationBuilder
         /// </summary>
         IMetricsBuilder Metrics { get; }
 
-        /// <summary>
-        /// Gets a collection of services for the application to compose. This is useful for adding user provided or framework provided services.
-        /// </summary>
-        IServiceCollection Services { get; }
 
 
         void AddConfiguration();

…ns/Builders/OltHostApplicationBuilder.cs …ns/Builders/OltApplicationHostBuilder.cssrc/OLT.Core.Hosting.Abstractions/Builders/OltHostApplicationBuilder.cs renamed to src/OLT.Core.Hosting.Abstractions/Builders/OltApplicationHostBuilder.cs src/OLT.Core.Hosting.Abstractions/Builders/OltHostApplicationBuilder.cs renamed to src/OLT.Core.Hosting.Abstractions/Builders/OltApplicationHostBuilder.cs

@@ -7,11 +7,11 @@
 
 namespace OLT.Core
 {
-    public abstract class OltHostApplicationBuilder<THostBuilder> : IOltApplicationBuilder
+    public abstract class OltApplicationHostBuilder<THostBuilder> : IOltApplicationHostBuilder
         where THostBuilder : class, IHostApplicationBuilder
     {
 
-        protected OltHostApplicationBuilder([NotNull] THostBuilder builder)
+        protected OltApplicationHostBuilder([NotNull] THostBuilder builder)
         {
             ArgumentNullException.ThrowIfNull(builder);
             Builder = builder;