Skip to content

Add ability to pass InitialSessionState to the ConsoleShell #9802

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
daxian-dbw merged 4 commits into from
Jun 10, 2019
Merged

Add ability to pass InitialSessionState to the ConsoleShell #9802

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
f771812
Add ability to pass InitialSessionState to the ConsoleShell
asrosent Jun 2, 2019
28b959f
revision 2
asrosent Jun 2, 2019
841994b
revision 3
asrosent Jun 2, 2019
1c1992d
revision 3
asrosent Jun 3, 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
21 changes: 20 additions & 1 deletion src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleShell.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

using System.Management.Automation;
using System.Management.Automation.Runspaces;
using System.Runtime.CompilerServices;

namespace Microsoft.PowerShell
{
Expand All @@ -21,11 +22,29 @@ class ConsoleShell
/// <returns>An integer value which should be used as exit code for the process.</returns>
public static int Start(string bannerText, string helpText, string[] args)
{
return Start(InitialSessionState.CreateDefault2(), bannerText, helpText, args);
}
Copy link
Collaborator

@vexx32 vexx32 Jun 3, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could be written with the => syntax and dropping the braces, but I guess that's a matter of one's preference. 🙂

public static int Start(string bannerText, string helpText, string[] args) 
    => Start(InitialSessionState.CreateDefault2(), bannerText, helpText, args);


/// <summary>Entry point in to ConsoleShell. Used to create a custom Powershell console application</summary>
/// <param name="initialSessionState">InitialSessionState to be used by the ConsoleHost.</param>
/// <param name="bannerText">Banner text to be displayed by ConsoleHost.</param>
/// <param name="helpText">Help text for the shell.</param>
/// <param name="args">Commandline parameters specified by user.</param>
/// <returns>An integer value which should be used as exit code for the process.</returns>
public static int Start(InitialSessionState initialSessionState, string bannerText, string helpText, string[] args)
{
if (initialSessionState == null)
{
throw PSTraceSource.NewArgumentNullException(nameof(initialSessionState));
}

if (args == null)
{
throw PSTraceSource.NewArgumentNullException("args");
throw PSTraceSource.NewArgumentNullException(nameof(args));
}

ConsoleHost.DefaultInitialSessionState = initialSessionState;

return ConsoleHost.Start(bannerText, helpText, args);
}
}
Expand Down
2 changes: 0 additions & 2 deletions src/Microsoft.PowerShell.ConsoleHost/host/msh/ManagedEntrance.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,6 @@ public static int Start(string consoleFilePath, [MarshalAs(UnmanagedType.LPArray
System.Diagnostics.Debugger.Break();
}
#endif
ConsoleHost.DefaultInitialSessionState = InitialSessionState.CreateDefault2();

int exitCode = 0;
try
{
Expand Down