From f044747185d14b416241c889f3900b037790d8c3 Mon Sep 17 00:00:00 2001
From: Chris Jacobsen <jacobsen9026@gmail.com>
Date: Sun, 2 Jun 2024 20:12:01 -0400
Subject: [PATCH 1/5] Update to .NET 8

---
 BlazamSetup/Services/PrerequisiteChecker.cs | 2 +-
 BlazamSetup/Steps/IISPrerequisiteCheck.xaml | 2 +-
 BlazamSetup/Steps/ServicePrerequisite.xaml  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/BlazamSetup/Services/PrerequisiteChecker.cs b/BlazamSetup/Services/PrerequisiteChecker.cs
index c5d8976..8e28f7a 100644
--- a/BlazamSetup/Services/PrerequisiteChecker.cs
+++ b/BlazamSetup/Services/PrerequisiteChecker.cs
@@ -20,7 +20,7 @@ internal static bool CheckForAspCore()
 
                     foreach (var dir in dirs)
                     {
-                        if (dir.Contains("6."))
+                        if (dir.Contains("8."))
                         {
                             
 
diff --git a/BlazamSetup/Steps/IISPrerequisiteCheck.xaml b/BlazamSetup/Steps/IISPrerequisiteCheck.xaml
index aef5daa..9e1f825 100644
--- a/BlazamSetup/Steps/IISPrerequisiteCheck.xaml
+++ b/BlazamSetup/Steps/IISPrerequisiteCheck.xaml
@@ -9,7 +9,7 @@
     <Grid>
         <local:StepTitle Title="IIS Pre-Requisites"/>
 
-        <CheckBox x:Name="frameworkCheckbox" IsEnabled="false" Content="ASP .NET 6 Core Web Hosting Bundle" Margin="10,40,0,0"/>
+        <CheckBox x:Name="frameworkCheckbox" IsEnabled="false" Content="ASP .NET 8 Core Web Hosting Bundle" Margin="10,40,0,0"/>
         <Label Content="ASP NET Core apps running under IIS require both the 32-bit and 64-bit Hosting Bundles" Margin="10,50,0,0" FontSize="11"/>
         <Button VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0,0,0,20" Content="Download Prerequisites" Click="Button_Click"  />
     </Grid>
diff --git a/BlazamSetup/Steps/ServicePrerequisite.xaml b/BlazamSetup/Steps/ServicePrerequisite.xaml
index 01b82b4..77e8fdd 100644
--- a/BlazamSetup/Steps/ServicePrerequisite.xaml
+++ b/BlazamSetup/Steps/ServicePrerequisite.xaml
@@ -9,7 +9,7 @@
     <Grid>
         <local:StepTitle Title="Service Pre-Requisites"/>
 
-        <CheckBox x:Name="frameworkCheckbox" IsEnabled="false" Content="ASP .NET 6 Core Runtime" Margin="10,40,0,0"/>
+        <CheckBox x:Name="frameworkCheckbox" IsEnabled="false" Content="ASP .NET 8 Core Runtime" Margin="10,40,0,0"/>
         <Button VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0,0,0,20" Content="Download Prerequisites" Click="Button_Click"  />
 
     </Grid>

From 9d629570897d5a0dcf5e00058d8a459d1ef0b095 Mon Sep 17 00:00:00 2001
From: Chris Jacobsen <jacobsen9026@gmail.com>
Date: Tue, 30 Jul 2024 18:02:45 -0400
Subject: [PATCH 2/5] Check .net 8 hosting bundle

---
 BlazamSetup/Services/PrerequisiteChecker.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BlazamSetup/Services/PrerequisiteChecker.cs b/BlazamSetup/Services/PrerequisiteChecker.cs
index 8e28f7a..3665d78 100644
--- a/BlazamSetup/Services/PrerequisiteChecker.cs
+++ b/BlazamSetup/Services/PrerequisiteChecker.cs
@@ -45,7 +45,7 @@ internal static bool CheckForAspCoreHosting()
                     {
                         foreach (var possibleKey in possibleAspKeys)
                         {
-                            if (possibleKey.Contains("Microsoft .NET 6") && possibleKey.Contains("Hosting"))
+                            if (possibleKey.Contains("Microsoft .NET 8") && possibleKey.Contains("Hosting"))
                             {
                                 return true;
                             }

From e35ecd8d908637ae16972a0e71abef2a8feb6e2c Mon Sep 17 00:00:00 2001
From: Chris Jacobsen <jacobsen9026@gmail.com>
Date: Sat, 10 Aug 2024 15:44:30 -0400
Subject: [PATCH 3/5] Huge amount of improvements

---
 BlazamSetup/BlazamSetup.csproj                |  14 ++
 BlazamSetup/Data/DatabaseConfiguration.cs     |   5 +-
 BlazamSetup/Data/InstallationConfiguraion.cs  |   8 +-
 BlazamSetup/Data/ProductInformation.cs        |   2 +-
 BlazamSetup/MainWindow.xaml.cs                |  10 +-
 BlazamSetup/Services/AppSettingsService.cs    |   6 +-
 BlazamSetup/Services/DownloadService.cs       | 121 ++++++++++--------
 BlazamSetup/Services/FileSystemService.cs     |   4 +-
 BlazamSetup/Services/IISManageer.cs           |   4 +-
 BlazamSetup/Services/InstallationService.cs   | 102 ++++++---------
 BlazamSetup/Services/PrerequisiteChecker.cs   |  18 +++
 BlazamSetup/Services/RegistryService.cs       |  21 +++
 BlazamSetup/Services/ServiceManager.cs        |   4 +-
 .../Steps/ConfigureDatabaseConnection.xaml    |  12 +-
 .../Steps/ConfigureDatabaseConnection.xaml.cs |   8 +-
 BlazamSetup/Steps/ConfirmSettings.xaml        |   2 +
 BlazamSetup/Steps/ConfirmSettings.xaml.cs     |   7 +-
 BlazamSetup/Steps/DatabaseType.xaml           |   2 +-
 .../Steps/DownloadInstallation.xaml.cs        |   2 +-
 BlazamSetup/Steps/IISPrerequisiteCheck.xaml   |  17 ++-
 .../Steps/IISPrerequisiteCheck.xaml.cs        |  57 +++++++++
 BlazamSetup/Steps/InstallDirectory.xaml.cs    |   4 +-
 BlazamSetup/Steps/InstalledActionDialog.xaml  |   5 +-
 .../Steps/InstalledActionDialog.xaml.cs       |  15 ++-
 BlazamSetup/Steps/PostInstallation.xaml.cs    |   6 +
 BlazamSetup/Steps/Repair/Repair.xaml          |   2 +
 BlazamSetup/Steps/Repair/Repair.xaml.cs       |  17 ++-
 BlazamSetup/Steps/Repair/WelcomeRepair.xaml   |   1 -
 .../Steps/Repair/WelcomeRepair.xaml.cs        |   2 +-
 BlazamSetup/Steps/Update/Update.xaml          |  22 ++++
 BlazamSetup/Steps/Update/Update.xaml.cs       |  82 ++++++++++++
 BlazamSetup/Steps/Update/WelcomeUpdate.xaml   |  16 +++
 .../Steps/Update/WelcomeUpdate.xaml.cs        |  33 +++++
 33 files changed, 466 insertions(+), 165 deletions(-)
 create mode 100644 BlazamSetup/Steps/Update/Update.xaml
 create mode 100644 BlazamSetup/Steps/Update/Update.xaml.cs
 create mode 100644 BlazamSetup/Steps/Update/WelcomeUpdate.xaml
 create mode 100644 BlazamSetup/Steps/Update/WelcomeUpdate.xaml.cs

diff --git a/BlazamSetup/BlazamSetup.csproj b/BlazamSetup/BlazamSetup.csproj
index d383639..b376eee 100644
--- a/BlazamSetup/BlazamSetup.csproj
+++ b/BlazamSetup/BlazamSetup.csproj
@@ -438,6 +438,12 @@
     <Compile Include="Steps\PostInstallation.xaml.cs">
       <DependentUpon>PostInstallation.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Steps\Update\Update.xaml.cs">
+      <DependentUpon>Update.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Steps\Update\WelcomeUpdate.xaml.cs">
+      <DependentUpon>WelcomeUpdate.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Steps\Repair\Repair.xaml.cs">
       <DependentUpon>Repair.xaml</DependentUpon>
     </Compile>
@@ -538,6 +544,14 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Steps\Update\Update.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Steps\Update\WelcomeUpdate.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Steps\Repair\Repair.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/BlazamSetup/Data/DatabaseConfiguration.cs b/BlazamSetup/Data/DatabaseConfiguration.cs
index 4ade366..f7ce9d6 100644
--- a/BlazamSetup/Data/DatabaseConfiguration.cs
+++ b/BlazamSetup/Data/DatabaseConfiguration.cs
@@ -9,7 +9,10 @@ public class DatabaseConfiguration
         public int Port { get; set; }
         public string Database { get; set; }
         public string Username { get; set; }
-        public string Password { get; set; }
+        public string Password {
+            get; 
+            set; 
+        }
         public string ValidationMessage
         {
             get
diff --git a/BlazamSetup/Data/InstallationConfiguraion.cs b/BlazamSetup/Data/InstallationConfiguraion.cs
index 4b1847e..5cb1d55 100644
--- a/BlazamSetup/Data/InstallationConfiguraion.cs
+++ b/BlazamSetup/Data/InstallationConfiguraion.cs
@@ -20,7 +20,7 @@ internal static class InstallationConfiguraion
         /// <summary>
         /// This value identifies the version of the installer that was used, it should change every update.
         /// </summary>
-        internal static string UpdateGuid => "a146351b-8ff5-457e-9aac-c6604a21bd1b".ToUpper();
+        internal static string UpdateGuid => "410dd7f9-001d-4916-a991-5ca86987b709".ToUpper();
 
         internal static ProductInformation ProductInformation { get; set; } = new ProductInformation();
 
@@ -39,9 +39,9 @@ internal static string InstallDirPath
         {
             get => installDirPath; set
             {
-                installDirPath = value;
-                ProductInformation.InstallLocation = Path.GetFullPath(value+"\\Blazam");
-                ProductInformation.UninstallString = '"'+Path.GetFullPath(value+"\\Blazam\\setup.exe")+"\" /u";
+                installDirPath = Path.GetFullPath(value + "\\"); 
+                ProductInformation.InstallLocation = Path.GetFullPath(value+"\\");
+                ProductInformation.UninstallString = '"'+Path.GetFullPath(value+"\\setup.exe")+"\" /u";
             }
         }
         internal static DatabaseConfiguration DatabaseConfiguration { get; set; } = new DatabaseConfiguration();
diff --git a/BlazamSetup/Data/ProductInformation.cs b/BlazamSetup/Data/ProductInformation.cs
index 8575ecf..064977e 100644
--- a/BlazamSetup/Data/ProductInformation.cs
+++ b/BlazamSetup/Data/ProductInformation.cs
@@ -13,7 +13,7 @@ internal class ProductInformation
     {
         public string DisplayName { get; set; } = "Blazam";
         public string Publisher { get; set; } = "blazam.org";
-        public string DisplayVersion { get; set; } = "0.8";
+        public string DisplayVersion { get; set; } = "1.0";
         public string Comments { get; set; } = " A web based Active Directry management portal";
         public int NoRepair { get; set; } = 0;
         public int NoModify { get; set; } = 1;
diff --git a/BlazamSetup/MainWindow.xaml.cs b/BlazamSetup/MainWindow.xaml.cs
index b54e5c5..a8b9218 100644
--- a/BlazamSetup/MainWindow.xaml.cs
+++ b/BlazamSetup/MainWindow.xaml.cs
@@ -11,13 +11,7 @@
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 using System.Windows.Threading;
 
 namespace BlazamSetup
@@ -43,8 +37,8 @@ public MainWindow()
                 if (RegistryService.InstallationExists)
                 {
                     InstallationConfiguraion.ProductInformation = RegistryService.GetProductInformation();
-                    
-                    InstallationConfiguraion.InstalledVersion = FileSystemService.GetFileVersion(InstallationConfiguraion.ProductInformation.InstallLocation);
+                    InstallationConfiguraion.InstallDirPath = RegistryService.InstallLocation;
+                    InstallationConfiguraion.InstalledVersion = FileSystemService.GetFileVersion(InstallationConfiguraion.ProductInformation.InstallLocation+"\\Blazam.exe");
                 }
                 if (App.StartupArgs.Args.Any(arg => arg.StartsWith("/u")))
                 {
diff --git a/BlazamSetup/Services/AppSettingsService.cs b/BlazamSetup/Services/AppSettingsService.cs
index bd438fc..4af45ca 100644
--- a/BlazamSetup/Services/AppSettingsService.cs
+++ b/BlazamSetup/Services/AppSettingsService.cs
@@ -19,7 +19,7 @@ internal static class AppSettingsService
         public static bool Configure()
         {
 
-            string path = Path.GetFullPath(InstallationConfiguraion.InstallDirPath + @"\\Blazam\\");
+            string path = Path.GetFullPath(InstallationConfiguraion.InstallDirPath);
             
 
             string jsonString = System.IO.File.ReadAllText(path+"appsettings.json");
@@ -46,8 +46,8 @@ public static bool Configure()
 
         internal static void Copy()
         {
-            string exampleFilePath = InstallationConfiguraion.InstallDirPath + "\\Blazam\\appsettings.example.json";
-            string filePath = InstallationConfiguraion.InstallDirPath + "\\Blazam\\appsettings.json";
+            string exampleFilePath = Path.GetFullPath(InstallationConfiguraion.InstallDirPath + "\\appsettings.example.json");
+            string filePath = Path.GetFullPath(InstallationConfiguraion.InstallDirPath + "\\appsettings.json");
          
                 if (File.Exists(exampleFilePath))
                     File.Copy(exampleFilePath, filePath,true);
diff --git a/BlazamSetup/Services/DownloadService.cs b/BlazamSetup/Services/DownloadService.cs
index b54f931..1cbcdc4 100644
--- a/BlazamSetup/Services/DownloadService.cs
+++ b/BlazamSetup/Services/DownloadService.cs
@@ -19,14 +19,14 @@ internal static class DownloadService
         public static string SetupTempDirectory = Path.GetTempPath() + "BlazamSetup\\";
         public static string SourceDirectory = Path.GetTempPath() + "BlazamSetup\\setup\\";
         public static string UpdateFile = SetupTempDirectory + "blazam.zip";
-        private static ReleaseAsset latestRelease;
+        public static ReleaseAsset LatestRelease;
 
         public static int ExpectedSize { get; private set; }
         public static CancellationTokenSource cancellationTokenSource { get; private set; } = new CancellationTokenSource();
         public static int CompletedBytes { get; private set; }
         public static InstallEvent<int> DownloadPercentageChanged { get; set; }
 
-        public static async Task<bool> Download()
+        public static async Task<bool> Download(string version=null)
         {
             Log.Information("Download started");
 
@@ -34,91 +34,99 @@ public static async Task<bool> Download()
 
 
 
-            var branch = "stable";
+            var branch = "Release";
             //Get the releases from the repo
             var releases = await githubclient.Repository.Release.GetAll("Blazam-App", "Blazam");
             //Filter the releases to the selected branch
-            var branchReleases = releases.Where(r => r.TagName.ToLower().Contains(branch));
+            var branchReleases = releases.Where(r => r.TagName.ToLower().Contains(branch)|| r.TagName.ToLower().Contains("stable"));
             //Get the first release,which should be the most recent
-            latestRelease = branchReleases.FirstOrDefault()?.Assets.FirstOrDefault();
+            LatestRelease = branchReleases.FirstOrDefault()?.Assets.FirstOrDefault();
             //Get the release filename to prepare a version object
-            var filename = Path.GetFileNameWithoutExtension(latestRelease.Name);
+            var filename = Path.GetFileNameWithoutExtension(LatestRelease.Name);
             //Create that version object
             if (filename == null) throw new ApplicationUpdateException("Filename could not be retrieved from GitHub");
 
 
 
 
+            if (version != null)
+            {
+                var matchingRelease = releases.Where(r=>r.TagName.ToLower().Contains(version)).FirstOrDefault();
+                if(matchingRelease != null)
+                {
+                    return await DownloadAsset(matchingRelease.Assets.FirstOrDefault());
 
-            if (latestRelease != null)
+                }
+                throw new ApplicationUpdateException("Could not find requested version number. Try running an update.");
+            }
+            else if (LatestRelease != null)
             {
+                return await DownloadAsset(LatestRelease);
 
+            }
+            return false;
+        }
 
-                using (var client = new HttpClient())
+        private static async Task<bool> DownloadAsset(ReleaseAsset releaseToDownload)
+        {
+            using (var client = new HttpClient())
+            {
+                using (var response = await client.GetAsync(releaseToDownload.BrowserDownloadUrl, HttpCompletionOption.ResponseHeadersRead))
                 {
-                    using (var response = await client.GetAsync(latestRelease.BrowserDownloadUrl, HttpCompletionOption.ResponseHeadersRead))
+                    if (!response.IsSuccessStatusCode)
                     {
-                        if (!response.IsSuccessStatusCode)
-                        {
-                            //Loggers.UpdateLogger?.Debug("Unable to connect to download url: " + response.StatusCode + " : " + response.ReasonPhrase);
+                        //Loggers.UpdateLogger?.Debug("Unable to connect to download url: " + response.StatusCode + " : " + response.ReasonPhrase);
 
-                            return false;
-                        }
+                        return false;
+                    }
 
-                        if (File.Exists(UpdateFile))
-                        {
-                            if (Debugger.IsAttached)
-                            {
-                                return true;
-                            }
-                            else
-                            {
-                                File.Delete(UpdateFile);
-                            }
+                    if (File.Exists(UpdateFile))
+                    {
+                      
+                            File.Delete(UpdateFile);
+                        
 
-                        }
-                        using (var streamToReadFrom = await response.Content.ReadAsStreamAsync())
+                    }
+                    using (var streamToReadFrom = await response.Content.ReadAsStreamAsync())
+                    {
+                        Directory.CreateDirectory(SetupTempDirectory);
+                        File.Create(UpdateFile).Close();
+                        using (var streamToWriteTo = File.OpenWrite(UpdateFile))
                         {
-                            Directory.CreateDirectory(SetupTempDirectory);
-                            File.Create(UpdateFile).Close();
-                            using (var streamToWriteTo = File.OpenWrite(UpdateFile))
-                            {
-                                ExpectedSize = (int)latestRelease.Size;
-                                var buffer = new byte[262144];
-                                //var buffer = new byte[4096];
-                                int bytesRead;
-                                int totalBytesRead = 0;
+                            ExpectedSize = (int)releaseToDownload.Size;
+                            var buffer = new byte[262144];
+                            //var buffer = new byte[4096];
+                            int bytesRead;
+                            int totalBytesRead = 0;
 
-                                while ((bytesRead = await streamToReadFrom.ReadAsync(buffer, 0, buffer.Length)) > 0)
+                            while ((bytesRead = await streamToReadFrom.ReadAsync(buffer, 0, buffer.Length)) > 0)
+                            {
+                                if (!cancellationTokenSource.IsCancellationRequested)
+                                {
+                                    await streamToWriteTo.WriteAsync(buffer, 0, bytesRead);
+                                    totalBytesRead += bytesRead;
+                                    CompletedBytes = totalBytesRead;
+                                    var percentage = (CompletedBytes / (double)ExpectedSize * 100);
+                                    DownloadPercentageChanged?.Invoke((int)percentage);
+                                }
+                                else
                                 {
-                                    if (!cancellationTokenSource.IsCancellationRequested)
-                                    {
-                                        await streamToWriteTo.WriteAsync(buffer, 0, bytesRead);
-                                        totalBytesRead += bytesRead;
-                                        CompletedBytes = totalBytesRead;
-                                        var percentage = (CompletedBytes / (double)ExpectedSize * 100);
-                                        DownloadPercentageChanged?.Invoke((int)percentage);
-                                    }
-                                    else
-                                    {
-                                        streamToReadFrom.Close();
-                                        DownloadPercentageChanged?.Invoke(0);
-
-                                        return false;
-                                    }
+                                    streamToReadFrom.Close();
+                                    DownloadPercentageChanged?.Invoke(0);
+
+                                    return false;
                                 }
+                            }
 
-                                return true;
+                            return true;
 
 
-                            }
                         }
                     }
                 }
-
             }
-            return false;
         }
+
         public static void CleanDownload()
         {
 
@@ -180,18 +188,21 @@ internal static async Task<bool> UnpackDownload()
                     Log.Information("Extracting files: " + SourceDirectory);
 
                     CleanSource();
+                
                     Directory.CreateDirectory(SourceDirectory);
                     ZipArchive download = new ZipArchive(File.OpenRead(UpdateFile));
                     download.ExtractToDirectory(SourceDirectory);
                     download.Dispose();
                     File.Delete(UpdateFile);
                     return true;
+
                 }
                 catch (Exception ex)
                 {
                     Log.Error("Error unpacking download: {@Error}", ex);
 
                 }
+              
                 return false;
             });
 
diff --git a/BlazamSetup/Services/FileSystemService.cs b/BlazamSetup/Services/FileSystemService.cs
index 8e90698..3d7c136 100644
--- a/BlazamSetup/Services/FileSystemService.cs
+++ b/BlazamSetup/Services/FileSystemService.cs
@@ -95,7 +95,9 @@ internal static string GetFileVersion(string installLocation)
             {
                 if (File.Exists(installLocation))
                 {
-                    return FileVersionInfo.GetVersionInfo(installLocation).ProductVersion;
+                    var fvi = FileVersionInfo.GetVersionInfo(installLocation);
+                    string version = fvi.FileVersion+"."+fvi.ProductVersion;
+                    return version; 
 
                 }
 
diff --git a/BlazamSetup/Services/IISManageer.cs b/BlazamSetup/Services/IISManageer.cs
index ac56785..b7ac658 100644
--- a/BlazamSetup/Services/IISManageer.cs
+++ b/BlazamSetup/Services/IISManageer.cs
@@ -26,7 +26,7 @@ public static bool CreateApplication()
                         site = serverManager.Sites.Add("Blazam",
                             "http",
                             httpBinding,
-                            Path.GetFullPath(InstallationConfiguraion.InstallDirPath + @"\\Blazam\\"));
+                            Path.GetFullPath(InstallationConfiguraion.InstallDirPath));
                     }
 
                     Log.Information("IIS Site {@Site}", site);
@@ -34,7 +34,7 @@ public static bool CreateApplication()
                     serverManager.CommitChanges();
 
                     FileSystemService.AddPermission(
-                        Path.GetFullPath(InstallationConfiguraion.InstallDirPath + "\\Blazam\\"),
+                        Path.GetFullPath(InstallationConfiguraion.InstallDirPath),
                         "IIS_IUSRS",
                         FileSystemRights.ReadAndExecute
                         );
diff --git a/BlazamSetup/Services/InstallationService.cs b/BlazamSetup/Services/InstallationService.cs
index 450fe8c..7d93224 100644
--- a/BlazamSetup/Services/InstallationService.cs
+++ b/BlazamSetup/Services/InstallationService.cs
@@ -21,11 +21,11 @@ internal static class InstallationService
 
         internal static async Task StartInstallationAsync()
         {
-            Log.Information("Installattion Started {@InstallationType} {@InstallDirPath} {@DatabaseConfiguration}", InstallationConfiguraion.InstallationType, InstallationConfiguraion.InstallDirPath, InstallationConfiguraion.DatabaseConfiguration);
+            Log.Information("Installation Started {@InstallationType} {@InstallDirPath} {@DatabaseConfiguration}", InstallationConfiguraion.InstallationType, InstallationConfiguraion.InstallDirPath, InstallationConfiguraion.DatabaseConfiguration);
 
             if (!await PreInstallation()) Rollback();
             if (CancellationTokenSource.IsCancellationRequested) return;
-            if (!await ApplyProgramFilesAsync(InstallationConfiguraion.InstallDirPath + "\\Blazam\\")) Rollback();
+            if (!await ApplyProgramFilesAsync(InstallationConfiguraion.InstallDirPath)) Rollback();
             if (CancellationTokenSource.IsCancellationRequested) return;
 
             await Task.Run(() =>
@@ -36,7 +36,7 @@ await Task.Run(() =>
                 if (!CreateProgramDataDirectory()) Rollback();
                 if (CancellationTokenSource.IsCancellationRequested) return;
 
-                
+
                 if (InstallationConfiguraion.InstallationType == InstallType.Service)
                 {
                     OnStepTitleChanged?.Invoke("Install Services");
@@ -69,7 +69,7 @@ await Task.Run(() =>
                     string identity = "IIS_IUSRS";
                     if (InstallationConfiguraion.InstallationType == InstallType.Service)
                         identity = "Network Service";
-           
+
                     Directory.CreateDirectory(InstallationConfiguraion.DatabaseConfiguration.SqliteDirectory);
                     FileSystemService.AddPermission(InstallationConfiguraion.DatabaseConfiguration.SqliteDirectory,
                         identity,
@@ -77,14 +77,13 @@ await Task.Run(() =>
                         );
                 }
                 AppSettingsService.Configure();
-                InstallationConfiguraion.ProductInformation.EstimatedSize = (int)(FileSystemService.GetDirectorySize(InstallationConfiguraion.ProductInformation.InstallLocation)/1024);
+                InstallationConfiguraion.ProductInformation.EstimatedSize = (int)(FileSystemService.GetDirectorySize(InstallationConfiguraion.ProductInformation.InstallLocation) / 1024);
                 RegistryService.SetProductInformation(InstallationConfiguraion.ProductInformation);
                 OnProgress?.Invoke(100);
                 OnStepTitleChanged?.Invoke("Installation Finished");
                 Log.Information("Installation Finished Successfully");
 
                 MainWindow.DisableBack();
-                MainWindow.EnableNext();
                 OnInstallationFinished?.Invoke();
             });
         }
@@ -109,7 +108,8 @@ private static bool CreateProgramDataDirectory()
                     FileSystemRights.Write | FileSystemRights.Modify | FileSystemRights.ReadAndExecute
                     );
                 return true;
-            }catch (Exception ex)
+            }
+            catch (Exception ex)
             {
                 Log.Error("Error creating program data directory: {@Error}", ex);
 
@@ -221,67 +221,47 @@ internal static void Cancel()
                 CancellationTokenSource.Cancel();
             }
         }
+        internal static async Task<bool> StartUpdateAsync()
+        {
 
+
+
+            var targetDirectory = InstallationConfiguraion.InstallDirPath;
+            OnStepTitleChanged("Downloading latest version...");
+            DownloadService.DownloadPercentageChanged = ((val) => { OnProgress(val); });
+            if (!await DownloadService.Download()) return false;
+            OnProgress(0);
+            if (DownloadService.LatestRelease.Name.Contains(InstallationConfiguraion.InstalledVersion))
+                throw new ApplicationUpdateException("Latest version is already installed.");
+            OnStepTitleChanged("Preparing update...");
+
+            if (!await PreInstallation()) return false;
+            if (CancellationTokenSource.IsCancellationRequested) return false;
+            OnStepTitleChanged("Applying update...");
+            //InstallationService.OnProgress= ((val) => { OnProgress(val); });
+            // InstallationService.OnInstallationFinished= (() => { OnInstallationFinished(); });
+            if (!await ApplyProgramFilesAsync(InstallationConfiguraion.InstallDirPath)) return false;
+            if (CancellationTokenSource.IsCancellationRequested) return false;
+
+            OnInstallationFinished?.Invoke();
+            return true;
+        }
         internal static async Task<bool> StartReparAsync()
         {
-            return await Task.Run(() =>
-            {
-                try
-                {
-                    
-                    var targetDirectory = InstallationConfiguraion.InstallDirPath;
-                    OnStepTitleChanged?.Invoke("Repairing Files");
-                    Log.Information("Repair File copy started");
 
-                    bool copyingDownTree = false;
-                    if (targetDirectory.Contains(DownloadService.SourceDirectory))
-                    {
-                        copyingDownTree = true;
-                    }
-                    var totalFiles = FileSystemService.GetFileCount(DownloadService.SourceDirectory);
-                    var fileIndex = 0;
 
-                    if (Directory.Exists(DownloadService.SetupTempDirectory))
-                    {
-                        var directories = Directory.GetDirectories(DownloadService.SourceDirectory, "*", SearchOption.AllDirectories).AsEnumerable();
-
-                        if (copyingDownTree)
-                            directories = directories.Where(d => !d.Contains(targetDirectory));
-
-                        //Now Create all of the directories
-                        foreach (string dirPath in directories)
-                        {
-                            Log.Information("Creating directory: " + dirPath);
-
-                            Directory.CreateDirectory(dirPath.Replace(DownloadService.SourceDirectory, targetDirectory));
-                        }
-                        var files = Directory.GetFiles(DownloadService.SourceDirectory, "*.*", SearchOption.AllDirectories).AsEnumerable();
-
-                        if (copyingDownTree)
-                            files = files.Where(f => !f.Contains(targetDirectory));
-                        //Copy all the files & Replaces any files with the same name
-                        foreach (string path in files)
-                        {
-                            var newPath = path.Replace(DownloadService.SourceDirectory, targetDirectory);
-                            Log.Information("Copying file: " + newPath);
-
-                            File.Copy(path, newPath, true);
-                            fileIndex++;
-                            OnProgress?.Invoke((fileIndex / totalFiles) * 100);
-                        }
-                        CopySetup(targetDirectory);
-                        return true;
 
-                    }
-                }
-                catch (Exception ex)
-                {
-                    Log.Error("Error Copying files {@Error}", ex);
+            var targetDirectory = InstallationConfiguraion.InstallDirPath;
+            OnStepTitleChanged("Downloading current version...");
+            DownloadService.DownloadPercentageChanged = ((val) => { OnProgress(val); });
+            if (!await DownloadService.Download(InstallationConfiguraion.InstalledVersion)) return false;
+            if (!await PreInstallation()) return false;
+            if (CancellationTokenSource.IsCancellationRequested) return false;
+            if (!await ApplyProgramFilesAsync(InstallationConfiguraion.InstallDirPath)) return false;
+            if (CancellationTokenSource.IsCancellationRequested) return false;
+            OnInstallationFinished?.Invoke();
 
-                    Console.WriteLine(ex.Message);
-                }
-                return false;
-            });
+            return true;
         }
 
         private static bool RemoveProgramFiles(string installPath)
diff --git a/BlazamSetup/Services/PrerequisiteChecker.cs b/BlazamSetup/Services/PrerequisiteChecker.cs
index 3665d78..9ba4d6d 100644
--- a/BlazamSetup/Services/PrerequisiteChecker.cs
+++ b/BlazamSetup/Services/PrerequisiteChecker.cs
@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Management;
+using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using static System.Net.Mime.MediaTypeNames;
@@ -57,5 +59,21 @@ internal static bool CheckForAspCoreHosting()
             return false;
 
         }
+        internal static bool CheckForWebSockets()
+        {
+            ManagementClass objMC = new ManagementClass("Win32_OptionalFeature");
+            ManagementObjectCollection objMOC = objMC.GetInstances();
+            foreach (ManagementObject objMO in objMOC)
+            {
+                string featureName = (string)objMO.Properties["Name"].Value;
+                if (featureName.Equals("IIS-WebSockets", StringComparison.InvariantCultureIgnoreCase))
+                {
+                    var path = (uint)objMO.Properties["InstallState"].Value;
+                    return path.Equals(1);
+                }
+                
+            }
+            return false;
+        }
     }
 }
diff --git a/BlazamSetup/Services/RegistryService.cs b/BlazamSetup/Services/RegistryService.cs
index 5fedb1e..2c17e5a 100644
--- a/BlazamSetup/Services/RegistryService.cs
+++ b/BlazamSetup/Services/RegistryService.cs
@@ -86,6 +86,27 @@ public static bool InstallationExists
                 }
             }
         }
