Merge branch 'system.text.json' of https://github.com/riganti/dotvvm …

…into system.text.json
riganti · Nov 3, 2024 · 20019bf · 20019bf
2 parents 91e03b6 + 32bafde
commit 20019bf
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/Framework/Framework/ViewModel/Serialization/ViewModelSerializationMapper.cs b/src/Framework/Framework/ViewModel/Serialization/ViewModelSerializationMapper.cs
@@ -162,7 +162,7 @@ protected virtual MemberInfo[] ResolveShadowing(Type type, MemberInfo[] members)
         protected virtual IEnumerable<ViewModelPropertyMap> GetProperties(Type type, MethodBase? constructor)
         {
             var ctorParams = constructor?.GetParameters().ToDictionary(p => p.Name.NotNull(), StringComparer.OrdinalIgnoreCase);
-            
+
             var properties = type.GetAllMembers(BindingFlags.Public | BindingFlags.Instance)
                                  .Where(m => m is PropertyInfo or FieldInfo)
                                  .ToArray();
@@ -175,10 +175,11 @@ protected virtual IEnumerable<ViewModelPropertyMap> GetProperties(Type type, Met
                 if (property is FieldInfo)
                 {
                     // fields are ignored by default, unless marked with [Bind(not None)], [JsonInclude] or defined in ValueTuple<...>
-                    include = include ||
+                    include = include && (
                         !(bindAttribute is null or { Direction: Direction.None }) ||
                         property.IsDefined(typeof(JsonIncludeAttribute)) ||
-                        (type.IsGenericType && type.FullName!.StartsWith("System.ValueTuple`"));
+                        (type.IsGenericType && type.FullName!.StartsWith("System.ValueTuple`"))
+                    );
                 }
                 if (!include) continue;