Merge branch 'master' into refactoring

Author: morrisjdev

Example/Data/Entities/User.cs

@@ -25,6 +25,8 @@ public User()
         [NotMapped]
         public string Ignored { get; set; }
 
+        public UserType Type { get; set; }
+        
         public Guid Test2 { get; set; }
 
         [NotMapped]
@@ -47,5 +49,10 @@ public string[] VContents
         public virtual List<Content> Contents { get; set; }
 
         public virtual List<Setting> Settings { get; set; }
+
+        public enum UserType
+        {
+            Admin, User, Manager
+        }
     }
 }

Example/Program.cs

@@ -49,7 +49,9 @@ static void Main(string[] args)
             User us = new User()
             {
                 Name = "Morris Janatzek",
-                Username = ""
+                Username = "",
+                Type = User.UserType.Manager,
+                Test = 2
             };
 
             db.Users.Add(us);

FileContextCore/Serializer/SerializerHelper.cs

@@ -13,13 +13,13 @@ static class SerializerHelper
     {
         public static object Deserialize(this string input, Type type)
         {
-	        type = Nullable.GetUnderlyingType(type) ?? type;
-
             if (string.IsNullOrEmpty(input))
             {
                 return type.GetDefaultValue();
             }
 
+            type = Nullable.GetUnderlyingType(type) ?? type;
+
             if (type == typeof(DateTimeOffset))
             {
                 return DateTimeOffset.Parse(input, CultureInfo.InvariantCulture);
@@ -29,12 +29,12 @@ public static object Deserialize(this string input, Type type)
             {
                 return TimeSpan.Parse(input, CultureInfo.InvariantCulture);
             }
-            
+
             if (type == typeof(Guid))
             {
                 return Guid.Parse(input);
             }
-            
+
             if (type.IsArray)
             {
                 Type arrType = type.GetElementType();
@@ -47,7 +47,11 @@ public static object Deserialize(this string input, Type type)
 
                 return arr.ToArray();
             }
-            
+
+            if (type.IsEnum)
+            {
+                return Enum.Parse(type, input);
+            }
 
             return Convert.ChangeType(input, type, CultureInfo.InvariantCulture);
         }
@@ -60,7 +64,7 @@ public static string Serialize(this object input)
                 {
                     string result = "";
 
-                    object[] arr = (object[])input;
+                    object[] arr = (object[]) input;
 
                     for (int i = 0; i < arr.Length; i++)
                     {
@@ -75,19 +79,22 @@ public static string Serialize(this object input)
                     return result;
                 }
 
-				return input is IFormattable formattable ? formattable.ToString(null, CultureInfo.InvariantCulture) : input.ToString();
-			}
+                return input is IFormattable formattable
+                    ? formattable.ToString(null, CultureInfo.InvariantCulture)
+                    : input.ToString();
+            }
 
             return "";
         }
 
-        public static TKey GetKey<TKey, T>(IPrincipalKeyValueFactory<T> keyValueFactory, IEntityType entityType, Func<string, string> valueSelector)
+        public static TKey GetKey<TKey, T>(IPrincipalKeyValueFactory<T> keyValueFactory, IEntityType entityType,
+            Func<string, string> valueSelector)
         {
-            return (TKey)keyValueFactory.CreateFromKeyValues(
+            return (TKey) keyValueFactory.CreateFromKeyValues(
                 entityType.FindPrimaryKey().Properties
                     .Select(p =>
                         valueSelector(p.GetColumnName())
                             .Deserialize(p.GetValueConverter()?.ProviderClrType ?? p.ClrType)).ToArray());
         }
     }
-}
+}