Skip to content

#13347: ObRoot: Use field if property does not exist #13375

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
adityapatwardhan merged 4 commits into from
Aug 25, 2020
Merged

#13347: ObRoot: Use field if property does not exist #13375

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f3894b0
#13347: ObRoot: Use field if property does not exist
Thomas-Torggler-EOS Aug 7, 2020
eecb78e
#13347: refactoring + check field first
Thomas-Torggler-EOS Aug 7, 2020
c85f8da
#13347: throw 'PSInvalidOperationException' instead of 'ArgumentNullE…
Thomas-Torggler-EOS Aug 11, 2020
4c74529
#13347: Added comment about Hyper-V change + variable name fix
Thomas-Torggler-EOS Aug 11, 2020
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/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 @@ -3443,7 +3443,26 @@ private void GetContainerPropertiesInternal()
//
if (RuntimeId == Guid.Empty)
{
ContainerObRoot = (string)computeSystemPropertiesType.GetProperty("ObRoot").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 obRootFieldInfo = computeSystemPropertiesType.GetField("ObRoot");
if (obRootFieldInfo != null)
{
ContainerObRoot = obRootFieldInfo.GetValue(computeSystemPropertiesHandle) as string;
}
else
{
var obRootPropertyInfo = computeSystemPropertiesType.GetProperty("ObRoot");
if (obRootPropertyInfo != null)
{
ContainerObRoot = obRootPropertyInfo.GetValue(computeSystemPropertiesHandle) as string;
}
}

if (ContainerObRoot == null)
{
throw new PSInvalidOperationException(RemotingErrorIdStrings.CannotGetHostInteropTypes);
}
}
}
}
Expand Down