From 01e585bddcab888b9deb42d003e7045dea2b6573 Mon Sep 17 00:00:00 2001
From: digitalsleuth <corey@digitalsleuth.ca>
Date: Wed, 3 May 2023 01:20:38 +0000
Subject: [PATCH] Update Customizer to 6.1.0

---
 WinFOR-Customizer/MainWindow.xaml.cs        | 22 +++++++++++++++++++--
 WinFOR-Customizer/Win-FOR Customizer.csproj |  6 +++---
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/WinFOR-Customizer/MainWindow.xaml.cs b/WinFOR-Customizer/MainWindow.xaml.cs
index b01bc6d..b0e14a9 100755
--- a/WinFOR-Customizer/MainWindow.xaml.cs
+++ b/WinFOR-Customizer/MainWindow.xaml.cs
@@ -1975,10 +1975,23 @@ private async void Check_Updates(object sender, RoutedEventArgs e)
         private void Results_Button(object sender, RoutedEventArgs e)
         // Parses the available logs for the SaltStack and WSL installs to determine its summary
         {
-            string version_file = @"C:\ProgramData\Salt Project\Salt\srv\salt\winfor\VERSION";
-            string release_version = File.ReadAllText($"{version_file}").TrimEnd();
+            string version_file_salt = @"C:\ProgramData\Salt Project\Salt\srv\salt\winfor\VERSION";
+            string version_file_local = @"C:\winfor-version";
             try
             {
+                string release_version = "";
+                if (File.Exists(version_file_salt))
+                {
+                    release_version = File.ReadAllText($"{version_file_salt}").TrimEnd();
+                }
+                else if (File.Exists(version_file_local))
+                {
+                    release_version = File.ReadAllText($"{version_file_local}").TrimEnd();
+                }
+                else
+                {
+                    throw new FileNotFoundException("VERSION files not found");
+                }
                 (StringBuilder results, StringBuilder errors) = Process_Results();
                 if (results.Length == 0)
                 {
@@ -1994,6 +2007,11 @@ private void Results_Button(object sender, RoutedEventArgs e)
                     resultsWindow.Show();
                 }
             }
+            catch (FileNotFoundException)
+            {
+                OutputExpander.IsExpanded = true;
+                Console_Output($"Unable to determine recent installation attempt:\n{version_file_salt} and {version_file_local} are not present.");
+            }
             catch (Exception ex)
             {
                 OutputExpander.IsExpanded = true;
diff --git a/WinFOR-Customizer/Win-FOR Customizer.csproj b/WinFOR-Customizer/Win-FOR Customizer.csproj
index 918bf99..7f9873c 100755
--- a/WinFOR-Customizer/Win-FOR Customizer.csproj	
+++ b/WinFOR-Customizer/Win-FOR Customizer.csproj	
@@ -12,9 +12,9 @@
     <RepositoryUrl>https://github.com/digitalsleuth/win-for</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <ApplicationIcon>Images\fp.ico</ApplicationIcon>
-    <Version>6.0.0</Version>
-    <AssemblyVersion>6.0.0</AssemblyVersion>
-    <FileVersion>6.0.0</FileVersion>
+    <Version>6.1.0</Version>
+    <AssemblyVersion>6.1.0</AssemblyVersion>
+    <FileVersion>6.1.0</FileVersion>
     <Authors>Corey Forman (digitalsleuth)</Authors>
     <Description>A graphical interface to choose which packages are installed in a Windows Forensics (Win-FOR) environment.</Description>
     <PackageProjectUrl>https://github.com/digitalsleuth/win-for</PackageProjectUrl>