Skip to content

Fix path handling bug in PSTask #12554

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
adityapatwardhan merged 5 commits into from
May 14, 2020
Merged

Fix path handling bug in PSTask #12554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1596c5c
Add ForEach-Object -Parallel path test for wildcard $PWD
IISResetMe May 2, 2020
323cceb
Fix #12428 incorrect literal path handling
IISResetMe May 2, 2020
7300d82
Update test/powershell/Modules/Microsoft.PowerShell.Utility/Foreach-O…
IISResetMe May 4, 2020
9aa2710
Fix style issues
IISResetMe May 4, 2020
23567c8
Merge branch 'fix/ForEach-Object-Parallel-path-test' of https://githu…
IISResetMe May 4, 2020
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
7 changes: 6 additions & 1 deletion src/System.Management.Automation/engine/hostifaces/PSTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,12 @@ public void Start(Runspace runspace)
try
{
Runspace.DefaultRunspace = runspace;
runspace.ExecutionContext.SessionState.Internal.SetLocation(_currentLocationPath);
var context = new CmdletProviderContext(runspace.ExecutionContext)
{
// _currentLocationPath denotes the current path as-is, and should not be attempted expanded.
SuppressWildcardExpansion = true
};
runspace.ExecutionContext.SessionState.Internal.SetLocation(_currentLocationPath, context);
}
catch (DriveNotFoundException)
{
Expand Down
21 changes: 21 additions & 0 deletions test/powershell/Modules/Microsoft.PowerShell.Utility/Foreach-Object-Parallel.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,27 @@ Describe 'ForEach-Object -Parallel Basic Tests' -Tags 'CI' {
$parallelScriptLocation.Path | Should -BeExactly $PWD.Path
}

It 'Verifies that the current working directory can have wildcards in its name' {
$oldLocation = Get-Location

$wildcardName = New-Item -Path 'TestDrive:\' -Name '[' -ItemType Directory
Set-Location -LiteralPath $wildcardName.FullName
try
{
{ 1..1 | ForEach-Object -Parallel { $PWD } } | Should -Not -Throw

$wildcardPathResult = 1..1 | ForEach-Object -Parallel { $PWD }
$wildcardPathResult.Path | Should -BeExactly $PWD.Path
}
finally
{
Set-Location -Path $oldLocation
if ($drive -is [System.IO.DirectoryInfo]) {
$drive | Remove-Item -Force
}
}
}

It 'Verifies no terminating error if current working drive is not found' {
$oldLocation = Get-Location
try
Expand Down