Address comment and try to fix test in CI

daxian-dbw · daxian-dbw · commit 4f81f7162510 · 2025-08-14T10:57:07.000-07:00
diff --git a/src/System.Management.Automation/engine/NativeCommandProcessor.cs b/src/System.Management.Automation/engine/NativeCommandProcessor.cs
@@ -332,8 +332,8 @@ private static void UpdateProcessEnvPath(string oldUserPath, string oldSystemPat
             string newSystemEnvPath = Environment.GetEnvironmentVariable("Path", EnvironmentVariableTarget.Machine);
             string procEnvPath = Environment.GetEnvironmentVariable("Path");
 
-            ReadOnlySpan<char> userPathChange = GetAddedPartOfString(oldUserPath, newUserEnvPath).TrimEnd(';');
-            ReadOnlySpan<char> systemPathChange = GetAddedPartOfString(oldSystemPath, newSystemEnvPath).TrimEnd(';');
+            ReadOnlySpan<char> userPathChange = GetAddedPartOfString(oldUserPath, newUserEnvPath).Trim(';');
+            ReadOnlySpan<char> systemPathChange = GetAddedPartOfString(oldSystemPath, newSystemEnvPath).Trim(';');
 
             // Add 2 to account for the path separators we may need to add.
             int maxLength = procEnvPath.Length + userPathChange.Length + systemPathChange.Length + 2;
@@ -361,12 +361,6 @@ void CreateNewProcEnvPath(ReadOnlySpan<char> newChange)
                 newPath ??= new StringBuilder(procEnvPath, capacity: maxLength);
 
                 if (newPath.Length is 0 || newPath[^1] is ';')
-                {
-                    newPath.Append(newChange[0] is ';'
-                        ? newChange.Slice(1)
-                        : newChange);
-                }
-                else if (newChange[0] is ';')
                 {
                     newPath.Append(newChange);
                 }
diff --git a/test/powershell/Language/Scripting/NativeExecution/NativeCommandPathUpdate.Tests.ps1 b/test/powershell/Language/Scripting/NativeExecution/NativeCommandPathUpdate.Tests.ps1
@@ -70,18 +70,18 @@ function UpdatePackageManager {
         [string] $Name
     )
 
-    try {
-        $regKey = [Microsoft.Win32.Registry]::LocalMachine.OpenSubKey('Software\Microsoft\Command Processor\KnownPackageManagers', $true)
+    $regKeyPath = 'HKLM:\Software\Microsoft\Command Processor\KnownPackageManagers'
+    $keyExists = Test-Path -Path $regKeyPath
+    if (-not $keyExists) {
+        Write-Host -ForegroundColor Cyan "The registry key 'KnownPackageManagers' doesn't exist."
+    }
 
-        if ($Add) {
-            $null = $regKey.CreateSubKey($Name)
-        }
-        elseif ($Remove) {
-            $regKey.DeleteSubKey($Name)
-        }
+    $subKeyPath = "$regKeyPath\$Name"
+    if ($Add) {
+        $null = New-Item $subKeyPath -Force -ErrorAction Stop
     }
-    finally {
-        ${regKey}?.Dispose()
+    elseif ($Remove -and $keyExists) {
+        Remove-Item $subKeyPath -Recurse -Force -ErrorAction Stop
     }
 }
 
