Stop redirecting std output in csq

clowd · Aug 20, 2022 · 6c782af · 6c782af
1 parent 0e8cbea
commit 6c782af
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/Squirrel.Tool/Program.cs b/src/Squirrel.Tool/Program.cs
@@ -171,15 +171,15 @@ 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
             var toolDllPath = Path.Combine(toolRootPath, "csq.dll");
             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<string> GetPackageVersionsFromDir(string rootDir, string packageName)
         {
             // old-style framework packages.config