Download and check icons at startup (#41)

Use browser to bypass header issues with http client

.github/workflows/cd.yaml

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

Daybreak.Installer/Daybreak.Installer.csproj

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

Daybreak.Installer/Program.cs

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

Daybreak.sln

@@ -13,6 +13,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Pipelines", "Pipelines", "{
 		.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
@@ -37,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

Daybreak/Behaviors/ScaleFontWithSize.cs

@@ -1,9 +1,9 @@
-using System;
+using Microsoft.Xaml.Behaviors;
+using System;
 using System.ComponentModel;
 using System.Globalization;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Interactivity;
 using System.Windows.Media;
 
 namespace Daybreak.Behaviors

Daybreak/Behaviors/ScrollIntoView.cs

@@ -1,7 +1,7 @@
-using System;
+using Microsoft.Xaml.Behaviors;
+using System;
 using System.Extensions;
 using System.Windows.Controls;
-using System.Windows.Interactivity;
 
 namespace Daybreak.Behaviors
 {

Daybreak/Configuration/ApplicationConfiguration.cs

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

Daybreak/Configuration/ExperimentalFeatures.cs

@@ -16,6 +16,8 @@ namespace Daybreak.Configuration
         public bool LaunchGuildwarsAsCurrentUser { get; set; } = true;
         [JsonProperty("CanInterceptKeys")]
         public bool CanInterceptKeys { get; set; }
+        [JsonProperty("DownloadIcons")]
+        public bool DownloadIcons { get; set; }
         [JsonProperty("Macros")]
         public List<KeyMacro> Macros { get; set; } = new();
     }

Daybreak/Configuration/ProjectConfiguration.cs

@@ -22,6 +22,7 @@ using LiteDB;
 using Daybreak.Services.Options;
 using Daybreak.Models;
 using Microsoft.CorrelationVector;
+using System.Logging;
 
 namespace Daybreak.Configuration
 {
@@ -50,6 +51,7 @@ namespace Daybreak.Configuration
             serviceProducer.RegisterSingleton<ILiteDatabase, LiteDatabase>(sp => new LiteDatabase("Daybreak.db"));
             serviceProducer.RegisterSingleton<IMutexHandler, MutexHandler>();
             serviceProducer.RegisterSingleton<IShortcutManager, ShortcutManager>();
+            serviceProducer.RegisterSingleton<IIconBrowser, IconBrowser>();
             serviceProducer.RegisterScoped<ICredentialManager, CredentialManager>();
             serviceProducer.RegisterScoped<IApplicationLauncher, ApplicationLauncher>();
             serviceProducer.RegisterScoped<IScreenshotProvider, ScreenshotProvider>();
@@ -59,7 +61,18 @@ namespace Daybreak.Configuration
             serviceProducer.RegisterScoped<IIconRetriever, IconRetriever>();
             serviceProducer.RegisterScoped<IPrivilegeManager, PrivilegeManager>();
             serviceProducer.RegisterScoped<IScreenManager, ScreenManager>();
-            serviceProducer.RegisterLogWriter<ILogsManager, JsonLogsManager>();
+            serviceProducer.RegisterSingleton<ILogsManager, JsonLogsManager>();
+            serviceProducer.RegisterSingleton<IDebugLogsWriter, Services.Logging.DebugLogsWriter>();
+            serviceProducer.RegisterSingleton<ILoggerFactory, LoggerFactory>(sp =>
+            {
+                var factory = new LoggerFactory();
+                factory.AddProvider(new CVLoggerProvider(sp.GetService<ILogsWriter>()));
+                return factory;
+            });
+            serviceProducer.RegisterSingleton<ILogsWriter, CompositeLogsWriter>(sp => new CompositeLogsWriter(
+                sp.GetService<ILogsManager>(),
+                sp.GetService<IDebugLogsWriter>()));
+            
             serviceProducer.RegisterScoped((sp) => new ScopeMetadata(new CorrelationVector()));
         }
 
@@ -81,6 +94,7 @@ namespace Daybreak.Configuration
             viewProducer.RegisterView<ScreenChoiceView>();
             viewProducer.RegisterView<VersionManagementView>();
             viewProducer.RegisterView<LogsView>();
+            viewProducer.RegisterView<IconDownloadView>();
         }
     }
 }

Daybreak/Controls/Buttons/TileButton.xaml

@@ -4,7 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Daybreak.Controls"
-             xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+             xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
              xmlns:behaviors="clr-namespace:Daybreak.Behaviors"
              xmlns:converters="clr-namespace:Daybreak.Converters"
              x:Name="_this"

Daybreak/Controls/Templates/BuildTemplate.xaml

@@ -4,11 +4,12 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Daybreak.Controls"
-             xmlns:interactivity="http://schemas.microsoft.com/expression/2010/interactivity"
+             xmlns:interactivity="http://schemas.microsoft.com/xaml/behaviors"
              xmlns:behaviors="clr-namespace:Daybreak.Behaviors"
              xmlns:converters="clr-namespace:Daybreak.Converters"
              mc:Ignorable="d"
              x:Name="_this"
+             Unloaded="BuildTemplate_Unloaded"
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid Background="Transparent" MouseLeftButtonDown="Grid_MouseLeftButtonDown">
         <Grid.RowDefinitions>

Daybreak/Controls/Templates/BuildTemplate.xaml.cs

@@ -7,8 +7,10 @@ using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Configuration;
+using System.Core.Extensions;
 using System.Extensions;
 using System.Linq;
+using System.Threading;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Extensions;
@@ -27,8 +29,10 @@ namespace Daybreak.Controls
 
         private bool suppressBuildChanged = false;
         private bool loadedProperties = false;
+        private IIconBrowser iconBrowser;
         private BuildEntry loadedBuild;
         private SkillTemplate selectingSkillTemplate;
+        private CancellationTokenSource cancellationTokenSource = new();
 
         public event EventHandler BuildChanged;
 
@@ -65,11 +69,14 @@ namespace Daybreak.Controls
 
         public void InitializeTemplate(
             IIconRetriever iconRetriever,
+            IIconBrowser iconBrowser,
             ILiveOptions<ApplicationConfiguration> liveOptions,
             IBuildTemplateManager buildTemplateManager,
             ILogger<ChromiumBrowserWrapper> logger)
         {
+            this.iconBrowser = iconBrowser.ThrowIfNull();
             this.SkillBrowser.InitializeBrowser(liveOptions, buildTemplateManager, logger);
+            this.iconBrowser.InitializeWebView(this.SkillBrowser.WebBrowser, this.cancellationTokenSource.Token);
             this.SkillTemplate0.InitializeSkillTemplate(iconRetriever);
             this.SkillTemplate1.InitializeSkillTemplate(iconRetriever);
             this.SkillTemplate2.InitializeSkillTemplate(iconRetriever);
@@ -131,6 +138,11 @@ namespace Daybreak.Controls
             }
         }
 
