Fix UniGetUI not detecting certain executables present on system path…

… but not on user (fix #2886, related to 2298)
marticliment · Feb 10, 2025 · 5f396ee · 5f396ee
1 parent f4e466f
commit 5f396ee
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -2,7 +2,7 @@
     <PropertyGroup>
         <ImplicitUsings>enable</ImplicitUsings>
         <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
-        <WindowsSdkPackageVersion>10.0.26100.56</WindowsSdkPackageVersion>
+        <WindowsSdkPackageVersion>10.0.26100.57</WindowsSdkPackageVersion>
         <SdkVersion>8.0.405</SdkVersion>
         <Authors>Martí Climent and the contributors</Authors>
         <PublisherName>Martí Climent</PublisherName>

diff --git a/src/UniGetUI.Core.Tools/Tools.cs b/src/UniGetUI.Core.Tools/Tools.cs
@@ -88,6 +88,12 @@ public static Tuple<bool, string> Which(string command, bool updateEnv = true)
         {
             command = command.Replace(";", "").Replace("&", "").Trim();
             Logger.Debug($"Begin \"which\" search for command {command}");
+
+            string PATH = Environment.GetEnvironmentVariable("PATH", EnvironmentVariableTarget.User) + ";";
+            PATH += Environment.GetEnvironmentVariable("PATH", EnvironmentVariableTarget.Machine) + ";";
+            PATH += Environment.GetEnvironmentVariable("PATH", EnvironmentVariableTarget.Process);
+            PATH = PATH.Replace(";;", ";").Trim(';');
+
             Process process = new()
             {
                 StartInfo = new ProcessStartInfo
@@ -106,6 +112,7 @@ public static Tuple<bool, string> Which(string command, bool updateEnv = true)
             {
                 process.StartInfo = UpdateEnvironmentVariables(process.StartInfo);
             }
+            process.StartInfo.Environment["PATH"] = PATH;
 
             try
             {