Visitar URL original
Fix `Resolve-Path -Relative` output for dot-prefixed names by daxian-dbw · Pull Request #28087 · PowerShell/PowerShell · GitHub
Skip to content

Fix Resolve-Path -Relative output for dot-prefixed names #28087

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

Merged
Dongbo Wang (daxian-dbw) merged 4 commits into from
Oct 9, 2026
Merged

Fix Resolve-Path -Relative output for dot-prefixed names #28087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
afaceaa
Fix Resolve-Path output for dot-prefixed names
daxian-dbw Sep 24, 2026
c55be01
Add Resolve-Path coverage for two-dot names
daxian-dbw Sep 24, 2026
0bfc92d
Add multi-result Resolve-Path coverage
daxian-dbw Sep 24, 2026
a164d65
Simplify relative path token check
daxian-dbw Sep 28, 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
15 changes: 14 additions & 1 deletion src/Microsoft.PowerShell.Commands.Management/commands/management/ResolvePathCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,19 @@ public override SwitchParameter Force

#endregion parameter data

private static bool StartsWithRelativePathToken(string path, ProviderInfo provider)
{
if (path.Length == 0 || path[0] != '.')
{
return false;
}

int separatorIndex = path.Length > 1 && path[1] == '.' ? 2 : 1;
return path.Length == separatorIndex ||
path[separatorIndex] == provider.ItemSeparator ||
path[separatorIndex] == provider.AltItemSeparator;
}
Comment thread
daxian-dbw marked this conversation as resolved.

#region Command code

/// <summary>
Expand Down Expand Up @@ -233,7 +246,7 @@ protected override void ProcessRecord()
// Do not insert './' if result path is not relative
if (!adjustedPath.StartsWith(
currentPath.Drive?.Root ?? currentPath.Path, StringComparison.OrdinalIgnoreCase) &&
!adjustedPath.StartsWith('.'))
!StartsWithRelativePathToken(adjustedPath, currentPath.Provider))
{
adjustedPath = SessionState.Path.Combine(".", adjustedPath);
}
Expand Down
25 changes: 25 additions & 0 deletions test/powershell/Modules/Microsoft.PowerShell.Management/Resolve-Path.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,31 @@ Describe "Resolve-Path returns proper path" -Tag "CI" {
Pop-Location
}
}

It "Resolve-Path -Relative prepends the current directory to every result" {
$directoryNames = ".directory", "..directory", "directory"
Comment thread
daxian-dbw marked this conversation as resolved.
foreach ($directoryName in $directoryNames) {
$directory = New-Item -Path (Join-Path $TestDrive $directoryName) -ItemType Directory
$null = New-Item -Path $directory -Name "file1.txt" -ItemType File
$null = New-Item -Path $directory -Name "file2.txt" -ItemType File
}

try {
Push-Location -Path $TestDrive
foreach ($directoryName in $directoryNames) {
$expected = @(
Join-Path "." $directoryName "file1.txt"
Join-Path "." $directoryName "file2.txt"
)
Resolve-Path -Path (Join-Path $directoryName "*.txt") -Relative |
Should -BeExactly $expected
}
}
finally {
Pop-Location
}
}

It 'Resolve-Path RelativeBasePath should handle <Scenario>' -TestCases @(
@{
Scenario = "Absolute Path, Absolute ReleativeBasePath"
Expand Down
Loading