Re-factored context logging by addin an ILoggingContext interface and…

… generalizing the Log extension methods. (#11)

src/Fluxera.Extensions.Hosting.Abstractions/Fluxera.Extensions.Hosting.Abstractions.csproj

@@ -23,7 +23,12 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Fluxera.Extensions.DependencyInjection.Abstractions" Version="6.0.28" />
+		<InternalsVisibleTo Include="Fluxera.Extensions.Hosting" />
+		<InternalsVisibleTo Include="Fluxera.Extensions.Hosting.AspNetCore" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Fluxera.Extensions.DependencyInjection.Abstractions" Version="6.0.29" />
 		<PackageReference Include="Fluxera.Guards" Version="6.0.22" />
 		<PackageReference Include="GitVersion.MsBuild" Version="5.10.1">
 		  <PrivateAssets>all</PrivateAssets>

src/Fluxera.Extensions.Hosting.Abstractions/IApplicationInitializationContext.cs

@@ -4,15 +4,14 @@
 	using JetBrains.Annotations;
 	using Microsoft.Extensions.Configuration;
 	using Microsoft.Extensions.Hosting;
-	using Microsoft.Extensions.Logging;
 
 	/// <summary>
 	///     A contract for a context type that is available during the application
 	///     initialization of modules. One service context instance is passed
 	///     down the module list.
 	/// </summary>
 	[PublicAPI]
-	public interface IApplicationInitializationContext
+	public interface IApplicationInitializationContext : ILoggingContext<IServiceProvider>
 	{
 		/// <summary>
 		///     Gets the service provider.
@@ -28,10 +27,5 @@ public interface IApplicationInitializationContext
 		///     Gets the environment the host runs under.
 		/// </summary>
 		IHostEnvironment Environment { get; }
-
-		/// <summary>
-		///     Gets a logger.
-		/// </summary>
-		ILogger Logger { get; }
 	}
 }

src/Fluxera.Extensions.Hosting.Abstractions/IApplicationShutdownContext.cs

@@ -4,14 +4,13 @@
 	using JetBrains.Annotations;
 	using Microsoft.Extensions.Configuration;
 	using Microsoft.Extensions.Hosting;
-	using Microsoft.Extensions.Logging;
 
 	/// <summary>
 	///     A contract for a context type that is available during the application
 	///     shutdown of modules. One service context instance is passed down the module list.
 	/// </summary>
 	[PublicAPI]
-	public interface IApplicationShutdownContext
+	public interface IApplicationShutdownContext : ILoggingContext<IServiceProvider>
 	{
 		/// <summary>
 		///     Gets the service provider.
@@ -27,10 +26,5 @@ public interface IApplicationShutdownContext
 		///     Gets the environment the host run under.
 		/// </summary>
 		IHostEnvironment Environment { get; }
-
-		/// <summary>
-		///     Gets a logger.
-		/// </summary>
-		ILogger Logger { get; set; }
 	}
 }

src/Fluxera.Extensions.Hosting.Abstractions/ILoggingContext.cs

@@ -0,0 +1,30 @@
+namespace Fluxera.Extensions.Hosting
+{
+	using JetBrains.Annotations;
+	using Microsoft.Extensions.Logging;
+
+	/// <summary>
+	///     A contract for a context that provides logging capabilities.
+	/// </summary>
+	[PublicAPI]
+	public interface ILoggingContext<out T> : ILoggingContext
+		where T : class
+	{
+		/// <summary>
+		///     Gets the context data, f.e. IServiceCollection.
+		/// </summary>
+		internal T LogContextData { get; }
+	}
+
+	/// <summary>
+	///     A contract for a context that provides logging capabilities.
+	/// </summary>
+	[PublicAPI]
+	public interface ILoggingContext
+	{
+		/// <summary>
+		///     Gets a logger.
+		/// </summary>
+		ILogger Logger { get; }
+	}
+}

src/Fluxera.Extensions.Hosting.Abstractions/IServiceConfigurationContext.cs

@@ -5,15 +5,14 @@
 	using Microsoft.Extensions.Configuration;
 	using Microsoft.Extensions.DependencyInjection;
 	using Microsoft.Extensions.Hosting;
