Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

4 files changed, 49 insertions, 22 deletions

diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index 86ea3b051..39a9b7789 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -37,10 +37,6 @@
     <Reference Include="Alchemy">
       <HintPath>..\packages\Alchemy.2.2.1\lib\net40\Alchemy.dll</HintPath>
     </Reference>
-    <Reference Include="ServiceStack.OrmLite, Version=3.9.60.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\ServiceStack.OrmLite.Sqlite32.3.9.63\lib\net40\ServiceStack.OrmLite.dll</HintPath>
-    </Reference>
     <Reference Include="ServiceStack.OrmLite.SqliteNET">
       <HintPath>..\packages\ServiceStack.OrmLite.Sqlite32.3.9.63\lib\net40\ServiceStack.OrmLite.SqliteNET.dll</HintPath>
     </Reference>
@@ -97,6 +93,15 @@
     <Reference Include="System.Data.SQLite.Linq">
       <HintPath>..\packages\System.Data.SQLite.x86.1.0.88.0\lib\net45\System.Data.SQLite.Linq.dll</HintPath>
     </Reference>
+    <Reference Include="Mono.Data.Sqlite">
+      <HintPath>..\packages\ServiceStack.OrmLite.Sqlite.Mono.3.9.64\lib\net35\Mono.Data.Sqlite.dll</HintPath>
+    </Reference>
+    <Reference Include="ServiceStack.OrmLite">
+      <HintPath>..\packages\ServiceStack.OrmLite.Sqlite.Mono.3.9.64\lib\net35\ServiceStack.OrmLite.dll</HintPath>
+    </Reference>
+    <Reference Include="ServiceStack.OrmLite.Sqlite">
+      <HintPath>..\packages\ServiceStack.OrmLite.Sqlite.Mono.3.9.64\lib\net35\ServiceStack.OrmLite.Sqlite.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\SharedVersion.cs">
@@ -253,6 +258,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
+    <None Include="sqlite3.dll" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="swagger-ui\css\hightlight.default.css">
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteExtensions.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteExtensions.cs
index 41e419e1a..b5672c39b 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteExtensions.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteExtensions.cs
@@ -1,7 +1,11 @@
 using MediaBrowser.Model.Logging;
 using System;
 using System.Data;
+#if __MonoCS__
+using Mono.Data.Sqlite;
+#else 
 using System.Data.SQLite;
+#endif
 using System.IO;
 using System.Threading.Tasks;
 
@@ -133,6 +137,18 @@ namespace MediaBrowser.Server.Implementations.Persistence
                 throw new ArgumentNullException("dbPath");
             }
 
+			#if __MonoCS__
+			var connectionstr = new SqliteConnectionStringBuilder
+			{
+				PageSize = 4096,
+				CacheSize = 4096,
+				SyncMode = SynchronizationModes.Normal,
+				DataSource = dbPath,
+				JournalMode = SQLiteJournalModeEnum.Off
+			};
+
+			var connection = new SqliteConnection(connectionstr.ConnectionString);
+#else
             var connectionstr = new SQLiteConnectionStringBuilder
             {
                 PageSize = 4096,
@@ -143,7 +159,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
             };
 
             var connection = new SQLiteConnection(connectionstr.ConnectionString);
-
+#endif
             await connection.OpenAsync().ConfigureAwait(false);
 
             return connection;
diff --git a/MediaBrowser.Server.Implementations/packages.config b/MediaBrowser.Server.Implementations/packages.config
index 6dfb01cc0..bdcf0f9ff 100644
--- a/MediaBrowser.Server.Implementations/packages.config
+++ b/MediaBrowser.Server.Implementations/packages.config
@@ -1,17 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Alchemy" version="2.2.1" targetFramework="net45" />
-  <package id="MediaBrowser.BdInfo" version="1.0.0.2" targetFramework="net45" />
-  <package id="morelinq" version="1.0.16006" targetFramework="net45" />
-  <package id="Rx-Core" version="2.1.30214.0" targetFramework="net45" />
-  <package id="Rx-Interfaces" version="2.1.30214.0" targetFramework="net45" />
-  <package id="Rx-Linq" version="2.1.30214.0" targetFramework="net45" />
-  <package id="ServiceStack" version="3.9.62" targetFramework="net45" />
-  <package id="ServiceStack.Api.Swagger" version="3.9.59" targetFramework="net45" />
-  <package id="ServiceStack.Common" version="3.9.62" targetFramework="net45" />
-  <package id="ServiceStack.OrmLite.Sqlite32" version="3.9.63" targetFramework="net45" />
-  <package id="ServiceStack.OrmLite.SqlServer" version="3.9.43" targetFramework="net45" />
-  <package id="ServiceStack.Redis" version="3.9.43" targetFramework="net45" />
-  <package id="ServiceStack.Text" version="3.9.62" targetFramework="net45" />
-  <package id="System.Data.SQLite.x86" version="1.0.88.0" targetFramework="net45" />
+<?xml version="1.0" encoding="utf-8"?>

+<packages>

+  <package id="Alchemy" version="2.2.1" targetFramework="net45" />

+  <package id="MediaBrowser.BdInfo" version="1.0.0.2" targetFramework="net45" />

+  <package id="morelinq" version="1.0.16006" targetFramework="net45" />

+  <package id="Rx-Core" version="2.1.30214.0" targetFramework="net45" />

+  <package id="Rx-Interfaces" version="2.1.30214.0" targetFramework="net45" />

+  <package id="Rx-Linq" version="2.1.30214.0" targetFramework="net45" />

+  <package id="ServiceStack" version="3.9.62" targetFramework="net45" />

+  <package id="ServiceStack.Api.Swagger" version="3.9.59" targetFramework="net45" />

+  <package id="ServiceStack.Common" version="3.9.62" targetFramework="net45" />

+  <package id="ServiceStack.OrmLite.Sqlite.Mono" version="3.9.64" targetFramework="net45" />

+  <package id="ServiceStack.OrmLite.Sqlite32" version="3.9.63" targetFramework="net45" />

+  <package id="ServiceStack.OrmLite.SqlServer" version="3.9.43" targetFramework="net45" />

+  <package id="ServiceStack.Redis" version="3.9.43" targetFramework="net45" />

+  <package id="ServiceStack.Text" version="3.9.62" targetFramework="net45" />

+  <package id="System.Data.SQLite.x86" version="1.0.88.0" targetFramework="net45" />

 </packages>
\ No newline at end of file
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs
index 5cf0f2efa..5ebeaf24a 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@@ -161,7 +161,11 @@ namespace MediaBrowser.WebDashboard.Api
         /// <returns>System.String.</returns>
         private string GetDashboardResourcePath(string virtualPath)
         {
-            return Path.Combine(DashboardUIPath, virtualPath.Replace('/', '\\'));
+			#if __MonoCS__
+			return Path.Combine(DashboardUIPath, virtualPath);
+			#else
+			return Path.Combine(DashboardUIPath, virtualPath.Replace('/', '\\'));
+			#endif
         }
 
         /// <summary>