+        public static string InstallLocation
+        {
+            get
+            {
+                try
+                {
+                    var key = OpenKey();
+                    if (key == null) return null;
+                    var installLocation = key.GetValue("InstallLocation");
+                    if (installLocation is string installLocationString && !installLocationString.IsNullOrEmpty())
+                    {
+                        return installLocationString;
+                    }
+                    return null;
+                }
+                catch (Exception e)
+                {
+                    return null;
+                }
+            }
+        }
         public static bool CreateUninstallKey()
         {
             try
diff --git a/BlazamSetup/Services/ServiceManager.cs b/BlazamSetup/Services/ServiceManager.cs
index 4db70bb..365b183 100644
--- a/BlazamSetup/Services/ServiceManager.cs
+++ b/BlazamSetup/Services/ServiceManager.cs
@@ -49,9 +49,9 @@ internal static bool Install()
             if (!IsInstalled)
             {
                 CreateTempNSSM();
-                var path = InstallationConfiguraion.InstallDirPath + "\\Blazam\\nssm.exe";
+                var path = InstallationConfiguraion.InstallDirPath + "\\nssm.exe";
 
-                var arguments = "install " + ServiceName + " \"" + InstallationConfiguraion.InstallDirPath + "\\Blazam\\blazam.exe\"";
+                var arguments = "install " + ServiceName + " \"" + InstallationConfiguraion.InstallDirPath + "\\blazam.exe\"";
                 Process.Start(path, arguments).WaitForExit();
                 arguments = "set " + ServiceName + " ObjectName \"NT AUTHORITY\\Network Service\" \"\"";
                 Process.Start(path, arguments).WaitForExit();
diff --git a/BlazamSetup/Steps/ConfigureDatabaseConnection.xaml b/BlazamSetup/Steps/ConfigureDatabaseConnection.xaml
index 59a2654..bfb8183 100644
--- a/BlazamSetup/Steps/ConfigureDatabaseConnection.xaml
+++ b/BlazamSetup/Steps/ConfigureDatabaseConnection.xaml
@@ -12,30 +12,30 @@
             <StackPanel  Width="250" HorizontalAlignment="Left" >
                 <StackPanel>
                     <Label Content="Server" />
-                    <TextBox  x:Name="ServerTextBox" TextChanged="ServerTextBox_TextChanged" />
+                    <TextBox TabIndex="0"  x:Name="ServerTextBox" TextChanged="ServerTextBox_TextChanged" />
                 </StackPanel>
 
                 <StackPanel>
                     <Label Content="Port" />
-                    <TextBox  x:Name="PortTextBox" TextChanged="PortTextBox_TextChanged"/>
+                    <TextBox TabIndex="1"  x:Name="PortTextBox" TextChanged="PortTextBox_TextChanged"/>
                 </StackPanel>
 
                 <StackPanel>
                     <Label Content="Database" />
-                    <TextBox  x:Name="DatabaseTextBox" TextChanged="DatabaseTextBox_TextChanged"/>
+                    <TextBox TabIndex="2"  x:Name="DatabaseTextBox" TextChanged="DatabaseTextBox_TextChanged"/>
                 </StackPanel>
 
                 <StackPanel>
                     <Label Content="Username" />
-                    <TextBox TextChanged="UsernameTextBox_TextChanged" x:Name="UsernameTextBox" />
+                    <TextBox TabIndex="3" TextChanged="UsernameTextBox_TextChanged" x:Name="UsernameTextBox" />
                 </StackPanel>
 
                 <StackPanel>
                     <Label Content="Password" />
-                    <PasswordBox PasswordChanged="PasswordTextBox_PasswordChanged"  x:Name="PasswordTextBox" />
+                    <PasswordBox TabIndex="4" PasswordChanged="PasswordTextBox_PasswordChanged"  x:Name="PasswordTextBox" />
                 </StackPanel>
 
-                <Button Content="Test Connection" Width="100" Margin="0,20,0,0" Click="Button_Click" />
+                <Button TabIndex="5" Content="Test Connection" Width="100" Margin="0,20,0,0" Click="Button_Click" />
             </StackPanel>
             <StackPanel Margin="10,0,0,0">
                 <Label Content="Status" HorizontalContentAlignment="Center"/>
diff --git a/BlazamSetup/Steps/ConfigureDatabaseConnection.xaml.cs b/BlazamSetup/Steps/ConfigureDatabaseConnection.xaml.cs
index ebe3771..a823834 100644
--- a/BlazamSetup/Steps/ConfigureDatabaseConnection.xaml.cs
+++ b/BlazamSetup/Steps/ConfigureDatabaseConnection.xaml.cs
@@ -55,7 +55,7 @@ protected override void OnVisualParentChanged(DependencyObject oldParent)
 
         private void Button_Click(object sender, RoutedEventArgs e)
         {
-          
+
             if (InstallationConfiguraion.DatabaseConfiguration.IsValid)
             {
                 PerformTest();
@@ -171,14 +171,14 @@ private void PortTextBox_TextChanged(object sender, TextChangedEventArgs e)
         private void DatabaseTextBox_TextChanged(object sender, TextChangedEventArgs e)
         {
             InstallationConfiguraion.DatabaseConfiguration.Database = DatabaseTextBox.Text;
-                TestFailed();
+            TestFailed();
 
         }
 
         private void PasswordTextBox_PasswordChanged(object sender, RoutedEventArgs e)
         {
-            
-           InstallationConfiguraion.DatabaseConfiguration.Password = PasswordTextBox.Password;
+            if (!PasswordTextBox.Password.IsNullOrEmpty())
+                InstallationConfiguraion.DatabaseConfiguration.Password = PasswordTextBox.Password;
 
             TestFailed();
         }
diff --git a/BlazamSetup/Steps/ConfirmSettings.xaml b/BlazamSetup/Steps/ConfirmSettings.xaml
index 8362947..b79f4b9 100644
--- a/BlazamSetup/Steps/ConfirmSettings.xaml
+++ b/BlazamSetup/Steps/ConfirmSettings.xaml
@@ -39,6 +39,8 @@
                 <Label Grid.Row="3" Grid.Column="0" x:Name="DatabasePathLabel"  Content="Database Server: "/>
                 <Label Grid.Row="3" Grid.Column="1" x:Name="DatabaseServerLabel" />
 
+                <Label Grid.Row="4" Grid.Column="0" x:Name="DatabaseDBLabel"  Content="Database Name: "/>
+                <Label Grid.Row="4" Grid.Column="1" x:Name="DatabaseNameLabel" />
             </Grid>
         </StackPanel>
 
diff --git a/BlazamSetup/Steps/ConfirmSettings.xaml.cs b/BlazamSetup/Steps/ConfirmSettings.xaml.cs
index b994b1e..c7ea1c3 100644
--- a/BlazamSetup/Steps/ConfirmSettings.xaml.cs
+++ b/BlazamSetup/Steps/ConfirmSettings.xaml.cs
@@ -26,9 +26,10 @@ public ConfirmSettings()
             InitializeComponent();
             CurrentDispatcher = Dispatcher;
             InstallationTypeLabel.Content = InstallationConfiguraion.InstallationType.ToString();
-            InstallationPathLabel.Content = InstallationConfiguraion.InstallDirPath+ "\\Blazam";
+            InstallationPathLabel.Content = InstallationConfiguraion.InstallDirPath;
             DatabaseTypeLabel.Content =  InstallationConfiguraion.DatabaseType.ToString();
-            DatabaseServerLabel.Content = InstallationConfiguraion.DatabaseType==DBType.Sqlite?InstallationConfiguraion.DatabaseConfiguration.SqliteDirectory + "\\Blazam" : InstallationConfiguraion.DatabaseConfiguration.Server;
+            DatabaseServerLabel.Content = InstallationConfiguraion.DatabaseType==DBType.Sqlite?InstallationConfiguraion.DatabaseConfiguration.SqliteDirectory : InstallationConfiguraion.DatabaseConfiguration.Server;
+            DatabaseNameLabel.Content = InstallationConfiguraion.DatabaseConfiguration.Database;
             MainWindow.NextStepButton.IsEnabled = true;
 
         }
@@ -45,10 +46,12 @@ protected override void OnVisualParentChanged(DependencyObject oldParent)
                     if (InstallationConfiguraion.DatabaseType == DBType.Sqlite)
                     {
                         DatabasePathLabel.Content = "Database Path";
+                        DatabaseDBLabel.Visibility = Visibility.Hidden;
                     }
                     else
                     {
                         DatabasePathLabel.Content = "Database Server";
+                        DatabaseDBLabel.Visibility = Visibility.Visible;
 
                     }
                     MainWindow.SetNextText("Install");
diff --git a/BlazamSetup/Steps/DatabaseType.xaml b/BlazamSetup/Steps/DatabaseType.xaml
index fae3289..5a6c9a4 100644
--- a/BlazamSetup/Steps/DatabaseType.xaml
+++ b/BlazamSetup/Steps/DatabaseType.xaml
@@ -9,7 +9,7 @@
     <Grid>
         <local:StepTitle Title="Database Type"/>
         <StackPanel Margin="10,60,0,0">
-            <RadioButton x:Name="SqliteRadioButton"  GroupName="DatabaseType" Content="File-Based (SQLite) [Acceptable for installations of up to 20 simultaneous app users]" Checked="Sqlite_Checked"/>
+            <RadioButton x:Name="SqliteRadioButton"  GroupName="DatabaseType" Content="File-Based (SQLite) [Only acceptable for testing]" Checked="Sqlite_Checked"/>
             <RadioButton x:Name="SqlRadioButton" GroupName="DatabaseType" Content="SQL Database (SQLExpress Compatible)" Checked="SQL_Checked"/>
             <RadioButton x:Name="MysqlRadioButton" GroupName="DatabaseType" Content="MySQL Database (MariaDB Compatible)" Checked="Mysql_Checked"/>
         </StackPanel>
diff --git a/BlazamSetup/Steps/DownloadInstallation.xaml.cs b/BlazamSetup/Steps/DownloadInstallation.xaml.cs
index 584a490..ee3dcf5 100644
--- a/BlazamSetup/Steps/DownloadInstallation.xaml.cs
+++ b/BlazamSetup/Steps/DownloadInstallation.xaml.cs
@@ -32,7 +32,7 @@ public DownloadInstallation()
             MainWindow.DisableNext();
 
             DownloadService.DownloadPercentageChanged += DownloadProgressMade;
-            DownloadLatestVersionAsync();
+            _=DownloadLatestVersionAsync();
         }
 
         IInstallationStep IInstallationStep.NextStep()
diff --git a/BlazamSetup/Steps/IISPrerequisiteCheck.xaml b/BlazamSetup/Steps/IISPrerequisiteCheck.xaml
index 9e1f825..5b7f733 100644
--- a/BlazamSetup/Steps/IISPrerequisiteCheck.xaml
+++ b/BlazamSetup/Steps/IISPrerequisiteCheck.xaml
@@ -8,9 +8,20 @@
              d:DesignHeight="450" d:DesignWidth="800" d:Background="White">
     <Grid>
         <local:StepTitle Title="IIS Pre-Requisites"/>
+        <StackPanel Margin="10,40,10,0">
+            <CheckBox x:Name="frameworkCheckbox" IsEnabled="false" Content="ASP .NET 8 Core Web Hosting Bundle" Margin="0,0,0,5" />
+            <CheckBox x:Name="websocketsCheckbox" IsEnabled="false" Content="IIS WebSockets Feature Enabled" Margin="0,0,0,5"/>
+            <TextBlock TextWrapping="Wrap" TextAlignment="Center" Text="ASP NET Core apps running under IIS require both the 32-bit and 64-bit runtimes which are included in the Hosting Bundle." 
+                  Margin="10,150,0,0" 
+                  FontSize="11"/>       
+        </StackPanel>
+
+
+        <StackPanel Margin="10,150,10,20" VerticalAlignment="Bottom">
+            <ProgressBar Margin="0,0,0,10" Height="5" x:Name="websocketProgressBar" IsIndeterminate="true" Visibility="Hidden"/>
+            <Button VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0,0,0,25" Content="Download Net Core 8" Click="Button_Click"  />
+            <Button x:Name="enableWebSocketsButton" VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0,0,0,0" Content="Enable WebSocket Protocol" Click="Button_Click_1"  />
+        </StackPanel>
 
-        <CheckBox x:Name="frameworkCheckbox" IsEnabled="false" Content="ASP .NET 8 Core Web Hosting Bundle" Margin="10,40,0,0"/>
-        <Label Content="ASP NET Core apps running under IIS require both the 32-bit and 64-bit Hosting Bundles" Margin="10,50,0,0" FontSize="11"/>
-        <Button VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0,0,0,20" Content="Download Prerequisites" Click="Button_Click"  />
     </Grid>
 </UserControl>
diff --git a/BlazamSetup/Steps/IISPrerequisiteCheck.xaml.cs b/BlazamSetup/Steps/IISPrerequisiteCheck.xaml.cs
index 1a67bb6..9eea9c6 100644
--- a/BlazamSetup/Steps/IISPrerequisiteCheck.xaml.cs
+++ b/BlazamSetup/Steps/IISPrerequisiteCheck.xaml.cs
@@ -30,9 +30,11 @@ public partial class IISPrerequisiteCheck : UserControl, IInstallationStep
         public IISPrerequisiteCheck()
         {
             InitializeComponent();
+            MainWindow.DisableNext();
             CurrentDispatcher = Dispatcher;
             DataContext = this;
             CheckForAspCoreHosting();
+            CheckForWebSockets();
         }
        
         void CheckForAspCoreHosting()
@@ -50,9 +52,41 @@ void CheckForAspCoreHosting()
                         frameworkCheckbox.IsChecked = false;
                     });
                 }
