Merge pull request #821 from AArnott/fix820

Fix serialization of private fields in base classes

Author: DotDeveloper95

src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Resolvers/DynamicObjectResolver.cs

@@ -1621,7 +1621,7 @@ public static ObjectSerializationInfo CreateOrNull(Type type, bool forceStringKe
                     }
                 }
 
-                foreach (FieldInfo item in type.GetRuntimeFields())
+                foreach (FieldInfo item in GetAllFields(type))
                 {
                     if (item.GetCustomAttribute<IgnoreMemberAttribute>(true) != null)
                     {
@@ -1897,6 +1897,23 @@ public static ObjectSerializationInfo CreateOrNull(Type type, bool forceStringKe
             };
         }
 
+        private static IEnumerable<FieldInfo> GetAllFields(Type type)
+        {
+            if (type.BaseType is object)
+            {
+                foreach (var item in GetAllFields(type.BaseType))
+                {
+                    yield return item;
+                }
+            }
+
+            // with declared only
+            foreach (var item in type.GetFields(BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly))
+            {
+                yield return item;
+            }
+        }
+
         private static bool TryGetNextConstructor(IEnumerator<ConstructorInfo> ctorEnumerator, ref ConstructorInfo ctor)
         {
             if (ctorEnumerator == null || ctor != null)

src/MessagePack.UnityClient/Assets/Scripts/Tests/ShareTests/DynamicObjectResolverTests.cs

@@ -4,6 +4,8 @@
 #if !ENABLE_IL2CPP
 
 using System;
+using System.Runtime.Serialization;
+using MessagePack.Resolvers;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -36,6 +38,13 @@ public void SerializeTypeWithReadWriteFields()
             Assert3MemberClassSerializedContent(MessagePackSerializer.Serialize(new TestMessageWithReadWriteFields()));
         }
 
+        [Fact]
+        public void PrivateMembersInBaseClass_StandardResolverAllowPrivate()
+        {
+            var options = StandardResolverAllowPrivate.Options;
+            PrivateMembersInBaseClass_Helper(options);
+        }
+
         private static void Assert3MemberClassSerializedContent(ReadOnlyMemory<byte> msgpack)
         {
             var reader = new MessagePackReader(msgpack);
@@ -45,6 +54,17 @@ private static void Assert3MemberClassSerializedContent(ReadOnlyMemory<byte> msg
             Assert.Equal(3, reader.ReadInt32());
         }
 
+        private void PrivateMembersInBaseClass_Helper(MessagePackSerializerOptions options)
+        {
+            var obj = new DerivedClass { Name = "name", BaseClassFieldAccessor = 15, BaseClassProperty = 5 };
+            var bin = MessagePackSerializer.Serialize(obj, options);
+            this.logger.WriteLine(MessagePackSerializer.ConvertToJson(bin));
+            var obj2 = MessagePackSerializer.Deserialize<DerivedClass>(bin, options);
+            Assert.Equal(obj.BaseClassFieldAccessor, obj2.BaseClassFieldAccessor);
+            Assert.Equal(obj.BaseClassProperty, obj2.BaseClassProperty);
+            Assert.Equal(obj.Name, obj2.Name);
+        }
+
         [MessagePackObject]
         public class TestMessageWithReadOnlyField
         {
@@ -83,6 +103,35 @@ public class TestMessageWithReadOnlyProperty
             [Key(2)]
             public int Property3 { get; set; } = 3;
         }
+
+        [DataContract]
+        public class BaseClass
+        {
+            [DataMember]
+            private int baseClassField;
+
+            public int BaseClassFieldAccessor
+            {
+                get => this.baseClassField;
+                set => this.baseClassField = value;
+            }
+
+            private int baseClassPropertyBackingField;
+
+            [DataMember]
+            public int BaseClassProperty
+            {
+                get => this.baseClassPropertyBackingField;
+                set => this.baseClassPropertyBackingField = value;
+            }
+        }
+
+        [DataContract]
+        public class DerivedClass : BaseClass
+        {
+            [DataMember]
+            public string Name { get; set; }
+        }
     }
 }