Fix bug regression re-added in commit cb76ac

Author: mythz

NuGet/servicestack.text.nuspec

@@ -3,7 +3,7 @@
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>ServiceStack.Text</id>
     <title>.NET's fastest JSON Serializer by ServiceStack</title>
-    <version>3.9.53</version> 
+    <version>3.9.54</version> 
     <authors>Demis Bellot</authors> 
     <owners>Demis Bellot</owners>
     <summary>.NET's fastest JSON, JSV and CSV Text Serializers</summary>

src/ServiceStack.Text/Json/JsonTypeSerializer.cs

@@ -288,10 +288,10 @@ public void WriteDecimal(TextWriter writer, object decimalValue)
         public void WriteEnum(TextWriter writer, object enumValue)
         {
             if (enumValue == null) return;
-            if (JsConfig.TreatEnumAsInteger)
+            if (GetTypeInfo(enumValue.GetType()).IsNumeric)
                 JsWriter.WriteEnumFlags(writer, enumValue);
             else
-                writer.Write(enumValue);
+                WriteRawString(writer, enumValue.ToString());
         }
 
         public void WriteEnumFlags(TextWriter writer, object enumFlagValue)

src/ServiceStack.Text/Json/JsonWriter.Generic.cs

@@ -130,8 +130,9 @@ public static WriteObjectDelegate GetValueTypeToStringMethod(Type type)
 
 	internal class TypeInfo
 	{
-		internal bool EncodeMapKey;
-	}
+        internal bool EncodeMapKey;
+        internal bool IsNumeric;
+    }
 
 	/// <summary>
 	/// Implement the serializer using a more static approach
@@ -163,8 +164,10 @@ public static TypeInfo GetTypeInfo()
 
 		static JsonWriter()
 		{
+		    var isNumeric = typeof(T).IsNumericType();
 			TypeInfo = new TypeInfo {
-                EncodeMapKey = typeof(T) == typeof(bool) || typeof(T).IsNumericType()
+                EncodeMapKey = typeof(T) == typeof(bool) || isNumeric,
+                IsNumeric = isNumeric
 			};
 
             CacheFn = typeof(T) == typeof(object) 

src/ServiceStack.Text/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.9.53.0")]
+[assembly: AssemblyVersion("3.9.54.0")]
 //[assembly: AssemblyFileVersion("1.0.0.0")]

src/ServiceStack.Text/ReflectionExtensions.cs

@@ -150,6 +150,11 @@ public static bool IsNumericType(this Type type)
         {
             if (type == null) return false;
 
+            if (type.IsEnum) //TypeCode can be TypeCode.Int32
+            {
+                return JsConfig.TreatEnumAsInteger || type.IsEnumFlags();
+            }
+
             switch (Type.GetTypeCode(type))
             {
                 case TypeCode.Byte:
@@ -172,7 +177,7 @@ public static bool IsNumericType(this Type type)
                     }
                     if (type.IsEnum)
                     {
-                        return type.IsEnumFlags();
+                        return JsConfig.TreatEnumAsInteger || type.IsEnumFlags();
                     }
                     return false;
             }

tests/ServiceStack.Text.Tests/AdhocModelTests.cs

@@ -534,7 +534,6 @@ public class DictionaryEnumType
         [Test]
         public void Can_Serialize_Dictionary_With_Enums()
         {
-
             Dictionary<EnumValues, Test> dictEnumType =
                 new Dictionary<EnumValues, Test> 
                 {