Skip to content

Handle exception if enumerating files fails when rebuilding path to have correct casing #11014

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

Handle exception if enumerating files fails when rebuilding path to have correct casing #11014

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
9a9d4c3
Handle exception if enumerating files fails when rebuilding path to h…
SteveL-MSFT Nov 7, 2019
e2485d3
Update test/powershell/Modules/Microsoft.PowerShell.Management/FileSy…
SteveL-MSFT Nov 8, 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
18 changes: 13 additions & 5 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 @@ -161,14 +161,22 @@ private static string GetCorrectCasedPath(string path)
else
{
// Use GetFileSystemEntries to get the correct casing of this element
var entries = Directory.GetFileSystemEntries(exactPath, item);
if (entries.Length > 0)
try
{
exactPath = entries.First();
var entries = Directory.GetFileSystemEntries(exactPath, item);
if (entries.Length > 0)
{
exactPath = entries.First();
}
else
{
// If previous call didn't return anything, something failed so we just return the path we were given
return path;
}
}
else
catch
{
// If previous call didn't return anything, something failed so we just return the path we were given
// If we can't enumerate, we stop and just return the original path
return path;
}
}
Expand Down
17 changes: 17 additions & 0 deletions test/powershell/Modules/Microsoft.PowerShell.Management/FileSystem.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,23 @@ Describe "Basic FileSystem Provider Tests" -Tags "CI" {
}
}

Context "Appx path" {
BeforeAll {
$skipTest = $true
if ($IsWindows -and (Get-Command -Name Get-AppxPackage) -and (Get-AppxPackage Microsoft.WindowsCalculator)) {
$skipTest = $false
}
}

It "Can get an appx package item" -Skip:$skipTest {
$pkgDir = (Get-AppxPackage)[0].InstallLocation

Get-Item $pkgDir\Calculator.exe -ErrorAction Stop | Should -BeOfType [System.IO.FileInfo]
Get-Item -Path $pkgDir -ErrorAction Stop | Should -BeOfType [System.IO.DirectoryInfo]
Get-ChildItem -Path $pkgDir -ErrorAction Stop | Should -Not -BeNullOrEmpty
}
}

Context "Validate basic host navigation functionality" {
BeforeAll {
#build semi-complex directory structure to test navigation within
Expand Down