Improved upgrade

https://github.com/2dust/v2rayN/issues/6102

v2rayN/AmazTool/UpgradeApp.cs

@@ -10,7 +10,7 @@ namespace AmazTool
         {
             Console.WriteLine($"{LocalizationHelper.GetLocalizedValue("Start_Unzipping")}\n{fileName}");
 
-            Thread.Sleep(9000);
+            Waiting(9);
 
             if (!File.Exists(fileName))
             {
@@ -23,11 +23,15 @@ namespace AmazTool
             {
                 var existing = Process.GetProcessesByName(V2rayN);
                 foreach (var pp in existing)
+                {
+                    var path = pp.MainModule?.FileName ?? "";
+                    if (path.StartsWith(GetPath(V2rayN)))
                     {
                         pp?.Kill();
                         pp?.WaitForExit(1000);
                     }
                 }
+            }
             catch (Exception ex)
             {
                 // Access may be denied without admin right. The user may not be an administrator.
@@ -87,7 +91,7 @@ namespace AmazTool
             }
 
             Console.WriteLine(LocalizationHelper.GetLocalizedValue("Restart_v2rayN"));
-            Thread.Sleep(9000);
+            Waiting(9);
             Process process = new()
             {
                 StartInfo = new()
@@ -120,6 +124,15 @@ namespace AmazTool
             return Path.Combine(startupPath, fileName);
         }
 
+        private static void Waiting(int second)
+        {
+            for (var i = second; i > 0; i--)
+            {
+                Console.WriteLine(i);
+                Thread.Sleep(1000);
+            }
+        }
+
         private static string V2rayN => "v2rayN";
     }
 }

v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs

@@ -324,6 +324,7 @@ namespace ServiceLib.ViewModels
             if (process.Id > 0)
             {
                 await MyAppExitAsync(false);
+                await MyAppExitAsync(false);
             }
         }