+            UpdateNextButton();
+        }
+
+        private void UpdateNextButton()
+        {
+            CurrentDispatcher.Invoke(() => {
+                if (websocketsCheckbox.IsChecked==true && frameworkCheckbox.IsChecked == true)
+                {
+                    MainWindow.EnableNext();
+                }
+            });
           
         }
 
+        void CheckForWebSockets()
+        {
+            
+                if (PrerequisiteChecker.CheckForWebSockets())
+                {
+                    CurrentDispatcher.Invoke(() => {
+                        websocketsCheckbox.IsChecked = true;
+                        enableWebSocketsButton.IsEnabled = false;
+                    });
+                }
+                else
+                {
+                    CurrentDispatcher.Invoke(() => {
+                        websocketsCheckbox.IsChecked = false;
+                        enableWebSocketsButton.IsEnabled = true;
+                    });
+                }
+            UpdateNextButton();
+
+        }
+
         IInstallationStep IInstallationStep.NextStep()
         {
             return new ConfigureIIS();
@@ -63,5 +97,28 @@ private void Button_Click(object sender, RoutedEventArgs e)
            
                 Process.Start("https://aka.ms/dotnet-download");
         }
+
+        private async void Button_Click_1(object sender, RoutedEventArgs e)
+        {
+            CurrentDispatcher.Invoke(() => {
+                enableWebSocketsButton.IsEnabled = false;
+                websocketProgressBar.Visibility = Visibility.Visible;
+            });
+            try
+            {
+                await Task.Run(() => {
+                    var dism = Process.Start("Dism", "/online /Enable-Feature /FeatureName:IIS-WebSockets /All");
+                    dism.WaitForExit();
+                });
+                
+            }catch (Exception ex)
+            {
+                
+            }
+            CurrentDispatcher.Invoke(() => {
+                websocketProgressBar.Visibility = Visibility.Hidden;
+            });
+            CheckForWebSockets();
+        }
     }
 }
