Use Microsoft.Logging.Abstractions

Typed ILogger.

Daybreak.Tests/Services/BuildTemplateManagerTests.cs

@@ -1,7 +1,7 @@
 using Daybreak.Models.Builds;
 using Daybreak.Services.BuildTemplates;
-using Daybreak.Services.Logging;
 using FluentAssertions;
+using Microsoft.Extensions.Logging;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using System.Collections.Generic;
@@ -17,7 +17,7 @@ namespace Daybreak.Tests.Services
         [TestInitialize]
         public void Initialize()
         {
-            buildTemplateManager = new BuildTemplateManager(new Mock<ILogger>().Object);
+            buildTemplateManager = new BuildTemplateManager(new Mock<ILogger<BuildTemplateManager>>().Object);
         }
 
         [TestMethod]

Daybreak/Configuration/ProjectConfiguration.cs

@@ -5,7 +5,6 @@ using Daybreak.Services.BuildTemplates;
 using Daybreak.Services.Configuration;
 using Daybreak.Services.Credentials;
 using Daybreak.Services.IconRetrieve;
-using Daybreak.Services.Logging;
 using Daybreak.Services.Mutex;
 using Daybreak.Services.Privilege;
 using Daybreak.Services.Runtime;
@@ -27,8 +26,6 @@ namespace Daybreak.Configuration
             serviceProducer.ThrowIfNull(nameof(serviceProducer));
 
             serviceProducer.RegisterSingleton<ICredentialManager, CredentialManager>();
-            serviceProducer.RegisterSingleton<ILoggingDatabase, FlatLoggingDatabase>();
-            serviceProducer.RegisterSingleton<ILogger, Logger>();
             serviceProducer.RegisterSingleton<ApplicationLifetimeManager>();
             serviceProducer.RegisterSingleton<ViewManager>();
             serviceProducer.RegisterSingleton<IApplicationLauncher, ApplicationLauncher>();
