Update dependencies (#23)

* Update dependencies
* Minor nit fixes
* Fix UTs

Daybreak.Tests/Services/JsonLoggerProviderTests.cs

@@ -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
 {

Daybreak/Configuration/ProjectConfiguration.cs

@@ -18,10 +18,9 @@ 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 System.Http;
 
 namespace Daybreak.Configuration
 {

Daybreak/Controls/ChromiumBrowserWrapper.xaml.cs

@@ -2,11 +2,11 @@
 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;
@@ -197,6 +197,7 @@ namespace Daybreak.Controls
             {
                 this.logger.LogError(e, $"Exception encountered when deserializing {nameof(BrowserPayload)}");
             }
+
             if (payload?.Key == BrowserPayload.PayloadKeys.ContextMenu)
             {
                 var contextMenuPayload = args.WebMessageAsJson.Deserialize<BrowserPayload<OnContextMenuPayload>>();

Daybreak/Controls/Templates/BuildTemplate.xaml.cs

@@ -1,12 +1,12 @@
 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;
@@ -60,7 +60,7 @@ namespace Daybreak.Controls
         {
             this.InitializeComponent();
             this.InitializeProperties();
-            this.DataContextChanged += BuildTemplate_DataContextChanged;
+            this.DataContextChanged += this.BuildTemplate_DataContextChanged;
         }
 
         public void InitializeTemplate(
@@ -98,6 +98,7 @@ namespace Daybreak.Controls
                 {
                     this.loadedBuild.Build.Secondary = this.SecondaryProfession;
                 }
+
                 this.LoadSkills();
                 this.LoadAttributes();
                 if (this.suppressBuildChanged is false)
@@ -193,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;
@@ -308,7 +316,7 @@ namespace Daybreak.Controls
                 return;
             }
 
-            this.BrowseToInfo(PrimaryProfession.Name);
+            this.BrowseToInfo(this.PrimaryProfession.Name);
             if (e is RoutedEventArgs routedEventArgs)
             {
                 routedEventArgs.Handled = true;
@@ -351,6 +359,7 @@ namespace Daybreak.Controls
             {
                 this.BrowseToInfo(skill.Name);
             }
+
             e.Handled = true;
         }
 
@@ -369,14 +378,14 @@ namespace Daybreak.Controls
 
             this.selectingSkillTemplate.DataContext = sender.As<ListView>().SelectedItem;
             this.HideSkillListView();
-            this.loadedBuild.Build.Skills[0] = Skill0;
-            this.loadedBuild.Build.Skills[1] = Skill1;
-            this.loadedBuild.Build.Skills[2] = Skill2;
-            this.loadedBuild.Build.Skills[3] = Skill3;
-            this.loadedBuild.Build.Skills[4] = Skill4;
-            this.loadedBuild.Build.Skills[5] = Skill5;
-            this.loadedBuild.Build.Skills[6] = Skill6;
-            this.loadedBuild.Build.Skills[7] = Skill7;
+            this.loadedBuild.Build.Skills[0] = this.Skill0;
+            this.loadedBuild.Build.Skills[1] = this.Skill1;
+            this.loadedBuild.Build.Skills[2] = this.Skill2;
+            this.loadedBuild.Build.Skills[3] = this.Skill3;
+            this.loadedBuild.Build.Skills[4] = this.Skill4;
+            this.loadedBuild.Build.Skills[5] = this.Skill5;
+            this.loadedBuild.Build.Skills[6] = this.Skill6;
+            this.loadedBuild.Build.Skills[7] = this.Skill7;
         }
 
         private void ListView_NavigateWithMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)

Daybreak/Daybreak.csproj

@@ -10,7 +10,7 @@
     <LangVersion>preview</LangVersion>
     <ApplicationIcon>Daybreak.ico</ApplicationIcon>
     <IncludePackageReferencesDuringMarkupCompilation>true</IncludePackageReferencesDuringMarkupCompilation>
-    <Version>0.9.2.4</Version>
+    <Version>0.9.2.7</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -27,7 +27,7 @@
     <PackageReference Include="System.Windows.Interactivity.WPF" Version="2.0.20525" />
     <PackageReference Include="SystemExtensions.NetStandard" Version="1.3.0" />
     <PackageReference Include="WCL" Version="1.0.2" />
-    <PackageReference Include="WpfExtended" Version="0.5.2" />
+    <PackageReference Include="WpfExtended" Version="0.6.1" />
     <PackageReference Include="WpfExtended.SourceGeneration" Version="0.1.1" />
     <PackageReference Include="WpfScreenHelper" Version="1.0.0" />
   </ItemGroup>

Daybreak/Launch/Launcher.cs

@@ -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");

Daybreak/Launch/MainWindow.xaml.cs

@@ -1,6 +1,5 @@
 using Daybreak.Configuration;
 using Daybreak.Services.Bloogum;
-using Daybreak.Services.Configuration;
 using Daybreak.Services.Privilege;
 using Daybreak.Services.Screenshots;
 using Daybreak.Services.Updater;
@@ -8,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;

Daybreak/Services/ApplicationLauncher/ApplicationLauncher.cs

@@ -1,6 +1,5 @@
 using Daybreak.Configuration;
 using Daybreak.Exceptions;
-using Daybreak.Services.Configuration;
 using Daybreak.Services.Credentials;
 using Daybreak.Services.Mutex;
 using Daybreak.Services.Privilege;
@@ -10,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;
@@ -18,7 +18,6 @@ using System.Security;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Extensions;
 
 namespace Daybreak.Services.ApplicationLauncher
 {
@@ -70,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: () =>
                 {

Daybreak/Services/Credentials/CredentialManager.cs

@@ -1,15 +1,14 @@
 using Daybreak.Configuration;
 using Daybreak.Models;
-using Daybreak.Services.Configuration;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
+using System.Configuration;
 using System.Extensions;
 using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Extensions;
 
 namespace Daybreak.Services.Credentials
 {
@@ -64,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();
             });
         }
@@ -76,9 +75,9 @@ namespace Daybreak.Services.Credentials
             {
                 this.logger.LogInformation("Storing credentials");
                 this.liveOptions.Value.ProtectedLoginCredentials = loginCredentials
-                    .Select(ProtectCredentials)
-                    .Where(CredentialsProtected)
-                    .Select(ExtractProtectedCredentials)
+                    .Select(this.ProtectCredentials)
+                    .Where(this.CredentialsProtected)
+                    .Select(this.ExtractProtectedCredentials)
                     .ToList();
                 this.liveOptions.UpdateOption();
             });   

Daybreak/Services/IconRetrieve/IconRetriever.cs

@@ -1,15 +1,14 @@
 using Daybreak.Configuration;
 using Daybreak.Models.Builds;
-using Daybreak.Services.Configuration;
 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.Threading.Tasks;
-using System.Windows.Extensions;
 
 namespace Daybreak.Services.IconRetrieve
 {
@@ -92,6 +91,7 @@ namespace Daybreak.Services.IconRetrieve
                 {
                     await SaveIconLocally(skill, iconData);
                 }
+
                 return new MemoryStream(iconData);
             }
 

Daybreak/Services/KeyboardMacros/MacroService.cs

@@ -1,16 +1,14 @@
 using Daybreak.Configuration;
 using Daybreak.Models;
-using Daybreak.Services.Configuration;
 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;
 using System.Threading;
-using System.Windows.Extensions;
 using System.Windows.Forms;
 
 namespace Daybreak.Services.KeyboardMacros
@@ -55,7 +53,7 @@ namespace Daybreak.Services.KeyboardMacros
             },
             TimeSpan.Zero,
             TimeSpan.FromMilliseconds(33),
