Merge pull request #2297 from MediaBrowser/dev

Dev

3 files changed, 0 insertions, 36 deletions

diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
index 0826dc2250..9e5de25e40 100644
--- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
+++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
@@ -102,10 +102,6 @@
     <Reference Include="System.Configuration" />
     <Reference Include="System.Configuration.Install" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Data.SQLite, Version=1.0.103.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\ThirdParty\System.Data.SQLite.ManagedOnly\1.0.94.0\System.Data.SQLite.dll</HintPath>
-    </Reference>
     <Reference Include="System.Drawing" />
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.Management" />
@@ -121,9 +117,6 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\MediaBrowser.Server.Startup.Common\Persistence\SqliteExtensions.cs">
-      <Link>Native\SqliteExtensions.cs</Link>
-    </Compile>
     <Compile Include="..\SharedVersion.cs">
       <Link>Properties\SharedVersion.cs</Link>
     </Compile>
@@ -141,7 +134,6 @@
     </Compile>
     <Compile Include="MainStartup.cs" />
     <Compile Include="Native\LnkShortcutHandler.cs" />
-    <Compile Include="Native\DbConnector.cs" />
     <Compile Include="Native\LoopbackUtil.cs" />
     <Compile Include="Native\PowerManagement.cs" />
     <Compile Include="Native\Standby.cs" />
diff --git a/MediaBrowser.ServerApplication/Native/DbConnector.cs b/MediaBrowser.ServerApplication/Native/DbConnector.cs
deleted file mode 100644
index 986bc1850e..0000000000
--- a/MediaBrowser.ServerApplication/Native/DbConnector.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System.Data;
-using System.Threading.Tasks;
-using Emby.Server.Core.Data;
-using MediaBrowser.Model.Logging;
-
-namespace MediaBrowser.ServerApplication.Native
-{
-    public class DbConnector : IDbConnector
-    {
-        private readonly ILogger _logger;
-
-        public DbConnector(ILogger logger)
-        {
-            _logger = logger;
-        }
-
-        public Task<IDbConnection> Connect(string dbPath, bool isReadOnly, bool enablePooling = false, int? cacheSize = null)
-        {
-            return SqliteExtensions.ConnectToDb(dbPath, isReadOnly, enablePooling, cacheSize, _logger);
-        }
-    }
-}
\ No newline at end of file
diff --git a/MediaBrowser.ServerApplication/WindowsAppHost.cs b/MediaBrowser.ServerApplication/WindowsAppHost.cs
index 937762ed00..e36287584e 100644
--- a/MediaBrowser.ServerApplication/WindowsAppHost.cs
+++ b/MediaBrowser.ServerApplication/WindowsAppHost.cs
@@ -4,7 +4,6 @@ using System.Diagnostics;
 using System.IO;
 using System.Reflection;
 using Emby.Server.Core;
-using Emby.Server.Core.Data;
 using Emby.Server.Implementations;
 using Emby.Server.Implementations.EntryPoints;
 using Emby.Server.Implementations.FFMpeg;
@@ -92,11 +91,6 @@ namespace MediaBrowser.ServerApplication
                     ConfigurationManager.CommonApplicationPaths.TempDirectory);
         }
 
-        protected override IDbConnector GetDbConnector()
-        {
-            return new DbConnector(Logger);
-        }
-
         protected override void ConfigureAutoRunInternal(bool autorun)
         {
             var shortcutPath = Path.Combine(System.Environment.GetFolderPath(System.Environment.SpecialFolder.StartMenu), "Emby", "Emby Server.lnk");