maxmustermann/PowerShell
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix for FormatTable remote deserialization regression (#9116)

Browse source
This commit is contained in:
Paul Higinbotham 2019-03-18 09:59:33 -07:00 committed by Aditya Patwardhan
parent e91d6dcf56
commit 66ab6e7e74
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/System.Management.Automation/FormatAndOutput/common/FormattingObjectsDeserializer.cs
View file

@ -291,9 +291,10 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
return (int)DeserializeMemberVariable(so, property, typeof(int), true /* cannotBeNull */);
}
internal bool DeserializeBoolMemberVariable(PSObject so, string property)
internal bool DeserializeBoolMemberVariable(PSObject so, string property, bool cannotBeNull = true)
{
return (bool)DeserializeMemberVariable(so, property, typeof(bool), true /* cannotBeNull */);
var val = DeserializeMemberVariable(so, property, typeof(bool), cannotBeNull);
return (val == null) ? false : (bool)val;
}
internal WriteStreamType DeserializeWriteStreamTypeMemberVariable(PSObject so)
@ -586,8 +587,11 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
internal override void Deserialize(PSObject so, FormatObjectDeserializer deserializer)
{
base.Deserialize(so, deserializer);
// The "repeatHeader" property was added later (V5, V6) and presents an incompatibility when remoting to older version PowerShell sessions.
// When the property is missing from the serialized object, let the deserialized property be false.
this.repeatHeader = deserializer.DeserializeBoolMemberVariable(so, "repeatHeader", cannotBeNull: false);
this.hideHeader = deserializer.DeserializeBoolMemberVariable(so, "hideHeader");
this.repeatHeader = deserializer.DeserializeBoolMemberVariable(so, "repeatHeader");
FormatInfoDataListDeserializer<TableColumnInfo>.ReadList(so, "tableColumnInfoList", this.tableColumnInfoList, deserializer);
}
}