Replaced JSON.Net with DataContractJsonSerializer

Author: mwhelan

src/TestStack.BDDfy/Reporters/Diagnostics/DiagnosticsReport.cs

@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace TestStack.BDDfy.Reporters.Diagnostics
+{
+    public class DiagnosticsReport
+    {
+        public IList<StoryDiagnostic> Stories { get; set; }
+    }
+}

src/TestStack.BDDfy/Reporters/Diagnostics/DiagnosticsReportBuilder.cs

@@ -18,7 +18,7 @@ public DiagnosticsReportBuilder(ISerializer serializer)
         public string CreateReport(FileReportModel model)
         {
             var graph = GetDiagnosticData(model);
-            var rootObject = new { Stories = graph };
+            var rootObject = new DiagnosticsReport { Stories = graph };
             return _serializer.Serialize(rootObject);
         }
 

src/TestStack.BDDfy/Reporters/Serializers/JsonSerializer.cs

@@ -1,35 +1,22 @@
+using System.IO;
+using System.Runtime.Serialization.Json;
+using System.Text;
+
 namespace TestStack.BDDfy.Reporters.Serializers
 {
-#if NET40
-    using System.Web.Script.Serialization;
-
     public class JsonSerializer : ISerializer
     {
         public string Serialize(object obj)
         {
-            var serializer = new JavaScriptSerializer();
-            string json = serializer.Serialize(obj);
+            var serializer = new DataContractJsonSerializer(obj.GetType());
+            string json;
+            using (var stream = new MemoryStream())
+            {
+                serializer.WriteObject(stream, obj);
+                json = Encoding.UTF8.GetString(stream.ToArray());
+            }
 
             return new JsonFormatter(json).Format();
         }
     }
-
-#else
-    using Newtonsoft.Json;
-
-    public class JsonSerializer : ISerializer
-    {
-        public string Serialize(object obj)
-        {
-            return JsonConvert.SerializeObject(obj, Formatting.Indented,
-                new JsonSerializerSettings
-                {
-                    NullValueHandling = NullValueHandling.Ignore,
-                    ReferenceLoopHandling = ReferenceLoopHandling.Ignore
-                });
-        }
-    }
-
-#endif
-
 }

src/TestStack.BDDfy/project.json

@@ -7,19 +7,18 @@
         "embed": "**/Scripts/*.*"
     },
     "dependencies": {
-        "NETStandard.Library": "1.6.0",
-        "Newtonsoft.Json": "9.0.1"
+        "NETStandard.Library": "1.6.0"
     },
 
     "frameworks": {
         "net40": {
             "dependencies": {
 
             },
-            "frameworkAssemblies": {
-                "System.Web": "4.0.0.0",
-                "System.Web.Extensions": "4.0.0.0"
-            },
+          "frameworkAssemblies": {
+            "System.Runtime.Serialization": "4.0.0.0",
+            "System.Xml": "4.0.0.0"
+          },
             "buildOptions": {
                 "define": [
                     "APPDOMAIN",
@@ -29,15 +28,18 @@
         },
         "netstandard1.5": {
             "imports": "dnxcore50",
-            "dependencies": {
-                "System.Reflection.TypeExtensions": "4.1.0",
-                "System.Runtime.Loader": "4.0.0",
-                "System.Threading.ThreadPool": "4.0.10",
-                "System.Linq.Expressions": "4.1.0",
-                "System.Reflection": "4.1.0",
-                "System.Runtime.Extensions": "4.1.0",
-                "System.Diagnostics.StackTrace": "4.0.1"
-            }
+          "dependencies": {
+            "System.Diagnostics.StackTrace": "4.0.1",
+            "System.Linq.Expressions": "4.1.0",
+            "System.Reflection": "4.1.0",
+            "System.Reflection.TypeExtensions": "4.1.0",
+            "System.Runtime.Extensions": "4.1.0",
+            "System.Runtime.Loader": "4.0.0",
+            "System.Runtime.Serialization.Json": "4.0.2",
+            "System.Runtime.Serialization.Primitives": "4.1.1",
+            "System.Text.Encoding": "4.0.11",
+            "System.Threading.ThreadPool": "4.0.10"
+          }
         }
     }
 }