diff --git a/mcs/class/corlib/Makefile b/mcs/class/corlib/Makefile index 25cdd80c95aa2..5f6733df4bdba 100644 --- a/mcs/class/corlib/Makefile +++ b/mcs/class/corlib/Makefile @@ -90,6 +90,8 @@ test-vts: $(vtsdir)/$(vts)TestLib/4.0/Address.cs $(MCS) -target:library \ $(vtsdir)/$(vts)TestLib/5.0/Address.cs + $(MCS) -target:library \ + $(vtsdir)/$(vts)TestLib/6.0/Address.cs run-test-vts: test-vts $(TEST_RUNTIME) $(RUNTIME_FLAGS) $(TEST_HARNESS) -noshadow \ $(vtsdir)/BinarySerializationOverVersions.exe diff --git a/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ObjectReader.cs b/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ObjectReader.cs index 3393930dae5bc..dd9b27513a8e6 100644 --- a/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ObjectReader.cs +++ b/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ObjectReader.cs @@ -294,13 +294,22 @@ private void ReadObjectContent (BinaryReader reader, TypeMetadata metadata, long info = metadata.NeedsSerializationInfo ? new SerializationInfo(metadata.Type, new FormatterConverter()) : null; - if (metadata.MemberNames != null) + if (metadata.MemberNames != null) { for (int n=0; n