From baedafbeb92db3ddf434f038984970bf0a6ac0c1 Mon Sep 17 00:00:00 2001
From: LukePulverenti Luke Pulverenti luke pulverenti
 <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com>
Date: Sun, 15 Jul 2012 16:27:07 -0400
Subject: Switched to service stack json. Added more api enhancements.

---
 MediaBrowser.Controller/Kernel.cs                      | 2 +-
 MediaBrowser.Controller/MediaBrowser.Controller.csproj | 4 ----
 MediaBrowser.Controller/UserController.cs              | 4 ++--
 MediaBrowser.Controller/packages.config                | 1 -
 4 files changed, 3 insertions(+), 8 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/Kernel.cs b/MediaBrowser.Controller/Kernel.cs
index b99d84616a..3db0cca8f0 100644
--- a/MediaBrowser.Controller/Kernel.cs
+++ b/MediaBrowser.Controller/Kernel.cs
@@ -202,7 +202,7 @@ namespace MediaBrowser.Controller
                 return new Configuration();
             }
 
-            return JsonSerializer.Deserialize<Configuration>(file);
+            return JsonSerializer.DeserializeFromFile<Configuration>(file);
         }
 
         public void ReloadItem(BaseItem item)
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index ad2289e1f4..c89a32c268 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -30,10 +30,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Newtonsoft.Json.4.5.7\lib\net40\Newtonsoft.Json.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Reactive">
diff --git a/MediaBrowser.Controller/UserController.cs b/MediaBrowser.Controller/UserController.cs
index cce20329fd..04ff6d215d 100644
--- a/MediaBrowser.Controller/UserController.cs
+++ b/MediaBrowser.Controller/UserController.cs
@@ -41,7 +41,7 @@ namespace MediaBrowser.Controller
         {
             string file = Path.Combine(path, "user.js");
 
-            return JsonSerializer.Deserialize<User>(file);
+            return JsonSerializer.DeserializeFromFile<User>(file);
         }
 
         public void CreateUser(User user)
@@ -54,7 +54,7 @@ namespace MediaBrowser.Controller
 
             Directory.CreateDirectory(userFolder);
 
-            JsonSerializer.Serialize(user, Path.Combine(userFolder, "user.js"));
+            JsonSerializer.SerializeToFile(user, Path.Combine(userFolder, "user.js"));
         }
     }
 }
diff --git a/MediaBrowser.Controller/packages.config b/MediaBrowser.Controller/packages.config
index 4f6bcdcffe..47102a263f 100644
--- a/MediaBrowser.Controller/packages.config
+++ b/MediaBrowser.Controller/packages.config
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="4.5.7" targetFramework="net45" />
   <package id="Rx-Main" version="1.0.11226" targetFramework="net45" />
 </packages>
\ No newline at end of file
-- 
cgit v1.2.3