diff --git a/BlazamSetup/Steps/InstallDirectory.xaml.cs b/BlazamSetup/Steps/InstallDirectory.xaml.cs
index 2ff722c..df8d2ed 100644
--- a/BlazamSetup/Steps/InstallDirectory.xaml.cs
+++ b/BlazamSetup/Steps/InstallDirectory.xaml.cs
@@ -31,7 +31,7 @@ public InstallDirectory()
                 if (InstallationConfiguraion.InstallationType != InstallType.Service)
                 {
                     if (Directory.Exists("C:\\inetpub\\"))
-                        InstallationConfiguraion.InstallDirPath = Path.GetFullPath("C:\\inetpub");
+                        InstallationConfiguraion.InstallDirPath = Path.GetFullPath("C:\\inetpub\\Blazam");
 
 
 
@@ -39,7 +39,7 @@ public InstallDirectory()
                 else
                 {
                     if (Directory.Exists(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles)))
-                        InstallationConfiguraion.InstallDirPath = Path.GetFullPath(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles));
+                        InstallationConfiguraion.InstallDirPath = Path.GetFullPath(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles)+"\\Blazam");
                 }
 
             }
diff --git a/BlazamSetup/Steps/InstalledActionDialog.xaml b/BlazamSetup/Steps/InstalledActionDialog.xaml
index 42b251d..2f74535 100644
--- a/BlazamSetup/Steps/InstalledActionDialog.xaml
+++ b/BlazamSetup/Steps/InstalledActionDialog.xaml
@@ -14,14 +14,15 @@
             </Label>
 
             <Label>A Blazam installaion was found on this machine.</Label>
