diff --git a/Toolkit.Foundation/ComponentBuilder.cs b/Toolkit.Foundation/ComponentBuilder.cs index 5aedfa8..91c6008 100644 --- a/Toolkit.Foundation/ComponentBuilder.cs +++ b/Toolkit.Foundation/ComponentBuilder.cs @@ -9,7 +9,9 @@ public class ComponentBuilder : { private readonly IHostBuilder hostBuilder; - private ComponentContentConfiguration configuration = new(); + public string ContentRoot { get; set; } = "Local"; + + public string ConfigurationFile { get; set; } = "Settings.json"; private ComponentBuilder() { @@ -65,7 +67,7 @@ public class ComponentBuilder : where TConfiguration : ComponentConfiguration, new() { - hostBuilder.AddConfiguration(section: section, + hostBuilder.AddConfiguration(section: section, path: ConfigurationFile, defaultConfiguration: configuration); return this; @@ -86,21 +88,13 @@ public class ComponentBuilder : public IComponentHost Build() { - hostBuilder.UseContentRoot(configuration.ContentRoot, true) + hostBuilder.UseContentRoot(ContentRoot, true) .ConfigureAppConfiguration(config => { - config.AddJsonFile(configuration.JsonFileName, true, true); + config.AddJsonFile(ConfigurationFile, true, true); }); IHost host = hostBuilder.Build(); return host.Services.GetRequiredService(); } - - public void SetContentConfiguration(Action configurationDelegate) - { - ComponentContentConfiguration configuration = new(); - configurationDelegate(configuration); - - this.configuration = configuration; - } } \ No newline at end of file diff --git a/Toolkit.Foundation/ComponentContentConfiguration.cs b/Toolkit.Foundation/ComponentContentConfiguration.cs index 8f3f91b..2081553 100644 --- a/Toolkit.Foundation/ComponentContentConfiguration.cs +++ b/Toolkit.Foundation/ComponentContentConfiguration.cs @@ -2,7 +2,7 @@ public record ComponentContentConfiguration { - public string ContentRoot { get; set; } = "Local"; + // public string ContentRoot { get; set; } = "Local"; - public string JsonFileName { get; set; } = "Settings.json"; + public string JsonFileName { get; set; } = "Settings2.json"; } \ No newline at end of file diff --git a/Toolkit.Foundation/IComponentBuilder.cs b/Toolkit.Foundation/IComponentBuilder.cs index cf0e855..ce42434 100644 --- a/Toolkit.Foundation/IComponentBuilder.cs +++ b/Toolkit.Foundation/IComponentBuilder.cs @@ -4,6 +4,10 @@ namespace Toolkit.Foundation; public interface IComponentBuilder { + string ConfigurationFile { get; set; } + + string ContentRoot { get; set; } + IComponentBuilder AddConfiguration(Action configurationDelegate) where TConfiguration : ComponentConfiguration, new(); @@ -17,6 +21,4 @@ public interface IComponentBuilder IComponentBuilder AddServices(Action configureDelegate); IComponentHost Build(); - - void SetContentConfiguration(Action configurationDelegate); } \ No newline at end of file