aboutsummaryrefslogtreecommitdiff
path: root/src/Emby.Server
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2016-11-18 12:52:16 -0500
committerGitHub <noreply@github.com>2016-11-18 12:52:16 -0500
commit9ff2d7590e7f34f26803cf658d20faeae6d9ecdb (patch)
tree612092edc128b95ba04e4c309a0379ac22fcfe9c /src/Emby.Server
parent0accbd194a191ce750b48a00c8a4f00786fe187d (diff)
parente0c72b605dbe124e111be9bff5cca442f86cf1ef (diff)
Merge pull request #2294 from MediaBrowser/dev
Dev
Diffstat (limited to 'src/Emby.Server')
-rw-r--r--src/Emby.Server/Program.cs1
-rw-r--r--src/Emby.Server/project.json3
2 files changed, 3 insertions, 1 deletions
diff --git a/src/Emby.Server/Program.cs b/src/Emby.Server/Program.cs
index 6f871990d..80e56c8ab 100644
--- a/src/Emby.Server/Program.cs
+++ b/src/Emby.Server/Program.cs
@@ -50,6 +50,7 @@ namespace Emby.Server
//var success = SetDllDirectory(architecturePath);
var appPaths = CreateApplicationPaths(baseDirectory);
+ SQLitePCL.raw.SetProvider(new SQLitePCL.SQLite3Provider_sqlite3());
var logManager = new NlogManager(appPaths.LogDirectoryPath, "server");
logManager.ReloadLogger(LogSeverity.Debug);
diff --git a/src/Emby.Server/project.json b/src/Emby.Server/project.json
index 55acee514..170523db1 100644
--- a/src/Emby.Server/project.json
+++ b/src/Emby.Server/project.json
@@ -15,7 +15,8 @@
"Microsoft.Win32.Registry": "4.0.0",
"System.Runtime.Extensions": "4.1.0",
"System.Diagnostics.Process": "4.1.0",
- "Microsoft.Data.SQLite": "1.1.0-preview1-final"
+ "Microsoft.Data.SQLite": "1.1.0-preview1-final",
+ "SQLitePCLRaw.provider.sqlite3.netstandard11": "1.1.0"
},
"frameworks": {