Skip to content

Fix local remoting #801

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
merged 7 commits into from
Nov 30, 2018
Merged

Fix local remoting #801

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d577c4e
consider "local remoting" as "Remote"
TylerLeonhardt Nov 29, 2018
e7a9115
comments
TylerLeonhardt Nov 29, 2018
efdfa78
Update src/PowerShellEditorServices/Session/RunspaceDetails.cs
SeeminglyScience Nov 30, 2018
ea22bfc
Update src/PowerShellEditorServices/Session/RunspaceDetails.cs
SeeminglyScience Nov 30, 2018
7a85460
Update src/PowerShellEditorServices/Session/RunspaceDetails.cs
SeeminglyScience Nov 30, 2018
65a4760
Update src/PowerShellEditorServices/Session/RunspaceDetails.cs
SeeminglyScience Nov 30, 2018
af7ac0d
addressed Paul's feedback
TylerLeonhardt Nov 30, 2018
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
17 changes: 10 additions & 7 deletions src/PowerShellEditorServices/Session/RunspaceDetails.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,6 @@ internal static RunspaceDetails CreateFromRunspace(
Validate.IsNotNull(nameof(runspace), runspace);
Validate.IsNotNull(nameof(sessionDetails), sessionDetails);

var runspaceId = runspace.InstanceId;
var runspaceLocation = RunspaceLocation.Local;
var runspaceContext = RunspaceContext.Original;
var versionDetails = PowerShellVersionDetails.GetVersionDetails(runspace, logger);
Expand All @@ -218,13 +217,17 @@ internal static RunspaceDetails CreateFromRunspace(
// ProcessId property isn't on the object, move on.
}

if (runspace.ConnectionInfo.ComputerName != "localhost")
{
runspaceId =
PowerShellContext.ExecuteScriptAndGetItem<Guid>(
"$host.Runspace.InstanceId",
runspace);
// Grab the $host.name which will tell us if we're in a PSRP session or not
string hostName =
PowerShellContext.ExecuteScriptAndGetItem<string>(
"$Host.Name",
runspace,
defaultValue: string.Empty);

// hostname is 'ServerRemoteHost' when the user enters a session.
// ex. Enter-PSSession, Enter-PSHostProcess
if (hostName.Equals("ServerRemoteHost", StringComparison.Ordinal))
{
runspaceLocation = RunspaceLocation.Remote;
connectionString =
runspace.ConnectionInfo.ComputerName +
Expand Down