From 7dfbb9176285ced37ce4e257491ea3f218b6bc04 Mon Sep 17 00:00:00 2001
From: TheXamlGuy <dan_clark@outlook.com>
Date: Tue, 30 Apr 2024 20:46:47 +0100
Subject: [PATCH] wip

---
 Toolkit.Foundation/ComponentBuilder.cs                 | 10 ++--------
 Toolkit.Foundation/IHostBuilderExtension.cs            |  3 ++-
 .../{IPipelineBehavior.cs => IPipelineBehaviour.cs}    |  0
 3 files changed, 4 insertions(+), 9 deletions(-)
 rename Toolkit.Foundation/{IPipelineBehavior.cs => IPipelineBehaviour.cs} (100%)

diff --git a/Toolkit.Foundation/ComponentBuilder.cs b/Toolkit.Foundation/ComponentBuilder.cs
index dde604e..2f90b1a 100644
--- a/Toolkit.Foundation/ComponentBuilder.cs
+++ b/Toolkit.Foundation/ComponentBuilder.cs
@@ -76,14 +76,8 @@ public class ComponentBuilder :
 
         configurationRegistered = true;
 
-        hostBuilder.ConfigureServices(services =>
-        {
-            services.AddConfiguration<ComponentConfiguration>(section: section,
-                defaultConfiguration: configuration);
-
-            services.AddConfiguration(section: section,
-                defaultConfiguration: configuration);
-        });
+        hostBuilder.AddConfiguration(section: section,
+            defaultConfiguration: configuration);
 
         return this;
     }
diff --git a/Toolkit.Foundation/IHostBuilderExtension.cs b/Toolkit.Foundation/IHostBuilderExtension.cs
index 944977b..de95c71 100644
--- a/Toolkit.Foundation/IHostBuilderExtension.cs
+++ b/Toolkit.Foundation/IHostBuilderExtension.cs
@@ -133,7 +133,8 @@ public static class IHostBuilderExtension
                 services.AddTransient<IConfigurationInitializer<TConfiguration>, ConfigurationInitializer<TConfiguration>>(provider =>
                     provider.GetRequiredService<IServiceFactory>().Create<ConfigurationInitializer<TConfiguration>>(section));
 
-                services.AddTransient<IWritableConfiguration<TConfiguration>, WritableConfiguration<TConfiguration>>();
+                services.TryAddKeyedTransient<IWritableConfiguration<TConfiguration>>(section, (provider, key) =>
+                    new WritableConfiguration<TConfiguration>(provider.GetRequiredKeyedService<IConfigurationWriter<TConfiguration>>(key)));
 
                 services.TryAddKeyedTransient<IConfigurationDescriptor<TConfiguration>>(section, (provider, key) =>
                     new ConfigurationDescriptor<TConfiguration>(section, provider.GetRequiredKeyedService<IConfigurationReader<TConfiguration>>(key)));
diff --git a/Toolkit.Foundation/IPipelineBehavior.cs b/Toolkit.Foundation/IPipelineBehaviour.cs
similarity index 100%
rename from Toolkit.Foundation/IPipelineBehavior.cs
rename to Toolkit.Foundation/IPipelineBehaviour.cs