Serialize all Properties by default (fixes dotnet#41749, dotnet#73021)

jogibear9988 · Jul 31, 2022 · d864eec · d864eec
1 parent ec5e8b5
commit d864eec
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/JsonSerializerOptions.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/JsonSerializerOptions.cs
@@ -71,6 +71,7 @@ public static JsonSerializerOptions Default
         private bool _ignoreReadOnlyProperties;
         private bool _ignoreReadonlyFields;
         private bool _includeFields;
+        private bool _onlyDeclaredProperties;
         private bool _propertyNameCaseInsensitive;
         private bool _writeIndented;
 
@@ -509,6 +510,23 @@ public bool PropertyNameCaseInsensitive
             }
         }
 
+        /// <summary>
+        /// Specifies that only members declared at the level of the supplied type's hierarchy should be considered.
+        /// Inherited members are not considered.
+        /// </summary>
+        public bool OnlyDeclaredProperties
+        {
+            get
+            {
+                return _onlyDeclaredProperties;
+            }
+            set
+            {
+                VerifyMutable();
+                _onlyDeclaredProperties = value;
+            }
+        }
+
         /// <summary>
         /// Defines how the comments are handled during deserialization.
         /// </summary>

diff --git a/...System.Text.Json/src/System/Text/Json/Serialization/Metadata/ReflectionJsonTypeInfoOfT.cs b/...System.Text.Json/src/System/Text/Json/Serialization/Metadata/ReflectionJsonTypeInfoOfT.cs
@@ -49,11 +49,13 @@ private void AddPropertiesAndParametersUsingReflection()
         {
             Debug.Assert(PropertyInfoForTypeInfo.ConverterStrategy == ConverterStrategy.Object);
 
-            const BindingFlags BindingFlags =
+            var BindingFlags BindingFlags =
                 BindingFlags.Instance |
                 BindingFlags.Public |
-                BindingFlags.NonPublic |
-                BindingFlags.DeclaredOnly;
+                BindingFlags.NonPublic;
+
+            if (this.Options.OnlyDeclaredProperties)
+                BindingFlags |= BindingFlags.DeclaredOnly;
 
             Dictionary<string, JsonPropertyInfo>? ignoredMembers = null;
             bool propertyOrderSpecified = false;