Implemented HttpClientResolver and LoggerResolver.

Refactored application statup flow to include HttpClientResolver as optional and SetupLoggerFactory to setup logging.

WpfExtended.SourceGeneration.Tests/Class1.cs

@@ -14,8 +14,6 @@ namespace WpfExtended.SourceGeneration.Tests
         [GenerateDependencyProperty]
         public Effect effect;
 
-
-
         public void TestValues()
         {
             this.SomeF.Should().Be(0);

WpfExtended.Test/MainWindow.xaml.cs

@@ -1,4 +1,5 @@
-using System;
+using Microsoft.Extensions.Logging;
+using System;
 using System.Extensions;
 using System.IO;
 using System.Windows;
@@ -25,9 +26,16 @@ namespace WpfExtended.Test
             set => this.SetTypedValue(ImageSourceProperty, value);
         }
 
-        public MainWindow()
+        private readonly ILogger<MainWindow> scopedLogger;
+        private readonly ILogger logger;
+
+        public MainWindow(
+            ILogger<MainWindow> scopedLogger,
+            ILogger logger)
         {
-            InitializeComponent();
+            this.InitializeComponent();
+            this.scopedLogger = scopedLogger.ThrowIfNull(nameof(scopedLogger));
+            this.logger = logger.ThrowIfNull(nameof(logger));
             this.ImageSource = new BitmapImage(new Uri(Path.GetFullPath("Images/Test.jpg")));
             this.BuildEffectsView();
         }
