Remove admin mode when updating (#31 )

Setup executable installer (#29 )
* Setup executable installer * Increment update to 0.9.3 * Improve installer
2026-09-16 13:29:30 +00:00 · 2022-08-04 21:59:55 +02:00 · 2022-08-04 21:39:17 +02:00 · 2022-08-04 19:52:54 +02:00 · 2022-08-04 19:25:53 +02:00 · 2021-07-10 13:39:00 +03:00
37 changed files with 480 additions and 496 deletions
@@ -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
@@ -70,11 +70,16 @@ jobs:
        $version = .\Scripts\GetBuildVersion.ps1
        echo "::set-env name=Version::$version"

-    - name: Create publish files
+    - name: Create publish launcher files
      run: dotnet publish .\Daybreak\Daybreak.csproj -c $env:Configuration -r $env:RuntimeIdentifier -p:PublishReadyToRun=true -p:PublishSingleFile=true --self-contained true -o .\Publish
      env:
        RuntimeIdentifier: win-${{ matrix.targetplatform }}

+    - name: Create publish installer files
+      run: dotnet publish .\Daybreak.Installer\Daybreak.Installer.csproj -c $env:Configuration -r $env:RuntimeIdentifier -p:PublishReadyToRun=true -p:PublishSingleFile=true --self-contained true -o .\Publish
+      env:
+        RuntimeIdentifier: win-${{ matrix.targetplatform }}
+
    - name: Pack publish files
      run: |
        Write-Host $env
@@ -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
@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>
@@ -0,0 +1,41 @@
+// See https://aka.ms/new-console-template for more information
+using System.Diagnostics;
+using System.IO.Compression;
+
+const string tempFile = "tempfile.zip";
+const string executableName = "Daybreak.exe";
+Console.Title = "Daybreak Installer";
+Console.WriteLine("Starting installation...");
+if (File.Exists(tempFile) is false)
+{
+    Console.ForegroundColor = ConsoleColor.Red;
+    Console.WriteLine("Unable to find launcher package. Aborting installation");
+    Console.ReadKey();
+    return;
+}
+
+Console.WriteLine("Unpacking files...");
+try
+{
+    ZipFile.ExtractToDirectory(tempFile, AppContext.BaseDirectory, true);
+}
+catch
+{
+
+}
+Console.WriteLine("Deleting package");
+File.Delete(tempFile);
+Console.WriteLine("Launching application");
+var process = new Process
+{
+    StartInfo = new ProcessStartInfo
+    {
+        FileName = executableName
+    }
+};
+
+if (process.Start() is false)
+{
+    Console.WriteLine("Failed to launch application");
+    Console.ReadKey();
+}
@@ -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>
@@ -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>();
+        }
+    }
+}
@@ -3,10 +3,9 @@ using FluentAssertions;
 using LiteDB;
 using Microsoft.Extensions.Logging;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System;
 using System.IO;
 using System.Linq;
-using WpfExtended.Logging;
+using System.Logging;

 namespace Daybreak.Tests.Services
 {
@@ -1,12 +1,20 @@

 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
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Daybreak.Installer", "Daybreak.Installer\Daybreak.Installer.csproj", "{4E2BB805-135D-4F02-8C53-3D8B6876D323}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -31,6 +39,14 @@ Global
 		{C911C1C2-6566-419C-89C7-F802EB3FE709}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C911C1C2-6566-419C-89C7-F802EB3FE709}.Release|x64.ActiveCfg = Release|Any CPU
 		{C911C1C2-6566-419C-89C7-F802EB3FE709}.Release|x64.Build.0 = Release|Any CPU
