From 369d5e8f09e4e6e7e493bf2049325251942cd215 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 11 Nov 2016 00:45:34 -0500 Subject: [PATCH] update core project --- .../Configuration/ServerConfigurationManager.cs | 2 +- .../ServerApplicationPaths.cs | 2 +- Emby.Server.Core/project.json | 6 ++++++ .../MediaBrowser.Server.Startup.Common.csproj | 2 -- 4 files changed, 8 insertions(+), 4 deletions(-) rename {MediaBrowser.Server.Startup.Common => Emby.Server.Core}/Configuration/ServerConfigurationManager.cs (99%) rename {MediaBrowser.Server.Startup.Common => Emby.Server.Core}/ServerApplicationPaths.cs (99%) diff --git a/MediaBrowser.Server.Startup.Common/Configuration/ServerConfigurationManager.cs b/Emby.Server.Core/Configuration/ServerConfigurationManager.cs similarity index 99% rename from MediaBrowser.Server.Startup.Common/Configuration/ServerConfigurationManager.cs rename to Emby.Server.Core/Configuration/ServerConfigurationManager.cs index 756a8d0bf9..f98c096ca3 100644 --- a/MediaBrowser.Server.Startup.Common/Configuration/ServerConfigurationManager.cs +++ b/Emby.Server.Core/Configuration/ServerConfigurationManager.cs @@ -17,7 +17,7 @@ using MediaBrowser.Model.IO; using MediaBrowser.Model.Logging; using MediaBrowser.Model.Serialization; -namespace MediaBrowser.Server.Startup.Common.Configuration +namespace Emby.Server.Core.Configuration { /// /// Class ServerConfigurationManager diff --git a/MediaBrowser.Server.Startup.Common/ServerApplicationPaths.cs b/Emby.Server.Core/ServerApplicationPaths.cs similarity index 99% rename from MediaBrowser.Server.Startup.Common/ServerApplicationPaths.cs rename to Emby.Server.Core/ServerApplicationPaths.cs index 11de1c4abc..d59dd89d9c 100644 --- a/MediaBrowser.Server.Startup.Common/ServerApplicationPaths.cs +++ b/Emby.Server.Core/ServerApplicationPaths.cs @@ -2,7 +2,7 @@ using Emby.Common.Implementations; using MediaBrowser.Controller; -namespace MediaBrowser.Server.Startup.Common +namespace Emby.Server.Core { /// /// Extends BaseApplicationPaths to add paths that are only applicable on the server diff --git a/Emby.Server.Core/project.json b/Emby.Server.Core/project.json index ae3ff52036..4f5adf09f4 100644 --- a/Emby.Server.Core/project.json +++ b/Emby.Server.Core/project.json @@ -19,6 +19,9 @@ }, "MediaBrowser.Controller": { "target": "project" + }, + "Emby.Common.Implementations": { + "target": "project" } } }, @@ -34,6 +37,9 @@ }, "MediaBrowser.Controller": { "target": "project" + }, + "Emby.Common.Implementations": { + "target": "project" } } } diff --git a/MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj b/MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj index 7d6df52c20..6196a74a2b 100644 --- a/MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj +++ b/MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj @@ -96,7 +96,6 @@ - @@ -165,7 +164,6 @@ -