+        private void BuildTemplate_Unloaded(object sender, RoutedEventArgs e)
+        {
+            this.cancellationTokenSource.Cancel();
+        }
+
         private void InitializeProperties()
         {
             this.PrimaryProfession = Profession.None;

Daybreak/Controls/Templates/SkillTemplate.xaml

@@ -1,8 +1,9 @@
 <UserControl x:Class="Daybreak.Controls.SkillTemplate"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:webview="clr-namespace:Microsoft.Web.WebView2.Wpf;assembly=Microsoft.Web.WebView2.Wpf"
              xmlns:local="clr-namespace:Daybreak.Controls"
              mc:Ignorable="d" 
              x:Name="_this"

Daybreak/Controls/Templates/SkillTemplate.xaml.cs

@@ -1,10 +1,6 @@
-using Daybreak.Launch;
-using Daybreak.Models.Builds;
+using Daybreak.Models.Builds;
 using Daybreak.Services.IconRetrieve;
 using System;
-using System.Extensions;
-using System.IO;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Extensions;
@@ -41,19 +37,17 @@ namespace Daybreak.Controls
             this.iconRetriever = iconRetriever;
         }
 
-        private void SkillTemplate_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
+        private async void SkillTemplate_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
         {
             if (e.NewValue is Skill skill)
             {
                 if (skill != Skill.NoSkill)
                 {
-                    Task.Run(() => this.GetImageStream(skill)).ContinueWith((previousTask) =>
+                    var maybeUri = await this.iconRetriever.GetIconUri(skill).ConfigureAwait(true);
+                    if (maybeUri.ExtractValue() is Uri uri)
                     {
-                        this.Dispatcher.Invoke(() =>
-                        {
-                            this.ImageSource = this.GetImageSource(previousTask.Result);
-                        });
-                    });
+                        this.ImageSource = new BitmapImage(uri);
+                    }
                 }
                 else if (this.ImageSource is not null)
                 {
@@ -90,32 +84,5 @@ namespace Daybreak.Controls
 
             return false;
         }
-        private async Task<Stream> GetImageStream(Skill skill)
-        {
-            if (this.iconRetriever is null)
-            {
-                return null;
-            }
-
-            var maybeStream = await this.iconRetriever.GetIcon(skill);
-            return maybeStream.ExtractValue();
-        }
-        private ImageSource GetImageSource(Stream stream)
-        {
-            if (stream is null)
-            {
-                return null;
-            }
-
-            return this.Dispatcher.Invoke(() =>
-            {
-                var bitmapImage = new BitmapImage();
-                bitmapImage.BeginInit();
-                bitmapImage.StreamSource = stream;
-                bitmapImage.CacheOption = BitmapCacheOption.OnDemand;
-                bitmapImage.EndInit();
-                return bitmapImage;
-            });
-        }
     }
 }

Daybreak/Daybreak.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <OutputType>WinExe</OutputType>
     <TargetFramework>net6.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
     <UseWindowsForms>true</UseWindowsForms>
@@ -10,21 +10,21 @@
     <LangVersion>preview</LangVersion>
     <ApplicationIcon>Daybreak.ico</ApplicationIcon>
     <IncludePackageReferencesDuringMarkupCompilation>true</IncludePackageReferencesDuringMarkupCompilation>
-    <Version>0.9.2.8</Version>
+    <Version>0.9.3.4</Version>
   </PropertyGroup>
 
   <ItemGroup>
-    <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="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="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="NReco.Logging.File" Version="1.1.5" />
     <PackageReference Include="securifybv.ShellLink" Version="0.1.0" />
     <PackageReference Include="Slim" Version="1.7.3" />
-    <PackageReference Include="System.Windows.Interactivity.WPF" Version="2.0.20525" />
+    <PackageReference Include="SystemExtensions.NetCore" Version="1.0.1" />
     <PackageReference Include="SystemExtensions.NetStandard" Version="1.5.0" />
     <PackageReference Include="WCL" Version="1.0.2" />
     <PackageReference Include="WpfExtended" Version="0.6.2" />
@@ -45,6 +45,9 @@
     <Compile Update="Controls\Buttons\CancelButton.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Update="Views\IconDownloadView.xaml.cs">
+      <SubType>Code</SubType>
+    </Compile>
   </ItemGroup>
 
   <ItemGroup>
@@ -68,6 +71,10 @@
       <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
       <SubType>Designer</SubType>
     </Page>
+    <Page Update="Views\IconDownloadView.xaml">
+      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+      <SubType>Designer</SubType>
+    </Page>
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(Configuration)' == 'Release'">
@@ -77,7 +84,7 @@
   <Target Name="RemoveDuplicateAnalyzers" BeforeTargets="CoreCompile">
 		<!-- Work around https://github.com/dotnet/wpf/issues/6792 -->
     <ItemGroup>
-      <FilteredAnalyzer Include="@(Analyzer->Distinct())" />
+      <FilteredAnalyzer Include="@(Analyzer-&gt;Distinct())" />
       <Analyzer Remove="@(Analyzer)" />
       <Analyzer Include="@(FilteredAnalyzer)" />
     </ItemGroup>

Daybreak/Models/Browser/BrowserPayload.cs

@@ -8,6 +8,7 @@ namespace Daybreak.Models.Browser
         [JsonConverter(typeof(StringEnumConverter))]
         public enum PayloadKeys
         {
+            None,
             ContextMenu
         }
 

Daybreak/Models/Builds/Skill.cs

@@ -143,7 +143,7 @@ namespace Daybreak.Models.Builds
         public static Skill Flurry { get; } = new() { Id = 344, Name = "Flurry", Profession = Profession.Warrior };
         public static Skill Frenzy { get; } = new() { Id = 346, Name = "Frenzy", Profession = Profession.Warrior };
         public static Skill Coward { get; } = new() { Id = 869, Name = "\"Coward!\"", Profession = Profession.Warrior };
-        public static Skill OnYourKnees { get; } = new() { Id = 906, Name = "On Your Knees!", Profession = Profession.Warrior };
+        public static Skill OnYourKnees { get; } = new() { Id = 906, Name = "\"On Your Knees!\"", Profession = Profession.Warrior };
         public static Skill YoureAllAlone { get; } = new() { Id = 1412, Name = "\"You're All Alone!\"", Profession = Profession.Warrior };
         public static Skill FrenziedDefense { get; } = new() { Id = 1700, Name = "Frenzied Defense", Profession = Profession.Warrior };
         public static Skill Grapple { get; } = new() { Id = 2011, Name = "Grapple", Profession = Profession.Warrior };
@@ -702,7 +702,7 @@ namespace Daybreak.Models.Builds
         public static Skill Echo { get; } = new() { Id = 74, Name = "Echo", Profession = Profession.Mesmer };
         public static Skill ArcaneEcho { get; } = new() { Id = 75, Name = "Arcane Echo", Profession = Profession.Mesmer };
         public static Skill Epidemic { get; } = new() { Id = 78, Name = "Epidemic", Profession = Profession.Mesmer };