+		{4E2BB805-135D-4F02-8C53-3D8B6876D323}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4E2BB805-135D-4F02-8C53-3D8B6876D323}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4E2BB805-135D-4F02-8C53-3D8B6876D323}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4E2BB805-135D-4F02-8C53-3D8B6876D323}.Debug|x64.Build.0 = Debug|Any CPU
+		{4E2BB805-135D-4F02-8C53-3D8B6876D323}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4E2BB805-135D-4F02-8C53-3D8B6876D323}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4E2BB805-135D-4F02-8C53-3D8B6876D323}.Release|x64.ActiveCfg = Release|Any CPU
+		{4E2BB805-135D-4F02-8C53-3D8B6876D323}.Release|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -18,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
 {
@@ -30,22 +31,21 @@ 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<ViewManager>();
+            serviceProducer.RegisterSingleton<ViewManager>(registerAllInterfaces: true);
            serviceProducer.RegisterSingleton<IConfigurationManager, ConfigurationManager>();
            serviceProducer.RegisterSingleton<ILiteDatabase, LiteDatabase>(sp => new LiteDatabase("Daybreak.db"));
            serviceProducer.RegisterSingleton<IMutexHandler, MutexHandler>();
@@ -60,6 +60,7 @@ 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 RegisterViews(IViewProducer viewProducer)
@@ -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;
@@ -31,7 +32,7 @@ namespace Daybreak.Controls
        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;
@@ -80,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();
@@ -98,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;
@@ -122,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) =>
                {
@@ -196,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>>();
@@ -1,11 +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;
@@ -59,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);
@@ -97,6 +98,7 @@ namespace Daybreak.Controls
                {
                    this.loadedBuild.Build.Secondary = this.SecondaryProfession;
                }
+
                this.LoadSkills();
                this.LoadAttributes();
                if (this.suppressBuildChanged is false)
@@ -192,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;
@@ -307,7 +316,7 @@ namespace Daybreak.Controls
                return;
            }

-            this.BrowseToInfo(PrimaryProfession.Name);
+            this.BrowseToInfo(this.PrimaryProfession.Name);
            if (e is RoutedEventArgs routedEventArgs)
            {
                routedEventArgs.Handled = true;
@@ -350,6 +359,7 @@ namespace Daybreak.Controls
            {
                this.BrowseToInfo(skill.Name);
            }
+
            e.Handled = true;
        }

@@ -368,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)
@@ -1,35 +1,35 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <OutputType>WinExe</OutputType>
+    <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.2.3</Version>
+    <Version>0.9.3.1</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.5.0" />
+    <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.5.0" />
+    <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-&gt;Distinct())" />
+      <Analyzer Remove="@(Analyzer)" />
+      <Analyzer Include="@(FilteredAnalyzer)" />
+    </ItemGroup>
+  </Target>
 </Project>
@@ -41,6 +41,11 @@ namespace Daybreak.Launch
                return false;
            }

+            if (this.logger is null)
+            {
+                return false;
+            }
+
            if (e is FatalException fatalException)
            {
                this.logger.LogCritical(e, $"{nameof(FatalException)} encountered. Closing application");
@@ -1,5 +1,5 @@
-using Daybreak.Services.Bloogum;
-using Daybreak.Services.Configuration;
+using Daybreak.Configuration;
+using Daybreak.Services.Bloogum;
 using Daybreak.Services.Privilege;
 using Daybreak.Services.Screenshots;
 using Daybreak.Services.Updater;
@@ -7,6 +7,7 @@ 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;
@@ -31,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]
@@ -49,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)
        {
@@ -177,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>();
@@ -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;
        }
    }
 }
@@ -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");
@@ -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
@@ -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();
            }
        }
@@ -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();
            });   
        }

@@ -1,12 +1,13 @@
-using Daybreak.Models.Builds;
-using Daybreak.Services.Configuration;
+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
@@ -21,16 +22,16 @@ namespace Daybreak.Services.IconRetrieve

        private readonly IHttpClient<IconRetriever> httpClient;
        private readonly ILogger<IconRetriever> logger;