-	using Microsoft.Extensions.Logging;
 
 	/// <summary>
 	///     A contract for a context type that is available during the service
 	///     configuration of modules. One service context instance is passed
 	///     down the module list.
 	/// </summary>
 	[PublicAPI]
-	public interface IServiceConfigurationContext
+	public interface IServiceConfigurationContext : ILoggingContext<IServiceCollection>
 	{
 		/// <summary>
 		///     Gets the service collection.
@@ -30,11 +29,6 @@ public interface IServiceConfigurationContext
 		/// </summary>
 		IHostEnvironment Environment { get; }
 
-		/// <summary>
-		///     Gets a logger.
-		/// </summary>
-		ILogger Logger { get; }
-
 		/// <summary>
 		///     Gets additional items that can be passed down the module service configuration pipeline.
 		///     This items are shared between modules during the service configuration phase.

src/Fluxera.Extensions.Hosting.Abstractions/Plugins/IPluginConfigurationContext.cs

@@ -3,13 +3,12 @@
 	using JetBrains.Annotations;
 	using Microsoft.Extensions.Configuration;
 	using Microsoft.Extensions.Hosting;
-	using Microsoft.Extensions.Logging;
 
 	/// <summary>
 	///     A contract for a context type that is given to the plugin module configuration.
 	/// </summary>
 	[PublicAPI]
-	public interface IPluginConfigurationContext
+	public interface IPluginConfigurationContext : ILoggingContext<IPluginSourceList>
 	{
 		/// <summary>
 		///     The list of plugin sources. One may add additional sources to configure
@@ -26,10 +25,5 @@ public interface IPluginConfigurationContext
 		///     Gets the environment the application runs under.
 		/// </summary>
 		IHostEnvironment Environment { get; }
-
-		/// <summary>
-		///     Gets a logger.
-		/// </summary>
-		ILogger Logger { get; }
 	}
 }

src/Fluxera.Extensions.Hosting.Abstractions/Plugins/IPluginSourceList.cs

@@ -17,13 +17,13 @@ public interface IPluginSourceList : ICollection<IPluginSource>
 		///     all available <see cref="IPluginSource" /> instances.
 		/// </summary>
 		/// <returns></returns>
-		IEnumerable<Assembly> GetAllAssemblies();
+		internal IEnumerable<Assembly> GetAllAssemblies();
 
 		/// <summary>
 		///     Gets all <see cref="IModule" /> types from all available
 		///     <see cref="IPluginSource" /> instances including their dependencies.
 		/// </summary>
 		/// <returns></returns>
-		IEnumerable<Type> GetAllModules();
+		internal IEnumerable<Type> GetAllModules();
 	}
 }

src/Fluxera.Extensions.Hosting.AspNetCore/WebApplicationInitializationContext.cs

@@ -35,6 +35,9 @@ public WebApplicationInitializationContext(IApplicationBuilder applicationBuilde
 		public IHostEnvironment Environment { get; }
 
 		/// <inheritdoc />
-		public ILogger Logger { get; set; }
+		public ILogger Logger { get; }
+
+		/// <inheritdoc />
+		IServiceProvider ILoggingContext<IServiceProvider>.LogContextData => this.ServiceProvider;
 	}
 }

src/Fluxera.Extensions.Hosting/ApplicationInitializationContext.cs

@@ -30,6 +30,9 @@ public ApplicationInitializationContext(IServiceProvider serviceProvider)
 		public IHostEnvironment Environment { get; }
 
 		/// <inheritdoc />
-		public ILogger Logger { get; set; }
+		public ILogger Logger { get; }
+
+		/// <inheritdoc />
+		IServiceProvider ILoggingContext<IServiceProvider>.LogContextData => this.ServiceProvider;
 	}
 }

src/Fluxera.Extensions.Hosting/ApplicationShutdownContext.cs

@@ -30,6 +30,9 @@ public ApplicationShutdownContext(IServiceProvider serviceProvider)
 		public IHostEnvironment Environment { get; }
 
 		/// <inheritdoc />
-		public ILogger Logger { get; set; }
+		public ILogger Logger { get; }
+
+		/// <inheritdoc />
+		IServiceProvider ILoggingContext<IServiceProvider>.LogContextData => this.ServiceProvider;
 	}
 }