aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Controller')
-rw-r--r--MediaBrowser.Controller/Kernel.cs2
-rw-r--r--MediaBrowser.Controller/MediaBrowser.Controller.csproj4
-rw-r--r--MediaBrowser.Controller/UserController.cs4
-rw-r--r--MediaBrowser.Controller/packages.config1
4 files changed, 3 insertions, 8 deletions
diff --git a/MediaBrowser.Controller/Kernel.cs b/MediaBrowser.Controller/Kernel.cs
index b99d84616..3db0cca8f 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 ad2289e1f..c89a32c26 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 cce20329f..04ff6d215 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 4f6bcdcff..47102a263 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