Now using extracted method to build arguments for msi installer too.

ravibpatel · Apr 29, 2023 · 7796d0b · 7796d0b
1 parent 9632536
commit 7796d0b
Showing 1 changed file with 9 additions and 38 deletions.
diff --git a/AutoUpdater.NET/DownloadUpdateDialog.cs b/AutoUpdater.NET/DownloadUpdateDialog.cs
@@ -186,7 +186,6 @@ private void WebClientOnDownloadFileCompleted(object sender, AsyncCompletedEvent
                     UseShellExecute = true
                 };
 
-#if NETFRAMEWORK
                 var arguments = new Collection<string>
                 {
                     "--input",
@@ -216,54 +215,26 @@ private void WebClientOnDownloadFileCompleted(object sender, AsyncCompletedEvent
                 }
 
                 processStartInfo.Arguments = Utils.BuildArguments(arguments);
-#else
-                processStartInfo.ArgumentList.Add("--input");
-                processStartInfo.ArgumentList.Add(tempPath);
-                processStartInfo.ArgumentList.Add("--output");
-                processStartInfo.ArgumentList.Add(extractionPath);
-                processStartInfo.ArgumentList.Add("--current-exe");
-                processStartInfo.ArgumentList.Add(currentExe);
-
-                if (!string.IsNullOrWhiteSpace(updatedExe))
-                {
-                    processStartInfo.ArgumentList.Add("--updated-exe");
-                    processStartInfo.ArgumentList.Add(updatedExe);
-                }
-
-                if (AutoUpdater.ClearAppDirectory)
-                {
-                    processStartInfo.ArgumentList.Add("--clear");
-                }
-
-                string[] args = Environment.GetCommandLineArgs();
-                if (args.Length > 0)
-                {
-                    string arguments = string.Join(" ", args.Skip(1).Select(arg => $"\"{arg}\""));
-                    processStartInfo.ArgumentList.Add("--args");
-                    processStartInfo.ArgumentList.Add(arguments);
-                }
-#endif
             }
             else if (extension.Equals(".msi", StringComparison.OrdinalIgnoreCase))
             {
                 processStartInfo = new ProcessStartInfo
                 {
                     FileName = "msiexec"
                 };
-#if NETFRAMEWORK
-                processStartInfo.Arguments = $"/i \"{tempPath}\"";
-                if (!string.IsNullOrEmpty(installerArgs))
+
+                var arguments = new Collection<string>
                 {
-                    processStartInfo.Arguments += $" {installerArgs}";
-                }
-#else
-                processStartInfo.ArgumentList.Add("/i");
-                processStartInfo.ArgumentList.Add(tempPath);
+                    "/i",
+                    tempPath
+                };
+
                 if (!string.IsNullOrEmpty(installerArgs))
                 {
-                    processStartInfo.ArgumentList.Add(installerArgs);
+                    arguments.Add(installerArgs);
                 }
-#endif
+
+                processStartInfo.Arguments = Utils.BuildArguments(arguments);
             }
 
             if (AutoUpdater.RunUpdateAsAdmin)