From 6c782afd6f20d114c6136e0ad85376db177f6d78 Mon Sep 17 00:00:00 2001 From: Caelan Sayler Date: Sat, 20 Aug 2022 13:22:25 +0100 Subject: [PATCH] Stop redirecting std output in csq --- src/Squirrel.Tool/Program.cs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/Squirrel.Tool/Program.cs b/src/Squirrel.Tool/Program.cs index 6ef4d6288..d934e111c 100644 --- a/src/Squirrel.Tool/Program.cs +++ b/src/Squirrel.Tool/Program.cs @@ -171,7 +171,7 @@ static int RunCsqFromPath(string toolRootPath, string[] args) var cliPath = Path.Combine(toolRootPath, "Squirrel.CommandLine.dll"); var dnargs = new[] { cliPath }.Concat(args).ToArray(); Write("running dotnet " + String.Join(" ", dnargs), true); - return PlatformUtil.InvokeProcess("dotnet", dnargs, Environment.CurrentDirectory, CancellationToken.None).ExitCode; + return RunProcess("dotnet", dnargs); } // v3.0 - v3.0.170 @@ -179,7 +179,7 @@ static int RunCsqFromPath(string toolRootPath, string[] args) if (File.Exists(toolDllPath)) { var dnargs = new[] { toolDllPath, "--csq-embedded" }.Concat(args).ToArray(); Write("running dotnet " + String.Join(" ", dnargs), true); - return PlatformUtil.InvokeProcess("dotnet", dnargs, Environment.CurrentDirectory, CancellationToken.None).ExitCode; + return RunProcess("dotnet", dnargs); } // < v3.0 @@ -189,12 +189,19 @@ static int RunCsqFromPath(string toolRootPath, string[] args) throw new NotSupportedException( $"Squirrel at '{toolRootPath}' does not support this operating system. Please update the package version to >= 3.0"); Write("running " + toolExePath + " " + String.Join(" ", args), true); - return PlatformUtil.InvokeProcess(toolExePath, args, Environment.CurrentDirectory, CancellationToken.None).ExitCode; + return RunProcess(toolExePath, args); } throw new Exception("Unable to locate Squirrel at: " + toolRootPath); } + static int RunProcess(string path, string[] args) + { + var p = Process.Start(path, args); + p.WaitForExit(); + return p.ExitCode; + } + static IEnumerable GetPackageVersionsFromDir(string rootDir, string packageName) { // old-style framework packages.config