Merge pull request #829 from AArnott/fix828

Fix serialization of private properties on base classes

Author: DotDeveloper95

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

@@ -1510,7 +1510,7 @@ public static ObjectSerializationInfo CreateOrNull(Type type, bool forceStringKe
                 var searchFirst = true;
                 var hiddenIntKey = 0;
 
-                foreach (PropertyInfo item in type.GetRuntimeProperties())
+                foreach (PropertyInfo item in GetAllProperties(type))
                 {
                     if (item.GetCustomAttribute<IgnoreMemberAttribute>(true) != null)
                     {
@@ -1914,6 +1914,23 @@ private static IEnumerable<FieldInfo> GetAllFields(Type type)
             }
         }
 
+        private static IEnumerable<PropertyInfo> GetAllProperties(Type type)
+        {
+            if (type.BaseType is object)
+            {
+                foreach (var item in GetAllProperties(type.BaseType))
+                {
+                    yield return item;
+                }
+            }
+
+            // with declared only
+            foreach (var item in type.GetProperties(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

@@ -116,13 +116,15 @@ public int BaseClassFieldAccessor
                 set => this.baseClassField = value;
             }
 
-            private int baseClassPropertyBackingField;
-
             [DataMember]
+#pragma warning disable SA1300 // Element should begin with upper-case letter
+            private int baseClassProperty { get; set; }
+#pragma warning restore SA1300 // Element should begin with upper-case letter
+
             public int BaseClassProperty
             {
-                get => this.baseClassPropertyBackingField;
-                set => this.baseClassPropertyBackingField = value;
+                get => this.baseClassProperty;
+                set => this.baseClassProperty = value;
             }
         }