+            <Label x:Name="installedVrsionLabel" Visibility="Hidden"></Label>
             <Label  Margin="0,0,0,20">Please choose from the following opions.</Label>
 
-            <StackPanel IsEnabled="False" Orientation="Horizontal">
+            <StackPanel Orientation="Horizontal">
                 <RadioButton x:Name="Update"  GroupName="InsalledAction" Content="Update" Checked="Update_Checked" VerticalAlignment="Center" Margin="0,0,30,0"/>
                 <Label Content="Update to the latest version."/>
             </StackPanel>
 
-            <StackPanel  IsEnabled="False" Orientation="Horizontal">
+            <StackPanel Orientation="Horizontal">
                 <RadioButton x:Name="Repair"  GroupName="InsalledAction" Content="Repair" Checked="Repair_Checked" VerticalAlignment="Center" Margin="0,0,36,0"/>
                 <Label Content="Attempt to repair the installation if it is not starting."/>
 
diff --git a/BlazamSetup/Steps/InstalledActionDialog.xaml.cs b/BlazamSetup/Steps/InstalledActionDialog.xaml.cs
index 5184c7e..8b32e14 100644
--- a/BlazamSetup/Steps/InstalledActionDialog.xaml.cs
+++ b/BlazamSetup/Steps/InstalledActionDialog.xaml.cs
@@ -1,4 +1,6 @@
-using BlazamSetup.Steps.Uninstall;
+using BlazamSetup.Steps.Repair;
+using BlazamSetup.Steps.Uninstall;
+using BlazamSetup.Steps.Update;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -27,6 +29,13 @@ public InstalledActionDialog()
             InitializeComponent();
             if (InstallationConfiguraion.ExecutableExists)
                 exeNotFoundWarning.Visibility = Visibility.Collapsed;
