Moved the module container configuration out of the application loade…

…r. (#59)
fluxera · Apr 26, 2024 · 6db8126 · 6db8126
1 parent 2f48f1d
commit 6db8126
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/Fluxera.Extensions.Hosting/ApplicationLoader.cs b/src/Fluxera.Extensions.Hosting/ApplicationLoader.cs
@@ -41,15 +41,8 @@ public ApplicationLoader(
 			this.PluginSources = pluginSources;
 			this.Modules = modules;
 
-			//	Configure the module container.
-			services.AddSingleton<IModuleContainer>(this);
-			services.AddObjectAccessor<IModuleContainer>(this, ObjectAccessorLifetime.ConfigureServices);
-
 			// Configure the services of the modules.
 			modules.ConfigureServices(services);
-
-			// Configure the application loader.
-			services.AddSingleton<IApplicationLoader>(this);
 		}
 
 		/// <inheritdoc />

diff --git a/src/Fluxera.Extensions.Hosting/ServiceCollectionExtensions.cs b/src/Fluxera.Extensions.Hosting/ServiceCollectionExtensions.cs
@@ -53,7 +53,14 @@ public static IServiceCollection AddApplicationLoader<TStartupModule>(this IServ
 			// Build the application.
 			IModularApplicationBuilder applicationBuilder = new ModularApplicationBuilder(typeof(TStartupModule), services);
 			configurePlugins?.Invoke(new PluginConfigurationContext(services, applicationBuilder.PluginSources));
-			applicationBuilder.Build(applicationLoaderFactory);
+			IApplicationLoader applicationLoader = applicationBuilder.Build(applicationLoaderFactory);
+
+			// Add the module container.
+			services.AddSingleton<IModuleContainer>(applicationLoader);
+			services.AddObjectAccessor<IModuleContainer>(applicationLoader, ObjectAccessorLifetime.ConfigureServices);
+
+			// Add the application loader.
+			services.AddSingleton(applicationLoader);
 
 			return services;
 		}