Skip to content

Stop altering the PATH env variable by honoring the PSHome path in CommandDiscovery #27757

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Dongbo Wang (daxian-dbw) wants to merge 10 commits into from
Closed

Stop altering the PATH env variable by honoring the PSHome path in CommandDiscovery #27757

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c981321
Stop altering the PATH env variable but honor the PSHome path in Comm…
daxian-dbw Aug 3, 2026
57ab3f0
Minor change
daxian-dbw Aug 3, 2026
9da7c31
Skip duplicate path of $PSHOME
daxian-dbw Aug 3, 2026
201b9ac
Address Copilot feedback
daxian-dbw Aug 3, 2026
c91cf83
Fix a Start-Process test
daxian-dbw Aug 3, 2026
dedfa78
Detect hosted PowerShell
daxian-dbw Aug 5, 2026
0fc9ec5
Small update
daxian-dbw Aug 5, 2026
09c0e34
Rename _psHome to _psExeHome to differentiate it from $PSHOME
daxian-dbw Aug 5, 2026
1cf844b
Revert code changes
daxian-dbw Aug 10, 2026
75a101a
Revert test changes
daxian-dbw Aug 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 30 additions & 41 deletions src/System.Management.Automation/engine/CommandDiscovery.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1199,63 +1199,57 @@ internal void UnregisterLookupCommandInfoAction(string currentAction, string com
/// </remarks>
internal LookupPathCollection GetLookupDirectoryPaths()
{
LookupPathCollection result = new LookupPathCollection();

string path = Environment.GetEnvironmentVariable("PATH");
discoveryTracer.WriteLine("PATH: {0}", path);

discoveryTracer.WriteLine(
"PATH: {0}",
path);

bool isPathCacheValid =
path != null &&
string.Equals(_pathCacheKey, path, StringComparison.OrdinalIgnoreCase) &&
_cachedPath != null;
bool isPathCacheValid = _cachedLookupPaths is not null
&& string.Equals(_pathCacheKey, path, StringComparison.OrdinalIgnoreCase);

if (!isPathCacheValid)
{
// Reset the cached lookup paths
_pathCacheKey = null;
Comment thread
daxian-dbw marked this conversation as resolved.
Resolved
_cachedLookupPaths = null;

// Tokenize the path and cache it

_pathCacheKey = path;

if (_pathCacheKey != null)
if (path is null)
{
// Cache an empty collection when PATH is null (unset).
_cachedLookupPaths = new LookupPathCollection();
}
else
{
// Tokenize the path and cache it
_pathCacheKey = path;
string[] tokenizedPath = _pathCacheKey.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries);
_cachedPath = new Collection<string>();
List<string> pathList = new(capacity: tokenizedPath.Length);

foreach (string directory in tokenizedPath)
{
string tempDir = directory.TrimStart();
if (tempDir.EqualsOrdinalIgnoreCase("~"))
string tempDir = directory.Trim();
if (tempDir.StartsWith('~'))
{
tempDir = Environment.GetFolderPath(
string homeDir = Environment.GetFolderPath(
Environment.SpecialFolder.UserProfile,
Environment.SpecialFolderOption.DoNotVerify);
}
else if (tempDir.StartsWith("~" + Path.DirectorySeparatorChar))
{
tempDir = Environment.GetFolderPath(
Environment.SpecialFolder.UserProfile,
Environment.SpecialFolderOption.DoNotVerify)
+ Path.DirectorySeparatorChar
+ tempDir.Substring(2);

if (tempDir.Length is 1)
{
tempDir = homeDir;
}
else if (tempDir[1] == Path.DirectorySeparatorChar)
{
tempDir = $"{homeDir}{Path.DirectorySeparatorChar}{tempDir.AsSpan(2)}";
}
}

_cachedPath.Add(tempDir);
result.Add(tempDir);
pathList.Add(tempDir);
}

// Cache the new lookup paths.
_cachedLookupPaths = new LookupPathCollection(pathList);
}
}
else
{
result.AddRange(_cachedPath);
}

// Cache the new lookup paths
return _cachedLookupPaths ??= result;
return _cachedLookupPaths;
}

/// <summary>
Expand All @@ -1269,11 +1263,6 @@ internal LookupPathCollection GetLookupDirectoryPaths()
/// </summary>
private string _pathCacheKey;

/// <summary>
/// The cache of the tokenized PATH directories.
/// </summary>
private Collection<string> _cachedPath;

#endregion internal members

#region environment variable helpers
Expand Down
Loading