+            if (!InstallationConfiguraion.InstalledVersion.IsNullOrEmpty())
+            {
+                installedVrsionLabel.Visibility = Visibility.Visible;
+                installedVrsionLabel.Content = "Version: "+InstallationConfiguraion.InstalledVersion;
+            }
+            
+
         }
 
         private void Update_Checked(object sender, RoutedEventArgs e)
@@ -50,6 +59,10 @@ IInstallationStep IInstallationStep.NextStep()
         {
            switch(InstallationConfiguraion.InstalledAction)
             {
+                case InstalledAction.Repair:
+                    return new WelcomeRepair();
+                case InstalledAction.Update:
+                    return new WelcomeUpdate();
                 case InstalledAction.Remove:
                 default:
                     return new WelcomeUninstall();
diff --git a/BlazamSetup/Steps/PostInstallation.xaml.cs b/BlazamSetup/Steps/PostInstallation.xaml.cs
index 36dd2ed..3f6bc58 100644
--- a/BlazamSetup/Steps/PostInstallation.xaml.cs
+++ b/BlazamSetup/Steps/PostInstallation.xaml.cs
@@ -25,12 +25,18 @@ public partial class PostInstallation : UserControl,IInstallationStep
         public PostInstallation()
         {
             InitializeComponent();
+            MainWindow.DisableBack();
+
         }
         protected override void OnVisualParentChanged(DependencyObject oldParent)
         {
             base.OnVisualParentChanged(oldParent);
             if (oldParent == null)
+            {
+                MainWindow.EnableNext();
+                MainWindow.DisableBack();
                 MainWindow.SetNextText("Finish");
+            }
 
 
         }
diff --git a/BlazamSetup/Steps/Repair/Repair.xaml b/BlazamSetup/Steps/Repair/Repair.xaml
index 8604d91..0cfae65 100644
--- a/BlazamSetup/Steps/Repair/Repair.xaml
+++ b/BlazamSetup/Steps/Repair/Repair.xaml
@@ -15,6 +15,8 @@
                 <Label x:Name="CurrentStepLabel"/>
             </StackPanel>
             <ProgressBar x:Name="RepairProgressBar" Height="10"/>
+            <Label x:Name="errorLabel"/>
+
         </StackPanel>
     </Grid>
 </UserControl>
diff --git a/BlazamSetup/Steps/Repair/Repair.xaml.cs b/BlazamSetup/Steps/Repair/Repair.xaml.cs
index e12161b..b2d3d27 100644
--- a/BlazamSetup/Steps/Repair/Repair.xaml.cs
+++ b/BlazamSetup/Steps/Repair/Repair.xaml.cs
@@ -32,13 +32,24 @@ public Repair()
             MainWindow.DisableNext();
             InstallationService.OnProgress += (value) => StepProgress = value;
             InstallationService.OnStepTitleChanged += (value) => CurrentStep = value;
-            InstallationService.OnInstallationFinished += () => MainWindow.EnableNext();
+            InstallationService.OnInstallationFinished += () => {
+                MainWindow.EnableNext();
+                CurrentStepLabel.Content = "Finished";
+                };
             RunRepair();
         }
 
-        private void RunRepair()
+        private async void RunRepair()
         {
-            InstallationService.StartReparAsync();
+            try
+            {
+
+                _ =await  InstallationService.StartReparAsync();
+            }catch (Exception ex)
+            {
+                CurrentStepLabel.Content = "Failed";
+                errorLabel.Content = ex.Message;
+            }
         }
 
         IInstallationStep IInstallationStep.NextStep()
diff --git a/BlazamSetup/Steps/Repair/WelcomeRepair.xaml b/BlazamSetup/Steps/Repair/WelcomeRepair.xaml
index 0bd02c4..aefd902 100644
--- a/BlazamSetup/Steps/Repair/WelcomeRepair.xaml
+++ b/BlazamSetup/Steps/Repair/WelcomeRepair.xaml
@@ -10,7 +10,6 @@
         <steps:StepTitle Title="Repair Blazam"/>
         <StackPanel x:Name="textStackPanel" HorizontalAlignment="Left" Margin="32,52,0,0" VerticalAlignment="Top">
             <Label Content="This procedure will attempt to repair your installation."  />
-            <Label Content="Choose the repair method from the options below..." />
 
         </StackPanel>
     </Grid>
diff --git a/BlazamSetup/Steps/Repair/WelcomeRepair.xaml.cs b/BlazamSetup/Steps/Repair/WelcomeRepair.xaml.cs
index 3511e36..b49aa34 100644
--- a/BlazamSetup/Steps/Repair/WelcomeRepair.xaml.cs
+++ b/BlazamSetup/Steps/Repair/WelcomeRepair.xaml.cs
@@ -27,7 +27,7 @@ public WelcomeRepair()
 
         IInstallationStep IInstallationStep.NextStep()
         {
-            throw new NotImplementedException();
+            return new Repair();
         }
     }
 }
