lots of tidying up

2024-01-25 20:33:55 +00:00
parent 5e26e97f6b
commit a322893166
20 changed files with 115 additions and 123 deletions
@@ -20,6 +20,8 @@ public class WidgetBuilder<TConfiguration>(TConfiguration configuration) :
        })
        .ConfigureServices((context, services) =>
        {
+            services.AddSingleton<IWidgetHost, WidgetHost>();
+
            services.AddScoped<IServiceFactory>(provider =>
                new ServiceFactory((type, parameters) =>
                    ActivatorUtilities.CreateInstance(provider, type, parameters!)));
@@ -50,8 +52,7 @@ public class WidgetBuilder<TConfiguration>(TConfiguration configuration) :
    public IWidgetHost Build()
    {
        IHost host = hostBuilder.Build();
-        return (IWidgetHost)ActivatorUtilities.CreateInstance(host.Services,
-            typeof(WidgetHost), host);
+        return host.Services.GetRequiredService<IWidgetHost>();
    }

    public IWidgetBuilder ConfigureServices(Action<IServiceCollection> configureDelegate)