-        private readonly IConfigurationManager configurationManager;
+        private readonly ILiveOptions<ApplicationConfiguration> liveOptions;

        public IconRetriever(
            ILogger<IconRetriever> logger,
            IHttpClient<IconRetriever> httpClient,
-            IConfigurationManager configurationManager)
+            ILiveOptions<ApplicationConfiguration> liveOptions)
        {
            this.logger = logger.ThrowIfNull(nameof(logger));
            this.httpClient = httpClient.ThrowIfNull(nameof(httpClient));
-            this.configurationManager = configurationManager.ThrowIfNull(nameof(configurationManager));
+            this.liveOptions = liveOptions.ThrowIfNull(nameof(liveOptions));
            this.httpClient.BaseAddress = new Uri(BaseUrl);
            if (Directory.Exists(IconsDirectoryName) is false)
            {
@@ -40,7 +41,7 @@ namespace Daybreak.Services.IconRetrieve

        public async Task<Optional<Stream>> GetIcon(Skill skill)
        {
-            if (this.configurationManager.GetConfiguration().KeepLocalIconCache)
+            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);
@@ -86,10 +87,11 @@ namespace Daybreak.Services.IconRetrieve
            {
                this.logger.LogInformation("Retrieved latest icon stream");
                var iconData = await iconResponse.Content.ReadAsByteArrayAsync();
-                if (this.configurationManager.GetConfiguration().KeepLocalIconCache)
+                if (this.liveOptions.Value.KeepLocalIconCache)
                {
-                    await this.SaveIconLocally(skill, iconData);
+                    await SaveIconLocally(skill, iconData);
                }
+
                return new MemoryStream(iconData);
            }

@@ -113,7 +115,7 @@ namespace Daybreak.Services.IconRetrieve
            return Optional.None<Stream>();
        }

-        private async Task SaveIconLocally(Skill skill, byte[] data)
+        private static async Task SaveIconLocally(Skill skill, byte[] data)
        {
            var curedSkillName = skill.Name
                .Replace(" ", "_")
@@ -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)
@@ -2,14 +2,14 @@
 using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
-using WpfExtended.Logging;
+using System.Logging;

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

 namespace Daybreak.Services.Logging
 {
@@ -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>();
@@ -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}");
+        }
+    }
+}
@@ -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);
        }
@@ -1,17 +1,16 @@
-using Daybreak.Exceptions;
+using Daybreak.Configuration;
+using Daybreak.Exceptions;
 using Daybreak.Models;
 using Daybreak.Models.Github;
-using Daybreak.Services.Configuration;
 using Daybreak.Services.ViewManagement;
-using Daybreak.Utils;
 using Daybreak.Views;
 using Microsoft.Extensions.Logging;
 using Microsoft.Win32;
 using System;
 using System.Collections.Generic;
+using System.Configuration;
 using System.Diagnostics;
 using System.Extensions;
-using System.Http;
 using System.IO;
 using System.Linq;
 using System.Net.Http;