@@ -48,7 +45,6 @@ namespace Daybreak.Configuration
         {
             applicationLifetimeProducer.ThrowIfNull(nameof(applicationLifetimeProducer));
 
-            applicationLifetimeProducer.RegisterService<ILoggingDatabase>();
             applicationLifetimeProducer.RegisterService<IScreenshotProvider>();
             applicationLifetimeProducer.RegisterService<IApplicationUpdater>();
             applicationLifetimeProducer.RegisterService<IShortcutManager>();

Daybreak/Controls/ChromiumBrowserWrapper.xaml.cs

@@ -3,8 +3,8 @@ using Daybreak.Models.Browser;
 using Daybreak.Models.Builds;
 using Daybreak.Services.BuildTemplates;
 using Daybreak.Services.Configuration;
-using Daybreak.Services.Logging;
 using Daybreak.Utils;
+using Microsoft.Extensions.Logging;
 using Microsoft.Web.WebView2.Core;
 using System;
 using System.Diagnostics;
@@ -30,7 +30,7 @@ namespace Daybreak.Controls
         public event EventHandler<Build> BuildDecoded;
 
         private readonly IConfigurationManager configurationManager;
-        private readonly ILogger logger;
+        private readonly ILogger<ChromiumBrowserWrapper> logger;
         private readonly IBuildTemplateManager buildTemplateManager;
         private CoreWebView2Environment coreWebView2Environment;
 
@@ -56,7 +56,7 @@ namespace Daybreak.Controls
         public ChromiumBrowserWrapper()
         {
             this.configurationManager = Launcher.ApplicationServiceManager.GetService<IConfigurationManager>();
-            this.logger = Launcher.ApplicationServiceManager.GetService<ILogger>();
+            this.logger = Launcher.ApplicationServiceManager.GetService<ILogger<ChromiumBrowserWrapper>>();
             this.buildTemplateManager = Launcher.ApplicationServiceManager.GetService<IBuildTemplateManager>();
             this.InitializeComponent();
             this.InitializeEnvironment();
@@ -174,7 +174,7 @@ namespace Daybreak.Controls
             }
             catch(Exception e)
             {
-                this.logger.LogError(e);
+                this.logger.LogError(e, $"Exception encountered when deserializing {nameof(BrowserPayload)}");
             }
             if (payload?.Key == BrowserPayload.PayloadKeys.ContextMenu)
             {

Daybreak/Daybreak.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <TargetFramework>net5.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
     <UseWindowsForms>true</UseWindowsForms>
@@ -10,19 +11,21 @@
     <LangVersion>preview</LangVersion>
     <ApplicationIcon>Daybreak.ico</ApplicationIcon>
     <IncludePackageReferencesDuringMarkupCompilation>true</IncludePackageReferencesDuringMarkupCompilation>
-    <Version>0.8.9</Version>
+    <Version>0.8.9.2</Version>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="HtmlAgilityPack" Version="1.11.32" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.818.41" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="NReco.Logging.File" Version="1.1.1" />
     <PackageReference Include="securifybv.ShellLink" Version="0.1.0" />
-    <PackageReference Include="Slim" Version="1.2.2" />
+    <PackageReference Include="Slim" Version="1.3.3" />
     <PackageReference Include="System.Windows.Interactivity.WPF" Version="2.0.20525" />
-    <PackageReference Include="SystemExtensions.NetStandard" Version="1.1.4" />
+    <PackageReference Include="SystemExtensions.NetStandard" Version="1.2.0" />
     <PackageReference Include="WCL" Version="1.0.2" />
-    <PackageReference Include="WpfExtended" Version="0.2.1" />
+    <PackageReference Include="WpfExtended" Version="0.3.2" />
     <PackageReference Include="WpfExtended.SourceGeneration" Version="0.1.1" />
     <PackageReference Include="WpfScreenHelper" Version="1.0.0" />
   </ItemGroup>

Daybreak/Launch/Launcher.cs

@@ -1,19 +1,19 @@
 using Daybreak.Configuration;
 using Daybreak.Exceptions;
 using Daybreak.Services.ApplicationLifetime;
-using Daybreak.Services.Logging;
 using Daybreak.Services.ViewManagement;
 using Daybreak.Utils;
-using Microsoft.Web.WebView2.Core;
-using Microsoft.Web.WebView2.Wpf;
+using Microsoft.Extensions.Logging;
+using NReco.Logging.File;
 using Slim;
 using System;
-using System.IO;
+using System.Extensions;
 using System.Linq;
+using System.Net.Http;
 using System.Runtime.InteropServices;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Extensions;
+using System.Windows.Extensions.Http;
 
 namespace Daybreak.Launch
 {
@@ -28,6 +28,23 @@ namespace Daybreak.Launch
             return LaunchMainWindow();
         }
 
+        protected override ILoggerFactory SetupLoggerFactory()
+        {
+            var factory = new LoggerFactory();
+            factory.AddProvider(new FileLoggerProvider("Daybreak.db"));
+            return factory;
+        }
+        protected override void SetupServiceManager(IServiceManager serviceManager)
+        {
+            serviceManager.RegisterResolver(
+                new HttpClientResolver()
+                .WithHttpMessageHandlerFactory((serviceProvider, categoryType) =>
+                {
+                    var loggerType = typeof(ILogger<>).MakeGenericType(categoryType);
+                    var logger = serviceProvider.GetService(loggerType).As<ILogger>();
+                    return new LoggingHttpHandler(logger, new HttpClientHandler());
+                }));
+        }
         protected override void RegisterServices(IServiceProducer serviceProducer)
         {
             ProjectConfiguration.RegisterServices(this.ServiceManager);
@@ -41,9 +58,10 @@ namespace Daybreak.Launch
                 return false;
             }
 
-            this.ServiceManager.GetService<ILogger>().LogCritical(e);
+            this.ServiceManager.GetService<ILogger>().LogCritical(e, $"Unhandled exception");
             if (e is FatalException fatalException)
             {
+                this.ServiceManager.GetService<ILogger>().LogCritical(e, $"{nameof(FatalException)} encountered. Closing application.");
                 MessageBox.Show(fatalException.ToString());
                 return false;
             }

Daybreak/Models/Log.cs

@@ -1,12 +0,0 @@
-using System;
-
-namespace Daybreak.Models
-{
-    public class Log
-    {
-        public LogLevel LogLevel { get; set; }
-        public string Message { get; set; }
-        public string StackTrace { get; set; }
-        public DateTime Timestamp { get; set; }
-    }
-}

Daybreak/Models/LogLevel.cs

@@ -1,10 +0,0 @@
-namespace Daybreak.Models
-{
-    public enum LogLevel
-    {
-        Information,
-        Warning,
-        Error,
-        Critical
-    }
-}

Daybreak/Services/ApplicationLauncher/ApplicationLauncher.cs

@@ -1,11 +1,10 @@
 using Daybreak.Exceptions;
 using Daybreak.Services.Configuration;
 using Daybreak.Services.Credentials;
-using Daybreak.Services.Logging;
 using Daybreak.Services.Mutex;
 using Daybreak.Services.Privilege;
-using Daybreak.Utils;
 using Daybreak.Views;
+using Microsoft.Extensions.Logging;
 using Microsoft.Win32;
 using Pepa.Wpf.Utilities;
 using System;
@@ -33,7 +32,7 @@ namespace Daybreak.Services.ApplicationLauncher
         private readonly IConfigurationManager configurationManager;
         private readonly ICredentialManager credentialManager;
         private readonly IMutexHandler mutexHandler;
-        private readonly ILogger logger;
+        private readonly ILogger<ApplicationLauncher> logger;
         private readonly IPrivilegeManager privilegeManager;
 
         public bool IsTexmodRunning => TexModProcessDetected();
@@ -44,7 +43,7 @@ namespace Daybreak.Services.ApplicationLauncher
             IConfigurationManager configurationManager,
             ICredentialManager credentialManager,
             IMutexHandler mutexHandler,
-            ILogger logger,
+            ILogger<ApplicationLauncher> logger,
             IPrivilegeManager privilegeManager)
         {
             this.logger = logger.ThrowIfNull(nameof(logger));

Daybreak/Services/Bloogum/BloogumClient.cs

@@ -1,10 +1,9 @@
 using Daybreak.Services.Bloogum.Models;
-using Daybreak.Services.Logging;
-using Daybreak.Utils;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Extensions;
+using System.Http;
 using System.IO;
-using System.Net.Http;
 using System.Threading.Tasks;
 
 namespace Daybreak.Services.Bloogum
@@ -12,15 +11,16 @@ namespace Daybreak.Services.Bloogum
     public sealed class BloogumClient : IBloogumClient
     {
         private const string BaseAddress = "http://bloogum.net/guildwars";
-        private readonly HttpClient httpClient;
+        private readonly IHttpClient<BloogumClient> httpClient;
         private readonly ILogger logger;
         private readonly Random random = new();
 
-        public BloogumClient(ILogger logger)
+        public BloogumClient(
+            ILogger<BloogumClient> logger,
+            IHttpClient<BloogumClient> httpClient)
         {
             this.logger = logger.ThrowIfNull(nameof(logger));
-
-            this.httpClient = new HttpClient();
+            this.httpClient = httpClient.ThrowIfNull(nameof(httpClient));
         }
 
         public async Task<Optional<Stream>> GetRandomScreenShot()
@@ -53,7 +53,7 @@ namespace Daybreak.Services.Bloogum
             }
             catch(Exception e)
             {
-                this.logger.LogError(e);
+                this.logger.LogError(e.ToString());
                 return Optional.None<Stream>();
             }
         }

Daybreak/Services/Bloogum/Models/Location.cs

@@ -81,13 +81,13 @@ namespace Daybreak.Services.Bloogum.Models
                     new Category("stingraystrand", 15),
                     new Category("fishermenshaven", 4),
                     new Category("riversideprovince", 31),
-                    new Category("sanctumcay", 21)
+                    new Category("sanctumcay", 21),
+                    new Category("majestysrest", 14)
             });
         public static readonly Location MaguumaJungle = new(
             "maguuma",
             new List<Category>
             {
-                    new Category("majestysrest", 14),
                     new Category("druidsoverlook", 1),
                     new Category("sagelands", 27),
                     new Category("thewilds", 19),

Daybreak/Services/BuildTemplates/BuildTemplateManager.cs

@@ -1,7 +1,6 @@
 using Daybreak.Models.Builds;
 using Daybreak.Services.BuildTemplates.Models;
-using Daybreak.Services.Logging;
-using Daybreak.Utils;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
 using System.Extensions;
@@ -16,10 +15,10 @@ namespace Daybreak.Services.BuildTemplates
         private const string DecodingLookupTable = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
         private readonly static string BuildsPath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + "\\Guild Wars\\Templates\\Skills";
 
-        private readonly ILogger logger;
+        private readonly ILogger<BuildTemplateManager> logger;
 
         public BuildTemplateManager(
-            ILogger logger)
+            ILogger<BuildTemplateManager> logger)
         {
             this.logger = logger.ThrowIfNull(nameof(logger));
         }
@@ -229,8 +228,10 @@ namespace Daybreak.Services.BuildTemplates
         {
             var curedTemplate = template.Trim();
 
-            var buildMetadata = new BuildMetadata();
-            buildMetadata.Base64Decoded = template.Select(c => DecodingLookupTable.IndexOf(c)).ToList();
+            var buildMetadata = new BuildMetadata
+            {
+                Base64Decoded = template.Select(c => DecodingLookupTable.IndexOf(c)).ToList(),
+            };
             buildMetadata.BinaryDecoded = buildMetadata.Base64Decoded.Select(b => ToBitString(b)).ToList();
 
             var stream = new DecodeCharStream(buildMetadata.BinaryDecoded.ToArray());

Daybreak/Services/Configuration/ConfigurationManager.cs

@@ -1,6 +1,6 @@
 using Daybreak.Configuration;
-using Daybreak.Services.Logging;
 using Daybreak.Utils;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Extensions;
 using System.IO;
@@ -12,11 +12,11 @@ namespace Daybreak.Services.Configuration
         private const string ConfigName = "Daybreak.config.json";
 
         private ApplicationConfiguration applicationConfiguration;
-        private readonly ILogger logger;
+        private readonly ILogger<ConfigurationManager> logger;
 
         public event EventHandler ConfigurationChanged;
 
-        public ConfigurationManager(ILogger logger)
+        public ConfigurationManager(ILogger<ConfigurationManager> logger)
         {
             this.logger = logger.ThrowIfNull(nameof(logger));
             try

Daybreak/Services/Credentials/CredentialManager.cs

@@ -1,7 +1,6 @@
 using Daybreak.Models;
 using Daybreak.Services.Configuration;
-using Daybreak.Services.Logging;
-using Daybreak.Utils;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
 using System.Extensions;
@@ -15,11 +14,11 @@ namespace Daybreak.Services.Credentials
     public sealed class CredentialManager : ICredentialManager
     {
         private static readonly byte[] Entropy = Convert.FromBase64String("R3VpbGR3YXJz");
-        private readonly ILogger logger;
+        private readonly ILogger<CredentialManager> logger;
         private readonly IConfigurationManager configurationManager;
 
         public CredentialManager(
-            ILogger logger,
+            ILogger<CredentialManager> logger,
             IConfigurationManager configurationManager)
         {
             this.configurationManager = configurationManager.ThrowIfNull(nameof(configurationManager));

Daybreak/Services/IconRetrieve/IconRetriever.cs

@@ -1,12 +1,11 @@
 using Daybreak.Models.Builds;
-using Daybreak.Services.Logging;
-using Daybreak.Utils;
 using HtmlAgilityPack;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Extensions;
+using System.Http;
 using System.IO;
 using System.Linq;
-using System.Net.Http;
 using System.Threading.Tasks;
 
 namespace Daybreak.Services.IconRetrieve
@@ -17,13 +16,15 @@ namespace Daybreak.Services.IconRetrieve
         private const string BaseUrl = "https://wiki.guildwars.com";
         private const string QueryUrl = $"wiki/File:{NamePlaceholder}.jpg";
 
-        private readonly HttpClient httpClient = new();
-        private readonly ILogger logger;
+        private readonly IHttpClient<IconRetriever> httpClient;
+        private readonly ILogger<IconRetriever> logger;
 
         public IconRetriever(
-            ILogger logger)
+            ILogger<IconRetriever> logger,
+            IHttpClient<IconRetriever> httpClient)
         {
             this.logger = logger.ThrowIfNull(nameof(logger));
+            this.httpClient = httpClient.ThrowIfNull(nameof(httpClient));
             this.httpClient.BaseAddress = new Uri(BaseUrl);
         }
 

Daybreak/Services/KeyboardHook/KeyboardHookService.cs

@@ -1,6 +1,5 @@
 using Daybreak.Models;
-using Daybreak.Services.Logging;
-using Daybreak.Utils;
+using Microsoft.Extensions.Logging;
 using Pepa.Wpf.Utilities;
 using System;
 using System.ComponentModel;
@@ -15,7 +14,7 @@ namespace Daybreak.Services.KeyboardHook
     // https://stackoverflow.com/questions/604410/global-keyboard-capture-in-c-sharp-application
     public sealed class KeyboardHookService : IKeyboardHookService, IDisposable
     {
-        private readonly ILogger logger;
+        private readonly ILogger<KeyboardHookService> logger;
         private IntPtr windowsHookHandle;
         private IntPtr user32LibraryHandle;
         private NativeMethods.HookProc hookProc;
@@ -23,7 +22,7 @@ namespace Daybreak.Services.KeyboardHook
         public event EventHandler<KeyboardHookEventArgs> KeyboardPressed;
 
         public KeyboardHookService(
-            ILogger logger)
+            ILogger<KeyboardHookService> logger)
         {
             this.logger = logger.ThrowIfNull(nameof(logger));
             this.Setup();

Daybreak/Services/KeyboardMacros/MacroService.cs

@@ -1,7 +1,7 @@
 using Daybreak.Models;
 using Daybreak.Services.Configuration;
 using Daybreak.Services.KeyboardHook;
-using Daybreak.Services.Logging;
+using Microsoft.Extensions.Logging;
 using Pepa.Wpf.Utilities;
 using System;
 using System.Collections.Generic;
@@ -16,7 +16,6 @@ namespace Daybreak.Services.KeyboardMacros
     public sealed class MacroService : IMacroService
     {
         private readonly CancellationTokenSource cancellationTokenSource = new();
-        private readonly ILogger logger;
         private readonly IKeyboardHookService keyboardHookService;
         private readonly IConfigurationManager configurationManager;
         private readonly HashSet<Keys> KeysDown = new();
@@ -26,11 +25,9 @@ namespace Daybreak.Services.KeyboardMacros
         private IntPtr gwWindowHwnd;
 
         public MacroService(
-            ILogger logger,
             IKeyboardHookService keyboardHookService,
             IConfigurationManager configurationManager)
         {
-            this.logger = logger.ThrowIfNull(nameof(logger));
             this.keyboardHookService = keyboardHookService.ThrowIfNull(nameof(keyboardHookService));
             this.configurationManager = configurationManager.ThrowIfNull(nameof(configurationManager));
 

Daybreak/Services/Logging/FlatLoggingDatabase.cs

@@ -1,143 +0,0 @@
-using Daybreak.Exceptions;
-using Daybreak.Models;
-using Daybreak.Utils;
-using System;
-using System.Collections.Generic;
-using System.Extensions;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Daybreak.Services.Logging
-{
-    public class FlatLoggingDatabase : ILoggingDatabase
-    {
-        private const string Path = "logs.db";
-        private const int bufferSize = 10;
-        private const char separator = '§';
-        private readonly string filePath = Path;
-        private readonly List<string> buffer = new List<string>();
-
-        public FlatLoggingDatabase()
-        {
-        }
-
-        public Task<IEnumerable<Log>> GetLogs()
-        {
-            return Task.Run(() =>
-            {
-                lock (this.buffer)
-                {
-                    if (this.buffer.Count > 0)
-                    {
-                        this.WriteBufferToFile();
-                    }
-                }
-
-                return this.GetSerializedLogs().Select(s => s.Deserialize<Log>());
-            });
-        }
-
-        public Task<IEnumerable<Log>> GetLogsByDate(DateTime startTime, DateTime endTime)
-        {
-            return Task.Run(() =>
-            {
-                lock (this.buffer)
-                {
-                    if (this.buffer.Count > 0)
-                    {
-                        this.WriteBufferToFile();
-                    }
-                }
-
-                return this.GetSerializedLogs()
-                    .Select(s => s.Deserialize<Log>())
-                    .Where(l => l.Timestamp > startTime && l.Timestamp < endTime);
-            });
-        }
-
-        public Task<bool> InsertLog(Log log)
-        {
-            return Task.Run(() =>
-            {
-                lock (this.buffer)
-                {
-                    this.buffer.Add(log.Serialize());
-
-                    if (this.buffer.Count > bufferSize)
-                    {
-                        this.WriteBufferToFile();
-                    }
-                }
-
-                return true;
-            });
-        }
-
-        public Task<bool> ClearDatabase()
-        {
-            return Task.Run(() =>
-            {
-                lock (this.buffer)
-                {
-                    this.buffer.Clear();
-                }
-                lock (this.filePath)
-                {
-                    File.WriteAllText(this.filePath, string.Empty);
-                }
-
-                return true;
-            });
-        }
-
-        public void OnClosing()
-        {
-            this.WriteBufferToFile();
-        }
-
-        public void OnStartup()
-        {
-            if (!File.Exists(filePath))
-            {
-                try
-                {
-                    using var fs = File.Create(filePath);
-                }
-                catch (Exception ex)
-                {
-                    throw new FatalException("Could not initialize logging. See inner exception for details.", ex);
-                }
-            }
-        }
-
-        private void WriteBufferToFile()
-        {
-            lock (this.filePath)
-            {
-                File.AppendAllLines(this.filePath, this.buffer.Select(s => s + separator), Encoding.UTF8);
-            }
-            this.buffer.Clear();
-        }
-
-        private IEnumerable<string> GetSerializedLogs()
-        {
-            lock (this.filePath)
-            {
-                var stringBuilder = new StringBuilder();
-                using var fileStream = File.OpenRead(this.filePath);
-                using var streamReader = new StreamReader(fileStream, Encoding.UTF8);
-                string serializedLog = null;
-                while ((serializedLog = streamReader.ReadUntil(separator.ToString())) != null
-                    && serializedLog != string.Empty
-                    && serializedLog != "\r"
-                    && serializedLog != "\n"
-                    && serializedLog != "\r\n")
-                {
-                    yield return serializedLog;
-                }
-            }
-        }
-    }
-}

Daybreak/Services/Logging/ILogger.cs

@@ -1,11 +0,0 @@
-using Daybreak.Models;
-using System;
-
-namespace Daybreak.Services.Logging
-{
-    public interface ILogger
-    {
-        void Log(LogLevel logLevel, Exception exception);
-        void Log(LogLevel logLevel, string message);
-    }
-}

Daybreak/Services/Logging/ILoggingDatabase.cs

@@ -1,16 +0,0 @@
-using Daybreak.Models;
-using Daybreak.Services.ApplicationLifetime;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace Daybreak.Services.Logging
-{
-    public interface ILoggingDatabase : IApplicationLifetimeService
-    {
-        Task<bool> ClearDatabase();
-        Task<IEnumerable<Log>> GetLogsByDate(DateTime startTime, DateTime endTime);
-        Task<IEnumerable<Log>> GetLogs();
-        Task<bool> InsertLog(Log log);
-    }
-}

Daybreak/Services/Logging/Logger.cs

@@ -1,42 +0,0 @@
-using Daybreak.Models;
-using System;
-
-namespace Daybreak.Services.Logging
-{
-    public class Logger : ILogger
-    {
-        private readonly ILoggingDatabase loggingDatabase;
-        public Logger(ILoggingDatabase loggingDatabase)
-        {
-            this.loggingDatabase = loggingDatabase;
-        }
-
-        public async void Log(LogLevel logLevel, Exception exception)
-        {
-            if (exception is null) throw new ArgumentNullException(nameof(exception));
-
-            await this.loggingDatabase.InsertLog(
-                new Log
-                {
-                    LogLevel = logLevel,
-                    Message = exception.Message,
-                    StackTrace = exception.StackTrace,
-                    Timestamp = DateTime.Now
-                }).ConfigureAwait(false);
-        }
-
-        public async void Log(LogLevel logLevel, string message)
-        {
-            if (message is null) throw new ArgumentNullException(nameof(message));
-
-            await this.loggingDatabase.InsertLog(
-                new Log
-                {
-                    LogLevel = logLevel,
-                    Message = message,
-                    StackTrace = Environment.StackTrace,
-                    Timestamp = DateTime.Now
-                }).ConfigureAwait(false);
-        }
-    }
-}

Daybreak/Services/Privilege/PrivilegeManager.cs

@@ -1,8 +1,7 @@
 using Daybreak.Models;
-using Daybreak.Services.Logging;
 using Daybreak.Services.ViewManagement;
-using Daybreak.Utils;
 using Daybreak.Views;
+using Microsoft.Extensions.Logging;
 using System.Extensions;
 using System.Security.Principal;
 using System.Windows.Controls;
@@ -14,11 +13,11 @@ namespace Daybreak.Services.Privilege
         public bool AdminPrivileges => new WindowsPrincipal(WindowsIdentity.GetCurrent()).IsInRole(WindowsBuiltInRole.Administrator);
 
         private readonly IViewManager viewManager;
-        private readonly ILogger logger;
+        private readonly ILogger<PrivilegeManager> logger;
 
         public PrivilegeManager(
             IViewManager viewManager,
-            ILogger logger)
+            ILogger<PrivilegeManager> logger)
         {
             this.logger = logger.ThrowIfNull(nameof(logger));
             this.viewManager = viewManager.ThrowIfNull(nameof(viewManager));

Daybreak/Services/Screens/ScreenManager.cs

@@ -1,6 +1,5 @@
 using Daybreak.Models;
-using Daybreak.Services.Logging;
-using Daybreak.Utils;
+using Microsoft.Extensions.Logging;
 using Pepa.Wpf.Utilities;
 using System;
 using System.Collections.Generic;
@@ -12,13 +11,13 @@ namespace Daybreak.Services.Screens
 {
     public sealed class ScreenManager : IScreenManager
     {
-        private readonly ILogger logger;
+        private readonly ILogger<ScreenManager> logger;
 
         public IEnumerable<Screen> Screens { get; } = WpfScreenHelper.Screen.AllScreens
             .Select((screen, index) => new Screen { Id = index, Size = screen.Bounds });
 
         public ScreenManager(
-            ILogger logger)
+            ILogger<ScreenManager> logger)
         {
             this.logger = logger.ThrowIfNull(nameof(logger));
         }

Daybreak/Services/Screenshots/ScreenshotProvider.cs

@@ -1,5 +1,4 @@
-using Daybreak.Services.Logging;
-using Daybreak.Utils;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
 using System.Extensions;
@@ -14,11 +13,11 @@ namespace Daybreak.Services.Screenshots
     {
         private const string ScreenshotsFolder = "Screenshots";
 
-        private readonly List<string> Screenshots = new List<string>();
-        private readonly ILogger logger;
+        private readonly List<string> Screenshots = new();
+        private readonly ILogger<ScreenshotProvider> logger;
         private int innerCount = 0;
 
-        public ScreenshotProvider(ILogger logger)
+        public ScreenshotProvider(ILogger<ScreenshotProvider> logger)
         {
             this.logger = logger.ThrowIfNull(nameof(logger));
             if (Directory.Exists(ScreenshotsFolder) is false)

Daybreak/Services/Updater/ApplicationUpdater.cs

@@ -1,16 +1,17 @@
 using Daybreak.Exceptions;
 using Daybreak.Models;
 using Daybreak.Models.Github;
-using Daybreak.Services.Logging;
 using Daybreak.Services.Runtime;
 using Daybreak.Services.ViewManagement;
 using Daybreak.Utils;
 using Daybreak.Views;
+using Microsoft.Extensions.Logging;
 using Microsoft.Win32;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Extensions;
+using System.Http;
 using System.IO;
 using System.Linq;
 using System.Net.Http;
@@ -56,21 +57,23 @@ namespace Daybreak.Services.Updater
         private const string RemovePs1 = $"Remove-item {ExtractAndRunPs1}";
 
         private readonly CancellationTokenSource updateCancellationTokenSource = new();
-        private readonly ILogger logger;
+        private readonly ILogger<ApplicationUpdater> logger;
         private readonly IViewManager viewManager;
         private readonly IRuntimeStore runtimeStore;
-        private readonly HttpClient httpClient = new();
+        private readonly IHttpClient<ApplicationUpdater> httpClient;
 
         public Version CurrentVersion { get; }
 
         public ApplicationUpdater(
-            ILogger logger,
+            ILogger<ApplicationUpdater> logger,
             IRuntimeStore runtimeStore,
-            IViewManager viewManager)
+            IViewManager viewManager,
+            IHttpClient<ApplicationUpdater> httpClient)
         {
             this.viewManager = viewManager.ThrowIfNull(nameof(viewManager));
             this.runtimeStore = runtimeStore.ThrowIfNull(nameof(runtimeStore));
             this.logger = logger.ThrowIfNull(nameof(logger));
+            this.httpClient = httpClient.ThrowIfNull(nameof(httpClient));
             this.httpClient.DefaultRequestHeaders.Add("user-agent", "Daybreak Client");
             if (Version.TryParse(Assembly.GetExecutingAssembly().GetName().Version.ToString(), out var currentVersion))
             {

Daybreak/Utils/LoggingExtensions.cs

@@ -1,65 +0,0 @@
-using Daybreak.Models;
-using Daybreak.Services.Logging;
-using System;
-
-namespace Daybreak.Utils
-{
-    public static class LoggingExtensions
-    {
-        public static void LogInformation(this ILogger logger, string message)
-        {
-            if (logger is null) throw new ArgumentNullException(nameof(logger));
-
-            logger.Log(LogLevel.Information, message);
-        }
-
-        public static void LogError(this ILogger logger, string message)
-        {
-            if (logger is null) throw new ArgumentNullException(nameof(logger));
-
-            logger.Log(LogLevel.Error, message);
-        }
-
-        public static void LogCritical(this ILogger logger, string message)
-        {
-            if (logger is null) throw new ArgumentNullException(nameof(logger));
-
-            logger.Log(LogLevel.Critical, message);
-        }
-
-        public static void LogWarning(this ILogger logger, string message)
-        {
-            if (logger is null) throw new ArgumentNullException(nameof(logger));
-
-            logger.Log(LogLevel.Warning, message);
-        }
-
-        public static void LogInformation(this ILogger logger, Exception e)
-        {
-            if (logger is null) throw new ArgumentNullException(nameof(logger));
-
-            logger.Log(LogLevel.Information, e);
-        }
-
-        public static void LogWarning(this ILogger logger, Exception e)
-        {
-            if (logger is null) throw new ArgumentNullException(nameof(logger));
-
-            logger.Log(LogLevel.Warning, e);
-        }
-
-        public static void LogError(this ILogger logger, Exception e)
-        {
-            if (logger is null) throw new ArgumentNullException(nameof(logger));
-
-            logger.Log(LogLevel.Error, e);
-        }
-
-        public static void LogCritical(this ILogger logger, Exception e)
-        {
-            if (logger is null) throw new ArgumentNullException(nameof(logger));
-
-            logger.Log(LogLevel.Critical, e);
-        }
-    }
-}

Daybreak/Utils/LoggingHttpHandler.cs

@@ -0,0 +1,35 @@
+using Microsoft.Extensions.Logging;
+using System;
+using System.Extensions;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Daybreak.Utils
+{
+    public sealed class LoggingHttpHandler : DelegatingHandler
+    {
+        private readonly ILogger logger;
+
+        public LoggingHttpHandler(ILogger logger, HttpMessageHandler innerHandler) : base(innerHandler)
+        {
+            this.logger = logger.ThrowIfNull(nameof(logger));
+        }
+
+        protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+        {
+            this.logger.LogInformation($"{request.Method} - {request.RequestUri}");
+            try
+            {
+                var response = await base.SendAsync(request, cancellationToken);
+                this.logger.LogInformation($"{request.RequestUri} - {response.StatusCode}");
+                return response;
+            }
+            catch(Exception e)
+            {
+                this.logger.LogError($"Exception encountered while processing {request.Method} - {request.RequestUri}", e);
+                throw;
+            }
+        }
+    }
+}

Daybreak/Views/AskUpdateView.xaml.cs

@@ -1,9 +1,8 @@
-using Daybreak.Services.Logging;
-using Daybreak.Services.Privilege;
+using Daybreak.Services.Privilege;
 using Daybreak.Services.Runtime;
 using Daybreak.Services.Updater;
 using Daybreak.Services.ViewManagement;
-using Daybreak.Utils;
+using Microsoft.Extensions.Logging;
 using System.Extensions;
 using System.Linq;
 using System.Windows.Controls;
@@ -17,14 +16,14 @@ namespace Daybreak.Views
     {
         private const string UpdateDesiredKey = "UpdateDesired";
 
-        private readonly ILogger logger;
+        private readonly ILogger<AskUpdateView> logger;
         private readonly IViewManager viewManager;
         private readonly IRuntimeStore runtimeStore;
         private readonly IPrivilegeManager privilegeManager;
         private readonly IApplicationUpdater applicationUpdater;
 
         public AskUpdateView(
-            ILogger logger,
+            ILogger<AskUpdateView> logger,
             IViewManager viewManager,
             IRuntimeStore runtimeStore,
             IPrivilegeManager privilegeManager,

Daybreak/Views/RequestElevationView.xaml.cs

@@ -1,8 +1,7 @@
 using Daybreak.Models;
 using Daybreak.Services.ApplicationLauncher;
-using Daybreak.Services.Logging;
 using Daybreak.Services.ViewManagement;
-using Daybreak.Utils;
+using Microsoft.Extensions.Logging;
 using System.Extensions;
 using System.Windows.Controls;
 
@@ -15,12 +14,12 @@ namespace Daybreak.Views
     {
         private readonly IApplicationLauncher applicationLauncher;
         private readonly IViewManager viewManager;
-        private readonly ILogger logger;
+        private readonly ILogger<RequestElevationView> logger;
 
         public RequestElevationView(
             IApplicationLauncher applicationLauncher,
             IViewManager viewManager,
-            ILogger logger)
+            ILogger<RequestElevationView> logger)
         {
             this.applicationLauncher = applicationLauncher.ThrowIfNull(nameof(applicationLauncher));
             this.viewManager = viewManager.ThrowIfNull(nameof(viewManager));

Daybreak/Views/UpdateView.xaml.cs

@@ -1,8 +1,7 @@
 using Daybreak.Models;
-using Daybreak.Services.Logging;
 using Daybreak.Services.Updater;
 using Daybreak.Services.ViewManagement;
-using Daybreak.Utils;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Windows;
 using System.Windows.Controls;
@@ -18,7 +17,7 @@ namespace Daybreak.Views
     [System.Diagnostics.CodeAnalysis.SuppressMessage("CodeQuality", "IDE0052:Remove unread private members", Justification = "Used by source generators")]
     public partial class UpdateView : UserControl
     {
-        private readonly ILogger logger;
+        private readonly ILogger<UpdateView> logger;
         private readonly IViewManager viewManager;
         private readonly IApplicationUpdater applicationUpdater;
         private readonly UpdateStatus updateStatus = new();
@@ -33,7 +32,7 @@ namespace Daybreak.Views
 
         public UpdateView(
             IApplicationUpdater applicationUpdater,
-            ILogger logger,
+            ILogger<UpdateView> logger,
             IViewManager viewManager)
         {
             this.applicationUpdater = applicationUpdater;