Skip to content

Fix Start-Job working directory path with trailing back slash #11041

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 4 commits into from
Nov 16, 2019
Merged

Fix Start-Job working directory path with trailing back slash #11041

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
1c4b98c
Fix Start-Job working directory with trailing back slash
PaulHigin Nov 11, 2019
e1d29dc
CR feedback.
PaulHigin Nov 12, 2019
9f81dd5
Use StartInfo.ArgumentList for start-job process arguments.
PaulHigin Nov 13, 2019
46be165
Remove unneeded quote escaping
PaulHigin Nov 13, 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
48 changes: 21 additions & 27 deletions src/System.Management.Automation/engine/hostifaces/PowerShellProcessInstance.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,38 +50,11 @@ static PowerShellProcessInstance()
/// <param name="workingDirectory">Specifies the initial working directory for the new powershell process.</param>
public PowerShellProcessInstance(Version powerShellVersion, PSCredential credential, ScriptBlock initializationScript, bool useWow64, string workingDirectory)
{
string processArguments = " -s -NoLogo -NoProfile";

if (!string.IsNullOrWhiteSpace(workingDirectory))
{
processArguments = string.Format(
CultureInfo.InvariantCulture,
"{0} -wd \"{1}\"",
processArguments,
workingDirectory.Replace("\"", "\"\""));
}

if (initializationScript != null)
{
string scripBlockAsString = initializationScript.ToString();
if (!string.IsNullOrEmpty(scripBlockAsString))
{
string encodedCommand =
Convert.ToBase64String(Encoding.Unicode.GetBytes(scripBlockAsString));
processArguments = string.Format(
CultureInfo.InvariantCulture,
"{0} -EncodedCommand {1}",
processArguments,
encodedCommand);
}
}

// 'WindowStyle' is used only if 'UseShellExecute' is 'true'. Since 'UseShellExecute' is set
// to 'false' in our use, we can ignore the 'WindowStyle' setting in the initialization below.
_startInfo = new ProcessStartInfo
{
FileName = PwshExePath,
Arguments = processArguments,
UseShellExecute = false,
RedirectStandardInput = true,
RedirectStandardOutput = true,
Expand All @@ -92,6 +65,27 @@ public PowerShellProcessInstance(Version powerShellVersion, PSCredential credent
#endif
};

_startInfo.ArgumentList.Add("-s");
_startInfo.ArgumentList.Add("-NoLogo");
_startInfo.ArgumentList.Add("-NoProfile");

if (!string.IsNullOrWhiteSpace(workingDirectory))
{
_startInfo.ArgumentList.Add("-wd");
_startInfo.ArgumentList.Add(workingDirectory);
}

if (initializationScript != null)
{
var scriptBlockString = initializationScript.ToString();
if (!string.IsNullOrEmpty(scriptBlockString))
{
var encodedCommand = Convert.ToBase64String(Encoding.Unicode.GetBytes(scriptBlockString));
_startInfo.ArgumentList.Add("-EncodedCommand");
_startInfo.ArgumentList.Add(encodedCommand);
}
}

if (credential != null)
{
Net.NetworkCredential netCredential = credential.GetNetworkCredential();
Expand Down
5 changes: 5 additions & 0 deletions test/powershell/engine/Job/Jobs.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,11 @@ Describe 'Basic Job Tests' -Tags 'CI' {
$jobOutput | Should -BeExactly $path.ToString()
}

It 'Verifies the working directory parameter path with trailing backslash' -Skip:(! $IsWindows) {
$job = Start-Job { $pwd } -WorkingDirectory '\' | Wait-Job
$job.JobStateInfo.State | Should -BeExactly 'Completed'
}

It 'Throws an error when the working directory parameter is <case>' -TestCases $invalidPathTestCases {
param($path, $case, $expectedErrorId)

Expand Down