-        public static Skill LyssasBalance { get; } = new() { Id = 877, Name = "Lyssa's Balance, Profession = Profession.Mesmer" };
+        public static Skill LyssasBalance { get; } = new() { Id = 877, Name = "Lyssa's Balance", Profession = Profession.Mesmer };
         public static Skill SignetofDisenchantment { get; } = new() { Id = 882, Name = "Signet of Disenchantment", Profession = Profession.Mesmer };
         public static Skill ShatterStorm { get; } = new() { Id = 933, Name = "Shatter Storm", Profession = Profession.Mesmer };
         public static Skill ExpelHexes { get; } = new() { Id = 954, Name = "Expel Hexes", Profession = Profession.Mesmer };
@@ -1053,7 +1053,7 @@ namespace Daybreak.Models.Builds
         public static Skill FeastofSouls { get; } = new() { Id = 980, Name = "Feast of Souls", Profession = Profession.Ritualist };
         public static Skill RitualLord { get; } = new() { Id = 1217, Name = "Ritual Lord", Profession = Profession.Ritualist };
         public static Skill AttunedWasSongkai { get; } = new() { Id = 1220, Name = "Attuned Was Songkai", Profession = Profession.Ritualist };
-        public static Skill AnguishedWasLingwah { get; } = new() { Id = 1223, Name = "Anguished Was Lingwah, Profession = Profession.Ritualist" };
+        public static Skill AnguishedWasLingwah { get; } = new() { Id = 1223, Name = "Anguished Was Lingwah", Profession = Profession.Ritualist };
         public static Skill ExplosiveGrowth { get; } = new() { Id = 1229, Name = "Explosive Growth", Profession = Profession.Ritualist };
         public static Skill BoonofCreation { get; } = new() { Id = 1230, Name = "Boon of Creation", Profession = Profession.Ritualist };
         public static Skill SpiritChanneling { get; } = new() { Id = 1231, Name = "Spirit Channeling", Profession = Profession.Ritualist };
@@ -1483,8 +1483,8 @@ namespace Daybreak.Models.Builds
         public static Skill VolfenBlessing { get; } = new() { Id = 2379, Name = "Volfen Blessing", Profession = Profession.None };
         public static Skill TimeWard { get; } = new() { Id = 3422, Name = "Time Ward", Profession = Profession.Mesmer };
         public static Skill SoulTaker { get; } = new() { Id = 3423, Name = "Soul Taker", Profession = Profession.Necromancer };
-        public static Skill OverTheLimit { get; } = new() { Id = 3424, Name = "Over The Limit", Profession = Profession.Elementalist };
-        public static Skill JudgementStrike { get; } = new() { Id = 3425, Name = "Judgement Strike", Profession = Profession.Monk };
+        public static Skill OverTheLimit { get; } = new() { Id = 3424, Name = "Over The Limit", AlternativeName = "Over the Limit", Profession = Profession.Elementalist };
+        public static Skill JudgementStrike { get; } = new() { Id = 3425, Name = "Judgement Strike", AlternativeName = "Judgment Strike", Profession = Profession.Monk };
         public static Skill SevenWeaponsStance { get; } = new() { Id = 3426, Name = "Seven Weapons Stance", Profession = Profession.Warrior };
         public static Skill Togetherasone { get; } = new() { Id = 3427, Name = "\"Together as one!\"", Profession = Profession.Ranger };
         public static Skill ShadowTheft { get; } = new() { Id = 3428, Name = "Shadow Theft", Profession = Profession.Assassin };
@@ -3022,6 +3022,7 @@ namespace Daybreak.Models.Builds
         public Profession Profession { get; private set; }
         public string Name { get; private set; }
         public int Id { get; private set; }
+        public string AlternativeName { get; private set; }
         private Skill()
         {
         }

Daybreak/Models/IconPayload.cs

@@ -0,0 +1,8 @@
+namespace Models
+{
+    public sealed class IconPayload
+    {
+        public string SkillUrl { get; set; }
+        public string SkillImage { get; set; }
+    }
+}

Daybreak/Models/IconRequest.cs

@@ -0,0 +1,11 @@
+using Daybreak.Models.Builds;
+
+namespace Models
+{
+    public sealed class IconRequest
+    {
+        public Skill Skill { get; set; }
+        public string IconBase64 { get; set; }
+        public bool Finished { get; set; }
+    }
+}

Daybreak/Services/IconRetrieve/IIconBrowser.cs

@@ -0,0 +1,16 @@
+using Microsoft.Web.WebView2.Wpf;
+using Models;
+using System.Threading;
+
+namespace Daybreak.Services.IconRetrieve
+{
+    public interface IIconBrowser
+    {
+        void InitializeWebView(WebView2 webView2, CancellationToken cancellationToken);
+        /// <summary>
+        /// Queue an icon request. The browser will attempt to download the icon. Monitor the <see cref="IconRequest.Finished"/> to be notified when the request has been served.
+        /// </summary>
+        /// <param name="iconRequest">Request model.</param>
+        void QueueIconRequest(IconRequest iconRequest);
+    }
+}

Daybreak/Services/IconRetrieve/IIconRetriever.cs

@@ -1,12 +1,12 @@
 using Daybreak.Models.Builds;
+using System;
 using System.Extensions;
-using System.IO;
 using System.Threading.Tasks;
 
 namespace Daybreak.Services.IconRetrieve
 {
     public interface IIconRetriever
     {
-        Task<Optional<Stream>> GetIcon(Skill skill);
+        Task<Optional<Uri>> GetIconUri(Skill skill);
     }
 }

Daybreak/Services/IconRetrieve/IconBrowser.cs