-            cancellationTokenSource.Token);
+            this.cancellationTokenSource.Token);
         }
 
         private void KeyboardHookService_KeyboardPressed(object sender, KeyboardHookEventArgs e)

Daybreak/Services/Logging/ILogsManager.cs

@@ -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();
     }
 }

Daybreak/Services/Logging/JsonLogsManager.cs

@@ -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
 {

Daybreak/Services/Options/ApplicationConfigurationOptionsManager.cs

@@ -1,8 +1,8 @@
 using Daybreak.Configuration;
 using Daybreak.Services.Configuration;
 using System;
+using System.Configuration;
 using System.Extensions;
-using System.Windows.Extensions;
 
 namespace Daybreak.Services.Options
 {

Daybreak/Services/Shortcuts/ShortcutManager.cs

@@ -1,10 +1,10 @@
 using Daybreak.Configuration;
 using Daybreak.Services.Configuration;
 using ShellLink;
+using System.Configuration;
 using System.Diagnostics;
 using System.Extensions;
 using System.IO;
-using System.Windows.Extensions;
 
 namespace Daybreak.Services.Shortcuts
 {

Daybreak/Services/Updater/ApplicationUpdater.cs

@@ -2,7 +2,6 @@
 using Daybreak.Exceptions;
 using Daybreak.Models;
 using Daybreak.Models.Github;
-using Daybreak.Services.Configuration;
 using Daybreak.Services.ViewManagement;
 using Daybreak.Utils;
 using Daybreak.Views;
@@ -10,6 +9,7 @@ using Microsoft.Extensions.Logging;
 using Microsoft.Win32;
 using System;
 using System.Collections.Generic;
+using System.Configuration;
 using System.Diagnostics;
 using System.Extensions;
 using System.Http;
@@ -20,7 +20,6 @@ using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Extensions;
 using Version = Daybreak.Models.Versioning.Version;
 
 namespace Daybreak.Services.Updater
@@ -45,7 +44,7 @@ namespace Daybreak.Services.Updater
         private const string Url = "https://github.com/AlexMacocian/Daybreak/releases/latest";
         private const string DownloadUrl = $"https://github.com/AlexMacocian/Daybreak/releases/download/{VersionTag}/Daybreak{VersionTag}.zip";
         private const string GetExecutionPolicyCommand = "Get-ExecutionPolicy -Scope CurrentUser";
-        private const string SetExecutionPolicyCommand = $"Set-ExecutionPolicy {ExecutionPolicyTag} -Scope CurrentUser";
+        private const string SetExecutionPolicyCommand = $"Set-ExecutionPolicy {ExecutionPolicyTag} -Scope CurrentUser -Force";
         private const string WaitCommand = $"Wait-Process -Id {ProcessIdTag}";
         private const string ExtractCommandTemplate = $"Expand-Archive -Path '{InputFileTag}' -DestinationPath '{OutputPathTag}' -Force";
         private const string PrepareScheduledAction = $"$action = New-ScheduledTaskAction -Execute {ExecutableNameTag} -WorkingDirectory {WorkingDirectoryTag}";

Daybreak/Views/AskUpdateView.xaml.cs

@@ -1,13 +1,12 @@
 using Daybreak.Configuration;
-using Daybreak.Services.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;
-using System.Windows.Extensions;
 
 namespace Daybreak.Views
 {

Daybreak/Views/BuildTemplateView.xaml.cs

@@ -2,17 +2,16 @@
 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
 {

Daybreak/Views/ExecutablesView.xaml.cs

@@ -1,16 +1,14 @@
 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;
 using System.Windows.Data;
-using System.Windows.Extensions;
 
 namespace Daybreak.Views
 {
@@ -82,6 +80,7 @@ namespace Daybreak.Views
             {
                 path.Default = false;
             }
+
             gwPath.Default = true;
             var view = CollectionViewSource.GetDefaultView(this.Paths);
             view.Refresh();

Daybreak/Views/ExperimentalSettingsView.xaml.cs

@@ -1,7 +1,7 @@
 using Daybreak.Configuration;
-using Daybreak.Services.Configuration;
 using Daybreak.Services.ViewManagement;
 using System;
+using System.Configuration;
 using System.Extensions;
 using System.Linq;
 using System.Windows;

Daybreak/Views/MainView.xaml.cs

@@ -4,11 +4,11 @@ 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;
@@ -136,6 +136,7 @@ namespace Daybreak.Views
                     {
                         throw new InvalidOperationException($"Unable to set guildwars on desired screen. No screen with id {id}");
                     }
+
                     await Task.Delay(1000);
                     this.screenManager.MoveGuildwarsToScreen(desiredScreen);
                 }

Daybreak/Views/ScreenChoiceView.xaml.cs

@@ -2,13 +2,12 @@
 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;
@@ -60,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);
             }
         }

Daybreak/Views/SettingsView.xaml.cs

@@ -1,12 +1,8 @@
 using Daybreak.Configuration;
-using Daybreak.Services.Configuration;
-using Daybreak.Services.Shortcuts;
 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;