Update for AutoUpdate

Author: naseif

Source/VisualPairCoding/VisualPairCoding.AvaloniaUI/EnterNamesWindow.axaml.cs

@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using VisualPairCoding.BL;
+using VisualPairCoding.BL.AutoUpdates;
 using VisualPairCoding.Infrastructure;
 
 namespace VisualPairCoding.AvaloniaUI
@@ -16,6 +17,7 @@ public EnterNamesForm()
         {
             InitializeComponent();
             WindowStartupLocation = WindowStartupLocation.CenterScreen;
+            Opened += OnActivated;
         }
 
         public EnterNamesForm(bool autostart)
@@ -26,8 +28,37 @@ public EnterNamesForm(bool autostart)
             Opened += OnActivated;
         }
 
-        private void OnActivated(object? sender, EventArgs e)
+        private async Task<bool> AutoUpdate()
+        {
+            var updater = new AutoUpdater(
+                "VisualPairCoding",
+                VersionInformation.Version,
+                "https://api.github.com/repos/CleverCodeCravers/VisualPairCoding/releases");
+
+            if (updater.IsUpdateAvailable())
+            {
+                var messageBox = MessageBox.Avalonia.MessageBoxManager.GetMessageBoxStandardWindow("Info", "There is a new update, do you want to install it now ?", MessageBox.Avalonia.Enums.ButtonEnum.YesNo, MessageBox.Avalonia.Enums.Icon.Info, WindowStartupLocation.CenterScreen);
+                var result = await messageBox.Show();
+
+                if (result.ToString() == "Yes")
+                {
+                    updater.Update();
+                    Close();
+                    return true;
+                }
+
+            }
+
+            return false;
+        }
+
+        private async void OnActivated(object? sender, EventArgs e)
         {
+            //Only perform auto - updates if not in dev environment
+            if (AutoUpdateDetector.isUpdateAvailable())
+            {
+                await AutoUpdate();
+            }
 
             if (_autostart)
             {

Source/VisualPairCoding/VisualPairCoding.AvaloniaUI/Program.cs

@@ -25,22 +25,32 @@ static void AppMain(Application app, string[] args)
         {
             app.Initialize();
 
-            // Only perform auto-updates if not in dev environment
-            //if (VersionInformation.Version != "$$VERSION$$")
-            //{
-            //    AutoUpdate();
-            //}
+            var enterNamesForm = new EnterNamesForm();
 
-            if (args.Length >= 1)
+            if (IsAutoUpdateShouldBeExecutedExplicitlySet(args))
+            {
+                AutoUpdateDetector.setUpdateIsAvailable();
+            }
+            
+            if (IsStartupWithSessionFile(args))
             {
                 var configPath = args[0];
-                var form = new EnterNamesForm(true);
-                form.LoadSessionIntoGui(configPath);
-                app.Run(form);
-                return;
+
+                enterNamesForm = new EnterNamesForm(true);
+                enterNamesForm.LoadSessionIntoGui(configPath);
             }
 
-            app.Run(new EnterNamesForm());
+            app.Run(enterNamesForm);
+        }
+
+        private static bool IsStartupWithSessionFile(string[] args)
+        {
+            return (args.Length >= 1 && args[0] != "AutoUpdate");
+        }
+
+        private static bool IsAutoUpdateShouldBeExecutedExplicitlySet(string[] args)
+        {
+            return (args.Length >= 1 && args[0] == "AutoUpdate");
         }
 
         public static AppBuilder BuildAvaloniaApp()
@@ -50,28 +60,5 @@ public static AppBuilder BuildAvaloniaApp()
                 .LogToTrace();
         }
 
-
-        private static bool AutoUpdate()
-        {
-            var updater = new AutoUpdater(
-                "VisualPairCoding",
-                VersionInformation.Version,
-                "https://api.github.com/repos/CleverCodeCravers/VisualPairCoding/releases");
-
-            if (updater.IsUpdateAvailable())
-            {
-                var messageBox = MessageBox.Avalonia.MessageBoxManager.GetMessageBoxStandardWindow("Info", "There is a new update, do you want to install it now ?", MessageBox.Avalonia.Enums.ButtonEnum.YesNo, MessageBox.Avalonia.Enums.Icon.Info, WindowStartupLocation.CenterScreen);
-                var result = messageBox.Show();
-
-                if (result.ToString() == "Yes")
-                {
-                    updater.Update();
-                    return true;
-                }
-
-            }
-
-            return false;
-        }
     }
 }

Source/VisualPairCoding/VisualPairCoding.AvaloniaUI/Properties/launchSettings.json

@@ -0,0 +1,8 @@
+{
+  "profiles": {
+    "VisualPairCoding.AvaloniaUI": {
+      "commandName": "Project",
+      "commandLineArgs": "AutoUpdate"
+    }
+  }
+}

Source/VisualPairCoding/VisualPairCoding.BL/AutoUpdates/AutoUpdateDetector.cs

@@ -0,0 +1,17 @@
+namespace VisualPairCoding.BL.AutoUpdates
+{
+    public static class AutoUpdateDetector
+    {
+        private static bool explicitUpdate = false;
+
+        public static void setUpdateIsAvailable()
+        {
+            explicitUpdate = true;
+        }
+        public static bool isUpdateAvailable()
+        {
+            if (explicitUpdate) return true;
+            return VersionInformation.Version != "$$VERSION$$";
+        }
+    }
+}

Source/VisualPairCoding/VisualPairCoding.Infrastructure/AutoUpdater.cs

@@ -43,17 +43,24 @@ public void Update()
 
         using (WebClient downloadClient = new())
         {
-            downloadClient.DownloadFile(releases[0].Assets[0].Browser_download_url, releases[0].Assets[0].Name);
+            var asset = releases[0].Assets.FirstOrDefault(x => x.Name.Contains("win-x64"));
+
+            if (asset == null) {
+                throw new Exception("Update not found");
+            }
+
+            downloadClient.DownloadFile(asset.Browser_download_url, asset.Name);
         }
 
         var cwd = Environment.CurrentDirectory;
         string path = cwd + "\\" + "updater.ps1";
 
         var script =
             @"
+Write-Host ""Update is executed, please wait a second...""
+Start-Sleep -Seconds 1
 Set-Location $PSScriptRoot
 $ErrorActionPreference = ""Stop""
-
 Start-Sleep -Seconds 5
 
 $Successful = $false
@@ -67,9 +74,9 @@ public void Update()
     }
 }
 
-Start-Process ""VisualPairCoding.WinForms.exe""
 Remove-Item -Path ""$pwd\VisualPairCoding-win-x64.zip"" -Force
 Remove-Item -Path ""$pwd\updater.ps1"" -Force
+Start-Process ""$pwd\VisualPairCoding.AvaloniaUI.exe""
 ";
 
         if (!File.Exists(path))