@@ -0,0 +1,163 @@
+using Daybreak.Models.Builds;
+using Daybreak.Utils;
+using Microsoft.Extensions.Logging;
+using Microsoft.Web.WebView2.Wpf;
+using Models;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Concurrent;
+using System.Core.Extensions;
+using System.Extensions;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Threading;
+
+namespace Daybreak.Services.IconRetrieve
+{
+    public sealed class IconBrowser : IIconBrowser
+    {
+        // Sometimes due to browser issues, retrieved base64 is just a blank jpeg. This is the base64 of the image.
+        private const string FaultyBase64 = "/9j/4AAQSkZJRgABAQAAAQABAAD/4gIoSUNDX1BST0ZJTEUAAQEAAAIYAAAAAAQwAABtbnRyUkdCIFhZWiAAAAAAAAAAAAAAAABhY3NwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAA9tYAAQAAAADTLQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAlkZXNjAAAA8AAAAHRyWFlaAAABZAAAABRnWFlaAAABeAAAABRiWFlaAAABjAAAABRyVFJDAAABoAAAAChnVFJDAAABoAAAAChiVFJDAAABoAAAACh3dHB0AAAByAAAABRjcHJ0AAAB3AAAADxtbHVjAAAAAAAAAAEAAAAMZW5VUwAAAFgAAAAcAHMAUgBHAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFhZWiAAAAAAAABvogAAOPUAAAOQWFlaIAAAAAAAAGKZAAC3hQAAGNpYWVogAAAAAAAAJKAAAA+EAAC2z3BhcmEAAAAAAAQAAAACZmYAAPKnAAANWQAAE9AAAApbAAAAAAAAAABYWVogAAAAAAAA9tYAAQAAAADTLW1sdWMAAAAAAAAAAQAAAAxlblVTAAAAIAAAABwARwBvAG8AZwBsAGUAIABJAG4AYwAuACAAMgAwADEANv/bAEMAAwICAgICAwICAgMDAwMEBgQEBAQECAYGBQYJCAoKCQgJCQoMDwwKCw4LCQkNEQ0ODxAQERAKDBITEhATDxAQEP/bAEMBAwMDBAMECAQECBALCQsQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEP/AABEIAEAAQAMBIgACEQEDEQH/xAAVAAEBAAAAAAAAAAAAAAAAAAAACf/EABQQAQAAAAAAAAAAAAAAAAAAAAD/xAAUAQEAAAAAAAAAAAAAAAAAAAAA/8QAFBEBAAAAAAAAAAAAAAAAAAAAAP/aAAwDAQACEQMRAD8AlUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD//2Q==";
+        private const string LargeFaultyBase64 = "/9j/4AAQSkZJRgABAQAAAQABAAD/4gIoSUNDX1BST0ZJTEUAAQEAAAIYAAAAAAQwAABtbnRyUkdCIFhZWiAAAAAAAAAAAAAAAABhY3NwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAA9tYAAQAAAADTLQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAlkZXNjAAAA8AAAAHRyWFlaAAABZAAAABRnWFlaAAABeAAAABRiWFlaAAABjAAAABRyVFJDAAABoAAAAChnVFJDAAABoAAAAChiVFJDAAABoAAAACh3dHB0AAAByAAAABRjcHJ0AAAB3AAAADxtbHVjAAAAAAAAAAEAAAAMZW5VUwAAAFgAAAAcAHMAUgBHAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFhZWiAAAAAAAABvogAAOPUAAAOQWFlaIAAAAAAAAGKZAAC3hQAAGNpYWVogAAAAAAAAJKAAAA+EAAC2z3BhcmEAAAAAAAQAAAACZmYAAPKnAAANWQAAE9AAAApbAAAAAAAAAABYWVogAAAAAAAA9tYAAQAAAADTLW1sdWMAAAAAAAAAAQAAAAxlblVTAAAAIAAAABwARwBvAG8AZwBsAGUAIABJAG4AYwAuACAAMgAwADEANv/bAEMAAwICAgICAwICAgMDAwMEBgQEBAQECAYGBQYJCAoKCQgJCQoMDwwKCw4LCQkNEQ0ODxAQERAKDBITEhATDxAQEP/bAEMBAwMDBAMECAQECBALCQsQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEP/AABEIAIAAQAMBIgACEQEDEQH/xAAVAAEBAAAAAAAAAAAAAAAAAAAACf/EABQQAQAAAAAAAAAAAAAAAAAAAAD/xAAUAQEAAAAAAAAAAAAAAAAAAAAA/8QAFBEBAAAAAAAAAAAAAAAAAAAAAP/aAAwDAQACEQMRAD8AlUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD//2Q==";
+        private const string BaseUrl = "https://wiki.guildwars.com";
+        private const string QueryUrl = $"wiki/File:{NamePlaceholder}.jpg";
+        private const string NamePlaceholder = "[SKILLNAME]";
+        private const string IconsDirectoryName = "Icons";
+        private const string IconsLocation = $"{IconsDirectoryName}/{NamePlaceholder}.jpg";
+
+        private readonly ConcurrentQueue<IconRequest> iconRequests = new();
+        private readonly ILogger<IconBrowser> logger;
+        private WebView2 webView2;
+        private CancellationToken cancellationToken;
+
+        public IconBrowser(
+            ILogger<IconBrowser> logger)
+        {
+            this.logger = logger.ThrowIfNull();
+        }
+
+        public void InitializeWebView(WebView2 webView2, CancellationToken cancellationToken)
+        {
+            this.webView2 = webView2.ThrowIfNull();
+            this.cancellationToken = cancellationToken;
+            Task.Run(this.PeriodicallyServeRequests, cancellationToken);
+        }
+
+        public void QueueIconRequest(IconRequest iconRequest)
+        {
+            this.iconRequests.Enqueue(iconRequest);
+        }
+
+        private async Task PeriodicallyServeRequests()
+        {
+            while(true)
+            {
+                if (this.cancellationToken.IsCancellationRequested)
+                {
+                    return;
+                }
+
+                if (this.iconRequests.TryDequeue(out var request) is false)
+                {
+                    await Task.Delay(1000);
+                    continue;
+                }
+
+                var logger = this.logger.CreateScopedLogger(nameof(this.PeriodicallyServeRequests), request.Skill?.Name);
+                logger.LogInformation($"Retrieving icon");
+                while(this.webView2 is null)
+                {
+                    if (this.cancellationToken.IsCancellationRequested)
+                    {
+                        return;
+                    }
+
+                    logger.LogInformation($"Browser is not yet initialized. Waiting");
+                    await Task.Delay(1000);
+                }
+                
+                var curedSkillName = request.Skill.AlternativeName.IsNullOrWhiteSpace() ?
+                    request.Skill.Name.Replace(" ", "_") :
+                    request.Skill.AlternativeName.Replace(" ", "_");
+                var skillIconUrl = $"{BaseUrl}/{QueryUrl.Replace(NamePlaceholder, curedSkillName)}";
+                logger.LogInformation($"Looking for icon at {skillIconUrl}");
+
+                Application.Current.Dispatcher.Invoke(() =>
+                {
+                    this.webView2.Source = new Uri(skillIconUrl);
+                });
+
+                for(var i = 0; i < 5; i++)
+                {
+                    if (this.cancellationToken.IsCancellationRequested)
+                    {
+                        return;
+                    }
+
+                    logger.LogInformation("Executing extraction script");
+                    var responseTask = await Application.Current.Dispatcher.InvokeAsync(async () =>
+                    {
+                        return await this.webView2.ExecuteScriptAsync(Scripts.GetHrefFromSkillPage);
+                    });
+                    var response = await responseTask;
+                    logger.LogInformation("Parsing response");
+                    var iconPayload = JsonConvert.DeserializeObject<IconPayload>(response);
+                    if (iconPayload is null)
+                    {
+                        logger.LogInformation("Bad response");
+                        await Task.Delay(1000);
+                        continue;
+                    }
+
+                    if (iconPayload.SkillUrl != skillIconUrl.Replace("\"", "%22"))
+                    {
+                        logger.LogInformation("Retrieved icon doesn't match");
+                        await Task.Delay(1000);
+                        continue;
+                    }
+
+                    var potentialBase64 = iconPayload.SkillImage.Split(',').Skip(1).FirstOrDefault();
+                    if (potentialBase64 == FaultyBase64 ||
+                        potentialBase64 == LargeFaultyBase64)
+                    {
+                        logger.LogInformation("Faulty base64 retrieved");
+                        await Task.Delay(1000);
+                        continue;
+                    }
+
+                    byte[] bytes;
+                    try
+                    {
+                        bytes = Convert.FromBase64String(potentialBase64);
+                    }
+                    catch
+                    {
+                        logger.LogError("Failed to parse base64");
+                        await Task.Delay(1000);
+                        continue;
+                    }
+
+                    await SaveIconLocally(request.Skill, bytes);
+                    request.IconBase64 = potentialBase64;
+                    request.Finished = true;
+                    break;
+                }
+
+                logger.LogError($"Failed to retrieve icon");
+                request.Finished = true;
+            }
+        }
+
+        private static async Task<string> SaveIconLocally(Skill skill, byte[] data)
+        {
+            var curedSkillName = skill.Name
+                .Replace(" ", "_")
+                .Replace("\"", "");
+            await File.WriteAllBytesAsync(IconsLocation.Replace(NamePlaceholder, curedSkillName), data);
+            return curedSkillName;
+        }
+    }
+}

