Skip to content

Fix global tool issues around exit code, command line parameters and path with spaces #10461

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 3 commits into from
Aug 30, 2019
Merged

Fix global tool issues around exit code, command line parameters and path with spaces #10461

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1d39e22
Allow all arguments to be sent to Powershell global tool
adityapatwardhan Aug 29, 2019
24e377c
Add quotes around pwsh full path and return exit code
adityapatwardhan Aug 29, 2019
f137d15
Fix codefactor issue
adityapatwardhan Aug 29, 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
11 changes: 7 additions & 4 deletions src/Microsoft.PowerShell.GlobalTool.Shim/GlobalToolShim.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@ public class EntryPoint
/// <summary>
/// Entry point for the global tool.
/// </summary>
/// <param name="args">Arguments passed to the global tool.</param>
public static void Main(string[] args)
/// <param name="args">Arguments passed to the global tool.</param>'
/// <returns>Exit code returned by pwsh.</returns>
public static int Main(string[] args)
{
var currentPath = new FileInfo(System.Reflection.Assembly.GetEntryAssembly().Location).Directory.FullName;
var isWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
Expand All @@ -31,11 +32,13 @@ public static void Main(string[] args)

string argsString = args.Length > 0 ? string.Join(" ", args) : null;
var pwshPath = Path.Combine(currentPath, platformFolder, PwshDllName);
string processArgs = string.IsNullOrEmpty(argsString) ? $"{pwshPath}" : $"{pwshPath} -c {argsString}";
string processArgs = string.IsNullOrEmpty(argsString) ? $"\"{pwshPath}\"" : $"\"{pwshPath}\" {argsString}";

if (File.Exists(pwshPath))
{
System.Diagnostics.Process.Start("dotnet", processArgs).WaitForExit();
var process = System.Diagnostics.Process.Start("dotnet", processArgs);
process.WaitForExit();
return process.ExitCode;
}
else
{
Expand Down