From 0ede9308947dd99cb74a7b588096dae988f493ec Mon Sep 17 00:00:00 2001
From: Phillip Hoff <phillip@orst.edu>
Date: Wed, 1 Dec 2021 11:48:25 -0800
Subject: [PATCH] Generally kill both parent and their child processes.

---
 src/Microsoft.Tye.Core/ProcessExtensions.cs | 2 +-
 src/Microsoft.Tye.Core/ProcessUtil.cs       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Microsoft.Tye.Core/ProcessExtensions.cs b/src/Microsoft.Tye.Core/ProcessExtensions.cs
index cd7826a67..0c75938e5 100644
--- a/src/Microsoft.Tye.Core/ProcessExtensions.cs
+++ b/src/Microsoft.Tye.Core/ProcessExtensions.cs
@@ -117,7 +117,7 @@ public static void RunProcessAndWaitForExit(string fileName, string arguments, T
             }
             else
             {
-                process?.Kill();
+                process?.Kill(entireProcessTree: true);
             }
         }
     }
diff --git a/src/Microsoft.Tye.Core/ProcessUtil.cs b/src/Microsoft.Tye.Core/ProcessUtil.cs
index c89c4943e..3df6303dc 100644
--- a/src/Microsoft.Tye.Core/ProcessUtil.cs
+++ b/src/Microsoft.Tye.Core/ProcessUtil.cs
@@ -165,7 +165,7 @@ public static async Task<ProcessResult> RunAsync(
                 {
                     if (!process.CloseMainWindow())
                     {
-                        process.Kill();
+                        process.Kill(entireProcessTree: true);
                     }
                 }
 
@@ -177,7 +177,7 @@ public static async Task<ProcessResult> RunAsync(
 
                     if (!process.HasExited)
                     {
-                        process.Kill();
+                        process.Kill(entireProcessTree: true);
                     }
                 }
             }
@@ -197,7 +197,7 @@ public static void KillProcess(int pid)
             try
             {
                 using var process = Process.GetProcessById(pid);
-                process?.Kill();
+                process?.Kill(entireProcessTree: true);
             }
             catch (ArgumentException) { }
             catch (InvalidOperationException) { }