Daybreak/Services/IconRetrieve/IconRetriever.cs

@@ -1,13 +1,12 @@
 using Daybreak.Configuration;
 using Daybreak.Models.Builds;
-using HtmlAgilityPack;
 using Microsoft.Extensions.Logging;
+using Models;
 using System;
 using System.Configuration;
+using System.Core.Extensions;
 using System.Extensions;
 using System.IO;
-using System.Linq;
-using System.Net.Http;
 using System.Threading.Tasks;
 
 namespace Daybreak.Services.IconRetrieve
@@ -15,91 +14,33 @@ namespace Daybreak.Services.IconRetrieve
     public sealed class IconRetriever : IIconRetriever
     {
         private const string NamePlaceholder = "[SKILLNAME]";
-        private const string BaseUrl = "https://wiki.guildwars.com";
-        private const string QueryUrl = $"wiki/File:{NamePlaceholder}.jpg";
         private const string IconsDirectoryName = "Icons";
         private const string IconsLocation = $"{IconsDirectoryName}/{NamePlaceholder}.jpg";
 
-        private readonly IHttpClient<IconRetriever> httpClient;
         private readonly ILogger<IconRetriever> logger;
-        private readonly ILiveOptions<ApplicationConfiguration> liveOptions;
 
         public IconRetriever(
-            ILogger<IconRetriever> logger,
-            IHttpClient<IconRetriever> httpClient,
-            ILiveOptions<ApplicationConfiguration> liveOptions)
+            ILogger<IconRetriever> logger)
         {
-            this.logger = logger.ThrowIfNull(nameof(logger));
-            this.httpClient = httpClient.ThrowIfNull(nameof(httpClient));
-            this.liveOptions = liveOptions.ThrowIfNull(nameof(liveOptions));
-            this.httpClient.BaseAddress = new Uri(BaseUrl);
+            this.logger = logger.ThrowIfNull();
             if (Directory.Exists(IconsDirectoryName) is false)
             {
                 Directory.CreateDirectory(IconsDirectoryName);
             }
         }
 
-        public async Task<Optional<Stream>> GetIcon(Skill skill)
+        public Task<Optional<Uri>> GetIconUri(Skill skill)
         {
-            if (this.liveOptions.Value.KeepLocalIconCache)
+            var maybeIconUri = this.GetLocalIcon(skill);
+            if (maybeIconUri.ExtractValue() is Uri uri)
             {
-                this.logger.LogInformation($"{nameof(IconRetriever)} configured to look first in cache before downloading icons");
-                var maybeIcon = await this.GetLocalIcon(skill);
-                if (maybeIcon.ExtractValue() is Stream stream)
-                {
-                    return stream;
-                }
-            }
-            else
-            {
-                this.logger.LogInformation($"{nameof(IconRetriever)} configured to skip local cache. Downloading icon");
+                return Task.FromResult(Optional.FromValue(uri));
             }
 
-            return await this.DownloadIcon(skill);
+            return Task.FromResult(Optional.None<Uri>());
         }
 
-        private async Task<Optional<Stream>> DownloadIcon(Skill skill)
-        {
-            var curedSkillName = skill.Name
-                .Replace(" ", "_");
-            var skillIconUrl = QueryUrl.Replace(NamePlaceholder, curedSkillName);
-            this.logger.LogInformation($"Looking up icon for skill '{skill.Name}' at url {skillIconUrl}");
-            using var response = await this.httpClient.GetAsync(skillIconUrl).ConfigureAwait(false);
-            if (response.IsSuccessStatusCode is false)
-            {
-                this.logger.LogError($"Client returned status code {response.StatusCode}");
-                return Optional.None<Stream>();
-            }
-
-            this.logger.LogInformation("Crawling through response for href to latest icon url");
-            var doc = new HtmlDocument();
-            doc.LoadHtml(await response.Content.ReadAsStringAsync());
-            var url = GetHref(doc);
-            if (url is null)
-            {
-                this.logger.LogError("Failed to find latest icon url");
-                return Optional.None<Stream>();
-            }
-
-            this.logger.LogInformation($"Found latest icon url at {BaseUrl + "/" + url}. Requesting stream");
-            using var iconResponse = await this.httpClient.GetAsync(url);
-            if (response.IsSuccessStatusCode)
-            {
-                this.logger.LogInformation("Retrieved latest icon stream");
-                var iconData = await iconResponse.Content.ReadAsByteArrayAsync();
-                if (this.liveOptions.Value.KeepLocalIconCache)
-                {
-                    await SaveIconLocally(skill, iconData);
-                }
-
-                return new MemoryStream(iconData);
-            }
-
-            this.logger.LogError($"Failed to retrieve icon from {BaseUrl + "/" + url}");
-            return Optional.None<Stream>();
-        }
-
-        private async Task<Optional<Stream>> GetLocalIcon(Skill skill)
+        private Optional<Uri> GetLocalIcon(Skill skill)
         {
             var curedSkillName = skill.Name
                 .Replace(" ", "_")
@@ -108,33 +49,11 @@ namespace Daybreak.Services.IconRetrieve
             if (File.Exists(IconsLocation.Replace(NamePlaceholder, curedSkillName)))
             {
                 this.logger.LogInformation("Local icon cache found. Retrieving icon");
-                return new MemoryStream(await File.ReadAllBytesAsync(IconsLocation.Replace(NamePlaceholder, curedSkillName)));
+                return new Uri(AppDomain.CurrentDomain.BaseDirectory + "/" + IconsLocation.Replace(NamePlaceholder, curedSkillName), UriKind.Absolute);
             }
 
             this.logger.LogWarning("No local icon cache found");
-            return Optional.None<Stream>();
-        }
-
-        private static async Task SaveIconLocally(Skill skill, byte[] data)
-        {
-            var curedSkillName = skill.Name
-                .Replace(" ", "_")
-                .Replace("\"", "");
-            await File.WriteAllBytesAsync(IconsLocation.Replace(NamePlaceholder, curedSkillName), data);
-        }
-
-        private static string GetHref(HtmlDocument doc)
-        {
-            foreach (var child in doc.DocumentNode.Descendants("a"))
-            {
-                var targetAttribute = child.Attributes.Where(a => a.Name == "href" && a.Value.Contains("images")).FirstOrDefault();
-                if (targetAttribute is not null)
-                {
-                    return targetAttribute.Value;
-                }
-            }
-
-            return null;
+            return Optional.None<Uri>();
         }
     }
 }

