From f331bffee70a77d528e3a7ebb46e378ae71172e7 Mon Sep 17 00:00:00 2001
From: Ben Wallis <ben-wallis@users.noreply.github.com>
Date: Sun, 30 Sep 2018 14:04:44 +0100
Subject: [PATCH 1/7] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fb353ec..41b98a3 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ Filtration is an editor for Path of Exile item filter scripts.
 
 ## Current Release (Released 2018-09-30)
 <b>Installer</b><br>
-<a href="https://github.com/ben-wallis/Filtration/releases/download/1.0.1/Setup.exe">Setup.exe</a>
+<a href="https://github.com/ben-wallis/Filtration/releases/download/1.0.2/Setup.exe">Setup.exe</a>
 
 ## System Requirements
 Filtration requires .NET Framework 4.6.1 installed.

From 8073948cfe2cdc57bceb55dfa9ea4bd50c62414c Mon Sep 17 00:00:00 2001
From: Ben Wallis <ben.wallis@datapath.co.uk>
Date: Mon, 1 Oct 2018 12:26:27 +0100
Subject: [PATCH 2/7] Added missing AlertSound mp3 files to installer

---
 Filtration/Filtration.nuspec          | 3 ++-
 Filtration/Properties/AssemblyInfo.cs | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Filtration/Filtration.nuspec b/Filtration/Filtration.nuspec
index 25a14bf..97ee48a 100644
--- a/Filtration/Filtration.nuspec
+++ b/Filtration/Filtration.nuspec
@@ -9,10 +9,11 @@
     <description>A Path of Exile loot filter script editor</description>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <copyright>Copyright 2018</copyright>
-    <releaseNotes>* Fixed crash on exit</releaseNotes>
+    <releaseNotes>* Added missing AlertSound mp3 resources to installer</releaseNotes>
     <dependencies />
   </metadata>
   <files>
     <file src="*.*" target="lib\net45\" exclude="*.pdb;*.nupkg;*.vshost.*;*.xml"/>
+	<file src="Resources\AlertSounds\*.mp3" target="lib\net45\Resources\AlertSounds\" />
   </files>
 </package>
\ No newline at end of file
diff --git a/Filtration/Properties/AssemblyInfo.cs b/Filtration/Properties/AssemblyInfo.cs
index 6c9cede..d241138 100644
--- a/Filtration/Properties/AssemblyInfo.cs
+++ b/Filtration/Properties/AssemblyInfo.cs
@@ -10,8 +10,8 @@ using System.Runtime.CompilerServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("1.0.2")]
-[assembly: AssemblyInformationalVersion("1.0.2")]
+[assembly: AssemblyVersion("1.0.3")]
+[assembly: AssemblyInformationalVersion("1.0.3-beta1")]
 
 [assembly: InternalsVisibleTo("Filtration.Tests")]
 [assembly: InternalsVisibleTo("Filtration.ItemFilterPreview.Tests")]

