aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorabeloin <alexandre.beloin@gmail.com>2013-12-25 19:40:53 -0500
committerabeloin <alexandre.beloin@gmail.com>2013-12-25 19:40:53 -0500
commit316500dca40f7d861af394d6db27f14302255622 (patch)
treebdac66b4be6b2d9faff178b41e349c714e4d5005
parent68cf16416ba4fb88293b2bdac9867c5534fd7357 (diff)
-Replaced Mono.Data.SQLite by System.Data.SQLite(ManagedOnly)
-Added System.Data.SQLite and Sqlite3 into ThirdParty -Depending of the OS, System.Data.SQLite will look for: sqlite3.dll in Windows(Provided with the project) libsqlite3.so.0 in Linux(Need to be installed. ie yum install sqlite.i686) libsqlite3.dylib in MacOS X(!?) (See http://www.mono-project.com/Interop_with_Native_Libraries for more info)
-rw-r--r--MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj20
-rw-r--r--MediaBrowser.Server.Implementations/Persistence/SqliteExtensions.cs18
-rw-r--r--MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj7
3 files changed, 22 insertions, 23 deletions
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index efc1549bc..3b20784fc 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -48,9 +48,6 @@
<Reference Include="Alchemy">
<HintPath>..\packages\Alchemy.2.2.1\lib\net40\Alchemy.dll</HintPath>
</Reference>
- <Reference Include="Mono.Data.Sqlite">
- <HintPath>..\ThirdParty\Mono.Data.Sqlite\Mono.Data.Sqlite.dll</HintPath>
- </Reference>
<Reference Include="ServiceStack.Api.Swagger">
<HintPath>..\ThirdParty\ServiceStack\ServiceStack.Api.Swagger.dll</HintPath>
</Reference>
@@ -67,9 +64,14 @@
<Reference Include="BDInfo">
<HintPath>..\packages\MediaBrowser.BdInfo.1.0.0.5\lib\net20\BDInfo.dll</HintPath>
</Reference>
- <Reference Include="System.Data.SQLite">
+ <Reference Include="System.Data.SQLite" Condition=" '$(ConfigurationName)' != 'Release Mono' ">
+ <SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\System.Data.SQLite.x86.1.0.89.0\lib\net45\System.Data.SQLite.dll</HintPath>
</Reference>
+ <Reference Include="System.Data.SQLite" Condition=" '$(ConfigurationName)' == 'Release Mono' ">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\ThirdParty\System.Data.SQLite.ManagedOnly\x86\1.0.90.0\net40\System.Data.SQLite.dll</HintPath>
+ </Reference>
<Reference Include="ServiceStack">
<HintPath>..\ThirdParty\ServiceStack\ServiceStack.dll</HintPath>
</Reference>
@@ -346,6 +348,16 @@
</Content>
<EmbeddedResource Include="Localization\Ratings\be.txt" />
</ItemGroup>
+ <ItemGroup>
+ <Content Include="..\ThirdParty\System.Data.SQLite.ManagedOnly\x86\1.0.90.0\net40\System.Data.SQLite.dll">
+ <Link>System.Data.SQLite.dll</Link>
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="..\ThirdParty\System.Data.SQLite.ManagedOnly\x86\1.0.90.0\net40\System.Data.SQLite.Linq.dll">
+ <Link>System.Data.SQLite.Linq.dll</Link>
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\nuget.targets" Condition=" '$(ConfigurationName)' != 'Release Mono' " />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteExtensions.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteExtensions.cs
index 9836de735..0b3d5f784 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteExtensions.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteExtensions.cs
@@ -1,11 +1,7 @@
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;
@@ -140,18 +136,6 @@ namespace MediaBrowser.Server.Implementations.Persistence
logger.Info("Opening {0}", 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,
@@ -162,7 +146,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.Mono/MediaBrowser.Server.Mono.csproj b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
index d3363ef0a..d37330821 100644
--- a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
+++ b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
@@ -128,8 +128,11 @@
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
- <None Include="sqlite3.dll">
+ </ItemGroup>
+ <ItemGroup>
+ <Content Include="..\ThirdParty\SQLite3\x86\3.8.2\sqlite3.dll">
+ <Link>sqlite3.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
+ </Content>
</ItemGroup>
</Project> \ No newline at end of file