@@ -37,6 +45,8 @@ namespace WpfExtended.Test
             foreach(var effectType in TypeCrawler.GetTypes<ShaderEffect>())
             {
                 var effect = Activator.CreateInstance(effectType).As<ShaderEffect>();
+                this.scopedLogger.LogInformation($"Creating effect {effectType.Name}");
+                this.logger.LogInformation($"Creating effect {effectType.Name}");
                 var image = new CaptionedImage()
                 {
                     Width = 800,

WpfExtended.Test/WpfExtended.Tests.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SystemExtensions.NetStandard" Version="1.1.4" />
+    <PackageReference Include="SystemExtensions.NetStandard" Version="1.2.0" />
   </ItemGroup>
 
   <ItemGroup>

WpfExtended/Extensions/ServiceManagerExtensions.cs

@@ -0,0 +1,17 @@
+using Slim;
+using System.Extensions;
+using System.Windows.Extensions.Http;
+
+namespace System.Windows.Extensions
+{
+    public static class ServiceManagerExtensions
+    {
+        public static IServiceProducer RegisterHttpFactory(this IServiceManager serviceManager)
+        {
+            serviceManager.ThrowIfNull(nameof(serviceManager));
+
+            serviceManager.RegisterResolver(new HttpClientResolver());
+            return serviceManager;
+        }
+    }
+}

WpfExtended/Http/HttpClientResolver.cs

@@ -0,0 +1,26 @@
+using Slim.Resolvers;
+using System.Http;
+
+namespace System.Windows.Extensions.Http
+{
+    public sealed class HttpClientResolver : IDependencyResolver
+    {
+        private readonly Type clientType = typeof(HttpClient<>);
+
+        public bool CanResolve(Type type)
+        {
+            if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(IHttpClient<>))
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        public object Resolve(Slim.IServiceProvider serviceProvider, Type type)
+        {
+            var typedClientType = clientType.MakeGenericType(type.GetGenericArguments());
+            return Activator.CreateInstance(typedClientType);
+        }
+    }
+}

WpfExtended/Launch/ExtendedApplication.cs

@@ -1,6 +1,9 @@
-using Slim;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Debug;
+using Slim;
 using System.Extensions;
 using System.Threading.Tasks;
+using System.Windows.Extensions.Logging;
 
 namespace System.Windows.Extensions
 {
@@ -12,12 +15,32 @@ namespace System.Windows.Extensions
         where T : Window
     {
         protected IServiceManager ServiceManager { get; } = new ServiceManager();
+        protected ILoggerFactory LoggerFactory { get; private set; }
 
         public ExtendedApplication()
         {
             this.RegisterInternals();
         }
 
+        /// <summary>
+        /// Do some work on the <see cref="IServiceManager"/> before calling <see cref="RegisterServices(IServiceProducer)"/>.
+        /// </summary>
+        protected virtual void SetupServiceManager(IServiceManager serviceManager)
+        {
+            serviceManager.RegisterHttpFactory();
+        }
+        /// <summary>
+        /// Setup the logger factory used to create the loggers.
+        /// </summary>
+        /// <remarks>By default, this method creates a <see cref="ILoggerFactory"/> with only one <see cref="Microsoft.Extensions.Logging.Debug.DebugLoggerProvider"/>.</remarks>
+        /// <returns><see cref="ILoggerFactory"/> used to create loggers.</returns>
+        protected virtual ILoggerFactory SetupLoggerFactory()
+        {
+            var factory = new LoggerFactory();
+            factory.AddProvider(new DebugLoggerProvider());
+            return factory;
+        }
+
         /// <summary>
         /// Called right before the window is shown.
         /// </summary>
@@ -41,6 +64,9 @@ namespace System.Windows.Extensions
         protected sealed override void OnStartup(StartupEventArgs e)
         {
             this.SetupExceptionHandling();
+            this.LoggerFactory = this.SetupLoggerFactory();
+            this.ServiceManager.RegisterSingleton<ILoggerFactory, ILoggerFactory>(_ => this.LoggerFactory);
+            this.SetupServiceManager(this.ServiceManager);
             this.RegisterServices(this.ServiceManager);
             this.SetupApplicationLifetime();
             this.LaunchWindow();
@@ -66,6 +92,7 @@ namespace System.Windows.Extensions
         {
             this.ServiceManager.RegisterServiceManager();
             this.ServiceManager.RegisterSingleton<T, T>();
+            this.ServiceManager.RegisterResolver(new LoggerResolver());
         }
         private void SetupExceptionHandling()
         {

WpfExtended/Logging/LoggerResolver.cs

@@ -0,0 +1,46 @@
+using Microsoft.Extensions.Logging;
+using Slim.Resolvers;
+using System.Linq;
+
+namespace System.Windows.Extensions.Logging
+{
+    public sealed class LoggerResolver : IDependencyResolver
+    {
+        public bool CanResolve(Type type)
+        {
+            if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(ILogger<>) ||
+                type == typeof(ILogger))
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        public object Resolve(Slim.IServiceProvider serviceProvider, Type type)
+        {
+            if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(ILogger<>))
+            {
+                return ResolveScopedLogger(serviceProvider, type);
+            }
+            else
+            {
+                return ResolveLogger(serviceProvider, type);
+            }
+        }
+
+        private static object ResolveScopedLogger(Slim.IServiceProvider serviceProvider, Type type)
+        {
+            var loggerFactory = serviceProvider.GetService<ILoggerFactory>();
+            var categoryTypes = type.GetGenericArguments();
+            var createLoggerMethod = typeof(LoggerFactoryExtensions).GetMethods().Where(m => m.IsGenericMethodDefinition && m.Name == nameof(LoggerFactoryExtensions.CreateLogger)).First();
+            return createLoggerMethod.MakeGenericMethod(categoryTypes.First()).Invoke(null, new object[] { loggerFactory });
+        }
+
+        private static object ResolveLogger(Slim.IServiceProvider serviceProvider, Type type)
+        {
+            var loggerFactory = serviceProvider.GetService<ILoggerFactory>();
+            return loggerFactory.CreateLogger(string.Empty);
+        }
+    }
+}

WpfExtended/WpfExtended.csproj

@@ -6,7 +6,7 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <PackageLicenseFile>License.txt</PackageLicenseFile>
-    <Version>0.2.1</Version>
+    <Version>0.3.0</Version>
     <LangVersion>latest</LangVersion>
     <Description>Extension library for Windows Presentation Platform.
 
@@ -83,8 +83,10 @@ http://www.java2s.com/Open-Source/CSharp_Free_Code/Windows_Presentation_Foundati
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Slim" Version="1.2.2" />
-    <PackageReference Include="SystemExtensions.NetStandard" Version="1.1.4" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
+    <PackageReference Include="Slim" Version="1.3.2" />
+    <PackageReference Include="SystemExtensions.NetStandard" Version="1.2.0" />
   </ItemGroup>
   <Import Project="ShaderCompiler.target" />
 </Project>