Update to .net 6 and update dependencies (#24)

* Update to .net 6 and update dependencies

.github/workflows/cd.yaml

@@ -52,7 +52,7 @@ jobs:
     - name: Install .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '5.0.202'
+        dotnet-version: '6.x'
 
     - name: Setup MSBuild.exe
       uses: microsoft/setup-msbuild@v1.0.1

.github/workflows/ci.yaml

@@ -38,7 +38,7 @@ jobs:
     - name: Install .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '5.0.202'
+        dotnet-version: '6.x'
 
     - name: Setup MSBuild.exe
       uses: microsoft/setup-msbuild@v1.0.1

Daybreak.Tests/Daybreak.Tests.csproj

@@ -1,19 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0-windows</TargetFramework>
-
+    <TargetFramework>net6.0-windows</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.0.0-alpha0002" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
-    <PackageReference Include="Moq" Version="4.16.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.1.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.1.1" />
-    <PackageReference Include="coverlet.collector" Version="1.3.0" />
-    <PackageReference Include="System.Linq.Async" Version="5.0.0" />
+    <PackageReference Include="FluentAssertions" Version="6.7.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0-preview-20220707-01" />
+    <PackageReference Include="Moq" Version="4.18.2" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
+    <PackageReference Include="coverlet.collector" Version="3.1.2" />
+    <PackageReference Include="System.Linq.Async" Version="6.0.1" />
   </ItemGroup>
 
   <ItemGroup>

Daybreak.Tests/Services/ApplicationConfigurationOptionsManagerTests.cs

@@ -0,0 +1,63 @@
+using Daybreak.Configuration;
+using Daybreak.Services.Configuration;
+using Daybreak.Services.Options;
+using FluentAssertions;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using System;
+
+namespace Daybreak.Tests.Services
+{
+    [TestClass]
+    public class ApplicationConfigurationOptionsManagerTests
+    {
+        private ApplicationConfigurationOptionsManager applicationConfigurationOptionsManager;
+
+        [TestInitialize]
+        public void TestInitialize()
+        {
+            var configurationManagerMock = new Mock<IConfigurationManager>();
+            configurationManagerMock
+                .Setup(u => u.GetConfiguration())
+                .Returns(new ApplicationConfiguration());
+
+            this.applicationConfigurationOptionsManager = new ApplicationConfigurationOptionsManager(configurationManagerMock.Object);
+        }
+
+        [TestMethod]
+        public void GetApplicationConfiguration_ReturnsObject()
+        {
+            var config = this.applicationConfigurationOptionsManager.GetOptions<ApplicationConfiguration>();
+
+            config.Should().NotBeNull();
+        }
+
+        [TestMethod]
+        public void GetOtherOptions_ThrowsInvalidOperationException()
+        {
+            var action = new Action(() =>
+            {
+                this.applicationConfigurationOptionsManager.GetOptions<object>();
+            });
+
+            action.Should().Throw<InvalidOperationException>();
+        }
+
+        [TestMethod]
+        public void UpdateOptions_OnApplicationConfiguration_Succeeds()
+        {
+            this.applicationConfigurationOptionsManager.UpdateOptions(new ApplicationConfiguration());
+        }
+
+        [TestMethod]
+        public void UpdateOptions_OnOthers_ThrowsInvalidOperationException()
+        {
+            var action = new Action(() =>
+            {
+                this.applicationConfigurationOptionsManager.UpdateOptions(new object());
+            });
+
+            action.Should().Throw<InvalidOperationException>();
+        }
+    }
+}

Daybreak.Tests/Services/JsonLoggerProviderTests.cs

@@ -4,7 +4,8 @@ using LiteDB;
 using Microsoft.Extensions.Logging;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.IO;
-using WpfExtended.Logging;
+using System.Linq;
+using System.Logging;
 
 namespace Daybreak.Tests.Services
 {
@@ -37,6 +38,18 @@ namespace Daybreak.Tests.Services
             logger.Should().NotBeNull();
         }
         [TestMethod]
+        public void LoggerLogsAndReaderReadsFiltered()
+        {
+            var logger = this.loggerProvider.CreateLogger("SomeCategory");
+            logger.LogTrace("Logging some trace");
+            logger.LogInformation("Logging some stuff");
+            logger.LogError("Logging some error");
+
+            this.logsManager.GetLogs(l => l.LogLevel < LogLevel.Information).Should().HaveCount(1);
+            var log = this.logsManager.GetLogs(l => l.LogLevel < LogLevel.Information).First();
+            log.LogLevel.Should().Be(LogLevel.Error);
+        }
+        [TestMethod]
         public void LoggerLogsAndReaderReads()
         {
             var logger = this.loggerProvider.CreateLogger("SomeCategory");

Daybreak.sln

@@ -1,12 +1,18 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.31005.135
+# Visual Studio Version 17
+VisualStudioVersion = 17.2.32616.157
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Daybreak", "Daybreak\Daybreak.csproj", "{AA45C2B1-8BD0-466C-9271-699F168905AF}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Daybreak.Tests", "Daybreak.Tests\Daybreak.Tests.csproj", "{C911C1C2-6566-419C-89C7-F802EB3FE709}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Pipelines", "Pipelines", "{067BF93F-E5B2-4E99-886E-039C04F35EAB}"
+	ProjectSection(SolutionItems) = preProject
+		.github\workflows\cd.yaml = .github\workflows\cd.yaml
+		.github\workflows\ci.yaml = .github\workflows\ci.yaml
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

Daybreak/Configuration/ApplicationConfiguration.cs

@@ -37,5 +37,7 @@ namespace Daybreak.Configuration
         public bool PlaceShortcut { get; set; }
         [JsonProperty("AutoCheckUpdate")]
         public bool AutoCheckUpdate { get; set; } = true;
+        [JsonProperty("KeepLocalIconCache")]
+        public bool KeepLocalIconCache { get; set; } = true;
     }
 }

Daybreak/Configuration/ProjectConfiguration.cs

@@ -1,5 +1,4 @@
 using Daybreak.Services.ApplicationLauncher;
-using Daybreak.Services.ApplicationLifetime;
 using Daybreak.Services.Bloogum;
 using Daybreak.Services.BuildTemplates;
 using Daybreak.Services.Configuration;
@@ -8,7 +7,6 @@ using Daybreak.Services.IconRetrieve;
 using Daybreak.Services.Logging;
 using Daybreak.Services.Mutex;
 using Daybreak.Services.Privilege;
-using Daybreak.Services.Runtime;
 using Daybreak.Services.Screens;
 using Daybreak.Services.Screenshots;
 using Daybreak.Services.Shortcuts;
@@ -20,9 +18,10 @@ using Microsoft.Extensions.Logging;
 using Slim;
 using System.Extensions;
 using System.Net.Http;
-using System.Windows.Extensions.Http;
 using LiteDB;
