Skip to content

Fix Enter-PSSession -ContainerId for newest Windows #7883

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
Oct 9, 2018
Merged

Fix Enter-PSSession -ContainerId for newest Windows #7883

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
66e85df
Hyper-V team changed the type used to get the runtimeid, so need to c…
Sep 27, 2018
223975c
address CodeFactor issue
Sep 27, 2018
db88f4b
address Paul's feedback
Oct 3, 2018
bee1221
address Dongbo's feedback
Oct 9, 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
41 changes: 36 additions & 5 deletions src/System.Management.Automation/engine/remoting/common/RunspaceConnectionInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3122,7 +3122,7 @@ public void CreateContainerProcess()
ContainerId));

case ContainersFeatureNotEnabled:
throw new PSInvalidOperationException(StringUtil.Format(RemotingErrorIdStrings.ContainersFeatureNotEnabled));
throw new PSInvalidOperationException(RemotingErrorIdStrings.ContainersFeatureNotEnabled);

// other errors caught with exception
case OtherError:
Expand Down Expand Up @@ -3163,7 +3163,7 @@ public void GetContainerProperties()
break;

case ContainersFeatureNotEnabled:
throw new PSInvalidOperationException(StringUtil.Format(RemotingErrorIdStrings.ContainersFeatureNotEnabled));
throw new PSInvalidOperationException(RemotingErrorIdStrings.ContainersFeatureNotEnabled);

case OtherError:
throw new PSInvalidOperationException(ErrorMessage);
Expand All @@ -3177,15 +3177,30 @@ public void GetContainerProperties()
/// <summary>
/// Dynamically load the Host Compute interop assemblies and return useful types.
/// </summary>
/// <param name="computeSystemPropertiesType">The Microsoft.HyperV.Schema.Compute.System.Properties type.</param>
/// <param name="computeSystemPropertiesType">The HCS.Compute.System.Properties type.</param>
/// <param name="hostComputeInteropType">The Microsoft.HostCompute.Interop.HostComputeInterop type.</param>
private static void GetHostComputeInteropTypes(out Type computeSystemPropertiesType, out Type hostComputeInteropType)
{
Assembly schemaAssembly = Assembly.Load(new AssemblyName("Microsoft.HyperV.Schema, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"));
computeSystemPropertiesType = schemaAssembly.GetType("Microsoft.HyperV.Schema.Compute.System.Properties");

// The type name was changed in newer version of Windows so we check for new one first,
// then fallback to previous type name to support older versions of Windows
computeSystemPropertiesType = schemaAssembly.GetType("HCS.Compute.System.Properties");
if (computeSystemPropertiesType == null)
{
computeSystemPropertiesType = schemaAssembly.GetType("Microsoft.HyperV.Schema.Compute.System.Properties");
if (computeSystemPropertiesType == null)
{
throw new PSInvalidOperationException(RemotingErrorIdStrings.CannotGetHostInteropTypes);
}
}

Assembly hostComputeInteropAssembly = Assembly.Load(new AssemblyName("Microsoft.HostCompute.Interop, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"));
hostComputeInteropType = hostComputeInteropAssembly.GetType("Microsoft.HostCompute.Interop.HostComputeInterop");
if (hostComputeInteropType == null)
{
throw new PSInvalidOperationException(RemotingErrorIdStrings.CannotGetHostInteropTypes);
}
}

/// <summary>
Expand Down Expand Up @@ -3350,7 +3365,23 @@ private void GetContainerPropertiesInternal()

var computeSystemPropertiesHandle = getComputeSystemPropertiesInfo.Invoke(null, new object[] { ComputeSystem });

RuntimeId = (Guid)computeSystemPropertiesType.GetProperty("RuntimeId").GetValue(computeSystemPropertiesHandle);
// Since Hyper-V changed this from a property to a field, we can optimize for newest Windows to see if it's a field,
// otherwise we fall back to old code to be compatible with older versions of Windows
var fieldInfo = computeSystemPropertiesType.GetField("RuntimeId");
if (fieldInfo != null)
{
RuntimeId = (Guid)fieldInfo.GetValue(computeSystemPropertiesHandle);
}
else
{
var propertyInfo = computeSystemPropertiesType.GetProperty("RuntimeId");
if (propertyInfo == null)
{
throw new PSInvalidOperationException(RemotingErrorIdStrings.CannotGetHostInteropTypes);
}

RuntimeId = (Guid)propertyInfo.GetValue(computeSystemPropertiesHandle);
}

//
// Get container object root for Windows Server container.
Expand Down
3 changes: 3 additions & 0 deletions src/System.Management.Automation/resources/RemotingErrorIdStrings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1667,4 +1667,7 @@ All WinRM sessions connected to PowerShell session configurations, such as Micro
<data name="ProcessInfoNotRecoverable" xml:space="preserve">
<value>Information about the process could not be read: '{0}'.</value>
</data>
<data name="CannotGetHostInteropTypes" xml:space="preserve">
<value>Host system does not have the correct version of Hyper-V schema.</value>
</data>
</root>