@@ -25,52 +24,32 @@ namespace Daybreak.Services.Updater
 {
    public sealed class ApplicationUpdater : IApplicationUpdater
    {
-        private const string LaunchActionName = "Launch_Daybreak";
-        private const string ExecutionPolicyKey = "ExecutionPolicy";
+        private const string InstallerFileName = "Daybreak.Installer.exe";
        private const string UpdatedKey = "Updating";
        private const string RegistryKey = "Daybreak";
-        private const string ExtractAndRunPs1 = "ExtractAndRun.ps1";
        private const string TempFile = "tempfile.zip";
        private const string VersionTag = "{VERSION}";
-        private const string InputFileTag = "{INPUTFILE}";
-        private const string OutputPathTag = "{OUTPUTPATH}";
-        private const string ExecutionPolicyTag = "{EXECUTIONPOLICY}";
-        private const string ProcessIdTag = "{PROCESSID}";
-        private const string ExecutableNameTag = "{EXECUTABLE}";
-        private const string WorkingDirectoryTag = "{WORKINGDIRECTORY}";
        private const string RefTagPrefix = "/refs/tags";
        private const string VersionListUrl = "https://api.github.com/repos/AlexMacocian/Daybreak/git/refs/tags";
        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 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}";
-        private const string PrepareTriggerForAction = $"$trigger = New-ScheduledTaskTrigger -Once -At (Get-Date)";
-        private const string RegisterScheduledAction = $"Register-ScheduledTask -Action $action -Trigger $trigger -TaskName {LaunchActionName} | Out-Null";
-        private const string LaunchScheduledAction = $"Start-ScheduledTask -TaskName {LaunchActionName}";
-        private const string SleepOneSecond = $"Start-Sleep -s 1";
-        private const string UnregisterScheduledAction = $"Unregister-ScheduledTask -TaskName {LaunchActionName} -Confirm:$false";
-        private const string RemoveTempFile = $"Remove-item {TempFile}";
-        private const string RemovePs1 = $"Remove-item {ExtractAndRunPs1}";

        private readonly CancellationTokenSource updateCancellationTokenSource = new();
        private readonly ILogger<ApplicationUpdater> logger;
        private readonly IViewManager viewManager;
-        private readonly IConfigurationManager configurationManager;
+        private readonly ILiveOptions<ApplicationConfiguration> liveOptions;
        private readonly IHttpClient<ApplicationUpdater> httpClient;

        public Version CurrentVersion { get; }

        public ApplicationUpdater(
            ILogger<ApplicationUpdater> logger,
-            IConfigurationManager configurationManager,
+            ILiveOptions<ApplicationConfiguration> liveOptions,
            IViewManager viewManager,
            IHttpClient<ApplicationUpdater> httpClient)
        {
            this.viewManager = viewManager.ThrowIfNull(nameof(viewManager));
-            this.configurationManager = configurationManager.ThrowIfNull(nameof(configurationManager));
+            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");
@@ -175,7 +154,7 @@ namespace Daybreak.Services.Updater
        {
            System.Extensions.TaskExtensions.RunPeriodicAsync(async () =>
            {
-                if (this.configurationManager.GetConfiguration().AutoCheckUpdate is false)
+                if (this.liveOptions.Value.AutoCheckUpdate is false)
                {
                    this.updateCancellationTokenSource.Cancel();
                    return;
@@ -190,23 +169,7 @@ namespace Daybreak.Services.Updater

        public void FinalizeUpdate()
        {
-            var maybeExecutionPolicy = this.RetrieveExecutionPolicy();
-            maybeExecutionPolicy.DoAny(
-                onNone: () =>
-                {
-                    throw new InvalidOperationException("Failed to retrieve execution policy");
-                });
-
-            var executionPolicy = maybeExecutionPolicy.ExtractValue();
-            if (executionPolicy is not ExecutionPolicies.Bypass ||
-                executionPolicy is not ExecutionPolicies.Unrestricted)
-            {
-                this.logger.LogInformation($"Execution policy is set to {executionPolicy}. Setting to {ExecutionPolicies.Bypass}");
-            }
-
-            SaveExecutionPolicyValueToRegistry(executionPolicy);
            MarkUpdateInRegistry();
-            this.SetExecutionPolicy(ExecutionPolicies.Bypass);
            this.LaunchExtractor();
        }

@@ -215,16 +178,6 @@ namespace Daybreak.Services.Updater
            if (UpdateMarkedInRegistry())
            {
                UnmarkUpdateInRegistry();
-                var maybeExecutionPolicy = LoadExecutionPolicyValueFromRegistry();
-                maybeExecutionPolicy.Do(
-                    onSome: policy =>
-                    {
-                        SetExecutionPolicy(policy);
-                    },
-                    onNone: () =>
-                    {
-                        throw new InvalidOperationException("Found update marked in registry but no execution policy");
-                    });
            }
        }

@@ -244,92 +197,19 @@ namespace Daybreak.Services.Updater
            return Optional.None<string>();
        }

-        private Optional<ExecutionPolicies> RetrieveExecutionPolicy()
-        {
-            var process = new Process()
-            {
-                StartInfo = new ProcessStartInfo
-                {
-                    FileName = "powershell",
-                    Arguments = GetExecutionPolicyCommand,
-                    UseShellExecute = false,
-                    RedirectStandardError = true,
-                    RedirectStandardInput = true,
-                    RedirectStandardOutput = true
-                }
-            };
-            process.Start();
-            this.logger.LogInformation("Checking current execution policy");
-            var output = process.StandardOutput.ReadToEnd();
-            if (!Enum.TryParse(typeof(ExecutionPolicies), output, out var executionPolicy))
-            {
-                var error = process.StandardError.ReadToEnd();
-                this.logger.LogError($"Failed to retrieve current user execution policy. Stdout: {output}. Stderr: {error}");
-                return Optional.None<ExecutionPolicies>();
-            }
-
-            return executionPolicy.Cast<ExecutionPolicies>();
-        }
-
-        private void SetExecutionPolicy(ExecutionPolicies executionPolicy)
-        {
-            var process = new Process()
-            {
-                StartInfo = new ProcessStartInfo
-                {
-                    FileName = "powershell",
-                    Arguments = SetExecutionPolicyCommand.Replace(ExecutionPolicyTag, executionPolicy.ToString()),
-                    UseShellExecute = false,
-                    RedirectStandardError = true,
-                    RedirectStandardInput = true,
-                    RedirectStandardOutput = true
-                }
-            };
-            process.Start();
-            this.logger.LogInformation($"Setting execution policy to {executionPolicy}");
-            var output = process.StandardOutput.ReadToEnd();
-            if (!string.IsNullOrWhiteSpace(output))
-            {
-                var error = process.StandardError.ReadToEnd();
-                throw new InvalidOperationException($"Failed to set execution policy to {executionPolicy}. Stdout: {output}. Stderr: {error}");
-            }
-        }
-
        private void LaunchExtractor()
        {
-            File.WriteAllLines(ExtractAndRunPs1, new List<string>()
-            {
-                WaitCommand.Replace(ProcessIdTag, Environment.ProcessId.ToString()),
-                ExtractCommandTemplate
-                    .Replace(InputFileTag, Path.GetFullPath(TempFile))
-                    .Replace(OutputPathTag, Directory.GetCurrentDirectory()),
-                RemoveTempFile,
-                PrepareScheduledAction
-                    .Replace(ExecutableNameTag, Process.GetCurrentProcess()?.MainModule?.FileName)
-                    .Replace(WorkingDirectoryTag, Directory.GetCurrentDirectory()),
-                PrepareTriggerForAction,
-                RegisterScheduledAction,
-                LaunchScheduledAction,
-                SleepOneSecond,
-                UnregisterScheduledAction,
-                RemovePs1,
-            });
            var process = new Process()
            {
                StartInfo = new ProcessStartInfo
                {
-                    FileName = "powershell.exe",
-                    Arguments = $@"{Directory.GetCurrentDirectory()}\{ExtractAndRunPs1}",
-                    UseShellExecute = true,
-                    WindowStyle = ProcessWindowStyle.Maximized,
-                    WorkingDirectory = Directory.GetCurrentDirectory(),
-                    Verb = "runas"
-                },
+                    FileName = InstallerFileName
+                }
            };
-            this.logger.LogInformation("Created extractor script. Attempting to launch powershell");
+            this.logger.LogInformation("Launching installer");
            if (process.Start() is false)
            {
-                throw new InvalidOperationException("Failed to create and start powershell script");
+                throw new InvalidOperationException("Failed to launch installer");
            }
        }

@@ -367,40 +247,6 @@ namespace Daybreak.Services.Updater
            return false;
        }

-        private static void SaveExecutionPolicyValueToRegistry(ExecutionPolicies executionPolicy)
-        {
-            var homeRegistryKey = GetOrCreateHomeKey();
-            homeRegistryKey.SetValue(ExecutionPolicyKey, executionPolicy.ToString());
-            homeRegistryKey.Close();
-        }
-
-        private static Optional<ExecutionPolicies> LoadExecutionPolicyValueFromRegistry()
-        {
-            var homeRegistryKey = GetOrCreateHomeKey();
-            var executionPolicy = homeRegistryKey.GetValue(ExecutionPolicyKey);
-            homeRegistryKey.Close();
-            
-            if (executionPolicy is null)
-            {
-                return Optional.None<ExecutionPolicies>();
-            }
-            else if (executionPolicy is string executionPolicyString)
-            {
-                if (Enum.TryParse<ExecutionPolicies>(executionPolicyString, out var executionPolicyValue))
-                {
-                    return executionPolicyValue;
-                }
-                else
-                {
-                    throw new InvalidOperationException($"Found execution policy with value {executionPolicy}");
-                }
-            }
-            else
-            {
-                throw new InvalidOperationException($"Found execution policy of type {executionPolicy.GetType()}.");
-            }
-        }
-
        private static RegistryKey GetOrCreateHomeKey()
        {
            var homeRegistryKey = Registry.CurrentUser.OpenSubKey("Software", true).OpenSubKey(RegistryKey, true);
@@ -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()
@@ -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);
@@ -1,8 +1,9 @@
-using Daybreak.Services.Configuration;
+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;
@@ -16,56 +17,36 @@ namespace Daybreak.Views
    {
        private readonly ILogger<AskUpdateView> logger;
        private readonly IViewManager viewManager;
-        private readonly IConfigurationManager configurationManager;
+        private readonly ILiveUpdateableOptions<ApplicationConfiguration> liveOptions;
        private readonly IPrivilegeManager privilegeManager;
        private readonly IApplicationUpdater applicationUpdater;

        public AskUpdateView(
            ILogger<AskUpdateView> logger,
            IViewManager viewManager,
-            IConfigurationManager configurationManager,
+            ILiveUpdateableOptions<ApplicationConfiguration> liveOptions,
            IPrivilegeManager privilegeManager,
            IApplicationUpdater applicationUpdater)
        {
            this.logger = logger.ThrowIfNull(nameof(logger));
            this.viewManager = viewManager.ThrowIfNull(nameof(viewManager));
-            this.configurationManager = configurationManager.ThrowIfNull(nameof(configurationManager));
+            this.liveOptions = liveOptions.ThrowIfNull(nameof(liveOptions));
            this.privilegeManager = privilegeManager.ThrowIfNull(nameof(privilegeManager));
            this.applicationUpdater = applicationUpdater.ThrowIfNull(nameof(applicationUpdater));
            this.InitializeComponent();
        }

-        private bool CheckIfAdmin()
-        {
-            if (this.privilegeManager.AdminPrivileges is false)
-            {
-                this.privilegeManager.RequestAdminPrivileges<MainView>("Application needs to be in administrator mode in order to update.");
-                return false;
-            }
-
-            return true;
-        }
-
        private void NoButton_Clicked(object sender, System.EventArgs e)
        {
            this.logger.LogInformation("User declined update");
-            var config = this.configurationManager.GetConfiguration();
-            config.AutoCheckUpdate = false;
-            this.configurationManager.SaveConfiguration(config);
+            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");
-            var config = this.configurationManager.GetConfiguration();
-            config.AutoCheckUpdate = false;
-            this.configurationManager.SaveConfiguration(config);
-            if (this.CheckIfAdmin() is false)
-            {
-                return;
-            }
-
            var latestVersion = (await this.applicationUpdater.GetVersions()).Last();
            this.viewManager.ShowView<UpdateView>(latestVersion);
        }
@@ -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
 {
@@ -39,7 +39,7 @@ namespace Daybreak.Views
            IViewManager viewManager,
            IBuildTemplateManager buildTemplateManager,
            IIconRetriever iconRetriever,
-            IConfigurationManager configurationManager,
+            ILiveOptions<ApplicationConfiguration> liveOptions,
            ILogger<ChromiumBrowserWrapper> chromiumLogger,
            ILogger<BuildTemplateView> logger)
        {
@@ -47,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)
@@ -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();
@@ -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)
@@ -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)
@@ -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>();
        }