Daybreak/Services/Logging/CompositeLogsWritter.cs

@@ -0,0 +1,23 @@
+using System.Collections.Generic;
+using System.Logging;
+
+namespace Daybreak.Services.Logging
+{
+    public sealed class CompositeLogsWriter : ILogsWriter
+    {
+        private readonly IEnumerable<ILogsWriter> logsWriters;
+
+        public CompositeLogsWriter(params ILogsWriter[] innerLogsWriters)
+        {
+            this.logsWriters = innerLogsWriters;
+        }
+
+        public void WriteLog(Log log)
+        {
+            foreach (var logWriter in this.logsWriters)
+            {
+                logWriter.WriteLog(log);
+            }
+        }
+    }
+}

Daybreak/Services/Logging/DebugLogsWriter.cs

@@ -0,0 +1,13 @@
+using System.Diagnostics;
+using System.Logging;
+
+namespace Daybreak.Services.Logging
+{
+    public sealed class DebugLogsWriter : IDebugLogsWriter
+    {
+        public void WriteLog(Log log)
+        {
+            Debug.WriteLine($"[{log.LogTime}]\t[{log.LogLevel}]\t[{log.Category}]\n{log.Message}");
+        }
+    }
+}

Daybreak/Services/Logging/IDebugLogsWriter.cs

@@ -0,0 +1,8 @@
+using System.Logging;
+
+namespace Daybreak.Services.Logging
+{
+    public interface IDebugLogsWriter : ILogsWriter
+    {
+    }
+}

Daybreak/Services/Updater/ApplicationUpdater.cs

@@ -3,7 +3,6 @@ using Daybreak.Exceptions;
 using Daybreak.Models;
 using Daybreak.Models.Github;
 using Daybreak.Services.ViewManagement;
-using Daybreak.Utils;
 using Daybreak.Views;
 using Microsoft.Extensions.Logging;
 using Microsoft.Win32;
@@ -12,7 +11,6 @@ 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;
@@ -26,35 +24,15 @@ 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 -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}";
-        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;
@@ -191,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();
         }
 
@@ -216,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");
-                    });
             }
         }
 
@@ -245,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");
             }
         }
 
@@ -368,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);

Daybreak/Utils/Scripts.cs

@@ -31,5 +31,32 @@
                 };
                 window.chrome.webview.postMessage(jsonObject);
             });";
+
+        public const string GetHrefFromSkillPage = @"
+            new function(){
+                var img = document.getElementsByClassName('fullImageLink')[0].childNodes[0].childNodes[0];
+                function getDataUrl(img) {
+                    // Create canvas
+                    const canvas = document.createElement('canvas');
+                    const ctx = canvas.getContext('2d');
+                    // Set width and height
+                    canvas.width = img.width;
+                    canvas.height = img.height;
+                    // Draw the image
+                    ctx.drawImage(img, 0, 0);
+                    return canvas.toDataURL('image/jpeg');
+                }
+                
+                console.log(img.src);
+                var imageBase64 = getDataUrl(img);
+                console.log(imageBase64);
+                let jsonObject =
+                {
+                    skillUrl: document.URL,
+                    skillImage: imageBase64
+                }
+                window.chrome.webview.postMessage(jsonObject);
+                return jsonObject;
+            }";
     }
 }

Daybreak/Views/AskUpdateView.xaml.cs

@@ -36,17 +36,6 @@ namespace Daybreak.Views
             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");
@@ -58,11 +47,6 @@ namespace Daybreak.Views
         private async void YesButton_Clicked(object sender, System.EventArgs e)
         {
             this.logger.LogInformation("User accepted update");
-            if (this.CheckIfAdmin() is false)
-            {
-                return;
-            }
-
             var latestVersion = (await this.applicationUpdater.GetVersions()).Last();
             this.viewManager.ShowView<UpdateView>(latestVersion);
         }

Daybreak/Views/BuildTemplateView.xaml.cs

@@ -39,6 +39,7 @@ namespace Daybreak.Views
             IViewManager viewManager,
             IBuildTemplateManager buildTemplateManager,
             IIconRetriever iconRetriever,
+            IIconBrowser iconBrowser,
             ILiveOptions<ApplicationConfiguration> liveOptions,
             ILogger<ChromiumBrowserWrapper> chromiumLogger,
             ILogger<BuildTemplateView> logger)
@@ -47,7 +48,7 @@ namespace Daybreak.Views
             this.logger = logger.ThrowIfNull(nameof(logger));
             this.viewManager = viewManager.ThrowIfNull(nameof(viewManager));
             this.InitializeComponent();
