admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Code clean up for PSSession class (#11001)

Browse Source
This commit is contained in:
Paul Higinbotham
2019-11-07 13:52:03 -08:00
committed by Andrew
parent 04a1fc3b74
commit 41e289853c
1 changed files with 46 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/System.Management.Automation/engine/remoting/client/remoterunspaceinfo.cs
+46 -64
View File
@@ -272,48 +272,35 @@ namespace System.Management.Automation.Runspaces
remoteRunspace.PSSessionName = Name;
}
// WSMan session
if (remoteRunspace.ConnectionInfo is WSManConnectionInfo)
switch (remoteRunspace.ConnectionInfo)
{
ComputerType = TargetMachineType.RemoteMachine;
case WSManConnectionInfo _:
ComputerType = TargetMachineType.RemoteMachine;
string fullShellName = WSManConnectionInfo.ExtractPropertyAsWsManConnectionInfo<string>(
remoteRunspace.ConnectionInfo,
"ShellUri", string.Empty);
ConfigurationName = GetDisplayShellName(fullShellName);
break;
string fullShellName = WSManConnectionInfo.ExtractPropertyAsWsManConnectionInfo<string>(
remoteRunspace.ConnectionInfo,
"ShellUri", string.Empty);
case VMConnectionInfo vmConnectionInfo:
ComputerType = TargetMachineType.VirtualMachine;
ConfigurationName = vmConnectionInfo.ConfigurationName;
break;
ConfigurationName = GetDisplayShellName(fullShellName);
return;
case ContainerConnectionInfo containerConnectionInfo:
ComputerType = TargetMachineType.Container;
ConfigurationName = containerConnectionInfo.ContainerProc.ConfigurationName;
break;
case SSHConnectionInfo _:
ComputerType = TargetMachineType.RemoteMachine;
ConfigurationName = "DefaultShell";
break;
default:
Dbg.Assert(false, "Invalid Runspace");
break;
}
// VM session
VMConnectionInfo vmConnectionInfo = remoteRunspace.ConnectionInfo as VMConnectionInfo;
if (vmConnectionInfo != null)
{
ComputerType = TargetMachineType.VirtualMachine;
ConfigurationName = vmConnectionInfo.ConfigurationName;
return;
}
// Container session
ContainerConnectionInfo containerConnectionInfo = remoteRunspace.ConnectionInfo as ContainerConnectionInfo;
if (containerConnectionInfo != null)
{
ComputerType = TargetMachineType.Container;
ConfigurationName = containerConnectionInfo.ContainerProc.ConfigurationName;
return;
}
// SSH session
SSHConnectionInfo sshConnectionInfo = remoteRunspace.ConnectionInfo as SSHConnectionInfo;
if (sshConnectionInfo != null)
{
ComputerType = TargetMachineType.RemoteMachine;
ConfigurationName = "DefaultShell";
return;
}
// We only support WSMan/VM/Container sessions now.
Dbg.Assert(false, "Invalid Runspace");
}
#endregion Constructor
@@ -326,33 +313,28 @@ namespace System.Management.Automation.Runspaces
/// <returns>Auto generated name.</returns>
private string GetTransportName()
{
if (_remoteRunspace.ConnectionInfo is WSManConnectionInfo)
switch (_remoteRunspace.ConnectionInfo)
{
return "WSMan";
}
else if (_remoteRunspace.ConnectionInfo is SSHConnectionInfo)
{
return "SSH";
}
else if (_remoteRunspace.ConnectionInfo is NamedPipeConnectionInfo)
{
return "NamedPipe";
}
else if (_remoteRunspace.ConnectionInfo is ContainerConnectionInfo)
{
return "Container";
}
else if (_remoteRunspace.ConnectionInfo is NewProcessConnectionInfo)
{
return "Process";
}
else if (_remoteRunspace.ConnectionInfo is VMConnectionInfo)
{
return "VMBus";
}
else
{
return "Unknown";
case WSManConnectionInfo _:
return "WSMan";
case SSHConnectionInfo _:
return "SSH";
case NamedPipeConnectionInfo _:
return "NamedPipe";
case ContainerConnectionInfo _:
return "Container";
case NewProcessConnectionInfo _:
return "Process";
case VMConnectionInfo _:
return "VMBus";
default:
return "Unknown";
}
}