Correct update process

xmegz · Apr 2, 2024 · d9b7cfa · d9b7cfa
1 parent 4e421df
commit d9b7cfa
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/MndpTray/MndpTray.Core/Update/Methods.cs b/MndpTray/MndpTray.Core/Update/Methods.cs
@@ -101,11 +101,10 @@ public static void UpdateProgram(string fileName, byte[] data)
         private static T DeserializeResponse<T>(string data)
         {
             var instance = Activator.CreateInstance<T>();
-            using (var ms = new MemoryStream(Encoding.Unicode.GetBytes(data)))
-            {
-                var serializer = new DataContractJsonSerializer(instance.GetType());
-                return (T)serializer.ReadObject(ms);
-            }
+            using var ms = new MemoryStream(Encoding.Unicode.GetBytes(data));
+
+            var serializer = new DataContractJsonSerializer(instance.GetType());
+            return (T)serializer.ReadObject(ms);
         }
 
         private static release GetMaxRelease(List<release> list)
@@ -194,7 +193,7 @@ private static string GetReleasesFromApi(string author, string repositoryName)
 
         private static List<int> GetReleaseVersion(release data)
         {
-            List<int> ret = new List<int>();
+            List<int> ret = [];
 
             if (data == null)
             {

diff --git a/MndpTray/MndpTray.Core/Visual/NotifyContext.cs b/MndpTray/MndpTray.Core/Visual/NotifyContext.cs
@@ -6,6 +6,7 @@
 namespace MndpTray.Core
 {
     using System;
+    using System.Diagnostics;
     using System.IO;
     using System.Reflection;
     using System.Threading;
@@ -80,6 +81,7 @@ private void Send_Click(object sender, System.EventArgs e)
             MndpSender.Instance.SendHostInfoNow();
         }
 
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "CA1839:Use 'Environment.ProcessPath'", Justification = "<Pending>")]
         private void Update_Click(object sender, System.EventArgs e)
         {
             string repositoryName = "MndpTray";
@@ -95,7 +97,8 @@ private void Update_Click(object sender, System.EventArgs e)
                 if (res == DialogResult.Yes)
                 {
                     byte[] data = Update.Methods.DownloadBinary(url);
-                    Update.Methods.UpdateProgram(Path.GetFullPath(Environment.ProcessPath), data);
+                    string processFileName = Process.GetCurrentProcess().MainModule.FileName;
+                    Update.Methods.UpdateProgram(Path.GetFullPath(processFileName), data);
 
                     MessageBox.Show("Update successful, please restart application!", "Update", MessageBoxButtons.OK, MessageBoxIcon.Information);
                 }