Merge remote-tracking branch 'origin/dev' into future

Author: Jason Becker

src/Moryx/Serialization/DefaultSerialization.cs

@@ -221,7 +221,7 @@ public virtual object ConvertValue(Type memberType, ICustomAttributeProvider att
                     return CollectionBuilder(memberType, currentValue, mappedEntry);
                 default:
                     var value = mappedEntry.Value.Current;
-                    if (value is null) 
+                    if (value is null)
                         return null;
 
                     try
@@ -251,6 +251,9 @@ public EntryUnitType GetUnitTypeByAttributes(ICustomAttributeProvider property)
         {
             var unitType = EntryUnitType.None;
 
+            if (HasFlagsAttribute(property))
+                unitType = EntryUnitType.Flags;
+
             var passwordAttr = property.GetCustomAttribute<PasswordAttribute>();
             if (passwordAttr != null)
                 unitType = EntryUnitType.Password;
@@ -318,5 +321,17 @@ protected static object CollectionBuilder(Type collectionType, object currentVal
             // Other collections are not supported
             return null;
         }
+
+        /// <summary>
+        /// Checks if the given property is an enum and has the <see cref="System.FlagsAttribute"/>.
+        /// </summary>
+        /// <param name="property">The property to inspect for attributes.</param>
+        /// <returns>True if the property has the Flags attribute; otherwise, false.</returns>
+        private bool HasFlagsAttribute(ICustomAttributeProvider property)
+        {
+            return property is PropertyInfo propertyInfo &&
+                   propertyInfo.PropertyType.IsEnum &&
+                   propertyInfo.PropertyType.GetCustomAttributes(typeof(System.FlagsAttribute), false).Any();
+        }
     }
 }

src/Moryx/Serialization/EntryConvert/EntryUnitType.cs

@@ -23,6 +23,10 @@ public enum EntryUnitType
         /// <summary>
         /// Unit directory
         /// </summary>
-        Directory
+        Directory,
+        /// <summary>
+        /// Unit with <see cref="System.FlagsAttribute"/>
+        /// </summary>
+        Flags,
     }
 }