From 1de8bc4bd0af72646ed58ecd7619a8731c48b09d Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 7 Apr 2017 16:36:44 -0400 Subject: [PATCH] use .net serializer rather than json.net --- Project-Unite/Controllers/APIController.cs | 17 ++++++++++++++--- Project-Unite/Project-Unite.csproj | 6 +++--- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/Project-Unite/Controllers/APIController.cs b/Project-Unite/Controllers/APIController.cs index 1a71209..286b4f4 100644 --- a/Project-Unite/Controllers/APIController.cs +++ b/Project-Unite/Controllers/APIController.cs @@ -3,13 +3,24 @@ using System.Collections.Generic; using System.Linq; using System.Web; using System.Web.Mvc; -using Newtonsoft.Json; +using System.Web.Script.Serialization; using Project_Unite.Models; namespace Project_Unite.Controllers { public class APIController : Controller { + public JavaScriptSerializer Serializer + { + get; set; + } + //I'll put those curly braces on their own line just to piss a certain smiley off. + + public APIController() + { + Serializer = new JavaScriptSerializer(); + } + // GET: API public ActionResult Index() { @@ -26,13 +37,13 @@ namespace Project_Unite.Controllers if (!showObsolete) releases = releases.Where(x => x.Obsolete == false).ToArray(); - return Content(JsonConvert.SerializeObject(releases)); + return Content(Serializer.Serialize(releases)); } public ActionResult Skins() { var db = new ApplicationDbContext(); - return Content(JsonConvert.SerializeObject(db.Skins.ToArray())); + return Content(Serializer.Serialize(db.Skins.ToArray())); } } } \ No newline at end of file diff --git a/Project-Unite/Project-Unite.csproj b/Project-Unite/Project-Unite.csproj index 36b45b0..5f09e0c 100644 --- a/Project-Unite/Project-Unite.csproj +++ b/Project-Unite/Project-Unite.csproj @@ -106,9 +106,9 @@ True - - False - Bin\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll + True ..\packages\Nito.AsyncEx.3.0.1\lib\net45\Nito.AsyncEx.dll