Skip to content

Fix setting original path of filesystem object to not have extra trailing slash #10959

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
iSazonov merged 2 commits into from
Nov 2, 2019
Merged

Fix setting original path of filesystem object to not have extra trailing slash #10959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ba8bdc
Fix setting original path of filesystem object to not have extra trai…
SteveL-MSFT Oct 31, 2019
fba8122
Address Ilya's feedback
SteveL-MSFT Nov 2, 2019
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
12 changes: 6 additions & 6 deletions src/System.Management.Automation/namespaces/FileSystemProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,12 @@ private static string GetCorrectCasedPath(string path)
else if (string.IsNullOrEmpty(item))
{
// This handles the trailing slash case
continue;
if (!exactPath.EndsWith(StringLiterals.DefaultPathSeparator))
{
exactPath += StringLiterals.DefaultPathSeparator;
}

break;
}
else if (item.Contains('~'))
{
Expand All @@ -159,11 +164,6 @@ private static string GetCorrectCasedPath(string path)
}
}

if (path.EndsWith(StringLiterals.DefaultPathSeparator))
{
return exactPath + StringLiterals.DefaultPathSeparator;
}

return exactPath;
}
else
Expand Down
5 changes: 5 additions & 0 deletions test/powershell/Modules/Microsoft.PowerShell.Management/Get-Item.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,11 @@ Describe "Get-Item" -Tags "CI" {
$result.Exists | Should -BeTrue
}

It "Should return correct result for ToString() on root of drive" {
$root = $IsWindows ? "${env:SystemDrive}\" : "/"
(Get-Item -Path $root).ToString() | Should -BeExactly $root
}

Context "Test for Include, Exclude, and Filter" {
BeforeAll {
${testBaseDir} = "${TESTDRIVE}/IncludeExclude"
Expand Down