diff --git a/BlazamSetup/Steps/Update/Update.xaml b/BlazamSetup/Steps/Update/Update.xaml
new file mode 100644
index 0000000..2f9e4fa
--- /dev/null
+++ b/BlazamSetup/Steps/Update/Update.xaml
@@ -0,0 +1,22 @@
+<UserControl x:Class="BlazamSetup.Steps.Update.Update"
+             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:BlazamSetup.Steps.Update" xmlns:steps="clr-namespace:BlazamSetup.Steps"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800" d:Background="White">
+    <Grid>
+        <steps:StepTitle Title="Updating"/>
+
+        <StackPanel VerticalAlignment="Center" Margin="20,0,20,0">
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                <Label Content="Current Step: "/>
+                <Label x:Name="CurrentStepLabel"/>
+            </StackPanel>
+            <ProgressBar x:Name="RepairProgressBar" Height="10"/>
+            <Label HorizontalAlignment="Center" x:Name="errorLabel"/>
+
+        </StackPanel>
+    </Grid>
+</UserControl>
diff --git a/BlazamSetup/Steps/Update/Update.xaml.cs b/BlazamSetup/Steps/Update/Update.xaml.cs
new file mode 100644
index 0000000..eda3484
--- /dev/null
+++ b/BlazamSetup/Steps/Update/Update.xaml.cs
@@ -0,0 +1,82 @@
+using BlazamSetup.Services;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using System.Windows.Threading;
+
+namespace BlazamSetup.Steps.Update
+{
+    /// <summary>
+    /// Interaction logic for Repair.xaml
+    /// </summary>
+    public partial class Update : UserControl,IInstallationStep
+    {
+        private double stepProgress;
+        private string currentStep;
+
+        public Update()
+        {
+            InitializeComponent();
+            CurrentDispatcher = Dispatcher;
+            MainWindow.DisableNext();
+            InstallationService.OnProgress += (value) => StepProgress = value;
+            InstallationService.OnStepTitleChanged += (value) => CurrentStep = value;
+            InstallationService.OnInstallationFinished += () => { 
+                MainWindow.EnableNext();
+
+                CurrentStepLabel.Content = "Finished";
+            };
+            RunUpdate();
+        }
+
+        private async void RunUpdate()
+        {
+            try
+            {
+
+                _ =await  InstallationService.StartUpdateAsync();
+            }catch (Exception ex)
+            {
+                CurrentStepLabel.Content = "Failed";
+                errorLabel.Content = ex.Message;
+            }
+        }
+
+        IInstallationStep IInstallationStep.NextStep()
+        {
+            return new ExitStep();
+
+        }
+
+        public string CurrentStep
+        {
+            get => currentStep; set
+            {
+                currentStep = value;
+                CurrentDispatcher.Invoke(() => { CurrentStepLabel.Content = value; });
+            }
+        }
+
+        public double StepProgress
+        {
+            get => stepProgress; set
+            {
+                stepProgress = value;
+                CurrentDispatcher.Invoke(() => { RepairProgressBar.Value = value; });
+
+            }
+        }
+        public Dispatcher CurrentDispatcher { get; }
+    }
+}
diff --git a/BlazamSetup/Steps/Update/WelcomeUpdate.xaml b/BlazamSetup/Steps/Update/WelcomeUpdate.xaml
new file mode 100644
index 0000000..43279bd
--- /dev/null
+++ b/BlazamSetup/Steps/Update/WelcomeUpdate.xaml
@@ -0,0 +1,16 @@
+<UserControl x:Class="BlazamSetup.Steps.Update.WelcomeUpdate"
+             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:BlazamSetup.Steps.Update" xmlns:steps="clr-namespace:BlazamSetup.Steps"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800" d:Background="White">
+    <Grid>
+        <steps:StepTitle Title="Update Blazam"/>
+        <StackPanel x:Name="textStackPanel" HorizontalAlignment="Left" Margin="32,52,0,0" VerticalAlignment="Top">
+            <Label Content="This procedure will update Blazam to the latest available version."  />
+
+        </StackPanel>
+    </Grid>
+</UserControl>
diff --git a/BlazamSetup/Steps/Update/WelcomeUpdate.xaml.cs b/BlazamSetup/Steps/Update/WelcomeUpdate.xaml.cs
new file mode 100644
index 0000000..58ec388
--- /dev/null
+++ b/BlazamSetup/Steps/Update/WelcomeUpdate.xaml.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace BlazamSetup.Steps.Update
+{
+    /// <summary>
+    /// Interaction logic for WelcomeRepair.xaml
+    /// </summary>
+    public partial class WelcomeUpdate : UserControl,IInstallationStep
+    {
+        public WelcomeUpdate()
+        {
+            InitializeComponent();
+        }
+
+        IInstallationStep IInstallationStep.NextStep()
+        {
+            return new Update();
+        }
+    }
+}