-using System.Windows.Extensions;
+using Daybreak.Services.Options;
+using Daybreak.Models;
+using Microsoft.CorrelationVector;
 
 namespace Daybreak.Configuration
 {
@@ -32,26 +31,23 @@ namespace Daybreak.Configuration
         {
             serviceManager.ThrowIfNull(nameof(serviceManager));
 
-            serviceManager.RegisterResolver(
-                new HttpClientResolver()
-                .WithHttpMessageHandlerFactory((serviceProvider, categoryType) =>
-                {
-                    var loggerType = typeof(ILogger<>).MakeGenericType(categoryType);
-                    var logger = serviceProvider.GetService(loggerType).As<ILogger>();
-                    var handler = new LoggingHttpMessageHandler(logger) { InnerHandler = new HttpClientHandler() };
-                    return handler;
-                }));
+            serviceManager.RegisterHttpFactory((serviceProvider, categoryType) =>
+            {
+                var loggerType = typeof(ILogger<>).MakeGenericType(categoryType);
+                var logger = serviceProvider.GetService(loggerType).As<ILogger>();
+                var handler = new LoggingHttpMessageHandler(logger) { InnerHandler = new HttpClientHandler() };
+                return handler;
+            });
+            serviceManager.RegisterOptionsManager<ApplicationConfigurationOptionsManager>();
         }
 
         public static void RegisterServices(IServiceProducer serviceProducer)
         {
             serviceProducer.ThrowIfNull(nameof(serviceProducer));
 
-            serviceProducer.RegisterSingleton<ApplicationLifetimeManager>();
-            serviceProducer.RegisterSingleton<ViewManager>();
+            serviceProducer.RegisterSingleton<ViewManager>(registerAllInterfaces: true);
             serviceProducer.RegisterSingleton<IConfigurationManager, ConfigurationManager>();
             serviceProducer.RegisterSingleton<ILiteDatabase, LiteDatabase>(sp => new LiteDatabase("Daybreak.db"));
-            serviceProducer.RegisterSingleton<IRuntimeStore, RuntimeStore>();
             serviceProducer.RegisterSingleton<IMutexHandler, MutexHandler>();
             serviceProducer.RegisterSingleton<IShortcutManager, ShortcutManager>();
             serviceProducer.RegisterScoped<ICredentialManager, CredentialManager>();
@@ -64,15 +60,9 @@ namespace Daybreak.Configuration
             serviceProducer.RegisterScoped<IPrivilegeManager, PrivilegeManager>();
             serviceProducer.RegisterScoped<IScreenManager, ScreenManager>();
             serviceProducer.RegisterLogWriter<ILogsManager, JsonLogsManager>();
+            serviceProducer.RegisterScoped((sp) => new ScopeMetadata(new CorrelationVector()));
         }
-        public static void RegisterLifetimeServices(IApplicationLifetimeProducer applicationLifetimeProducer)
-        {
-            applicationLifetimeProducer.ThrowIfNull(nameof(applicationLifetimeProducer));
 
-            applicationLifetimeProducer.RegisterService<IScreenshotProvider>();
-            applicationLifetimeProducer.RegisterService<IApplicationUpdater>();
-            applicationLifetimeProducer.RegisterService<IShortcutManager>();
-        }
         public static void RegisterViews(IViewProducer viewProducer)
         {
             viewProducer.ThrowIfNull(nameof(viewProducer));

Daybreak/Controls/ChromiumBrowserWrapper.xaml.cs

@@ -1,11 +1,12 @@
-using Daybreak.Models.Browser;
+using Daybreak.Configuration;
+using Daybreak.Models.Browser;
 using Daybreak.Models.Builds;
 using Daybreak.Services.BuildTemplates;
-using Daybreak.Services.Configuration;
 using Daybreak.Utils;
 using Microsoft.Extensions.Logging;
 using Microsoft.Web.WebView2.Core;
 using System;
+using System.Configuration;
 using System.Diagnostics;
 using System.Extensions;
 using System.Threading.Tasks;
@@ -22,13 +23,16 @@ namespace Daybreak.Controls
     [System.Diagnostics.CodeAnalysis.SuppressMessage("CodeQuality", "IDE0052:Remove unread private members", Justification = "Used by source generators")]
     public partial class ChromiumBrowserWrapper : UserControl
     {
+        public static readonly DependencyProperty AddressProperty =
+            DependencyPropertyExtensions.Register<ChromiumBrowserWrapper, string>(nameof(Address));
+        
         private const string BrowserDownloadLink = "https://developer.microsoft.com/en-us/microsoft-edge/webview2/";
 
         public event EventHandler<string> FavoriteUriChanged;
         public event EventHandler MaximizeClicked;
         public event EventHandler<Build> BuildDecoded;
 
-        private IConfigurationManager configurationManager;
+        private ILiveOptions<ApplicationConfiguration> liveOptions;
         private ILogger<ChromiumBrowserWrapper> logger;
         private IBuildTemplateManager buildTemplateManager;
         private CoreWebView2Environment coreWebView2Environment;
@@ -49,8 +53,17 @@ namespace Daybreak.Controls
         private bool navigating;
         [GenerateDependencyProperty]
         private string favoriteAddress;
-        [GenerateDependencyProperty]
-        private string address;
+        public string Address
+        {
+            get => this.GetTypedValue<string>(AddressProperty);
+            set
+            {
+                if (this.BrowserSupported is true)
+                {
+                    this.SetValue(AddressProperty, value);
+                }
+            }
+        }
 
         public ChromiumBrowserWrapper()
         {
@@ -68,11 +81,11 @@ namespace Daybreak.Controls
         }
 
         public async void InitializeBrowser(
-            IConfigurationManager configurationManager,
+            ILiveOptions<ApplicationConfiguration> liveOptions,
             IBuildTemplateManager buildTemplateManager,
             ILogger<ChromiumBrowserWrapper> logger)
         {
-            this.configurationManager = configurationManager;
+            this.liveOptions = liveOptions;
             this.buildTemplateManager = buildTemplateManager;
             this.logger = logger;
             this.InitializeEnvironment();
@@ -86,7 +99,7 @@ namespace Daybreak.Controls
 
         private void InitializeEnvironment()
         {
-            if (this.configurationManager.GetConfiguration().BrowsersEnabled is false)
+            if (this.liveOptions.Value.BrowsersEnabled is false)
             {
                 this.BrowserSupported = false;
                 return;
@@ -110,8 +123,8 @@ namespace Daybreak.Controls
             {
                 this.WebBrowser.IsEnabled = true;
                 await this.WebBrowser.EnsureCoreWebView2Async(this.coreWebView2Environment);
-                this.AddressBarReadonly = this.configurationManager.GetConfiguration().AddressBarReadonly;
-                this.CanDownloadBuild = this.configurationManager.GetConfiguration().ExperimentalFeatures.DynamicBuildLoading;
+                this.AddressBarReadonly = this.liveOptions.Value.AddressBarReadonly;
+                this.CanDownloadBuild = this.liveOptions.Value.ExperimentalFeatures.DynamicBuildLoading;
                 this.WebBrowser.CoreWebView2.NewWindowRequested += (browser, args) => args.Handled = true;
                 this.WebBrowser.NavigationStarting += (browser, args) =>
                 {
@@ -184,6 +197,7 @@ namespace Daybreak.Controls
             {
                 this.logger.LogError(e, $"Exception encountered when deserializing {nameof(BrowserPayload)}");
             }
+
             if (payload?.Key == BrowserPayload.PayloadKeys.ContextMenu)
             {
                 var contextMenuPayload = args.WebMessageAsJson.Deserialize<BrowserPayload<OnContextMenuPayload>>();

Daybreak/Controls/Templates/AttributeTemplate.xaml.cs

@@ -15,6 +15,7 @@ namespace Daybreak.Controls
     public partial class AttributeTemplate : UserControl
     {
         public event EventHandler<AttributeEntry> HelpClicked;
+        public event EventHandler<AttributeEntry> AttributeChanged;
         
         [GenerateDependencyProperty(InitialValue = false)]
         private bool canAdd;
@@ -50,6 +51,7 @@ namespace Daybreak.Controls
                 this.DataContext.As<AttributeEntry>().Points--;
                 this.CanSubtract = this.DataContext.As<AttributeEntry>().Points > 0;
                 this.CanAdd = true;
+                this.AttributeChanged?.Invoke(this, this.DataContext.As<AttributeEntry>());
             }
         }
 
@@ -60,6 +62,7 @@ namespace Daybreak.Controls
                 this.DataContext.As<AttributeEntry>().Points++;
                 this.CanAdd = this.DataContext.As<AttributeEntry>().Points < 12;
                 this.CanSubtract = true;
+                this.AttributeChanged?.Invoke(this, this.DataContext.As<AttributeEntry>());
             }
         }
 

Daybreak/Controls/Templates/BuildTemplate.xaml

@@ -75,7 +75,7 @@
                      HorizontalContentAlignment="Stretch" BorderThickness="0">
                 <ListBox.ItemTemplate>
                     <DataTemplate>
-                        <local:AttributeTemplate HelpClicked="AttributeTemplate_HelpClicked"></local:AttributeTemplate>
+                        <local:AttributeTemplate HelpClicked="AttributeTemplate_HelpClicked" AttributeChanged="AttributeTemplate_AttributeChanged"></local:AttributeTemplate>
                     </DataTemplate>
                 </ListBox.ItemTemplate>
             </ListBox>

Daybreak/Controls/Templates/BuildTemplate.xaml.cs

@@ -1,10 +1,12 @@
-using Daybreak.Models.Builds;
+using Daybreak.Configuration;
+using Daybreak.Models.Builds;
 using Daybreak.Services.BuildTemplates;
-using Daybreak.Services.Configuration;
 using Daybreak.Services.IconRetrieve;
 using Microsoft.Extensions.Logging;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Configuration;
 using System.Extensions;
 using System.Linq;
 using System.Windows;
@@ -23,10 +25,13 @@ namespace Daybreak.Controls
         private const string InfoNamePlaceholder = "[NAME]";
         private const string BaseAddress = $"https://wiki.guildwars.com/wiki/{InfoNamePlaceholder}";
 
+        private bool suppressBuildChanged = false;
         private bool loadedProperties = false;
         private BuildEntry loadedBuild;
         private SkillTemplate selectingSkillTemplate;
 
+        public event EventHandler BuildChanged;
+
         [GenerateDependencyProperty]
         private Profession primaryProfession;
         [GenerateDependencyProperty]
@@ -55,16 +60,16 @@ namespace Daybreak.Controls
         {
             this.InitializeComponent();
             this.InitializeProperties();
-            this.DataContextChanged += BuildTemplate_DataContextChanged;
+            this.DataContextChanged += this.BuildTemplate_DataContextChanged;
         }
 
         public void InitializeTemplate(
             IIconRetriever iconRetriever,
-            IConfigurationManager configurationManager,
+            ILiveOptions<ApplicationConfiguration> liveOptions,
             IBuildTemplateManager buildTemplateManager,
             ILogger<ChromiumBrowserWrapper> logger)
         {
-            this.SkillBrowser.InitializeBrowser(configurationManager, buildTemplateManager, logger);
+            this.SkillBrowser.InitializeBrowser(liveOptions, buildTemplateManager, logger);
             this.SkillTemplate0.InitializeSkillTemplate(iconRetriever);
             this.SkillTemplate1.InitializeSkillTemplate(iconRetriever);
             this.SkillTemplate2.InitializeSkillTemplate(iconRetriever);
@@ -93,8 +98,36 @@ namespace Daybreak.Controls
                 {
                     this.loadedBuild.Build.Secondary = this.SecondaryProfession;
                 }
+
                 this.LoadSkills();
                 this.LoadAttributes();
+                if (this.suppressBuildChanged is false)
+                {
+                    this.BuildChanged?.Invoke(this, new EventArgs());
+                }
+            }
+
+            if (e.Property == Skill0Property ||
+                e.Property == Skill1Property ||
+                e.Property == Skill2Property ||
+                e.Property == Skill3Property ||
+                e.Property == Skill4Property ||
+                e.Property == Skill5Property ||
+                e.Property == Skill6Property ||
+                e.Property == Skill7Property)
+            {
+                if (this.suppressBuildChanged is false)
+                {
+                    this.loadedBuild.Build.Skills[0] = this.Skill0;
+                    this.loadedBuild.Build.Skills[1] = this.Skill1;
+                    this.loadedBuild.Build.Skills[2] = this.Skill2;
+                    this.loadedBuild.Build.Skills[3] = this.Skill3;
+                    this.loadedBuild.Build.Skills[4] = this.Skill4;
+                    this.loadedBuild.Build.Skills[5] = this.Skill5;
+                    this.loadedBuild.Build.Skills[6] = this.Skill6;
+                    this.loadedBuild.Build.Skills[7] = this.Skill7;
+                    this.BuildChanged?.Invoke(this, new EventArgs());
+                }
             }
         }
 
@@ -161,55 +194,62 @@ namespace Daybreak.Controls
         private void LoadSkills()
         {
             var possibleSkills = Skill.Skills
-                .Where(s => s.Profession == PrimaryProfession || s.Profession == SecondaryProfession || s.Profession == Profession.None)
+                .Where(s => s.Profession == this.PrimaryProfession || s.Profession == this.SecondaryProfession || s.Profession == Profession.None)
                 .Where(s => s != Skill.NoSkill)
                 .OrderBy(s => s.Name);
             this.AvailableSkills.ClearAnd().AddRange(possibleSkills);
 
-            if (this.Skill0.Profession != PrimaryProfession &&
-                this.Skill0.Profession != SecondaryProfession &&
+            if (this.Skill0.Profession != this.PrimaryProfession &&
+                this.Skill0.Profession != this.SecondaryProfession &&
                 this.Skill0.Profession != Profession.None)
             {
                 this.Skill0 = Skill.NoSkill;
             }
-            if (this.Skill1.Profession != PrimaryProfession &&
-                this.Skill1.Profession != SecondaryProfession &&
+
+            if (this.Skill1.Profession != this.PrimaryProfession &&
+                this.Skill1.Profession != this.SecondaryProfession &&
                 this.Skill1.Profession != Profession.None)
             {
                 this.Skill1 = Skill.NoSkill;
             }
-            if (this.Skill2.Profession != PrimaryProfession &&
-                this.Skill2.Profession != SecondaryProfession &&
+
+            if (this.Skill2.Profession != this.PrimaryProfession &&
+                this.Skill2.Profession != this.SecondaryProfession &&
                 this.Skill2.Profession != Profession.None)
             {
                 this.Skill2 = Skill.NoSkill;
             }
-            if (this.Skill3.Profession != PrimaryProfession &&
-                this.Skill3.Profession != SecondaryProfession &&
+
+            if (this.Skill3.Profession != this.PrimaryProfession &&
+                this.Skill3.Profession != this.SecondaryProfession &&
                 this.Skill3.Profession != Profession.None)
             {
                 this.Skill3 = Skill.NoSkill;
             }
-            if (this.Skill4.Profession != PrimaryProfession &&
-                this.Skill4.Profession != SecondaryProfession &&
+
+            if (this.Skill4.Profession != this.PrimaryProfession &&
+                this.Skill4.Profession != this.SecondaryProfession &&
                 this.Skill4.Profession != Profession.None)
             {
                 this.Skill4 = Skill.NoSkill;
             }
-            if (this.Skill5.Profession != PrimaryProfession &&
-                this.Skill5.Profession != SecondaryProfession &&
+
+            if (this.Skill5.Profession != this.PrimaryProfession &&
+                this.Skill5.Profession != this.SecondaryProfession &&
                 this.Skill5.Profession != Profession.None)
             {
                 this.Skill5 = Skill.NoSkill;
             }
-            if (this.Skill6.Profession != PrimaryProfession &&
-                this.Skill6.Profession != SecondaryProfession &&
+
+            if (this.Skill6.Profession != this.PrimaryProfession &&
+                this.Skill6.Profession != this.SecondaryProfession &&
                 this.Skill6.Profession != Profession.None)
             {
                 this.Skill6 = Skill.NoSkill;
             }
-            if (this.Skill7.Profession != PrimaryProfession &&
-                this.Skill7.Profession != SecondaryProfession &&
+
+            if (this.Skill7.Profession != this.PrimaryProfession &&
+                this.Skill7.Profession != this.SecondaryProfession &&
                 this.Skill7.Profession != Profession.None)
             {
                 this.Skill7 = Skill.NoSkill;
@@ -218,6 +258,7 @@ namespace Daybreak.Controls
 
         private void LoadBuild()
         {
+            this.suppressBuildChanged = true;
             var build = this.DataContext.As<BuildEntry>();
             this.loadedBuild = build;
             this.PrimaryProfession = build.Build.Primary;
@@ -230,6 +271,7 @@ namespace Daybreak.Controls
             this.Skill5 = build.Build.Skills[5];
             this.Skill6 = build.Build.Skills[6];
             this.Skill7 = build.Build.Skills[7];
+            this.suppressBuildChanged = false;
         }
 
         private void BrowseToInfo(string infoName)
@@ -241,13 +283,19 @@ namespace Daybreak.Controls
 
         private void ShowInfoBrowser()
         {
-            this.SkillBrowser.Width = 400;
-            this.SkillsListView.Width = 0;
+            if (this.SkillBrowser.BrowserSupported is true)
+            {
+                this.SkillBrowser.Width = 400;
+                this.SkillsListView.Width = 0;
+            }
         }
 
         private void HideInfoBrowser()
         {
-            this.SkillBrowser.Width = 0;
+            if (this.SkillBrowser.BrowserSupported is true)
+            {
+                this.SkillBrowser.Width = 0;
+            }
         }
 
         private void ShowSkillListView()
@@ -268,7 +316,7 @@ namespace Daybreak.Controls
                 return;
             }
 
-            this.BrowseToInfo(PrimaryProfession.Name);
+            this.BrowseToInfo(this.PrimaryProfession.Name);
             if (e is RoutedEventArgs routedEventArgs)
             {
                 routedEventArgs.Handled = true;
@@ -294,6 +342,11 @@ namespace Daybreak.Controls
             this.BrowseToInfo(e.Attribute.Name);
         }
 
+        private void AttributeTemplate_AttributeChanged(object sender, AttributeEntry e)
+        {
+            this.BuildChanged?.Invoke(this, new EventArgs());
+        }
+
         private void SkillTemplate_Clicked(object sender, RoutedEventArgs e)
         {
             var skill = sender.As<SkillTemplate>().DataContext.As<Skill>();
@@ -306,6 +359,7 @@ namespace Daybreak.Controls
             {
                 this.BrowseToInfo(skill.Name);
             }
+
             e.Handled = true;
         }
 
@@ -324,14 +378,14 @@ namespace Daybreak.Controls
 
             this.selectingSkillTemplate.DataContext = sender.As<ListView>().SelectedItem;
             this.HideSkillListView();
-            this.loadedBuild.Build.Skills[0] = Skill0;
-            this.loadedBuild.Build.Skills[1] = Skill1;
-            this.loadedBuild.Build.Skills[2] = Skill2;
-            this.loadedBuild.Build.Skills[3] = Skill3;
-            this.loadedBuild.Build.Skills[4] = Skill4;
-            this.loadedBuild.Build.Skills[5] = Skill5;
-            this.loadedBuild.Build.Skills[6] = Skill6;
-            this.loadedBuild.Build.Skills[7] = Skill7;
+            this.loadedBuild.Build.Skills[0] = this.Skill0;
+            this.loadedBuild.Build.Skills[1] = this.Skill1;
+            this.loadedBuild.Build.Skills[2] = this.Skill2;
+            this.loadedBuild.Build.Skills[3] = this.Skill3;
+            this.loadedBuild.Build.Skills[4] = this.Skill4;
+            this.loadedBuild.Build.Skills[5] = this.Skill5;
+            this.loadedBuild.Build.Skills[6] = this.Skill6;
+            this.loadedBuild.Build.Skills[7] = this.Skill7;
         }
 
         private void ListView_NavigateWithMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)

Daybreak/Controls/Templates/LogMessageTemplate.xaml

@@ -0,0 +1,18 @@
+<UserControl x:Class="Daybreak.Controls.LogMessageTemplate"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Daybreak.Controls"
+             x:Name="_this"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <UserControl.Resources>
+        <BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter"></BooleanToVisibilityConverter>
+    </UserControl.Resources>
+    <Grid HorizontalAlignment="Stretch">
+        <TextBlock Text="{Binding ElementName=_this, Path=Message, Mode=OneWay}" Background="Transparent"
+                 Foreground="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
+                 MouseLeftButtonDown="TextBox_MouseLeftButtonDown" MaxHeight="18" TextWrapping="Wrap"></TextBlock>
+    </Grid>
+</UserControl>

Daybreak/Controls/Templates/LogMessageTemplate.xaml.cs

@@ -0,0 +1,36 @@
+using System.Windows.Extensions;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Extensions;
+
+namespace Daybreak.Controls
+{
+    /// <summary>
+    /// Interaction logic for LogTemplate.xaml
+    /// </summary>
+    public partial class LogMessageTemplate : UserControl
+    {
+        private bool expanded;
+
+        [GenerateDependencyProperty]
+        private string message;
+
+        public LogMessageTemplate()
+        {
+            this.InitializeComponent();
+        }
+
+        private void TextBox_MouseLeftButtonDown(object sender, MouseButtonEventArgs eventArgs)
+        {
+            this.expanded = !this.expanded;
+            if (this.expanded)
+            {
+                sender.As<TextBlock>().MaxHeight = double.MaxValue;
+            }
+            else
+            {
+                sender.As<TextBlock>().MaxHeight = 18;
+            }
+        }
+    }
+}

Daybreak/Daybreak.csproj

@@ -2,34 +2,34 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
     <UseWindowsForms>true</UseWindowsForms>
     <Platforms>AnyCPU</Platforms>
-    <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <LangVersion>preview</LangVersion>
     <ApplicationIcon>Daybreak.ico</ApplicationIcon>
     <IncludePackageReferencesDuringMarkupCompilation>true</IncludePackageReferencesDuringMarkupCompilation>
-    <Version>0.9.1</Version>
+    <Version>0.9.2.8</Version>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="HtmlAgilityPack" Version="1.11.32" />
-    <PackageReference Include="LiteDB" Version="5.0.10" />
+    <PackageReference Include="HtmlAgilityPack" Version="1.11.43" />
+    <PackageReference Include="LiteDB" Version="5.0.12" />
     <PackageReference Include="Microsoft.CorrelationVector" Version="1.0.42" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.864.35" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1264.42" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="NReco.Logging.File" Version="1.1.1" />
+    <PackageReference Include="NReco.Logging.File" Version="1.1.5" />
     <PackageReference Include="securifybv.ShellLink" Version="0.1.0" />
-    <PackageReference Include="Slim" Version="1.4.3" />
+    <PackageReference Include="Slim" Version="1.7.3" />
     <PackageReference Include="System.Windows.Interactivity.WPF" Version="2.0.20525" />
-    <PackageReference Include="SystemExtensions.NetStandard" Version="1.3.0" />
+    <PackageReference Include="SystemExtensions.NetStandard" Version="1.5.0" />
     <PackageReference Include="WCL" Version="1.0.2" />
-    <PackageReference Include="WpfExtended" Version="0.4.1" />
+    <PackageReference Include="WpfExtended" Version="0.6.2" />
     <PackageReference Include="WpfExtended.SourceGeneration" Version="0.1.1" />
-    <PackageReference Include="WpfScreenHelper" Version="1.0.0" />
+    <PackageReference Include="WpfScreenHelper" Version="2.0.0" />
   </ItemGroup>
 
   <ItemGroup>
@@ -74,4 +74,12 @@
     <Exec Command="echo.&gt;$(Version).version" />
   </Target>
 
+  <Target Name="RemoveDuplicateAnalyzers" BeforeTargets="CoreCompile">
+		<!-- Work around https://github.com/dotnet/wpf/issues/6792 -->
+    <ItemGroup>
+      <FilteredAnalyzer Include="@(Analyzer->Distinct())" />
+      <Analyzer Remove="@(Analyzer)" />
+      <Analyzer Include="@(FilteredAnalyzer)" />
+    </ItemGroup>
+  </Target>
 </Project>

Daybreak/Launch/Launcher.cs

@@ -1,6 +1,5 @@
 using Daybreak.Configuration;
 using Daybreak.Exceptions;
-using Daybreak.Services.ApplicationLifetime;
 using Daybreak.Services.ViewManagement;
 using Microsoft.Extensions.Logging;
 using Slim;
@@ -16,7 +15,7 @@ namespace Daybreak.Launch
 {
     public sealed class Launcher : ExtendedApplication<MainWindow>
     {
-        public static IServiceManager ApplicationServiceManager { get; private set; }
+        private ILogger logger;
         private readonly static Launcher launcher = new();
 
         [STAThread]
@@ -27,14 +26,12 @@ namespace Daybreak.Launch
 
         protected override void SetupServiceManager(IServiceManager serviceManager)
         {
-            ApplicationServiceManager = this.ServiceManager;
             ProjectConfiguration.RegisterResolvers(serviceManager);
         }
         protected override void RegisterServices(IServiceProducer serviceProducer)
         {
             ProjectConfiguration.RegisterServices(this.ServiceManager);
             ServiceManager.BuildSingletons();
-            ProjectConfiguration.RegisterLifetimeServices(this.ServiceManager.GetService<IApplicationLifetimeManager>());
             ProjectConfiguration.RegisterViews(this.ServiceManager.GetService<IViewManager>());
         }
         protected override bool HandleException(Exception e)
@@ -44,17 +41,21 @@ namespace Daybreak.Launch
                 return false;
             }
 
-            this.ServiceManager.GetService<ILogger>().LogCritical(e, $"Unhandled exception");
+            if (this.logger is null)
+            {
+                return false;
+            }
+
             if (e is FatalException fatalException)
             {
-                this.ServiceManager.GetService<ILogger>().LogCritical(e, $"{nameof(FatalException)} encountered. Closing application.");
+                this.logger.LogCritical(e, $"{nameof(FatalException)} encountered. Closing application");
                 MessageBox.Show(fatalException.ToString());
                 File.WriteAllText("crash.log", e.ToString());
                 return false;
             }
             else if (e is TargetInvocationException targetInvocationException && e.InnerException is FatalException innerFatalException)
             {
-                this.ServiceManager.GetService<ILogger>().LogCritical(e, $"{nameof(FatalException)} encountered. Closing application.");
+                this.logger.LogCritical(e, $"{nameof(FatalException)} encountered. Closing application");
                 MessageBox.Show(innerFatalException.ToString());
                 File.WriteAllText("crash.log", e.ToString());
                 return false;
@@ -66,23 +67,33 @@ namespace Daybreak.Launch
                 {
                     /* 
                      * Ignore exception caused by browser failing to initialize due to missing window.
-                     * Likely caused by switching windows before browser was initialized.
+                     * Likely caused by switching views before browser was initialized.
                      */
+                    this.logger.LogError(e, "Failed to initialize browser");
                     return true;
                 }
             }
+            else if (e.Message.Contains("Invalid window handle.") && e.StackTrace.Contains("CoreWebView2Environment.CreateCoreWebView2ControllerAsync"))
+            {
+                /*
+                 * Ignore exception caused by browser failing to initialize due to missing window.
+                 * Likely caused by switching views before the browser was initialized.
+                 */
+                this.logger.LogError(e, "Failed to initialize browser");
+                return true;
+            }
 
+            this.logger.LogError(e, $"Unhandled exception caught {e.GetType()}");
             MessageBox.Show(e.ToString());
             return true;
         }
         protected override void ApplicationStarting()
         {
-            this.ServiceManager.GetService<IApplicationLifetimeManager>().OnStartup();
+            this.logger = this.ServiceManager.GetService<ILogger<Launcher>>();
             this.RegisterViewContainer();
         }
         protected override void ApplicationClosing()
         {
-            this.ServiceManager.GetService<IApplicationLifetimeManager>().OnClosing();
         }
 
         private void RegisterViewContainer()

Daybreak/Launch/MainWindow.xaml.cs

@@ -1,13 +1,13 @@
-using Daybreak.Services.Bloogum;
-using Daybreak.Services.Configuration;
+using Daybreak.Configuration;
+using Daybreak.Services.Bloogum;
 using Daybreak.Services.Privilege;
-using Daybreak.Services.Runtime;
 using Daybreak.Services.Screenshots;
 using Daybreak.Services.Updater;
 using Daybreak.Services.ViewManagement;
 using Daybreak.Views;
 using Pepa.Wpf.Utilities;
 using System;
+using System.Configuration;
 using System.Diagnostics;
 using System.Extensions;
 using System.Threading;
@@ -32,11 +32,9 @@ namespace Daybreak.Launch
         private readonly IBloogumClient bloogumClient;
         private readonly IApplicationUpdater applicationUpdater;
         private readonly IPrivilegeManager privilegeManager;
-        private readonly IConfigurationManager configurationManager;
+        private readonly ILiveOptions<ApplicationConfiguration> liveOptions;
         private readonly CancellationTokenSource cancellationToken = new();
 
-        private bool canCheckUpdate = false;
-
         [GenerateDependencyProperty]
         private string creditText;
         [GenerateDependencyProperty]
@@ -50,26 +48,19 @@ namespace Daybreak.Launch
             IBloogumClient bloogumClient,
             IApplicationUpdater applicationUpdater,
             IPrivilegeManager privilegeManager,
-            IConfigurationManager configurationManager)
+            ILiveOptions<ApplicationConfiguration> liveOptions)
         {
             this.viewManager = viewManager.ThrowIfNull(nameof(viewManager));
             this.screenshotProvider = screenshotProvider.ThrowIfNull(nameof(screenshotProvider));
             this.bloogumClient = bloogumClient.ThrowIfNull(nameof(bloogumClient));
             this.applicationUpdater = applicationUpdater.ThrowIfNull(nameof(applicationUpdater));
             this.privilegeManager = privilegeManager.ThrowIfNull(nameof(privilegeManager));
-            this.configurationManager = configurationManager.ThrowIfNull(nameof(configurationManager));
+            this.liveOptions = liveOptions.ThrowIfNull(nameof(liveOptions));
             this.InitializeComponent();
-            this.LoadConfiguration();
-            this.configurationManager.ConfigurationChanged += (s, e) => this.LoadConfiguration();
             this.CurrentVersionText = this.applicationUpdater.CurrentVersion.ToString();
             this.IsRunningAsAdmin = this.privilegeManager.AdminPrivileges;
         }
 
-        private void LoadConfiguration()
-        {
-            var configuration = this.configurationManager.GetConfiguration();
-            this.canCheckUpdate = configuration.AutoCheckUpdate;
-        }
 
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
@@ -178,7 +169,7 @@ namespace Daybreak.Launch
 
         private async void CheckForUpdates()
         {
-            var updateAvailable = this.canCheckUpdate is true && await this.applicationUpdater.UpdateAvailable().ConfigureAwait(true);
+            var updateAvailable = this.liveOptions.Value.AutoCheckUpdate is true && await this.applicationUpdater.UpdateAvailable().ConfigureAwait(true);
             if (updateAvailable)
             {
                 this.viewManager.ShowView<AskUpdateView>();

Daybreak/Models/Log.cs

@@ -0,0 +1,15 @@
+using Microsoft.Extensions.Logging;
+using System;
+
+namespace Daybreak.Models
+{
+    public sealed class Log
+    {
+        public string Message { get; set; }
+        public string Category { get; set; }
+        public LogLevel LogLevel { get; set; }
+        public string CorrelationVector { get; set; }
+        public string EventId { get; set; }
+        public DateTime LogTime { get; set; }
+    }
+}

Daybreak/Models/SecureString.cs

@@ -9,49 +9,45 @@ namespace Daybreak.Models
     [Serializable]
     public sealed class SecureString
     {
-        public static SecureString Empty { get => new SecureString(string.Empty); }
+        public static SecureString Empty { get => new(string.Empty); }
 
         private byte[] encryptedBytes;
         private readonly byte[] key;
 
         private byte[] DecryptedValue
         {
-            get => encryptedBytes.DecryptBytes(key);
-            set => encryptedBytes = value.EncryptBytes(key);
+            get => this.encryptedBytes.DecryptBytes(key);
+            set => this.encryptedBytes = value.EncryptBytes(key);
         }
         [JsonProperty("value")]
         public string Value
         {
             get
             {
-                return encryptedBytes.DecryptBytes(key).AsString();
+                return this.encryptedBytes.DecryptBytes(key).AsString();
             }
             set
             {
-                encryptedBytes = value.AsBytes().EncryptBytes(key);
+                this.encryptedBytes = value.AsBytes().EncryptBytes(key);
             }
         }
         private SecureString(byte[] value)
         {
-            key = new byte[32];
-            using (var crypto = new RNGCryptoServiceProvider())
-            {
-                crypto.GetBytes(key);
-            }
+            this.key = new byte[32];
+            using var crypto = RandomNumberGenerator.Create();
+            crypto.GetBytes(key);
             this.DecryptedValue = value;
         }
         public SecureString(string value)
         {
-            key = new byte[32];
-            using (var crypto = new RNGCryptoServiceProvider())
-            {
-                crypto.GetBytes(key);
-            }
+            this.key = new byte[32];
+            using var crypto = RandomNumberGenerator.Create();
+            crypto.GetBytes(key);
             this.Value = value;
         }
 
         public static implicit operator string(SecureString ss) => ss is null ? string.Empty : ss.Value;
-        public static implicit operator SecureString(string s) => new SecureString(s);
+        public static implicit operator SecureString(string s) => new(s);
         public static SecureString operator +(SecureString ss1, SecureString ss2)
         {
             if (ss1 is null) throw new ArgumentNullException(nameof(ss1));
@@ -123,12 +119,12 @@ namespace Daybreak.Models
 
         public override int GetHashCode()
         {
-            return Value.GetHashCode();
+            return this.Value.GetHashCode();
         }
 
         public override string ToString()
         {
-            return Value;
+            return this.Value;
         }
     }
 }

Daybreak/Services/ApplicationLauncher/ApplicationLauncher.cs

@@ -1,5 +1,5 @@
-using Daybreak.Exceptions;
-using Daybreak.Services.Configuration;
+using Daybreak.Configuration;
+using Daybreak.Exceptions;
 using Daybreak.Services.Credentials;
 using Daybreak.Services.Mutex;
 using Daybreak.Services.Privilege;
@@ -9,6 +9,7 @@ using Microsoft.Win32;
 using Pepa.Wpf.Utilities;
 using System;
 using System.Collections.Generic;
+using System.Configuration;
 using System.Diagnostics;
 using System.Extensions;
 using System.IO;
@@ -29,7 +30,7 @@ namespace Daybreak.Services.ApplicationLauncher
         private const string ProcessName = "gw";
         private const string ArenaNetMutex = "AN-Mute";
 
-        private readonly IConfigurationManager configurationManager;
+        private readonly ILiveOptions<ApplicationConfiguration> liveOptions;
         private readonly ICredentialManager credentialManager;
         private readonly IMutexHandler mutexHandler;
         private readonly ILogger<ApplicationLauncher> logger;
@@ -40,7 +41,7 @@ namespace Daybreak.Services.ApplicationLauncher
         public bool IsToolboxRunning => GuildwarsToolboxProcessDetected();
 
         public ApplicationLauncher(
-            IConfigurationManager configurationManager,
+            ILiveOptions<ApplicationConfiguration> liveOptions,
             ICredentialManager credentialManager,
             IMutexHandler mutexHandler,
             ILogger<ApplicationLauncher> logger,
@@ -49,13 +50,13 @@ namespace Daybreak.Services.ApplicationLauncher
             this.logger = logger.ThrowIfNull(nameof(logger));
             this.mutexHandler = mutexHandler.ThrowIfNull(nameof(mutexHandler));
             this.credentialManager = credentialManager.ThrowIfNull(nameof(credentialManager));
-            this.configurationManager = configurationManager.ThrowIfNull(nameof(configurationManager));
+            this.liveOptions = liveOptions.ThrowIfNull(nameof(liveOptions));
             this.privilegeManager = privilegeManager.ThrowIfNull(nameof(privilegeManager));
         }
 
         public async Task<bool> LaunchGuildwars()
         {
-            var configuration = this.configurationManager.GetConfiguration();
+            var configuration = this.liveOptions.Value;
             var auth = await this.credentialManager.GetDefaultCredentials().ConfigureAwait(false);
             return await auth.Switch(
                 onSome: async (credentials) =>
@@ -68,10 +69,10 @@ namespace Daybreak.Services.ApplicationLauncher
                             return false;
                         }
 
-                        ClearGwLocks();
+                        this.ClearGwLocks();
                     }
 
-                    return await LaunchGuildwarsProcess(credentials.Username, credentials.Password, credentials.CharacterName);
+                    return await this.LaunchGuildwarsProcess(credentials.Username, credentials.Password, credentials.CharacterName);
                 },
                 onNone: () =>
                 {
@@ -84,7 +85,7 @@ namespace Daybreak.Services.ApplicationLauncher
         {
             return Task.Run(() =>
             {
-                var configuration = this.configurationManager.GetConfiguration();
+                var configuration = this.liveOptions.Value;
                 var executable = configuration.ToolboxPath;
                 if (File.Exists(executable) is false)
                 {
@@ -102,7 +103,7 @@ namespace Daybreak.Services.ApplicationLauncher
         {
             return Task.Run(() =>
             {
-                var configuration = this.configurationManager.GetConfiguration();
+                var configuration = this.liveOptions.Value;
                 var executable = configuration.TexmodPath;
                 if (File.Exists(executable) is false)
                 {
@@ -145,7 +146,7 @@ namespace Daybreak.Services.ApplicationLauncher
 
         private async Task<bool> LaunchGuildwarsProcess(string email, Models.SecureString password, string character)
         {
-            var executable = this.configurationManager.GetConfiguration().GuildwarsPaths.Where(path => path.Default).FirstOrDefault();
+            var executable = this.liveOptions.Value.GuildwarsPaths.Where(path => path.Default).FirstOrDefault();
             if (executable is null)
             {
                 throw new ExecutableNotFoundException($"No executable selected");
@@ -169,7 +170,7 @@ namespace Daybreak.Services.ApplicationLauncher
                 args.Add(character);
             }
 
-            var identity = this.configurationManager.GetConfiguration().ExperimentalFeatures.LaunchGuildwarsAsCurrentUser ?
+            var identity = this.liveOptions.Value.ExperimentalFeatures.LaunchGuildwarsAsCurrentUser ?
                 System.Security.Principal.WindowsIdentity.GetCurrent().Name :
                 System.Security.Principal.WindowsIdentity.GetAnonymous().Name;
             this.logger.LogInformation($"Launching guildwars as [{identity}] identity");
@@ -221,11 +222,11 @@ namespace Daybreak.Services.ApplicationLauncher
 
         private bool GuildwarsProcessDetected()
         {
-            if (this.configurationManager.GetConfiguration().ExperimentalFeatures.MultiLaunchSupport is true)
+            if (this.liveOptions.Value.ExperimentalFeatures.MultiLaunchSupport is true)
             {
                 try
                 {
-                    var path = this.configurationManager.GetConfiguration().GuildwarsPaths.Where(path => path.Default).FirstOrDefault();
+                    var path = this.liveOptions.Value.GuildwarsPaths.Where(path => path.Default).FirstOrDefault();
                     if (path is null)
                     {
                         return false;
@@ -253,7 +254,7 @@ namespace Daybreak.Services.ApplicationLauncher
 
         private void SetRegistryGuildwarsPath()
         {
-            var path = this.configurationManager.GetConfiguration().GuildwarsPaths.Where(path => path.Default).FirstOrDefault();
+            var path = this.liveOptions.Value.GuildwarsPaths.Where(path => path.Default).FirstOrDefault();
             if (path is null)
             {
                 throw new ExecutableNotFoundException("No executable currently selected");

Daybreak/Services/ApplicationLifetime/ApplicationLifetimeManager.cs

@@ -1,43 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Extensions;
-using IServiceProvider = Slim.IServiceProvider;
-
-namespace Daybreak.Services.ApplicationLifetime
-{
-    public sealed class ApplicationLifetimeManager : IApplicationLifetimeManager
-    {
-        private readonly IServiceProvider serviceProvider;
-        private List<Type> RegisteredTypes { get; } = new List<Type>();
-
-        public ApplicationLifetimeManager(IServiceProvider serviceProvider)
-        {
-            serviceProvider.ThrowIfNull(nameof(serviceProvider));
-
-            this.serviceProvider = serviceProvider;
-        }
-
-        public void RegisterService<T>() where T : IApplicationLifetimeService
-        {
-            this.RegisteredTypes.Add(typeof(T));
-        }
-
-        public void OnStartup()
-        {
-            foreach (var serviceType in this.RegisteredTypes)
-            {
-                var service = this.serviceProvider.GetService(serviceType);
-                service.As<IApplicationLifetimeService>().OnStartup();
-            }
-        }
-
-        public void OnClosing()
-        {
-            foreach (var serviceType in this.RegisteredTypes)
-            {
-                var service = this.serviceProvider.GetService(serviceType);
-                service.As<IApplicationLifetimeService>().OnClosing();
-            }
-        }
-    }
-}

Daybreak/Services/ApplicationLifetime/IApplicationLifetimeManager.cs

@@ -1,8 +0,0 @@
-namespace Daybreak.Services.ApplicationLifetime
-{
-    public interface IApplicationLifetimeManager : IApplicationLifetimeProducer
-    {
-        void OnStartup();
-        void OnClosing();
-    }
-}

Daybreak/Services/ApplicationLifetime/IApplicationLifetimeProducer.cs

@@ -1,7 +0,0 @@
-namespace Daybreak.Services.ApplicationLifetime
-{
-    public interface IApplicationLifetimeProducer
-    {
-        void RegisterService<T>() where T : IApplicationLifetimeService;
-    }
-}

Daybreak/Services/ApplicationLifetime/IApplicationLifetimeService.cs

@@ -1,8 +0,0 @@
-namespace Daybreak.Services.ApplicationLifetime
-{
-    public interface IApplicationLifetimeService
-    {
-        void OnStartup();
-        void OnClosing();
-    }
-}

Daybreak/Services/Bloogum/BloogumClient.cs

@@ -2,8 +2,8 @@
 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

Daybreak/Services/Configuration/ConfigurationManager.cs

@@ -26,7 +26,7 @@ namespace Daybreak.Services.Configuration
             }
             catch(Exception e)
             {
-                this.logger.LogWarning($"No configuration detected. Loading default configuration. Details: {e}");
+                this.logger.LogWarning(e, $"Failed to load configuration. Falling back to default configuration");
                 this.applicationConfiguration = new ApplicationConfiguration();
             }
         }

Daybreak/Services/Credentials/CredentialManager.cs

@@ -1,8 +1,9 @@
-using Daybreak.Models;
-using Daybreak.Services.Configuration;
+using Daybreak.Configuration;
+using Daybreak.Models;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
+using System.Configuration;
 using System.Extensions;
 using System.Linq;
 using System.Security.Cryptography;
@@ -15,13 +16,13 @@ namespace Daybreak.Services.Credentials
     {
         private static readonly byte[] Entropy = Convert.FromBase64String("R3VpbGR3YXJz");
         private readonly ILogger<CredentialManager> logger;
-        private readonly IConfigurationManager configurationManager;
+        private readonly ILiveUpdateableOptions<ApplicationConfiguration> liveOptions;
 
         public CredentialManager(
             ILogger<CredentialManager> logger,
-            IConfigurationManager configurationManager)
+            ILiveUpdateableOptions<ApplicationConfiguration> liveOptions)
         {
-            this.configurationManager = configurationManager.ThrowIfNull(nameof(configurationManager));
+            this.liveOptions = liveOptions.ThrowIfNull(nameof(liveOptions));
             this.logger = logger.ThrowIfNull(nameof(logger));
         }
 
@@ -53,7 +54,7 @@ namespace Daybreak.Services.Credentials
             return Task.Run(() =>
             {
                 this.logger.LogInformation("Retrieving credentials");
-                var config = this.configurationManager.GetConfiguration();
+                var config = this.liveOptions.Value;
                 if (config.ProtectedLoginCredentials is null || config.ProtectedLoginCredentials.Count == 0)
                 {
                     this.logger.LogInformation("No credentials found");
@@ -62,9 +63,9 @@ namespace Daybreak.Services.Credentials
 
                 return config
                     .ProtectedLoginCredentials
-                    .Select(UnprotectCredentials)
-                    .Where(CredentialsUnprotected)
-                    .Select(ExtractCredentials)
+                    .Select(this.UnprotectCredentials)
+                    .Where(this.CredentialsUnprotected)
+                    .Select(this.ExtractCredentials)
                     .ToList();
             });
         }
@@ -73,13 +74,12 @@ namespace Daybreak.Services.Credentials
             return Task.Run(() =>
             {
                 this.logger.LogInformation("Storing credentials");
-                var config = this.configurationManager.GetConfiguration();
-                config.ProtectedLoginCredentials = loginCredentials
-                    .Select(ProtectCredentials)
-                    .Where(CredentialsProtected)
-                    .Select(ExtractProtectedCredentials)
+                this.liveOptions.Value.ProtectedLoginCredentials = loginCredentials
+                    .Select(this.ProtectCredentials)
+                    .Where(this.CredentialsProtected)
+                    .Select(this.ExtractProtectedCredentials)
                     .ToList();
-                this.configurationManager.SaveConfiguration(config);
+                this.liveOptions.UpdateOption();
             });   
         }
 

Daybreak/Services/IconRetrieve/IconRetriever.cs

@@ -1,11 +1,13 @@
-using Daybreak.Models.Builds;
+using Daybreak.Configuration;
+using Daybreak.Models.Builds;
 using HtmlAgilityPack;
 using Microsoft.Extensions.Logging;
 using System;
+using System.Configuration;
 using System.Extensions;
-using System.Http;
 using System.IO;
 using System.Linq;
+using System.Net.Http;
 using System.Threading.Tasks;
 
 namespace Daybreak.Services.IconRetrieve
@@ -15,20 +17,48 @@ namespace Daybreak.Services.IconRetrieve
         private const string NamePlaceholder = "[SKILLNAME]";
         private const string BaseUrl = "https://wiki.guildwars.com";
         private const string QueryUrl = $"wiki/File:{NamePlaceholder}.jpg";
+        private const string IconsDirectoryName = "Icons";
+        private const string IconsLocation = $"{IconsDirectoryName}/{NamePlaceholder}.jpg";
 
         private readonly IHttpClient<IconRetriever> httpClient;
         private readonly ILogger<IconRetriever> logger;
+        private readonly ILiveOptions<ApplicationConfiguration> liveOptions;
 
         public IconRetriever(
             ILogger<IconRetriever> logger,
-            IHttpClient<IconRetriever> httpClient)
+            IHttpClient<IconRetriever> httpClient,
+            ILiveOptions<ApplicationConfiguration> liveOptions)
         {
             this.logger = logger.ThrowIfNull(nameof(logger));
             this.httpClient = httpClient.ThrowIfNull(nameof(httpClient));
+            this.liveOptions = liveOptions.ThrowIfNull(nameof(liveOptions));
             this.httpClient.BaseAddress = new Uri(BaseUrl);
+            if (Directory.Exists(IconsDirectoryName) is false)
+            {
+                Directory.CreateDirectory(IconsDirectoryName);
+            }
         }
 
         public async Task<Optional<Stream>> GetIcon(Skill skill)
+        {
+            if (this.liveOptions.Value.KeepLocalIconCache)
+            {
+                this.logger.LogInformation($"{nameof(IconRetriever)} configured to look first in cache before downloading icons");
+                var maybeIcon = await this.GetLocalIcon(skill);
+                if (maybeIcon.ExtractValue() is Stream stream)
+                {
+                    return stream;
+                }
+            }
+            else
+            {
+                this.logger.LogInformation($"{nameof(IconRetriever)} configured to skip local cache. Downloading icon");
+            }
+
+            return await this.DownloadIcon(skill);
+        }
+
+        private async Task<Optional<Stream>> DownloadIcon(Skill skill)
         {
             var curedSkillName = skill.Name
                 .Replace(" ", "_");
@@ -56,13 +86,43 @@ namespace Daybreak.Services.IconRetrieve
             if (response.IsSuccessStatusCode)
             {
                 this.logger.LogInformation("Retrieved latest icon stream");
-                return new MemoryStream(await iconResponse.Content.ReadAsByteArrayAsync());
+                var iconData = await iconResponse.Content.ReadAsByteArrayAsync();
+                if (this.liveOptions.Value.KeepLocalIconCache)
+                {
+                    await SaveIconLocally(skill, iconData);
+                }
+
+                return new MemoryStream(iconData);
             }
 
             this.logger.LogError($"Failed to retrieve icon from {BaseUrl + "/" + url}");
             return Optional.None<Stream>();
         }
 
+        private async Task<Optional<Stream>> GetLocalIcon(Skill skill)
+        {
+            var curedSkillName = skill.Name
+                .Replace(" ", "_")
+                .Replace("\"", "");
+            this.logger.LogInformation("Checking local icon cache");
+            if (File.Exists(IconsLocation.Replace(NamePlaceholder, curedSkillName)))
+            {
+                this.logger.LogInformation("Local icon cache found. Retrieving icon");
+                return new MemoryStream(await File.ReadAllBytesAsync(IconsLocation.Replace(NamePlaceholder, curedSkillName)));
+            }
+
+            this.logger.LogWarning("No local icon cache found");
+            return Optional.None<Stream>();
+        }
+
+        private static async Task SaveIconLocally(Skill skill, byte[] data)
+        {
+            var curedSkillName = skill.Name
+                .Replace(" ", "_")
+                .Replace("\"", "");
+            await File.WriteAllBytesAsync(IconsLocation.Replace(NamePlaceholder, curedSkillName), data);
+        }
+
         private static string GetHref(HtmlDocument doc)
         {
             foreach (var child in doc.DocumentNode.Descendants("a"))

Daybreak/Services/KeyboardHook/IKeyboardHookService.cs

@@ -1,6 +1,6 @@
 using Daybreak.Models;
-using Daybreak.Services.ApplicationLifetime;
 using System;
+using System.Windows.Extensions.Services;
 
 namespace Daybreak.Services.KeyboardHook
 {

Daybreak/Services/KeyboardMacros/IMacroService.cs

@@ -1,4 +1,4 @@
-using Daybreak.Services.ApplicationLifetime;
+using System.Windows.Extensions.Services;
 
 namespace Daybreak.Services.KeyboardMacros
 {

Daybreak/Services/KeyboardMacros/MacroService.cs

@@ -1,10 +1,10 @@
-using Daybreak.Models;
-using Daybreak.Services.Configuration;
+using Daybreak.Configuration;
+using Daybreak.Models;
 using Daybreak.Services.KeyboardHook;
-using Microsoft.Extensions.Logging;
 using Pepa.Wpf.Utilities;
 using System;
 using System.Collections.Generic;
+using System.Configuration;
 using System.Extensions;
 using System.Linq;
 using System.Text;
@@ -17,32 +17,23 @@ namespace Daybreak.Services.KeyboardMacros
     {
         private readonly CancellationTokenSource cancellationTokenSource = new();
         private readonly IKeyboardHookService keyboardHookService;
-        private readonly IConfigurationManager configurationManager;
+        private readonly ILiveOptions<ApplicationConfiguration> liveOptions;
         private readonly HashSet<Keys> KeysDown = new();
 
-        private IEnumerable<KeyMacro> loadedMacros;
-        private bool gameActive, hookEnabled;
+        private bool gameActive;
         private IntPtr gwWindowHwnd;
 
         public MacroService(
             IKeyboardHookService keyboardHookService,
-            IConfigurationManager configurationManager)
+            ILiveOptions<ApplicationConfiguration> liveOptions)
         {
             this.keyboardHookService = keyboardHookService.ThrowIfNull(nameof(keyboardHookService));
-            this.configurationManager = configurationManager.ThrowIfNull(nameof(configurationManager));
+            this.liveOptions = liveOptions.ThrowIfNull(nameof(liveOptions));
 
-            this.configurationManager.ConfigurationChanged += (s, e) => this.LoadConfiguration();
-            this.LoadConfiguration();
             this.keyboardHookService.KeyboardPressed += this.KeyboardHookService_KeyboardPressed;
             this.SetupGameActiveChecker();
         }
 
-        private void LoadConfiguration()
-        {
-            this.hookEnabled = this.configurationManager.GetConfiguration().ExperimentalFeatures.CanInterceptKeys;
-            this.loadedMacros = this.configurationManager.GetConfiguration().ExperimentalFeatures.Macros ?? new List<KeyMacro>();
-        }
-
         private void SetupGameActiveChecker()
         {
             TaskExtensions.RunPeriodicAsync(() =>
@@ -62,12 +53,12 @@ namespace Daybreak.Services.KeyboardMacros
             },
             TimeSpan.Zero,
             TimeSpan.FromMilliseconds(33),
-            cancellationTokenSource.Token);
+            this.cancellationTokenSource.Token);
         }
 
         private void KeyboardHookService_KeyboardPressed(object sender, KeyboardHookEventArgs e)
         {
-            if (this.gameActive && this.hookEnabled)
+            if (this.gameActive && this.liveOptions.Value.ExperimentalFeatures.CanInterceptKeys)
             {
                 if (e.KeyboardState == KeyboardState.KeyDown)
                 {
@@ -79,7 +70,7 @@ namespace Daybreak.Services.KeyboardMacros
                     return;
                 }
 
-                e.Handled = this.loadedMacros
+                e.Handled = this.liveOptions.Value.ExperimentalFeatures.Macros
                     .Where(keyMacro => MacroContainsKey(keyMacro, e.KeyboardInput.Key))
                     .Where(this.MacroHit)
                     .Do(this.HandleMacro)

Daybreak/Services/Logging/ILogsManager.cs

@@ -1,12 +1,15 @@
-using System.Collections.Generic;
-using WpfExtended.Logging;
-using WpfExtended.Models;
+using Daybreak.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Logging;
 
 namespace Daybreak.Services.Logging
 {
     public interface ILogsManager : ILogsWriter
     {
-        IEnumerable<Log> GetLogs();
+        IEnumerable<Models.Log> GetLogs(Expression<Func<Models.Log, bool>> filter);
+        IEnumerable<Models.Log> GetLogs();
         int DeleteLogs();
     }
 }

Daybreak/Services/Logging/JsonLogsManager.cs

@@ -1,7 +1,9 @@
 using LiteDB;
+using System;
 using System.Collections.Generic;
 using System.Extensions;
-using WpfExtended.Models;
+using System.Linq.Expressions;
+using System.Logging;
 
 namespace Daybreak.Services.Logging
 {
@@ -14,17 +16,31 @@ namespace Daybreak.Services.Logging
             this.liteDatabase = liteDatabase.ThrowIfNull(nameof(liteDatabase));
         }
 
-        public IEnumerable<Log> GetLogs()
+        public IEnumerable<Models.Log> GetLogs(Expression<Func<Models.Log, bool>> filter)
         {
-            return this.liteDatabase.GetCollection<Log>().FindAll();
+            return this.liteDatabase.GetCollection<Models.Log>().Find(filter);
+        }
+        public IEnumerable<Models.Log> GetLogs()
+        {
+            return this.liteDatabase.GetCollection<Models.Log>().FindAll();
         }
         public void WriteLog(Log log)
         {
-            this.liteDatabase.GetCollection<Log>().Insert(log);
+            var dbLog = new Models.Log
+            {
+                EventId = log.EventId,
+                Message = log.Exception is null ? log.Message : $"{log.Message}{Environment.NewLine}{log.Exception}",
+                Category = log.Category,
+                LogLevel = log.LogLevel,
+                LogTime = log.LogTime,
+                CorrelationVector = log.CorrelationVector
+            };
+
+            this.liteDatabase.GetCollection<Models.Log>().Insert(dbLog);
         }
         public int DeleteLogs()
         {
-            return this.liteDatabase.GetCollection<Log>().DeleteAll();
+            return this.liteDatabase.GetCollection<Models.Log>().DeleteAll();
         }
     }
 }

Daybreak/Services/Navigation/ViewManager.cs

@@ -56,7 +56,6 @@ namespace Daybreak.Services.ViewManagement
         private void ShowViewInner(Type viewType, object dataContext)
         {
             var scopedManager = this.serviceManager.CreateScope();
-            scopedManager.As<IServiceManager>().RegisterScoped<ScopeMetadata, ScopeMetadata>((sp) => new ScopeMetadata(new CorrelationVector()));
             Application.Current.Dispatcher.Invoke(() =>
             {
                 var view = scopedManager.GetService(viewType).As<UserControl>();

Daybreak/Services/Options/ApplicationConfigurationOptionsManager.cs

@@ -0,0 +1,39 @@
+using Daybreak.Configuration;
+using Daybreak.Services.Configuration;
+using System;
+using System.Configuration;
+using System.Extensions;
+
+namespace Daybreak.Services.Options
+{
+    public sealed class ApplicationConfigurationOptionsManager : IOptionsManager
+    {
+        private readonly IConfigurationManager configurationManager;
+
+        public ApplicationConfigurationOptionsManager(IConfigurationManager configurationManager)
+        {
+            this.configurationManager = configurationManager;
+        }
+
+        public T GetOptions<T>() where T : class
+        {
+            if (typeof(T) == typeof(ApplicationConfiguration))
+            {
+                return this.configurationManager.GetConfiguration().Cast<T>();
+            }
+
+            throw new InvalidOperationException($"{nameof(ApplicationConfigurationOptionsManager)} cannot return options of type {typeof(T).Name}");
+        }
+
+        public void UpdateOptions<T>(T value) where T : class
+        {
+            if (typeof(T) == typeof(ApplicationConfiguration))
+            {
+                this.configurationManager.SaveConfiguration(value.Cast<ApplicationConfiguration>());
+                return;
+            }
+
+            throw new InvalidOperationException($"{nameof(ApplicationConfigurationOptionsManager)} cannot save options of type {typeof(T).Name}");
+        }
+    }
+}

Daybreak/Services/Runtime/IRuntimeStore.cs

@@ -1,9 +0,0 @@
-namespace Daybreak.Services.Runtime
-{
-    public interface IRuntimeStore
-    {
-        void StoreValue<T>(string name, T value);
-        bool TryGetValue<T>(string name, out T value);
-        T GetValue<T>(string name);
-    }
-}

Daybreak/Services/Runtime/RuntimeStore.cs

@@ -1,36 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Extensions;
-
-namespace Daybreak.Services.Runtime
-{
-    public sealed class RuntimeStore : IRuntimeStore
-    {
-        private Dictionary<string, object> InnerStore { get; } = new Dictionary<string, object>();
-
-        public T GetValue<T>(string name)
-        {
-            if(this.InnerStore.TryGetValue(name, out var value))
-            {
-                return value.Cast<T>();
-            }
-
-            throw new InvalidOperationException($"Could not find any value stored with name {name}");
-        }
-        public void StoreValue<T>(string name, T value)
-        {
-            this.InnerStore[name] = value;
-        }
-        public bool TryGetValue<T>(string name, out T value)
-        {
-            if (this.InnerStore.TryGetValue(name, out var valueObj))
-            {
-                value = valueObj.Cast<T>();
-                return true;
-            }
-
-            value = default;
-            return false;
-        }
-    }
-}

Daybreak/Services/Screenshots/IScreenshotProvider.cs

@@ -1,5 +1,5 @@
-using Daybreak.Services.ApplicationLifetime;
-using System.Extensions;
+using System.Extensions;
+using System.Windows.Extensions.Services;
 using System.Windows.Media;
 
 namespace Daybreak.Services.Screenshots

Daybreak/Services/Shortcuts/IShortcutManager.cs

@@ -1,4 +1,4 @@
-using Daybreak.Services.ApplicationLifetime;
+using System.Windows.Extensions.Services;
 
 namespace Daybreak.Services.Shortcuts
 {

Daybreak/Services/Shortcuts/ShortcutManager.cs

@@ -1,16 +1,20 @@
-using Daybreak.Services.Configuration;
+using Daybreak.Configuration;
+using Daybreak.Services.Configuration;
 using ShellLink;
+using System.Configuration;
 using System.Diagnostics;
 using System.Extensions;
 using System.IO;
 
 namespace Daybreak.Services.Shortcuts
 {
+    //TODO: Fix dependency on IConfigurationManager
     public sealed class ShortcutManager : IShortcutManager
     {
         private const string ShortcutName = "Daybreak.lnk";
 
         private readonly IConfigurationManager configurationManager;
+        private readonly ILiveOptions<ApplicationConfiguration> liveOptions;
 
         public bool ShortcutEnabled {
             get => this.ShortcutExists();
@@ -27,16 +31,19 @@ namespace Daybreak.Services.Shortcuts
             }
         }
 
-        public ShortcutManager(IConfigurationManager configurationManager)
+        public ShortcutManager(
+            IConfigurationManager configurationManager,
+            ILiveOptions<ApplicationConfiguration> liveOptions)
         {
             this.configurationManager = configurationManager.ThrowIfNull(nameof(configurationManager));
+            this.liveOptions = liveOptions.ThrowIfNull(nameof(liveOptions));
             this.configurationManager.ConfigurationChanged += (_, _) => this.LoadConfiguration();
             this.LoadConfiguration();
         }
 
         private void LoadConfiguration()
         {
-            var shortcutEnabled = this.configurationManager.GetConfiguration().PlaceShortcut;
+            var shortcutEnabled = this.liveOptions.Value.PlaceShortcut;
             if (shortcutEnabled && this.ShortcutEnabled is false)
             {
                 this.ShortcutEnabled = true;
@@ -49,7 +56,7 @@ namespace Daybreak.Services.Shortcuts
 
         private bool ShortcutExists()
         {
-            var shortcutFolder = this.configurationManager.GetConfiguration().ShortcutLocation;
+            var shortcutFolder = this.liveOptions.Value.ShortcutLocation;
             var shortcutPath = $"{shortcutFolder}\\{ShortcutName}";
             if (File.Exists(shortcutPath))
             {
@@ -73,7 +80,7 @@ namespace Daybreak.Services.Shortcuts
                 return;
             }
 
-            var shortcutFolder = this.configurationManager.GetConfiguration().ShortcutLocation;
+            var shortcutFolder = this.liveOptions.Value.ShortcutLocation;
             var shortcutPath = $"{shortcutFolder}\\{ShortcutName}";
             var currentExecutable = Process.GetCurrentProcess()?.MainModule?.FileName;
             var shortcut = Shortcut.CreateShortcut(currentExecutable);
@@ -92,7 +99,7 @@ namespace Daybreak.Services.Shortcuts
                 return;
             }
 
-            var shortcutFolder = this.configurationManager.GetConfiguration().ShortcutLocation;
+            var shortcutFolder = this.liveOptions.Value.ShortcutLocation;
             var shortcutPath = $"{shortcutFolder}\\{ShortcutName}";
             File.Delete(shortcutPath);
         }

Daybreak/Services/Updater/ApplicationUpdater.cs

@@ -1,7 +1,7 @@
-using Daybreak.Exceptions;
+using Daybreak.Configuration;
+using Daybreak.Exceptions;
 using Daybreak.Models;
 using Daybreak.Models.Github;
-using Daybreak.Services.Runtime;
 using Daybreak.Services.ViewManagement;
 using Daybreak.Utils;
 using Daybreak.Views;
@@ -9,6 +9,7 @@ using Microsoft.Extensions.Logging;
 using Microsoft.Win32;
 using System;
 using System.Collections.Generic;
+using System.Configuration;
 using System.Diagnostics;
 using System.Extensions;
 using System.Http;
@@ -26,7 +27,6 @@ namespace Daybreak.Services.Updater
     public sealed class ApplicationUpdater : IApplicationUpdater
     {
         private const string LaunchActionName = "Launch_Daybreak";
-        private const string UpdateDesiredKey = "UpdateDesired";
         private const string ExecutionPolicyKey = "ExecutionPolicy";
         private const string UpdatedKey = "Updating";
         private const string RegistryKey = "Daybreak";
@@ -44,7 +44,7 @@ namespace Daybreak.Services.Updater
         private const string Url = "https://github.com/AlexMacocian/Daybreak/releases/latest";
         private const string DownloadUrl = $"https://github.com/AlexMacocian/Daybreak/releases/download/{VersionTag}/Daybreak{VersionTag}.zip";
         private const string GetExecutionPolicyCommand = "Get-ExecutionPolicy -Scope CurrentUser";
-        private const string SetExecutionPolicyCommand = $"Set-ExecutionPolicy {ExecutionPolicyTag} -Scope CurrentUser";
+        private const string SetExecutionPolicyCommand = $"Set-ExecutionPolicy {ExecutionPolicyTag} -Scope CurrentUser -Force";
         private const string WaitCommand = $"Wait-Process -Id {ProcessIdTag}";
         private const string ExtractCommandTemplate = $"Expand-Archive -Path '{InputFileTag}' -DestinationPath '{OutputPathTag}' -Force";
         private const string PrepareScheduledAction = $"$action = New-ScheduledTaskAction -Execute {ExecutableNameTag} -WorkingDirectory {WorkingDirectoryTag}";
@@ -59,19 +59,19 @@ namespace Daybreak.Services.Updater
         private readonly CancellationTokenSource updateCancellationTokenSource = new();
         private readonly ILogger<ApplicationUpdater> logger;
         private readonly IViewManager viewManager;
-        private readonly IRuntimeStore runtimeStore;
+        private readonly ILiveOptions<ApplicationConfiguration> liveOptions;
         private readonly IHttpClient<ApplicationUpdater> httpClient;
 
         public Version CurrentVersion { get; }
 
         public ApplicationUpdater(
             ILogger<ApplicationUpdater> logger,
-            IRuntimeStore runtimeStore,
+            ILiveOptions<ApplicationConfiguration> liveOptions,
             IViewManager viewManager,
             IHttpClient<ApplicationUpdater> httpClient)
         {
             this.viewManager = viewManager.ThrowIfNull(nameof(viewManager));
-            this.runtimeStore = runtimeStore.ThrowIfNull(nameof(runtimeStore));
+            this.liveOptions = liveOptions.ThrowIfNull(nameof(liveOptions));
             this.logger = logger.ThrowIfNull(nameof(logger));
             this.httpClient = httpClient.ThrowIfNull(nameof(httpClient));
             this.httpClient.DefaultRequestHeaders.Add("user-agent", "Daybreak Client");
@@ -176,7 +176,7 @@ namespace Daybreak.Services.Updater
         {
             System.Extensions.TaskExtensions.RunPeriodicAsync(async () =>
             {
-                if (this.runtimeStore.TryGetValue<bool>(UpdateDesiredKey, out var desiringUpdate) && desiringUpdate is false)
+                if (this.liveOptions.Value.AutoCheckUpdate is false)
                 {
                     this.updateCancellationTokenSource.Cancel();
                     return;

Daybreak/Services/Updater/IApplicationUpdater.cs

@@ -1,8 +1,8 @@
 using Daybreak.Models;
 using Daybreak.Models.Versioning;
-using Daybreak.Services.ApplicationLifetime;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using System.Windows.Extensions.Services;
 
 namespace Daybreak.Services.Updater
 {

Daybreak/Utils/EncryptionHelper.cs

@@ -22,7 +22,7 @@ namespace Daybreak
             }
         }
         private static int Iterations { get; } = 10000;
-        private static RNGCryptoServiceProvider Rng { get; } = new RNGCryptoServiceProvider();
+        private static RandomNumberGenerator Rng { get; } = RandomNumberGenerator.Create();
 
         public static int BlockSize { get => Aes.BlockSize; }
 
@@ -31,29 +31,19 @@ namespace Daybreak
             var saltBytes = Generate128BitsOfRandomEntropy();
             var ivBytes = Generate128BitsOfRandomEntropy();
 
-            using (var password = new Rfc2898DeriveBytes(key, saltBytes, Iterations))
-            {
-                var keyBytes = password.GetBytes(Aes.KeySize / 8);
-                using (var encryptor = Aes.CreateEncryptor(keyBytes, ivBytes))
-                {
-                    using (var memoryStream = new MemoryStream())
-                    {
-                        using (var cryptoStream = new CryptoStream(memoryStream, encryptor, CryptoStreamMode.Write))
-                        {
-                            cryptoStream.Write(bytes, 0, bytes.Length);
-                            cryptoStream.FlushFinalBlock();
-                            // Create the final bytes as a concatenation of the random salt bytes, the random iv bytes and the cipher bytes.
-                            using (var encryptedMemoryStream = new MemoryStream((int)(saltBytes.Length + ivBytes.Length + memoryStream.Length)))
-                            {
-                                encryptedMemoryStream.Write(saltBytes, 0, saltBytes.Length);
-                                encryptedMemoryStream.Write(ivBytes, 0, ivBytes.Length);
-                                encryptedMemoryStream.Write(memoryStream.ToArray(), 0, (int)memoryStream.Length);
-                                return encryptedMemoryStream.ToArray();
-                            }
-                        }
-                    }
-                }
-            }
+            using var password = new Rfc2898DeriveBytes(key, saltBytes, Iterations);
+            var keyBytes = password.GetBytes(Aes.KeySize / 8);
+            using var encryptor = Aes.CreateEncryptor(keyBytes, ivBytes);
+            using var memoryStream = new MemoryStream();
+            using var cryptoStream = new CryptoStream(memoryStream, encryptor, CryptoStreamMode.Write);
+            cryptoStream.Write(bytes, 0, bytes.Length);
+            cryptoStream.FlushFinalBlock();
+            // Create the final bytes as a concatenation of the random salt bytes, the random iv bytes and the cipher bytes.
+            using var encryptedMemoryStream = new MemoryStream((int)(saltBytes.Length + ivBytes.Length + memoryStream.Length));
+            encryptedMemoryStream.Write(saltBytes, 0, saltBytes.Length);
+            encryptedMemoryStream.Write(ivBytes, 0, ivBytes.Length);
+            encryptedMemoryStream.Write(memoryStream.ToArray(), 0, (int)memoryStream.Length);
+            return encryptedMemoryStream.ToArray();
         }
 
         public static byte[] DecryptBytes(this byte[] bytes, byte[] key)
@@ -61,29 +51,20 @@ namespace Daybreak
             var saltBytes = new byte[Aes.BlockSize / 8];
             var ivBytes = new byte[Aes.BlockSize / 8];
             var cipherBytes = new byte[bytes.Length - Aes.BlockSize / 4];
-            using (MemoryStream encryptedStream = new MemoryStream(bytes))
-            {
-                encryptedStream.Read(saltBytes, 0, saltBytes.Length);
-                encryptedStream.Read(ivBytes, 0, ivBytes.Length);
-                encryptedStream.Read(cipherBytes, 0, cipherBytes.Length);
-            }
 
-            using (var password = new Rfc2898DeriveBytes(key, saltBytes, Iterations))
-            {
-                var keyBytes = password.GetBytes(Aes.KeySize / 8);
-                using (var decryptor = Aes.CreateDecryptor(keyBytes, ivBytes))
-                {
-                    using (var memoryStream = new MemoryStream(cipherBytes))
-                    {
-                        using (var cryptoStream = new CryptoStream(memoryStream, decryptor, CryptoStreamMode.Read))
-                        {
-                            var plainTextBytes = new byte[memoryStream.Length];
-                            var decryptedByteCount = cryptoStream.Read(plainTextBytes, 0, plainTextBytes.Length);
-                            return plainTextBytes.Take(decryptedByteCount).ToArray();
-                        }
-                    }
-                }
-            }
+            using var encryptedStream = new MemoryStream(bytes);
+            encryptedStream.Read(saltBytes, 0, saltBytes.Length);
+            encryptedStream.Read(ivBytes, 0, ivBytes.Length);
+            encryptedStream.Read(cipherBytes, 0, cipherBytes.Length);
+
+            using var password = new Rfc2898DeriveBytes(key, saltBytes, Iterations);
+            var keyBytes = password.GetBytes(Aes.KeySize / 8);
+            using var decryptor = Aes.CreateDecryptor(keyBytes, ivBytes);
+            using var memoryStream = new MemoryStream(cipherBytes);
+            using var cryptoStream = new CryptoStream(memoryStream, decryptor, CryptoStreamMode.Read);
+            var plainTextBytes = new byte[memoryStream.Length];
+            var decryptedByteCount = cryptoStream.Read(plainTextBytes, 0, plainTextBytes.Length);
+            return plainTextBytes.Take(decryptedByteCount).ToArray();
         }
 
         private static byte[] Generate128BitsOfRandomEntropy()

Daybreak/Utils/SerializationExtensions.cs

@@ -1,20 +1,9 @@
-using Newtonsoft.Json;
-using System.Text;
+using System.Text;
 
 namespace Daybreak.Utils
 {
     public static class SerializationExtensions
     {
-        public static string Serialize<T>(this T obj)
-        {
-            return JsonConvert.SerializeObject(obj);
-        }
-
-        public static T Deserialize<T>(this string serializedObject)
-        {
-            return JsonConvert.DeserializeObject<T>(serializedObject);
-        }
-
         public static byte[] AsBytes(this string s)
         {
             return Encoding.UTF8.GetBytes(s);

Daybreak/Views/AskUpdateView.xaml.cs

@@ -1,8 +1,9 @@
-using Daybreak.Services.Privilege;
-using Daybreak.Services.Runtime;
+using Daybreak.Configuration;
+using Daybreak.Services.Privilege;
 using Daybreak.Services.Updater;
 using Daybreak.Services.ViewManagement;
 using Microsoft.Extensions.Logging;
+using System.Configuration;
 using System.Extensions;
 using System.Linq;
 using System.Windows.Controls;
@@ -14,24 +15,22 @@ namespace Daybreak.Views
     /// </summary>
     public partial class AskUpdateView : UserControl
     {
-        private const string UpdateDesiredKey = "UpdateDesired";
-
         private readonly ILogger<AskUpdateView> logger;
         private readonly IViewManager viewManager;
-        private readonly IRuntimeStore runtimeStore;
+        private readonly ILiveUpdateableOptions<ApplicationConfiguration> liveOptions;
         private readonly IPrivilegeManager privilegeManager;
         private readonly IApplicationUpdater applicationUpdater;
 
         public AskUpdateView(
             ILogger<AskUpdateView> logger,
             IViewManager viewManager,
-            IRuntimeStore runtimeStore,
+            ILiveUpdateableOptions<ApplicationConfiguration> liveOptions,
             IPrivilegeManager privilegeManager,
             IApplicationUpdater applicationUpdater)
         {
             this.logger = logger.ThrowIfNull(nameof(logger));
             this.viewManager = viewManager.ThrowIfNull(nameof(viewManager));
-            this.runtimeStore = runtimeStore.ThrowIfNull(nameof(runtimeStore));
+            this.liveOptions = liveOptions.ThrowIfNull(nameof(liveOptions));
             this.privilegeManager = privilegeManager.ThrowIfNull(nameof(privilegeManager));
             this.applicationUpdater = applicationUpdater.ThrowIfNull(nameof(applicationUpdater));
             this.InitializeComponent();
@@ -51,14 +50,14 @@ namespace Daybreak.Views
         private void NoButton_Clicked(object sender, System.EventArgs e)
         {
             this.logger.LogInformation("User declined update");
-            this.runtimeStore.StoreValue(UpdateDesiredKey, false);
+            this.liveOptions.Value.AutoCheckUpdate = false;
+            this.liveOptions.UpdateOption();
             this.viewManager.ShowView<MainView>();
         }
 
         private async void YesButton_Clicked(object sender, System.EventArgs e)
         {
             this.logger.LogInformation("User accepted update");
-            this.runtimeStore.StoreValue(UpdateDesiredKey, true);
             if (this.CheckIfAdmin() is false)
             {
                 return;

Daybreak/Views/BuildTemplateView.xaml

@@ -43,10 +43,10 @@
             </Grid.ColumnDefinitions>
             <TextBlock Text="Code: " Foreground="White" Background="Transparent" FontSize="16"></TextBlock>
             <TextBox Grid.Column="1" Foreground="White" Background="Transparent" FontSize="16"
-                     Text="{Binding ElementName=_this, Path=CurrentBuildCode, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                     KeyDown="BuildCodeTextBox_KeyDown"></TextBox>
+                     Text="{Binding ElementName=_this, Path=CurrentBuildCode, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"></TextBox>
         </Grid>
-        <controls:BuildTemplate x:Name="BuildTemplate" Grid.Row="2" DataContext="{Binding ElementName=_this, Path=CurrentBuild, Mode=OneWay}">
+        <controls:BuildTemplate x:Name="BuildTemplate" Grid.Row="2" DataContext="{Binding ElementName=_this, Path=CurrentBuild, Mode=OneWay}"
+                                BuildChanged="BuildTemplate_BuildChanged">
         </controls:BuildTemplate>
     </Grid>
 </UserControl>

Daybreak/Views/BuildTemplateView.xaml.cs

@@ -1,17 +1,17 @@
-using Daybreak.Controls;
+using Daybreak.Configuration;
+using Daybreak.Controls;
 using Daybreak.Models.Builds;
 using Daybreak.Services.BuildTemplates;
-using Daybreak.Services.Configuration;
 using Daybreak.Services.IconRetrieve;
 using Daybreak.Services.ViewManagement;
 using Microsoft.Extensions.Logging;
 using System;
+using System.Configuration;
 using System.Extensions;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Extensions;
-using System.Windows.Input;
 
 namespace Daybreak.Views
 {
@@ -22,6 +22,8 @@ namespace Daybreak.Views
     {
         private const string DisallowedChars = "\r\n\\/.";
 
+        private bool supressDecode = false;
+
         private readonly IViewManager viewManager;
         private readonly IBuildTemplateManager buildTemplateManager;
         private readonly ILogger<BuildTemplateView> logger;
@@ -37,7 +39,7 @@ namespace Daybreak.Views
             IViewManager viewManager,
             IBuildTemplateManager buildTemplateManager,
             IIconRetriever iconRetriever,
-            IConfigurationManager configurationManager,
+            ILiveOptions<ApplicationConfiguration> liveOptions,
             ILogger<ChromiumBrowserWrapper> chromiumLogger,
             ILogger<BuildTemplateView> logger)
         {
@@ -45,7 +47,7 @@ namespace Daybreak.Views
             this.logger = logger.ThrowIfNull(nameof(logger));
             this.viewManager = viewManager.ThrowIfNull(nameof(viewManager));
             this.InitializeComponent();
-            this.BuildTemplate.InitializeTemplate(iconRetriever, configurationManager, buildTemplateManager, chromiumLogger);
+            this.BuildTemplate.InitializeTemplate(iconRetriever, liveOptions, buildTemplateManager, chromiumLogger);
             this.DataContextChanged += (sender, contextArgs) =>
             {
                 if (contextArgs.NewValue is BuildEntry)
@@ -57,28 +59,48 @@ namespace Daybreak.Views
             };
         }
 
-        private void BuildCodeTextBox_KeyDown(object sender, KeyEventArgs e)
+        protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs e)
         {
-            if (e.Key == Key.Enter)
+            base.OnPropertyChanged(e);
+            if (e.Property == CurrentBuildCodeProperty && this.supressDecode is false)
             {
-                this.logger.LogInformation($"Attempting to decode provided template {sender.As<TextBox>().Text}");
+                this.logger.LogInformation($"Attempting to decode provided template {this.CurrentBuildCode}");
                 try
                 {
                     this.CurrentBuild = new BuildEntry
                     {
                         Name = this.CurrentBuild.Name,
                         PreviousName = this.CurrentBuild.PreviousName,
-                        Build = this.buildTemplateManager.DecodeTemplate(sender.As<TextBox>().Text)
+                        Build = this.buildTemplateManager.DecodeTemplate(this.CurrentBuildCode)
                     };
 
-                    this.logger.LogInformation($"Template {sender.As<TextBox>().Text} decoded");
+                    this.logger.LogInformation($"Template {CurrentBuildCode} decoded");
                 }
-                catch (Exception ex)
+                catch
                 {
-                    throw new InvalidOperationException($"Failed to decode template {sender.As<TextBox>().Text}", ex);
+                    this.logger.LogWarning($"Failed to decode {this.CurrentBuildCode}. Reverting to default build");
+                    this.CurrentBuild = new BuildEntry
+                    {
+                        Name = this.CurrentBuild.Name,
+                        PreviousName = this.CurrentBuild.PreviousName,
+                        Build = new Build()
+                    };
                 }
             }
         }
+
+        private void BuildTemplate_BuildChanged(object sender, EventArgs e)
+        {
+            try
+            {
+                this.supressDecode = true;
+                this.CurrentBuildCode = this.buildTemplateManager.EncodeTemplate(this.CurrentBuild.Build);
+            }
+            finally
+            {
+                this.supressDecode = false;
+            }
+        }
         private void BackButton_Clicked(object sender, EventArgs e)
         {
             this.viewManager.ShowView<BuildsListView>();

Daybreak/Views/ExecutablesView.xaml.cs

@@ -1,10 +1,10 @@
-using Daybreak.Controls;
+using Daybreak.Configuration;
+using Daybreak.Controls;
 using Daybreak.Models;
-using Daybreak.Services.Configuration;
 using Daybreak.Services.ViewManagement;
-using Microsoft.Win32;
 using System;
 using System.Collections.ObjectModel;
+using System.Configuration;
 using System.Extensions;
 using System.Linq;
 using System.Windows.Controls;
@@ -17,15 +17,15 @@ namespace Daybreak.Views
     /// </summary>
     public partial class ExecutablesView : UserControl
     {
-        private readonly IConfigurationManager configurationManager;
+        private readonly ILiveUpdateableOptions<ApplicationConfiguration> liveUpdateableOptions;
         private readonly IViewManager viewManager;
         public ObservableCollection<GuildwarsPath> Paths { get; } = new();
 
         public ExecutablesView(
-            IConfigurationManager configurationManager,
+            ILiveUpdateableOptions<ApplicationConfiguration> liveUpdateableOptions,
             IViewManager viewManager)
         {
-            this.configurationManager = configurationManager.ThrowIfNull(nameof(configurationManager));
+            this.liveUpdateableOptions = liveUpdateableOptions.ThrowIfNull(nameof(liveUpdateableOptions));
             this.viewManager = viewManager.ThrowIfNull(nameof(viewManager));
             this.InitializeComponent();
             this.GetPaths();
@@ -33,7 +33,7 @@ namespace Daybreak.Views
 
         private void GetPaths()
         {
-            this.Paths.AddRange(this.configurationManager.GetConfiguration().GuildwarsPaths);
+            this.Paths.AddRange(this.liveUpdateableOptions.Value.GuildwarsPaths);
         }
 
         private void BackButton_Clicked(object sender, EventArgs e)
@@ -53,9 +53,8 @@ namespace Daybreak.Views
 
         private void SaveButton_Clicked(object sender, EventArgs e)
         {
-            var config = this.configurationManager.GetConfiguration();
-            config.GuildwarsPaths = this.Paths.ToList();
-            this.configurationManager.SaveConfiguration(config);
+            this.liveUpdateableOptions.Value.GuildwarsPaths = this.Paths.ToList();
+            this.liveUpdateableOptions.UpdateOption();
             this.viewManager.ShowView<SettingsCategoryView>();
         }
 
@@ -81,6 +80,7 @@ namespace Daybreak.Views
             {
                 path.Default = false;
             }
+
             gwPath.Default = true;
             var view = CollectionViewSource.GetDefaultView(this.Paths);
             view.Refresh();

Daybreak/Views/ExperimentalSettingsView.xaml.cs

@@ -1,6 +1,7 @@
-using Daybreak.Services.Configuration;
+using Daybreak.Configuration;
 using Daybreak.Services.ViewManagement;
 using System;
+using System.Configuration;
 using System.Extensions;
 using System.Linq;
 using System.Windows;
@@ -27,7 +28,7 @@ namespace Daybreak.Views
             DependencyPropertyExtensions.Register<ExperimentalSettingsView, bool>(nameof(MacrosEnabled));
 
         private readonly IViewManager viewManager;
-        private readonly IConfigurationManager configurationManager;
+        private readonly ILiveUpdateableOptions<ApplicationConfiguration> liveUpdateableOptions;
 
         public bool LaunchAsCurrentUser
         {
@@ -57,17 +58,17 @@ namespace Daybreak.Views
 
         public ExperimentalSettingsView(
             IViewManager viewManager,
-            IConfigurationManager configurationManager)
+            ILiveUpdateableOptions<ApplicationConfiguration> liveUpdateableOptions)
         {
             this.viewManager = viewManager.ThrowIfNull(nameof(viewManager));
-            this.configurationManager = configurationManager.ThrowIfNull(nameof(configurationManager));
+            this.liveUpdateableOptions = liveUpdateableOptions.ThrowIfNull(nameof(liveUpdateableOptions));
             this.InitializeComponent();
             this.LoadExperimentalSettings();
         }
 
         private void LoadExperimentalSettings()
         {
-            var config = this.configurationManager.GetConfiguration();
+            var config = this.liveUpdateableOptions.Value;
             this.MultiLaunch = config.ExperimentalFeatures.MultiLaunchSupport;
             this.GWToolboxLaunchDelay = config.ExperimentalFeatures.ToolboxAutoLaunchDelay.ToString();
             this.DynamicBuildLoading = config.ExperimentalFeatures.DynamicBuildLoading;
@@ -77,7 +78,7 @@ namespace Daybreak.Views
 
         private void SaveExperimentalSettings()
         {
-            var config = this.configurationManager.GetConfiguration();
+            var config = this.liveUpdateableOptions.Value;
             config.ExperimentalFeatures.MultiLaunchSupport = this.MultiLaunch;
             config.ExperimentalFeatures.DynamicBuildLoading = this.DynamicBuildLoading;
             config.ExperimentalFeatures.LaunchGuildwarsAsCurrentUser = this.LaunchAsCurrentUser;
@@ -87,7 +88,7 @@ namespace Daybreak.Views
                 config.ExperimentalFeatures.ToolboxAutoLaunchDelay = gwToolboxLaunchDelay;
             }
 
-            this.configurationManager.SaveConfiguration(config);
+            this.liveUpdateableOptions.UpdateOption();
         }
 
         private void SaveButton_Clicked(object sender, EventArgs e)

Daybreak/Views/LogsView.xaml

@@ -24,6 +24,12 @@
                             Clicked="BinButton_Clicked"></controls:BinButton>
         <controls:RefreshGlyph Foreground="White" Height="30" Width="30" HorizontalAlignment="Right" Margin="0, 5, 45, 5"
                                Clicked="RefreshGlyph_Clicked"></controls:RefreshGlyph>
+        <controls:BackButton Foreground="White" Height="30" Width="30" HorizontalAlignment="Right" Margin="0, 5, 85, 5"
+                             Clicked="ExportButton_Clicked">
+            <controls:BackButton.RenderTransform>
+                <RotateTransform Angle="270" CenterX="15" CenterY="15"></RotateTransform>
+            </controls:BackButton.RenderTransform>
+        </controls:BackButton>
         <DataGrid IsReadOnly="True" Background="Transparent" Foreground="White" Grid.Row="1"
                   ItemsSource="{Binding ElementName=_this, Path=Logs, Mode=OneWay}" HorizontalScrollBarVisibility="Disabled"
                   AutoGenerateColumns="False" HeadersVisibility="Column" EnableColumnVirtualization="True"
@@ -54,7 +60,13 @@
                 <DataGridTextColumn IsReadOnly="True" Header="Category" Binding="{Binding Category}" ElementStyle="{StaticResource WrapText}" Width="auto"/>
                 <DataGridTextColumn IsReadOnly="True" Header="LogLevel" Binding="{Binding LogLevel}" ElementStyle="{StaticResource WrapText}" Width="auto"/>
                 <DataGridTextColumn IsReadOnly="True" Header="EventId" Binding="{Binding EventId}" ElementStyle="{StaticResource WrapText}" Width="auto"/>
-                <DataGridTextColumn IsReadOnly="True" Header="Message" Binding="{Binding Message}" ElementStyle="{StaticResource WrapText}" Width="*"/>
+                <DataGridTemplateColumn IsReadOnly="True" Header="Message" Width="*">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <controls:LogMessageTemplate Message="{Binding Message}" Foreground="White"></controls:LogMessageTemplate>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
             </DataGrid.Columns>
         </DataGrid>
     </Grid>

Daybreak/Views/LogsView.xaml.cs

@@ -1,10 +1,15 @@
-using Daybreak.Services.Logging;
+using Daybreak.Models;
+using Daybreak.Services.Logging;
 using Daybreak.Services.ViewManagement;
+using Daybreak.Utils;
+using Microsoft.Extensions.Logging;
+using Microsoft.Win32;
 using System;
 using System.Collections.ObjectModel;
 using System.Extensions;
+using System.IO;
+using System.Linq;
 using System.Windows.Controls;
-using WpfExtended.Models;
 
 namespace Daybreak.Views
 {
@@ -15,22 +20,47 @@ namespace Daybreak.Views
     {
         private readonly IViewManager viewManager;
         private readonly ILogsManager logManager;
+        private readonly ILogger<LogsView> logger;
 
         public ObservableCollection<Log> Logs { get; } = new ObservableCollection<Log>();
 
         public LogsView(
             IViewManager viewManager,
-            ILogsManager logManager)
+            ILogsManager logManager,
+            ILogger<LogsView> logger)
         {
             this.logManager = logManager.ThrowIfNull(nameof(logManager));
             this.viewManager = viewManager.ThrowIfNull(nameof(viewManager));
+            this.logger = logger.ThrowIfNull(nameof(logger));
             this.InitializeComponent();
             this.UpdateLogs();
         }
 
         private void UpdateLogs()
         {
-            this.Logs.ClearAnd().AddRange(this.logManager.GetLogs());
+            this.Logs.ClearAnd().AddRange(this.logManager.GetLogs(l => l.LogLevel < Microsoft.Extensions.Logging.LogLevel.Trace));
+        }
+        private async void ExportButton_Clicked(object sender, EventArgs e)
+        {
+            this.logger.LogInformation("Exporting logs");
+            var saveFileDialog = new SaveFileDialog
+            {
+                DefaultExt = "json",
+                Filter = "Json files (*.json)|*.json",
+                Title = "Export logs",
+                ValidateNames = true,
+                CreatePrompt = true
+            };
+            if (saveFileDialog.ShowDialog() is true)
+            {
+                var fileName = saveFileDialog.FileName;
+                this.logger.LogInformation($"Exporting to {fileName}");
+                await File.WriteAllTextAsync(fileName, this.logManager.GetLogs().ToList().Serialize());
+            }
+            else
+            {
+                this.logger.LogInformation("Exporting canceled");
+            }
         }
         private void BackButton_Clicked(object sender, EventArgs e)
         {

Daybreak/Views/MainView.xaml.cs

@@ -1,13 +1,14 @@
-using Daybreak.Controls;
+using Daybreak.Configuration;
+using Daybreak.Controls;
 using Daybreak.Exceptions;
 using Daybreak.Models.Builds;
 using Daybreak.Services.ApplicationLauncher;
 using Daybreak.Services.BuildTemplates;
-using Daybreak.Services.Configuration;
 using Daybreak.Services.Screens;
 using Daybreak.Services.ViewManagement;
 using Microsoft.Extensions.Logging;
 using System;
+using System.Configuration;
 using System.Extensions;
 using System.Linq;
 using System.Threading;
@@ -27,7 +28,7 @@ namespace Daybreak.Views
     {
         private readonly IApplicationLauncher applicationDetector;
         private readonly IViewManager viewManager;
-        private readonly IConfigurationManager configurationManager;
+        private readonly ILiveUpdateableOptions<ApplicationConfiguration> liveOptions;
         private readonly IScreenManager screenManager;
         private readonly IBuildTemplateManager buildTemplateManager;
         private readonly ILogger<ChromiumBrowserWrapper> browserLogger;
@@ -58,7 +59,7 @@ namespace Daybreak.Views
         public MainView(
             IApplicationLauncher applicationDetector,
             IViewManager viewManager,
-            IConfigurationManager configurationManager,
+            ILiveUpdateableOptions<ApplicationConfiguration> liveOptions,
             IScreenManager screenManager,
             IBuildTemplateManager buildTemplateManager,
             ILogger<ChromiumBrowserWrapper> browserLogger)
@@ -66,7 +67,7 @@ namespace Daybreak.Views
             this.browserLogger = browserLogger;
             this.buildTemplateManager = buildTemplateManager.ThrowIfNull(nameof(buildTemplateManager));
             this.screenManager = screenManager.ThrowIfNull(nameof(screenManager));
-            this.configurationManager = configurationManager.ThrowIfNull(nameof(configurationManager));
+            this.liveOptions = liveOptions.ThrowIfNull(nameof(liveOptions));
             this.applicationDetector = applicationDetector.ThrowIfNull(nameof(applicationDetector));
             this.viewManager = viewManager.ThrowIfNull(nameof(viewManager));
             this.InitializeComponent();
@@ -77,13 +78,13 @@ namespace Daybreak.Views
 
         private void InitializeBrowsers()
         {
-            this.LeftWebBrowser.InitializeBrowser(this.configurationManager, this.buildTemplateManager, this.browserLogger);
-            this.RightWebBrowser.InitializeBrowser(this.configurationManager, this.buildTemplateManager, this.browserLogger);
+            this.LeftWebBrowser.InitializeBrowser(this.liveOptions, this.buildTemplateManager, this.browserLogger);
+            this.RightWebBrowser.InitializeBrowser(this.liveOptions, this.buildTemplateManager, this.browserLogger);
         }
 
         private void NavigateToDefaults()
         {
-            var applicationConfiguration = this.configurationManager.GetConfiguration();
+            var applicationConfiguration = this.liveOptions.Value;
             if (applicationConfiguration.BrowsersEnabled)
             {
                 this.LeftBrowserFavoriteAddress = applicationConfiguration.LeftBrowserDefault;
@@ -127,21 +128,22 @@ namespace Daybreak.Views
                     return;
                 }
 
-                if (this.configurationManager.GetConfiguration().SetGuildwarsWindowSizeOnLaunch)
+                if (this.liveOptions.Value.SetGuildwarsWindowSizeOnLaunch)
                 {
-                    var id = this.configurationManager.GetConfiguration().DesiredGuildwarsScreen;
+                    var id = this.liveOptions.Value.DesiredGuildwarsScreen;
                     var desiredScreen = this.screenManager.Screens.Skip(id).FirstOrDefault();
                     if (desiredScreen is null)
                     {
                         throw new InvalidOperationException($"Unable to set guildwars on desired screen. No screen with id {id}");
                     }
+
                     await Task.Delay(1000);
                     this.screenManager.MoveGuildwarsToScreen(desiredScreen);
                 }
 
-                if (this.configurationManager.GetConfiguration().ToolboxAutoLaunch is true)
+                if (this.liveOptions.Value.ToolboxAutoLaunch is true)
                 {
-                    var delay = this.configurationManager.GetConfiguration().ExperimentalFeatures.ToolboxAutoLaunchDelay;
+                    var delay = this.liveOptions.Value.ExperimentalFeatures.ToolboxAutoLaunchDelay;
                     await Task.Delay(delay);
                     await this.applicationDetector.LaunchGuildwarsToolbox();
                 }
@@ -180,23 +182,23 @@ namespace Daybreak.Views
             }
         }
 
-        private void ChromiumBrowserWrapper_BuildDecoded(object sender, Models.Builds.Build e)
+        private void ChromiumBrowserWrapper_BuildDecoded(object sender, Build e)
         {
             this.viewManager.ShowView<BuildTemplateView>(new BuildEntry { Build = e, Name = string.Empty });
         }
 
         private void LeftBrowser_FavoriteUriChanged(object sender, string e)
         {
-            var config = this.configurationManager.GetConfiguration();
+            var config = this.liveOptions.Value;
             config.LeftBrowserDefault = e;
-            this.configurationManager.SaveConfiguration(config);
+            this.liveOptions.UpdateOption();
         }
 
         private void RightBrowser_FavoriteUriChanged(object sender, string e)
         {
-            var config = this.configurationManager.GetConfiguration();
+            var config = this.liveOptions.Value;
             config.RightBrowserDefault = e;
-            this.configurationManager.SaveConfiguration(config);
+            this.liveOptions.UpdateOption();
         }
 
         private void LeftChromiumBrowserWrapper_MaximizeClicked(object sender, EventArgs e)

Daybreak/Views/ScreenChoiceView.xaml.cs

@@ -1,13 +1,13 @@
-using Daybreak.Controls.Templates;
+using Daybreak.Configuration;
+using Daybreak.Controls.Templates;
 using Daybreak.Models;
 using Daybreak.Services.ApplicationLauncher;
-using Daybreak.Services.Configuration;
 using Daybreak.Services.Screens;
 using Daybreak.Services.ViewManagement;
 using System;
+using System.Configuration;
 using System.Extensions;
 using System.Linq;
-using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Extensions;
 using System.Windows.Media;
@@ -23,7 +23,7 @@ namespace Daybreak.Views
     {        
         private readonly IScreenManager screenManager;
         private readonly IViewManager viewManager;
-        private readonly IConfigurationManager configurationManager;
+        private readonly ILiveOptions<ApplicationConfiguration> liveOptions;
         private readonly IApplicationLauncher applicationLauncher;
         private int selectedId;
 
@@ -33,15 +33,15 @@ namespace Daybreak.Views
         public ScreenChoiceView(
             IViewManager viewManager,
             IScreenManager screenManager,
-            IConfigurationManager configurationManager,
+            ILiveOptions<ApplicationConfiguration> liveOptions,
             IApplicationLauncher applicationLauncher)
         {
             this.viewManager = viewManager.ThrowIfNull(nameof(viewManager));
             this.screenManager = screenManager.ThrowIfNull(nameof(screenManager));
-            this.configurationManager = configurationManager.ThrowIfNull(nameof(configurationManager));
+            this.liveOptions = liveOptions.ThrowIfNull(nameof(liveOptions));
             this.applicationLauncher = applicationLauncher.ThrowIfNull(nameof(applicationLauncher));
             this.InitializeComponent();
-            this.selectedId = configurationManager.GetConfiguration().DesiredGuildwarsScreen;
+            this.selectedId = this.liveOptions.Value.DesiredGuildwarsScreen;
             this.CanTest = applicationLauncher.IsGuildwarsRunning;
             this.SetupView();
         }
@@ -59,8 +59,8 @@ namespace Daybreak.Views
                     VerticalAlignment = System.Windows.VerticalAlignment.Top,
                     HorizontalAlignment = System.Windows.HorizontalAlignment.Left,
                     Foreground = screen.Id == this.selectedId ? Brushes.LightGreen : Brushes.White
-            };
-                screenTemplate.Clicked += ScreenTemplate_Clicked;
+                };
+                screenTemplate.Clicked += this.ScreenTemplate_Clicked;
                 this.ScreenContainer.Children.Add(screenTemplate);
             }
         }
@@ -86,7 +86,7 @@ namespace Daybreak.Views
 
         private void SaveButton_Clicked(object sender, EventArgs e)
         {
-            this.configurationManager.GetConfiguration().DesiredGuildwarsScreen = this.selectedId;
+            this.liveOptions.Value.DesiredGuildwarsScreen = this.selectedId;
             this.viewManager.ShowView<SettingsCategoryView>();
         }
 

Daybreak/Views/SettingsView.xaml

@@ -94,6 +94,7 @@
                 <TextBlock Text="Desired screen id: " FontSize="22" Foreground="White" Height="30"></TextBlock>
                 <TextBlock Text="Place Shortcut: " FontSize="22" Foreground="White" Height="30"></TextBlock>
                 <TextBlock Text="Shortcut folder: " FontSize="22" Foreground="White" Height="30"></TextBlock>
+                <TextBlock Text="Keep local cache of icons: " FontSize="22" Foreground="White" Height="30"></TextBlock>
             </StackPanel>
             <StackPanel Orientation="Vertical" Grid.Row="1" Grid.Column="1">
                 <ToggleButton HorizontalAlignment="Center" HorizontalContentAlignment="Stretch" Style="{StaticResource AnimatedSwitch}" Height="30" Width="40"
@@ -148,6 +149,8 @@
                                       Foreground="White" BorderBrush="Gray" BorderThickness="0"
                                       Clicked="ShortcutFolderPickerGlyph_Clicked"></controls:FilePickerGlyph>
                 </Grid>
+                <ToggleButton HorizontalAlignment="Center" HorizontalContentAlignment="Stretch" Style="{StaticResource AnimatedSwitch}" Height="30" Width="40"
+                            FontSize="22" Foreground="White" IsChecked="{Binding ElementName=_this, Path=KeepLocalIconCache, Mode=TwoWay}"></ToggleButton>
             </StackPanel>
         </Grid>
     </ScrollViewer>

Daybreak/Views/SettingsView.xaml.cs

@@ -1,11 +1,8 @@
-using Daybreak.Services.Configuration;
-using Daybreak.Services.Shortcuts;
+using Daybreak.Configuration;
 using Daybreak.Services.ViewManagement;
-using Microsoft.Win32;
 using System;
+using System.Configuration;
 using System.Extensions;
-using System.Windows;
-using System.Windows.Controls;
 using System.Windows.Extensions;
 using System.Windows.Forms;
 
@@ -18,7 +15,7 @@ namespace Daybreak.Views
     [System.Diagnostics.CodeAnalysis.SuppressMessage("CodeQuality", "IDE0052:Remove unread private members", Justification = "Used by source generators")]
     public partial class SettingsView : System.Windows.Controls.UserControl
     {
-        private readonly IConfigurationManager configurationManager;
+        private readonly ILiveUpdateableOptions<ApplicationConfiguration> liveUpdateableOptions;
         private readonly IViewManager viewManager;
 
         [GenerateDependencyProperty]
@@ -45,12 +42,14 @@ namespace Daybreak.Views
         private bool shortcutPlaced;
         [GenerateDependencyProperty]
         private bool autoCheckUpdate;
+        [GenerateDependencyProperty]
+        private bool keepLocalIconCache;
 
         public SettingsView(
-            IConfigurationManager configurationManager,
+            ILiveUpdateableOptions<ApplicationConfiguration> liveUpdateableOptions,
             IViewManager viewManager)
         {
-            this.configurationManager = configurationManager.ThrowIfNull(nameof(configurationManager));
+            this.liveUpdateableOptions = liveUpdateableOptions.ThrowIfNull(nameof(liveUpdateableOptions));
             this.viewManager = viewManager.ThrowIfNull(nameof(viewManager));
             this.InitializeComponent();
             this.LoadSettings();
@@ -58,7 +57,7 @@ namespace Daybreak.Views
 
         private void LoadSettings()
         {
-            var config = this.configurationManager.GetConfiguration();
+            var config = this.liveUpdateableOptions.Value;
             this.AddressBarReadonly = config.AddressBarReadonly;
             this.ToolboxPath = config.ToolboxPath;
             this.LeftBrowserUrl = config.LeftBrowserDefault;
@@ -71,11 +70,12 @@ namespace Daybreak.Views
             this.ShortcutFolder = config.ShortcutLocation;
             this.ShortcutPlaced = config.PlaceShortcut;
             this.AutoCheckUpdate = config.AutoCheckUpdate;
+            this.KeepLocalIconCache = config.KeepLocalIconCache;
         }
 
         private void SaveButton_Clicked(object sender, EventArgs e)
         {
-            var currentConfig = this.configurationManager.GetConfiguration();
+            var currentConfig = this.liveUpdateableOptions.Value;
             currentConfig.ToolboxPath = this.ToolboxPath;
             currentConfig.AddressBarReadonly = this.AddressBarReadonly;
             currentConfig.LeftBrowserDefault = this.LeftBrowserUrl;
@@ -88,7 +88,8 @@ namespace Daybreak.Views
             currentConfig.ShortcutLocation = this.ShortcutFolder;
             currentConfig.PlaceShortcut = this.ShortcutPlaced;
             currentConfig.AutoCheckUpdate = this.AutoCheckUpdate;
-            this.configurationManager.SaveConfiguration(currentConfig);
+            currentConfig.KeepLocalIconCache = this.KeepLocalIconCache;
+            this.liveUpdateableOptions.UpdateOption();
             this.viewManager.ShowView<SettingsCategoryView>();
         }