-            this.BuildTemplate.InitializeTemplate(iconRetriever, liveOptions, buildTemplateManager, chromiumLogger);
+            this.BuildTemplate.InitializeTemplate(iconRetriever, iconBrowser, liveOptions, buildTemplateManager, chromiumLogger);
             this.DataContextChanged += (sender, contextArgs) =>
             {
                 if (contextArgs.NewValue is BuildEntry)

Daybreak/Views/ExperimentalSettingsView.xaml

@@ -92,6 +92,7 @@
                 <TextBlock Text="GWToolbox startup delay (in ms)" Foreground="White" FontSize="22" Height="30"></TextBlock>
                 <TextBlock Text="Detect build templates (in browser)" Foreground="White" FontSize="22" Height="30"></TextBlock>
                 <TextBlock Text="Launch gw as current user" Foreground="White" FontSize="22" Height="30"></TextBlock>
+                <TextBlock Text="Download icons" Foreground="White" FontSize="22" Height="30"></TextBlock>
             </StackPanel>
             <StackPanel Grid.Column="1">
                 <ToggleButton IsChecked="{Binding ElementName=_this, Path=MultiLaunch, Mode=TwoWay}" Style="{StaticResource AnimatedSwitch}"
@@ -103,6 +104,8 @@
                               Height="30" Width="60"></ToggleButton>
                 <ToggleButton IsChecked="{Binding ElementName=_this, Path=LaunchAsCurrentUser, Mode=TwoWay}" Style="{StaticResource AnimatedSwitch}"
                               Height="30" Width="60"></ToggleButton>
+                <ToggleButton IsChecked="{Binding ElementName=_this, Path=DownloadIcons, Mode=TwoWay}" Style="{StaticResource AnimatedSwitch}"
+                              Height="30" Width="60"></ToggleButton>
             </StackPanel>
         </Grid>
     </Grid>

Daybreak/Views/ExperimentalSettingsView.xaml.cs

@@ -16,46 +16,22 @@ namespace Daybreak.Views
     /// </summary>
     public partial class ExperimentalSettingsView : UserControl
     {
-        public static readonly DependencyProperty MultiLaunchProperty =
-            DependencyPropertyExtensions.Register<ExperimentalSettingsView, bool>(nameof(MultiLaunch));
-        public static readonly DependencyProperty GWToolboxLaunchDelayProperty =
-            DependencyPropertyExtensions.Register<ExperimentalSettingsView, string>(nameof(GWToolboxLaunchDelay));
-        public static readonly DependencyProperty DynamicBuildLoadingProperty =
-            DependencyPropertyExtensions.Register<ExperimentalSettingsView, bool>(nameof(DynamicBuildLoading));
-        public static readonly DependencyProperty LaunchAsCurrentUserProperty =
-            DependencyPropertyExtensions.Register<ExperimentalSettingsView, bool>(nameof(LaunchAsCurrentUser));
-        public static readonly DependencyProperty MacrosEnabledProperty =
-            DependencyPropertyExtensions.Register<ExperimentalSettingsView, bool>(nameof(MacrosEnabled));
+        [GenerateDependencyProperty]
+        private bool launchAsCurrentUser;
+        [GenerateDependencyProperty]
+        private bool multiLaunch;
+        [GenerateDependencyProperty]
+        private bool dynamicBuildLoading;
+        [GenerateDependencyProperty]
+        private bool macrosEnabled;
+        [GenerateDependencyProperty]
+        public string gWToolboxLaunchDelay;
+        [GenerateDependencyProperty]
+        public bool downloadIcons;
 
         private readonly IViewManager viewManager;
         private readonly ILiveUpdateableOptions<ApplicationConfiguration> liveUpdateableOptions;
 
-        public bool LaunchAsCurrentUser
-        {
-            get => this.GetTypedValue<bool>(LaunchAsCurrentUserProperty);
-            set => this.SetValue(LaunchAsCurrentUserProperty, value);
-        }
-        public bool MultiLaunch
-        {
-            get => this.GetTypedValue<bool>(MultiLaunchProperty);
-            set => this.SetValue(MultiLaunchProperty, value);
-        }
-        public string GWToolboxLaunchDelay
-        {
-            get => this.GetTypedValue<string>(GWToolboxLaunchDelayProperty);
-            set => this.SetValue(GWToolboxLaunchDelayProperty, value);
-        }
-        public bool DynamicBuildLoading
-        {
-            get => this.GetTypedValue<bool>(DynamicBuildLoadingProperty);
-            set => this.SetValue(DynamicBuildLoadingProperty, value);
-        }
-        public bool MacrosEnabled
-        {
-            get => this.GetTypedValue<bool>(MacrosEnabledProperty);
-            set => this.SetValue(MacrosEnabledProperty, value);
-        }
-
         public ExperimentalSettingsView(
             IViewManager viewManager,
             ILiveUpdateableOptions<ApplicationConfiguration> liveUpdateableOptions)
@@ -74,6 +50,7 @@ namespace Daybreak.Views
             this.DynamicBuildLoading = config.ExperimentalFeatures.DynamicBuildLoading;
             this.LaunchAsCurrentUser = config.ExperimentalFeatures.LaunchGuildwarsAsCurrentUser;
             this.MacrosEnabled = config.ExperimentalFeatures.CanInterceptKeys;
+            this.DownloadIcons = config.ExperimentalFeatures.DownloadIcons;
         }
 
         private void SaveExperimentalSettings()
@@ -83,6 +60,7 @@ namespace Daybreak.Views
             config.ExperimentalFeatures.DynamicBuildLoading = this.DynamicBuildLoading;
             config.ExperimentalFeatures.LaunchGuildwarsAsCurrentUser = this.LaunchAsCurrentUser;
             config.ExperimentalFeatures.CanInterceptKeys = this.MacrosEnabled;
+            config.ExperimentalFeatures.DownloadIcons = this.DownloadIcons;
             if (int.TryParse(this.GWToolboxLaunchDelay, out var gwToolboxLaunchDelay))
             {
                 config.ExperimentalFeatures.ToolboxAutoLaunchDelay = gwToolboxLaunchDelay;

Daybreak/Views/IconDownloadView.xaml

@@ -0,0 +1,35 @@
+<UserControl x:Class="Daybreak.Views.IconDownloadView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Daybreak.Views"
+             xmlns:controls="clr-namespace:Daybreak.Controls"
+             mc:Ignorable="d"
+             x:Name="_this"
+             Unloaded="IconDownloadView_Unloaded"
+             Loaded="IconDownloadView_Loaded"
+             d:DesignHeight="450" d:DesignWidth="800">
+    <UserControl.Resources>
+        <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"></BooleanToVisibilityConverter>
+    </UserControl.Resources>
+    <Grid VerticalAlignment="Center" HorizontalAlignment="Center" Background="White" MinHeight="200" MinWidth="400">
+        <controls:ChromiumBrowserWrapper x:Name="WebView"
+                                         ControlsEnabled="False"
+                                         AddressBarReadonly="True"
+                                         CanNavigate="False"
+                                         CanDownloadBuild="False"
+                                         VerticalAlignment="Center"
+                                         HorizontalAlignment="Center"
+                                         Visibility="Visible"
+                                         Width="0"
+                                         Height="0"></controls:ChromiumBrowserWrapper>
+        <StackPanel VerticalAlignment="Center">
+            <TextBlock Text="{Binding ElementName=_this, Path=Description, Mode=OneWay}" Margin="10, 0, 10, 0" Foreground="Black"
+                       TextWrapping="Wrap" HorizontalAlignment="Center" FontSize="16"></TextBlock>
+            <ProgressBar Minimum="0" Maximum="100" Value="{Binding ElementName=_this, Path=ProgressValue, Mode=OneWay}" Width="300" Height="20"></ProgressBar>
+            <controls:OpaqueButton Text="Cancel" BackgroundOpacity="0.2" TransparentBackground="Gray" HorizontalAlignment="Center" Margin="10" Width="50" Height="25"
+                                   Clicked="OpaqueButton_Clicked" Foreground="Black" FontSize="16"></controls:OpaqueButton>
+        </StackPanel>
+    </Grid>
+</UserControl>

Daybreak/Views/IconDownloadView.xaml.cs

@@ -0,0 +1,125 @@
+using Daybreak.Models.Builds;
+using Daybreak.Services.IconRetrieve;
+using Daybreak.Services.ViewManagement;
+using Microsoft.Extensions.Logging;
+using Models;
+using System.Core.Extensions;
+using System.Extensions;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows.Controls;
+using System.Windows.Extensions;
+
+namespace Daybreak.Views
+{
+    /// <summary>
+    /// Interaction logic for UpdateView.xaml
+    /// </summary>
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0044:Add readonly modifier", Justification = "Fields used by source generator for DependencyProperty")]
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("CodeQuality", "IDE0052:Remove unread private members", Justification = "Used by source generators")]
+    public partial class IconDownloadView : UserControl
+    {
+        private static bool CompleteIcons = false;
+
+        private readonly CancellationTokenSource cancellationTokenSource = new();
+        private readonly IIconRetriever iconRetriever;
+        private readonly IIconBrowser iconBrowser;
+        private readonly IViewManager viewManager;
+        private readonly ILogger<IconDownloadView> logger;
+
+        [GenerateDependencyProperty]
+        private string description;
+        [GenerateDependencyProperty]
+        private double progressValue;
+
+        public IconDownloadView(
+            IIconRetriever iconRetriever,
+            IIconBrowser iconBrowser,
+            IViewManager viewManager,
+            ILogger<IconDownloadView> logger)
+        {
+            this.iconRetriever = iconRetriever.ThrowIfNull();
+            this.iconBrowser = iconBrowser.ThrowIfNull();
+            this.viewManager = viewManager.ThrowIfNull();
+            this.logger = logger.ThrowIfNull();
+            this.InitializeComponent();
+            this.Description = "Verifying icons";
+        }
+
+        private async void IconDownloadView_Loaded(object sender, System.Windows.RoutedEventArgs e)
+        {
+            await this.WebView.WebBrowser.EnsureCoreWebView2Async();
+            this.DownloadSkills();
+        }
+
+        private void IconDownloadView_Unloaded(object sender, System.Windows.RoutedEventArgs e)
+        {
+            this.cancellationTokenSource.Cancel();
+        }
+
+        private void OpaqueButton_Clicked(object sender, System.EventArgs e)
+        {
+            this.viewManager.ShowView<BuildsListView>();
+        }
+
+        private async void DownloadSkills()
+        {
+            if (CompleteIcons)
+            {
+                this.logger.LogInformation("All icons were detected. Skipping check");
+                this.viewManager.ShowView<BuildsListView>();
+                return;
+            }
+
+            this.logger.LogInformation("Beginning icon download");
+            this.iconBrowser.InitializeWebView(this.WebView.WebBrowser, this.cancellationTokenSource.Token);
+            var progressIncrement = 100d / Skill.Skills.Count();
+            var incomplete = false;
+            foreach(var skill in Skill.Skills.OrderBy(s => s.Name))
+            {
+                if (skill == Skill.NoSkill)
+                {
+                    this.ProgressValue += progressIncrement;
+                    continue;
+                }
+
+                var logger = this.logger.CreateScopedLogger(nameof(this.DownloadSkills), skill.Name);
+                logger.LogInformation("Verifying if icon exists");
+                this.Description = $"Checking [{skill.Name}] icon";
+                if ((await this.iconRetriever.GetIconUri(skill)).ExtractValue() is not null)
+                {
+                    logger.LogInformation("Icon exists");
+                    this.ProgressValue += progressIncrement;
+                    await Task.Delay(1);
+                    continue;
+                }
+
+                this.Description = $"Downloading [{skill.Name}] icon";
+                logger.LogInformation("Downloading icon");
+                var request = new IconRequest { Skill = skill };
+                this.iconBrowser.QueueIconRequest(request);
+
+                while(request.Finished is false)
+                {
+                    await Task.Delay(1000);
+                }
+
+                if (request.IconBase64.IsNullOrWhiteSpace())
+                {
+                    logger.LogWarning("Failed to download icon");
+                    incomplete = true;
+                }
+                else
+                {
+                    logger.LogInformation("Downloaded icon");
+                }
+
+                this.ProgressValue += progressIncrement;
+            }
+
+            CompleteIcons = !incomplete;
+            this.viewManager.ShowView<BuildsListView>();
+        }
+    }
+}

Daybreak/Views/SettingsCategoryView.xaml.cs

@@ -1,4 +1,7 @@
-using Daybreak.Services.ViewManagement;
+using Daybreak.Configuration;
+using Daybreak.Services.ViewManagement;
+using System.Configuration;
+using System.Core.Extensions;
 using System.Extensions;
 using System.Windows.Controls;
 
@@ -10,11 +13,14 @@ namespace Daybreak.Views
     public partial class SettingsCategoryView : UserControl
     {
         private readonly IViewManager viewManager;
+        private readonly ILiveOptions<ApplicationConfiguration> liveOptions;
 
         public SettingsCategoryView(
+            ILiveOptions<ApplicationConfiguration> liveOptions,
             IViewManager viewManager)
         {
-            this.viewManager = viewManager.ThrowIfNull(nameof(viewManager));
+            this.liveOptions = liveOptions.ThrowIfNull();
+            this.viewManager = viewManager.ThrowIfNull();
             InitializeComponent();
         }
 
@@ -35,7 +41,14 @@ namespace Daybreak.Views
 
         private void BuildsButton_Clicked(object sender, System.EventArgs e)
         {
-            this.viewManager.ShowView<BuildsListView>();
+            if (this.liveOptions.Value.ExperimentalFeatures.DownloadIcons)
+            {
+                this.viewManager.ShowView<IconDownloadView>();
+            }
+            else
+            {
+                this.viewManager.ShowView<BuildsListView>();
+            }
         }
 
         private void VersionButton_Clicked(object sender, System.EventArgs e)

Daybreak/Views/SettingsView.xaml

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

Daybreak/Views/SettingsView.xaml.cs

@@ -42,8 +42,6 @@ namespace Daybreak.Views
         private bool shortcutPlaced;
         [GenerateDependencyProperty]
         private bool autoCheckUpdate;
-        [GenerateDependencyProperty]
-        private bool keepLocalIconCache;
 
         public SettingsView(
             ILiveUpdateableOptions<ApplicationConfiguration> liveUpdateableOptions,
@@ -70,7 +68,6 @@ namespace Daybreak.Views
             this.ShortcutFolder = config.ShortcutLocation;
             this.ShortcutPlaced = config.PlaceShortcut;
             this.AutoCheckUpdate = config.AutoCheckUpdate;
-            this.KeepLocalIconCache = config.KeepLocalIconCache;
         }
 
         private void SaveButton_Clicked(object sender, EventArgs e)
@@ -88,7 +85,6 @@ namespace Daybreak.Views
             currentConfig.ShortcutLocation = this.ShortcutFolder;
             currentConfig.PlaceShortcut = this.ShortcutPlaced;
             currentConfig.AutoCheckUpdate = this.AutoCheckUpdate;
-            currentConfig.KeepLocalIconCache = this.KeepLocalIconCache;
             this.liveUpdateableOptions.UpdateOption();
             this.viewManager.ShowView<SettingsCategoryView>();
         }

Daybreak/Views/VersionManagementView.xaml.cs

@@ -4,6 +4,7 @@ using System;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.Extensions;
+using System.Linq;
 using System.Windows.Controls;
 using System.Windows.Extensions;
 using Version = Daybreak.Models.Versioning.Version;
@@ -39,7 +40,7 @@ namespace Daybreak.Views
 
         private async void LoadVersionList()
         {
-            this.Versions.ClearAnd().AddRange(await this.applicationUpdater.GetVersions());
+            this.Versions.ClearAnd().AddRange((await this.applicationUpdater.GetVersions()).Reverse());
         }
 
         private void CurrentVersion_Clicked(object sender, EventArgs e)

Scripts/BuildRelease.ps1

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