From 0b0f086f3eb29012ddc5237be728820893e63c2a Mon Sep 17 00:00:00 2001
From: Chris Jacobsen <jacobsen9026@gmail.com>
Date: Sat, 10 Aug 2024 15:53:18 -0400
Subject: [PATCH 4/5] Build on windows 2019

---
 .github/workflows/dotnet.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index b640bc7..dc1e163 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -13,7 +13,7 @@ on:
 jobs:
   build:
 
-    runs-on: windows-latest
+    runs-on: windows-2019
 
     steps:
     - uses: actions/checkout@v3

From e7d887439b449bb922d8775e7b8d2c69074fcf18 Mon Sep 17 00:00:00 2001
From: Chris Jacobsen <jacobsen9026@gmail.com>
Date: Mon, 12 Aug 2024 19:41:09 -0400
Subject: [PATCH 5/5] Fix for not downloading v1 release

---
 BlazamSetup/Services/DownloadService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BlazamSetup/Services/DownloadService.cs b/BlazamSetup/Services/DownloadService.cs
index 1cbcdc4..4c3a806 100644
--- a/BlazamSetup/Services/DownloadService.cs
+++ b/BlazamSetup/Services/DownloadService.cs
@@ -34,7 +34,7 @@ public static async Task<bool> Download(string version=null)
 
 
 
-            var branch = "Release";
+            var branch = "release";
             //Get the releases from the repo
             var releases = await githubclient.Repository.Release.GetAll("Blazam-App", "Blazam");
             //Filter the releases to the selected branch