Serialize fields explicitly marked with [DataMember] attribute

Author: mythz

src/ServiceStack.Text/Common/DeserializeTypeRef.cs

@@ -38,7 +38,7 @@ internal static Dictionary<string, TypeAccessor> GetTypeAccessorMap(TypeConfig t
             var type = typeConfig.Type;
 
             var propertyInfos = type.GetSerializableProperties();
-            var fieldInfos = JsConfig.IncludePublicFields ? type.GetSerializableFields() : new FieldInfo[0];
+            var fieldInfos = type.GetSerializableFields();
             if (propertyInfos.Length == 0 && fieldInfos.Length == 0) return null;
 
             var map = new Dictionary<string, TypeAccessor>(StringComparer.OrdinalIgnoreCase);

src/ServiceStack.Text/Common/WriteType.cs

@@ -112,7 +112,7 @@ private static bool Init()
             if (!typeof(T).IsClass() && !typeof(T).IsInterface() && !JsConfig.TreatAsRefType(typeof(T))) return false;
 
             var propertyInfos = TypeConfig<T>.Properties;
-            var fieldInfos = JsConfig.IncludePublicFields ? TypeConfig<T>.Fields : new FieldInfo[0];
+            var fieldInfos = TypeConfig<T>.Fields;
             var propertyNamesLength = propertyInfos.Length;
             var fieldNamesLength = fieldInfos.Length;
             PropertyWriters = new TypePropertyWriter[propertyNamesLength + fieldNamesLength];

src/ServiceStack.Text/ReflectionExtensions.cs

@@ -656,9 +656,13 @@ public static FieldInfo[] GetSerializableFields(this Type type)
         {
             if (type.IsDto())
             {
-                return new FieldInfo[0];
+                return type.GetAllFields().Where(attr =>
+                    attr.HasAttribute<DataMemberAttribute>()).ToArray();
             }
 
+            if (!JsConfig.IncludePublicFields)
+                return new FieldInfo[0];
+
             var publicFields = type.GetPublicFields();
 
             // else return those properties that are not decorated with IgnoreDataMember
@@ -850,6 +854,20 @@ public static PropertyInfo[] Properties(this Type type)
 #endif
         }
 
+        public static FieldInfo[] GetAllFields(this Type type)
+        {
+            if (type.IsInterface())
+            {
+                return new FieldInfo[0];
+            }
+
+#if (NETFX_CORE || PCL)
+            return type.GetRuntimeFields().Where(p => !p.isStatic).ToArray();
+#else
+            return type.GetPublicFields();
+#endif
+        }
+
         public static FieldInfo[] GetPublicFields(this Type type)
         {
             if (type.IsInterface())