From 4022cf12a01a999d42b6013df0cb536f9017f5f0 Mon Sep 17 00:00:00 2001
From: azakhi <azak.halilibrahim@gmail.com>
Date: Mon, 1 Oct 2018 15:29:35 +0300
Subject: [PATCH 3/7] Fix crash caused by null selected blocks (#92)

* Fixed a crash caused by null selected blocks
---
 Filtration/ViewModels/ItemFilterScriptViewModel.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Filtration/ViewModels/ItemFilterScriptViewModel.cs b/Filtration/ViewModels/ItemFilterScriptViewModel.cs
index 154dab6..12bda5d 100644
--- a/Filtration/ViewModels/ItemFilterScriptViewModel.cs
+++ b/Filtration/ViewModels/ItemFilterScriptViewModel.cs
@@ -379,7 +379,7 @@ namespace Filtration.ViewModels
         {
             for (var i = 0; i < SelectedBlockViewModels.Count; i++)
             {
-                if (!ViewItemFilterBlockViewModels.Contains(SelectedBlockViewModels[i]))
+                if (SelectedBlockViewModels[i] == null || !ViewItemFilterBlockViewModels.Contains(SelectedBlockViewModels[i]))
                 {
                     SelectedBlockViewModels.RemoveAt(i--);
                 }
@@ -554,6 +554,8 @@ namespace Filtration.ViewModels
 
         public bool CanModifySelectedBlocks()
         {
+            ValidateSelectedBlocks();
+
             if (SelectedBlockViewModels.Count < 1)
                 return false;
 
@@ -570,6 +572,9 @@ namespace Filtration.ViewModels
 
         public bool CanModifyBlock(IItemFilterBlockViewModelBase itemFilterBlock)
         {
+            if (itemFilterBlock == null)
+                return false;
+
             if (itemFilterBlock is IItemFilterBlockViewModel)
                 return true;
 

From 4c826f42fd89245399170d23e76e97b03c9afc01 Mon Sep 17 00:00:00 2001
From: Ben Wallis <ben.wallis@datapath.co.uk>
Date: Mon, 1 Oct 2018 13:31:57 +0100
Subject: [PATCH 4/7] Bumped version to 1.0.3-beta2

---
 Filtration/Filtration.nuspec          | 3 ++-
 Filtration/Properties/AssemblyInfo.cs | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Filtration/Filtration.nuspec b/Filtration/Filtration.nuspec
index 97ee48a..40eccf3 100644
--- a/Filtration/Filtration.nuspec
+++ b/Filtration/Filtration.nuspec
@@ -9,7 +9,8 @@
     <description>A Path of Exile loot filter script editor</description>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <copyright>Copyright 2018</copyright>
-    <releaseNotes>* Added missing AlertSound mp3 resources to installer</releaseNotes>
+    <releaseNotes>* Added missing AlertSound mp3 resources to installer
+* Fixed a crash related to performing certain commands with no blocks selected</releaseNotes>
     <dependencies />
   </metadata>
   <files>
diff --git a/Filtration/Properties/AssemblyInfo.cs b/Filtration/Properties/AssemblyInfo.cs
index d241138..bf5655f 100644
--- a/Filtration/Properties/AssemblyInfo.cs
+++ b/Filtration/Properties/AssemblyInfo.cs
@@ -11,7 +11,7 @@ using System.Runtime.CompilerServices;
 [assembly: AssemblyCulture("")]
 
 [assembly: AssemblyVersion("1.0.3")]
-[assembly: AssemblyInformationalVersion("1.0.3-beta1")]
+[assembly: AssemblyInformationalVersion("1.0.3-beta2")]
 
 [assembly: InternalsVisibleTo("Filtration.Tests")]
 [assembly: InternalsVisibleTo("Filtration.ItemFilterPreview.Tests")]

From d4e8a72d47610a9a08e10a89e4a78e716dcf2450 Mon Sep 17 00:00:00 2001
From: Ben Wallis <atomyc+github@gmail.com>
Date: Mon, 1 Oct 2018 17:00:55 +0100
Subject: [PATCH 5/7] Implemented Splat logging integration to enable Squirrel
 to write log files

---
 Filtration/Filtration.csproj                  |  1 +
 Filtration/Filtration.nuspec                  |  3 +-
 Filtration/NLog.config                        |  6 +++
 Filtration/Properties/AssemblyInfo.cs         |  2 +-
 Filtration/Services/UpdateService.cs          |  6 ++-
 Filtration/Utility/SplatNLogAdapter.cs        | 52 +++++++++++++++++++
 .../WindsorInstallers/ServicesInstaller.cs    |  6 +++
 7 files changed, 73 insertions(+), 3 deletions(-)
 create mode 100644 Filtration/Utility/SplatNLogAdapter.cs

diff --git a/Filtration/Filtration.csproj b/Filtration/Filtration.csproj
index c23e09c..65ed30d 100644
--- a/Filtration/Filtration.csproj
+++ b/Filtration/Filtration.csproj
@@ -230,6 +230,7 @@
     <Compile Include="UserControls\ThemeComponentSelectionControl.xaml.cs">
       <DependentUpon>ThemeComponentSelectionControl.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Utility\SplatNLogAdapter.cs" />
     <Compile Include="ViewModels\DesignTime\DesignTimeSettingsPageViewModel.cs" />
     <Compile Include="Views\AttachedProperties\SelectedItemsAttachedProperty.cs" />
     <Compile Include="Utility\RoutedCommandHandler.cs" />
diff --git a/Filtration/Filtration.nuspec b/Filtration/Filtration.nuspec
index 40eccf3..f679557 100644
--- a/Filtration/Filtration.nuspec
+++ b/Filtration/Filtration.nuspec
@@ -10,7 +10,8 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <copyright>Copyright 2018</copyright>
     <releaseNotes>* Added missing AlertSound mp3 resources to installer
-* Fixed a crash related to performing certain commands with no blocks selected</releaseNotes>
+* Fixed a crash related to performing certain commands with no blocks selected
+* Added extra logging to updater</releaseNotes>
     <dependencies />
   </metadata>
   <files>
diff --git a/Filtration/NLog.config b/Filtration/NLog.config
index af4b9bb..00cf2ac 100644
--- a/Filtration/NLog.config
+++ b/Filtration/NLog.config
@@ -10,15 +10,21 @@
             layout="${longdate} ${uppercase:${level}} ${message}" />
     <target xsi:type="File" name="fDebug" fileName="${basedir}/Filtration_debug_${shortdate}.log"
             layout="${longdate} ${uppercase:${level}} ${message}" />
+    <target xsi:type="File" name="fUpdater" fileName="${basedir}/Filtration_updater_${shortdate}.log"
+            layout="${longdate} ${uppercase:${level}} ${message}" />
     <target xsi:type="Debugger" name="cDebug" layout="${longdate} ${uppercase:${level}} ${message}"/>
   </targets>
 
   <rules>
 
+    <!-- Squirrel Updater Log-->
+    <logger name="SquirrelLogger" minlevel="Trace" writeTo="fUpdater" />
+
     <!-- Uncomment the Debug line to enable Debug logging -->
     <!--<logger name="*" minlevel="Debug" writeTo="fDebug" final="true" />-->
     <logger name="*" minlevel="Error" writeTo="fErrors" />
     <logger name="*" minlevel="Trace" writeTo="cDebug" />
+
     
   </rules>
 </nlog>
\ No newline at end of file
diff --git a/Filtration/Properties/AssemblyInfo.cs b/Filtration/Properties/AssemblyInfo.cs
index bf5655f..d79c7e3 100644
--- a/Filtration/Properties/AssemblyInfo.cs
+++ b/Filtration/Properties/AssemblyInfo.cs
@@ -11,7 +11,7 @@ using System.Runtime.CompilerServices;
 [assembly: AssemblyCulture("")]
 
 [assembly: AssemblyVersion("1.0.3")]
-[assembly: AssemblyInformationalVersion("1.0.3-beta2")]
+[assembly: AssemblyInformationalVersion("1.0.3-beta3")]
 
 [assembly: InternalsVisibleTo("Filtration.Tests")]
 [assembly: InternalsVisibleTo("Filtration.ItemFilterPreview.Tests")]
diff --git a/Filtration/Services/UpdateService.cs b/Filtration/Services/UpdateService.cs
index 120f628..7b3c778 100644
--- a/Filtration/Services/UpdateService.cs
+++ b/Filtration/Services/UpdateService.cs
@@ -4,6 +4,7 @@ using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Filtration.Enums;
 using Filtration.Properties;
+using Filtration.Utility;
 using NLog;
 using Squirrel;
 
@@ -76,11 +77,14 @@ namespace Filtration.Services
         private bool _downloadPrereleaseUpdates;
         private UpdateStatus _updateStatus;
 
-        public UpdateService(ISettingsService settingsService)
+        public UpdateService(ISettingsService settingsService,
+                             ISplatNLogAdapter splatNLogAdapter)
         {
             _settingsService = settingsService;
 
             UpdateStatus = UpdateStatus.NoUpdateAvailable;
+
+            Splat.Locator.CurrentMutable.Register(() => splatNLogAdapter, typeof(Splat.ILogger));
         }
 
         public event EventHandler<UpdateStatusChangedEventArgs> UpdateStatusChanged;
diff --git a/Filtration/Utility/SplatNLogAdapter.cs b/Filtration/Utility/SplatNLogAdapter.cs
new file mode 100644
index 0000000..59916c2
--- /dev/null
+++ b/Filtration/Utility/SplatNLogAdapter.cs
@@ -0,0 +1,52 @@
+using System;
+using NLog;
+using ILogger = Splat.ILogger;
+using LogLevel = Splat.LogLevel;
+
+namespace Filtration.Utility
+{
+    public interface ISplatNLogAdapter
+    {
+    }
+
+    public class SplatNLogAdapter : ILogger, ISplatNLogAdapter
+    {
+        private static readonly Logger Logger = LogManager.GetLogger("SquirrelLogger");
+
+        public void Write(string message, LogLevel logLevel)
+        {
+            switch (logLevel)
+            {
+                case LogLevel.Debug:
+                {
+                    Logger.Debug(message);
+                    break;
+                }
+                case LogLevel.Info:
+                {
+                    Logger.Info(message);
+                    break;
+                }
+                case LogLevel.Error:
+                {
+                    Logger.Error(message);
+                    break;
+                }
+                case LogLevel.Fatal:
+                {
+                    Logger.Fatal(message);
+                    break;
+                }
+                case LogLevel.Warn:
+                {
+                    Logger.Warn(message);
+                    break;
+                }
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(logLevel), logLevel, null);
+            }
+        }
+
+        public LogLevel Level { get; set; }
+    }
+}
diff --git a/Filtration/WindsorInstallers/ServicesInstaller.cs b/Filtration/WindsorInstallers/ServicesInstaller.cs
index f736c1e..141c089 100644
--- a/Filtration/WindsorInstallers/ServicesInstaller.cs
+++ b/Filtration/WindsorInstallers/ServicesInstaller.cs
@@ -2,6 +2,7 @@
 using Castle.MicroKernel.SubSystems.Configuration;
 using Castle.Windsor;
 using Filtration.Services;
+using Filtration.Utility;
 
 namespace Filtration.WindsorInstallers
 {
@@ -43,6 +44,11 @@ namespace Filtration.WindsorInstallers
                 Component.For<ISettingsService>()
                     .ImplementedBy<SettingsService>()
                     .LifeStyle.Singleton);
+
+            container.Register(
+                Component.For<ISplatNLogAdapter>()
+                    .ImplementedBy<SplatNLogAdapter>()
+                    .LifeStyle.Singleton);
         }
     }
 }

From c96aa472d9b110b0e6c0613050deaef68044a7b1 Mon Sep 17 00:00:00 2001
From: Ben Wallis <atomyc+github@gmail.com>
Date: Mon, 1 Oct 2018 17:23:38 +0100
Subject: [PATCH 6/7] Bumped version to 1.0.3

---
 Filtration/Properties/AssemblyInfo.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Filtration/Properties/AssemblyInfo.cs b/Filtration/Properties/AssemblyInfo.cs
index d79c7e3..bc81759 100644
--- a/Filtration/Properties/AssemblyInfo.cs
+++ b/Filtration/Properties/AssemblyInfo.cs
@@ -11,7 +11,7 @@ using System.Runtime.CompilerServices;
 [assembly: AssemblyCulture("")]
 
 [assembly: AssemblyVersion("1.0.3")]
-[assembly: AssemblyInformationalVersion("1.0.3-beta3")]
+[assembly: AssemblyInformationalVersion("1.0.3")]
 
 [assembly: InternalsVisibleTo("Filtration.Tests")]
 [assembly: InternalsVisibleTo("Filtration.ItemFilterPreview.Tests")]

From cde2d692c936f99bdf104eda6a8f535e838e05ef Mon Sep 17 00:00:00 2001
From: Ben Wallis <ben-wallis@users.noreply.github.com>
Date: Mon, 1 Oct 2018 17:29:00 +0100
Subject: [PATCH 7/7] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 41b98a3..9afba17 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ Filtration is an editor for Path of Exile item filter scripts.
 
 ## Current Release (Released 2018-09-30)
 <b>Installer</b><br>
-<a href="https://github.com/ben-wallis/Filtration/releases/download/1.0.2/Setup.exe">Setup.exe</a>
+<a href="https://github.com/ben-wallis/Filtration/releases/download/1.0.3/Setup.exe">Setup.exe</a>
 
 ## System Requirements
 Filtration requires .NET Framework 4.6.1 installed.