diff --git a/MediaBrowser.Api/MediaBrowser.Api.csproj b/MediaBrowser.Api/MediaBrowser.Api.csproj
index b1e0339fcb..f33db49790 100644
--- a/MediaBrowser.Api/MediaBrowser.Api.csproj
+++ b/MediaBrowser.Api/MediaBrowser.Api.csproj
@@ -38,14 +38,6 @@
Always
-
- False
- ..\ThirdParty\ServiceStack\ServiceStack.Interfaces.dll
-
-
- False
- ..\ThirdParty\ServiceStack\ServiceStack.Text.dll
-
@@ -56,6 +48,12 @@
..\packages\morelinq.1.0.16006\lib\net35\MoreLinq.dll
+
+ ..\ThirdParty\ServiceStack\ServiceStack.Interfaces.dll
+
+
+ ..\ThirdParty\ServiceStack\ServiceStack.Text.dll
+
diff --git a/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj b/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj
index 7d75cfd3db..0d35cb4da0 100644
--- a/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj
+++ b/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj
@@ -37,14 +37,6 @@
Always
-
- False
- ..\ThirdParty\ServiceStack\ServiceStack.Text.dll
-
-
- False
- ..\packages\sharpcompress.0.10.2\lib\net40\SharpCompress.dll
-
@@ -58,6 +50,12 @@
..\packages\SimpleInjector.2.3.6\lib\net40-client\SimpleInjector.dll
+
+ ..\ThirdParty\ServiceStack\ServiceStack.Text.dll
+
+
+ ..\packages\sharpcompress.0.10.2\lib\net40\SharpCompress.dll
+
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index f1f2aaf5ef..8d03f84807 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -58,10 +58,6 @@
4
-
- False
- ..\ThirdParty\ServiceStack\ServiceStack.Interfaces.dll
-
@@ -74,6 +70,9 @@
..\packages\morelinq.1.0.16006\lib\net35\MoreLinq.dll
+
+ ..\ThirdParty\ServiceStack\ServiceStack.Interfaces.dll
+
diff --git a/MediaBrowser.Mono.sln b/MediaBrowser.Mono.sln
index 397763489a..bfd30573ec 100644
--- a/MediaBrowser.Mono.sln
+++ b/MediaBrowser.Mono.sln
@@ -36,8 +36,8 @@ Global
{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Debug|x86.Build.0 = Debug|x86
{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Release|Any CPU.Build.0 = Release|Any CPU
- {17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Release|x86.ActiveCfg = Release|Any CPU
- {17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Release|x86.Build.0 = Release|Any CPU
+ {17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Release|x86.ActiveCfg = Release|x86
+ {17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Release|x86.Build.0 = Release|x86
{2E781478-814D-4A48-9D80-BFF206441A65}.Debug|x86.ActiveCfg = Debug|Any CPU
{2E781478-814D-4A48-9D80-BFF206441A65}.Debug|x86.Build.0 = Debug|Any CPU
{2E781478-814D-4A48-9D80-BFF206441A65}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -82,6 +82,6 @@ Global
{C4D2573A-3FD3-441F-81AF-174AC4CD4E1D}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
- StartupItem = MediaBrowser.Model\MediaBrowser.Model.csproj
+ StartupItem = MediaBrowser.Server.Mono\MediaBrowser.Server.Mono.csproj
EndGlobalSection
EndGlobal
diff --git a/MediaBrowser.Mono.userprefs b/MediaBrowser.Mono.userprefs
index 51ba9d804b..26e63f6a87 100644
--- a/MediaBrowser.Mono.userprefs
+++ b/MediaBrowser.Mono.userprefs
@@ -1,13 +1,25 @@
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index 39966f0d7a..3d50de86cb 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -37,25 +37,8 @@
..\packages\Alchemy.2.2.1\lib\net40\Alchemy.dll
-
- False
- ..\ThirdParty\ServiceStack\ServiceStack.dll
-
-
- False
- ..\ThirdParty\ServiceStack\ServiceStack.Client.dll
-
-
- False
- ..\ThirdParty\ServiceStack\ServiceStack.Common.dll
-
-
- False
- ..\ThirdParty\ServiceStack\ServiceStack.Interfaces.dll
-
-
- False
- ..\ThirdParty\ServiceStack\ServiceStack.Text.dll
+
+ ..\ThirdParty\Mono.Data.Sqlite\Mono.Data.Sqlite.dll
@@ -73,6 +56,21 @@
..\packages\System.Data.SQLite.x86.1.0.89.0\lib\net45\System.Data.SQLite.dll
+
+ ..\ThirdParty\ServiceStack\ServiceStack.dll
+
+
+ ..\ThirdParty\ServiceStack\ServiceStack.Client.dll
+
+
+ ..\ThirdParty\ServiceStack\ServiceStack.Common.dll
+
+
+ ..\ThirdParty\ServiceStack\ServiceStack.Interfaces.dll
+
+
+ ..\ThirdParty\ServiceStack\ServiceStack.Text.dll
+
diff --git a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
index be7fb7b278..7df6146444 100644
--- a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
+++ b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
@@ -39,11 +39,8 @@
-
- ..\packages\ServiceStack.Common.3.9.70\lib\net35\ServiceStack.Common.dll
-
- ..\packages\ServiceStack.Common.3.9.70\lib\net35\ServiceStack.Interfaces.dll
+ ..\ThirdParty\ServiceStack\ServiceStack.Interfaces.dll
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 35ed3f1e26..9d2b42c85d 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -37,16 +37,15 @@
Always
-
- False
- ..\ThirdParty\ServiceStack\ServiceStack.Interfaces.dll
-
+
+ ..\ThirdParty\ServiceStack\ServiceStack.Interfaces.dll
+