@@ -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]
@@ -49,10 +46,10 @@ namespace Daybreak.Views
        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();
@@ -60,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;
@@ -78,7 +75,7 @@ namespace Daybreak.Views

        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;
@@ -92,7 +89,7 @@ namespace Daybreak.Views
            currentConfig.PlaceShortcut = this.ShortcutPlaced;
            currentConfig.AutoCheckUpdate = this.AutoCheckUpdate;
            currentConfig.KeepLocalIconCache = this.KeepLocalIconCache;
-            this.configurationManager.SaveConfiguration(currentConfig);
+            this.liveUpdateableOptions.UpdateOption();
            this.viewManager.ShowView<SettingsCategoryView>();
        }

@@ -5,6 +5,7 @@ Param(

 Write-Output "Deleting pdb file"
 Remove-item .\Publish\Daybreak.pdb
+Remove-item .\Publish\Daybreak.Installer.pdb
 $zipPath = "Publish\daybreakv$version.zip"
 Write-Output "Compressing binaries to $zipPath"
 Compress-Archive .\Publish\* $zipPath -Force
Author	SHA1	Message	Date
amacocianandGitHub	782b76cd8e	Remove admin mode when updating (#31 )	2022-08-04 21:59:55 +02:00
amacocianandGitHub	230c2d9457	Setup executable installer (#29 ) * Setup executable installer * Increment update to 0.9.3 * Improve installer	2022-08-04 21:39:17 +02:00
amacocianandGitHub	63531e3b8c	Hide console window (#25 )	2022-08-04 19:52:54 +02:00
amacocianandGitHub	ac430305f4	Update to .net 6 and update dependencies (#24 ) * Update to .net 6 and update dependencies	2022-08-04 19:25:53 +02:00
amacocianandGitHub	3d830cfc16	Update dependencies (#23 )	2021-07-10 13:39:00 +03:00
amacocianandGitHub	b529aa8861	Fix logging on startup when ILogger is null (#22 )	2021-07-10 12:45:44 +03:00
amacocianandGitHub	3798daa54e	Update dependencies (#21 ) * Update dependencies * Minor nit fixes * Fix UTs	2021-07-10 12:08:43 +03:00
amacocianandGitHub	624380ed86	Use IOptions instead of IConfigurationManager (#20 ) * Use IOptions instead of dependency on IConfigurationManager	2021-06-22 15:48:37 +03:00