Mirrors/velopack
1
0
Fork 0
mirror of https://github.com/velopack/velopack.git synced 2025-10-25 15:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hopefully fix CI deadlock

Browse Source
This commit is contained in:
Caelan Sayler
2024-07-27 22:27:38 +01:00
parent e2a1f5effd
commit 10306c03ad
1 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/Velopack.Packaging/Exe.cs
View File

@@ -1,4 +1,5 @@
using System.Diagnostics; using System.Diagnostics;
using System.Text;
using Velopack.Packaging.Exceptions; using Velopack.Packaging.Exceptions;
namespace Velopack.Packaging; namespace Velopack.Packaging;
@@ -76,6 +77,27 @@ public static class Exe
public static (int ExitCode, string StdOutput) InvokeProcess(ProcessStartInfo psi, CancellationToken ct) public static (int ExitCode, string StdOutput) InvokeProcess(ProcessStartInfo psi, CancellationToken ct)
{ {
var pi = Process.Start(psi); var pi = Process.Start(psi);
var process = new Process();
process.StartInfo = psi;
var sOut = new StringBuilder();
var sErr = new StringBuilder();
pi.OutputDataReceived += (sender, e) => {
if (e.Data != null) sOut.AppendLine(e.Data);
};
pi.ErrorDataReceived += (sender, e) => {
if (e.Data != null) sErr.AppendLine(e.Data);
};
if (!pi.Start())
throw new Exception("Failed to start process");
pi.BeginOutputReadLine();
pi.BeginErrorReadLine();
while (!ct.IsCancellationRequested) { while (!ct.IsCancellationRequested) {
if (pi.WaitForExit(500)) break; if (pi.WaitForExit(500)) break;
} }
@@ -85,14 +107,12 @@ public static class Exe
ct.ThrowIfCancellationRequested(); ct.ThrowIfCancellationRequested();
} }
string output = pi.StandardOutput.ReadToEnd(); var all = (sOut.ToString().Trim()) + Environment.NewLine + (sOut.ToString().Trim());
string error = pi.StandardError.ReadToEnd();
var all = (output ?? "") + Environment.NewLine + (error ?? "");
return (pi.ExitCode, all.Trim()); return (pi.ExitCode, all.Trim());
} }
public static (int ExitCode, string StdOutput, string Command) InvokeProcess(string fileName, IEnumerable<string> args, string workingDirectory, CancellationToken ct = default, IDictionary<string, string> envVar = null) public static (int ExitCode, string StdOutput, string Command) InvokeProcess(string fileName, IEnumerable<string> args, string workingDirectory, CancellationToken ct = default,
IDictionary<string, string> envVar = null)
{ {
var psi = CreateProcessStartInfo(fileName, workingDirectory); var psi = CreateProcessStartInfo(fileName, workingDirectory);
if (envVar != null) { if (envVar != null) {
@@ -100,6 +120,7 @@ public static class Exe
psi.EnvironmentVariables[kvp.Key] = kvp.Value; psi.EnvironmentVariables[kvp.Key] = kvp.Value;
} }
} }
psi.AppendArgumentListSafe(args, out var argString); psi.AppendArgumentListSafe(args, out var argString);
var p = InvokeProcess(psi, ct); var p = InvokeProcess(psi, ct);
return (p.ExitCode, p.StdOutput, $"{fileName} {argString}"); return (p.ExitCode, p.StdOutput, $"{fileName} {argString}");
@@ -117,4 +138,4 @@ public static class Exe
psi.WorkingDirectory = workingDirectory ?? Environment.CurrentDirectory; psi.WorkingDirectory = workingDirectory ?? Environment.CurrentDirectory;
return psi; return psi;
} }
} }