From 1cb805c850fa94fed24ebd68f89dd4e65018cf30 Mon Sep 17 00:00:00 2001
From: "Zhaopeng Wang (from Dev Box)" <zhaopengwang@microsoft.com>
Date: Mon, 26 May 2025 21:52:09 +0800
Subject: [PATCH] fix error

---
 .pipelines/v2/templates/steps-ensure-dotnet-version.yml | 3 ---
 src/common/UITestAutomation/UITestBase.cs               | 7 +------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/.pipelines/v2/templates/steps-ensure-dotnet-version.yml b/.pipelines/v2/templates/steps-ensure-dotnet-version.yml
index 9a2324d84e..b327b8004f 100644
--- a/.pipelines/v2/templates/steps-ensure-dotnet-version.yml
+++ b/.pipelines/v2/templates/steps-ensure-dotnet-version.yml
@@ -22,9 +22,6 @@ steps:
     }
     $NEW_DOTNET_ROOT = "$(Agent.ToolsDirectory)\dotnet"
     & ./dotnet-install.ps1 -Channel "${{parameters.version}}" -InstallDir $NEW_DOTNET_ROOT
-    & ./dotnet-install.ps1 -Channel "${{parameters.version}}" -InstallDir $NEW_DOTNET_ROOT -Runtime "windowsdesktop"
-    & ./dotnet-install.ps1 -Channel "${{parameters.version}}"
-    & ./dotnet-install.ps1 -Channel "${{parameters.version}}" -Runtime "windowsdesktop"
     Write-Host "##vso[task.setvariable variable=DOTNET_ROOT]${NEW_DOTNET_ROOT}"
     Write-Host "##vso[task.prependpath]${NEW_DOTNET_ROOT}"
     Remove-Item dotnet-install.ps1 -ErrorAction:Ignore
diff --git a/src/common/UITestAutomation/UITestBase.cs b/src/common/UITestAutomation/UITestBase.cs
index 9ff7be60e2..ed9c2d3bcf 100644
--- a/src/common/UITestAutomation/UITestBase.cs
+++ b/src/common/UITestAutomation/UITestBase.cs
@@ -484,12 +484,7 @@ namespace Microsoft.PowerToys.UITest
             };
             foreach (var processName in processNamesToClose)
             {
-                var processes = Process.GetProcessesByName(processName);
-                foreach (var process in processes)
-                {
-                    process.Kill();
-                    process.WaitForExit();
-                }
+                Session.KillAllProcessesByName(processName);
             }
         }