Merge pull request #2281 from MediaBrowser/dev

Dev

2 files changed, 4 insertions, 18 deletions

diff --git a/MediaBrowser.ServerApplication/Native/DbConnector.cs b/MediaBrowser.ServerApplication/Native/DbConnector.cs
index f403ce2ce4..986bc1850e 100644
--- a/MediaBrowser.ServerApplication/Native/DbConnector.cs
+++ b/MediaBrowser.ServerApplication/Native/DbConnector.cs
@@ -1,7 +1,7 @@
 using System.Data;
 using System.Threading.Tasks;
+using Emby.Server.Core.Data;
 using MediaBrowser.Model.Logging;
-using MediaBrowser.Server.Implementations.Persistence;
 
 namespace MediaBrowser.ServerApplication.Native
 {
diff --git a/MediaBrowser.ServerApplication/Native/WindowsApp.cs b/MediaBrowser.ServerApplication/Native/WindowsApp.cs
index 5bed8556e2..babe952d6d 100644
--- a/MediaBrowser.ServerApplication/Native/WindowsApp.cs
+++ b/MediaBrowser.ServerApplication/Native/WindowsApp.cs
@@ -8,13 +8,12 @@ using System.Diagnostics;
 using System.IO;
 using System.Reflection;
 using System.Windows.Forms;
+using Emby.Server.Core;
+using Emby.Server.Core.Data;
+using Emby.Server.Core.FFMpeg;
 using MediaBrowser.Common.IO;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Model.IO;
-using MediaBrowser.Model.System;
-using MediaBrowser.Server.Implementations.Persistence;
-using MediaBrowser.Server.Startup.Common.FFMpeg;
-using OperatingSystem = MediaBrowser.Server.Startup.Common.OperatingSystem;
 
 namespace MediaBrowser.ServerApplication.Native
 {
@@ -48,19 +47,6 @@ namespace MediaBrowser.ServerApplication.Native
             ServerAuthorization.AuthorizeServer(udpPort, httpServerPort, httpsPort, applicationPath, tempDirectory);
         }
 
-        public NativeEnvironment Environment
-        {
-            get
-            {
-                return new NativeEnvironment
-                {
-                    OperatingSystem = OperatingSystem.Windows,
-                    SystemArchitecture = System.Environment.Is64BitOperatingSystem ? Architecture.X64 : Architecture.X86,
-                    OperatingSystemVersionString = System.Environment.OSVersion.VersionString
-                };
-            }
-        }
-
         public bool SupportsLibraryMonitor
         {
             get { return true; }