diff --git a/MediaBrowser.ApiInteraction/BaseApiClient.cs b/MediaBrowser.ApiInteraction/BaseApiClient.cs
index 4bd4ace508..bcbcc53afb 100644
--- a/MediaBrowser.ApiInteraction/BaseApiClient.cs
+++ b/MediaBrowser.ApiInteraction/BaseApiClient.cs
@@ -26,13 +26,13 @@ namespace MediaBrowser.ApiInteraction
/// Gets the protobuf serializer.
///
/// The protobuf serializer.
- public IProtobufSerializer ProtobufSerializer { get; private set; }
+ public IProtobufSerializer ProtobufSerializer { get; set; }
///
/// Gets the json serializer.
///
/// The json serializer.
- public IJsonSerializer JsonSerializer { get; private set; }
+ public IJsonSerializer JsonSerializer { get; set; }
///
/// Initializes a new instance of the class.
diff --git a/MediaBrowser.Logging.NLog/LogHelper.cs b/MediaBrowser.Common.Implementations/Logging/LogHelper.cs
similarity index 98%
rename from MediaBrowser.Logging.NLog/LogHelper.cs
rename to MediaBrowser.Common.Implementations/Logging/LogHelper.cs
index 93df4b2aa6..4afd302d5b 100644
--- a/MediaBrowser.Logging.NLog/LogHelper.cs
+++ b/MediaBrowser.Common.Implementations/Logging/LogHelper.cs
@@ -1,7 +1,7 @@
using System;
using System.Text;
-namespace MediaBrowser.Logging.Nlog
+namespace MediaBrowser.Common.Implementations.Logging
{
///
/// Class LogHelper
diff --git a/MediaBrowser.Logging.NLog/NLogger.cs b/MediaBrowser.Common.Implementations/Logging/NLogger.cs
similarity index 99%
rename from MediaBrowser.Logging.NLog/NLogger.cs
rename to MediaBrowser.Common.Implementations/Logging/NLogger.cs
index b3aedbf7c3..c87b58f70a 100644
--- a/MediaBrowser.Logging.NLog/NLogger.cs
+++ b/MediaBrowser.Common.Implementations/Logging/NLogger.cs
@@ -2,7 +2,7 @@
using System;
using System.Text;
-namespace MediaBrowser.Logging.Nlog
+namespace MediaBrowser.Common.Implementations.Logging
{
///
/// Class NLogger
diff --git a/MediaBrowser.Logging.NLog/NlogManager.cs b/MediaBrowser.Common.Implementations/Logging/NlogManager.cs
similarity index 98%
rename from MediaBrowser.Logging.NLog/NlogManager.cs
rename to MediaBrowser.Common.Implementations/Logging/NlogManager.cs
index fa69b94a01..1e525137cf 100644
--- a/MediaBrowser.Logging.NLog/NlogManager.cs
+++ b/MediaBrowser.Common.Implementations/Logging/NlogManager.cs
@@ -6,7 +6,7 @@ using System;
using System.IO;
using System.Threading.Tasks;
-namespace MediaBrowser.Logging.Nlog
+namespace MediaBrowser.Common.Implementations.Logging
{
///
/// Class NlogManager
diff --git a/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj b/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj
index 59ec01aaf1..52be41ddde 100644
--- a/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj
+++ b/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj
@@ -35,6 +35,9 @@
Always
+
+ ..\packages\NLog.2.0.0.2000\lib\net40\NLog.dll
+
..\packages\protobuf-net.2.0.0.621\lib\net40\protobuf-net.dll
@@ -56,6 +59,9 @@
+
+
+
diff --git a/MediaBrowser.Common.Implementations/packages.config b/MediaBrowser.Common.Implementations/packages.config
index 63fd0052fc..2578e48f3b 100644
--- a/MediaBrowser.Common.Implementations/packages.config
+++ b/MediaBrowser.Common.Implementations/packages.config
@@ -1,5 +1,6 @@
+
diff --git a/MediaBrowser.Controller/Localization/LocalizedStrings.cs b/MediaBrowser.Controller/Localization/LocalizedStrings.cs
index 6405be5f84..cd1a570470 100644
--- a/MediaBrowser.Controller/Localization/LocalizedStrings.cs
+++ b/MediaBrowser.Controller/Localization/LocalizedStrings.cs
@@ -88,7 +88,7 @@ namespace MediaBrowser.Controller.Localization
{
using (var fs = new FileStream(file, FileMode.Open, FileAccess.Read))
{
- strings = (LocalizedStringData)xs.Deserialize(fs);
+ strings = (BaseStrings)xs.Deserialize(fs);
}
}
else
@@ -100,7 +100,7 @@ namespace MediaBrowser.Controller.Localization
{
//only re-save the english version as that is the one defined internally
strings = new BaseStrings {FileName = file};
- strings.Save();
+ //strings.Save();
}
return strings;
diff --git a/MediaBrowser.Logging.NLog/MediaBrowser.Logging.NLog.csproj b/MediaBrowser.Logging.NLog/MediaBrowser.Logging.NLog.csproj
deleted file mode 100644
index 1bc6086790..0000000000
--- a/MediaBrowser.Logging.NLog/MediaBrowser.Logging.NLog.csproj
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
-
- Debug
- AnyCPU
- {67310740-0EC4-4DC2-9921-33DF38B20167}
- Library
- Properties
- MediaBrowser.Logging.NLog
- MediaBrowser.Logging.NLog
- v4.5
- 512
- ..\
- true
-
-
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
-
-
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
-
-
-
- ..\packages\NLog.2.0.0.2000\lib\net40\NLog.dll
-
-
-
-
-
-
-
-
-
-
-
- Properties\SharedVersion.cs
-
-
-
-
-
-
-
-
- {7eeeb4bb-f3e8-48fc-b4c5-70f0fff8329b}
- MediaBrowser.Model
-
-
-
-
-
-
-
-
- xcopy "$(TargetPath)" "$(SolutionDir)\Nuget\dlls\" /y /d /r /i
-
-
-
\ No newline at end of file
diff --git a/MediaBrowser.Logging.NLog/Properties/AssemblyInfo.cs b/MediaBrowser.Logging.NLog/Properties/AssemblyInfo.cs
deleted file mode 100644
index 345d727bee..0000000000
--- a/MediaBrowser.Logging.NLog/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("MediaBrowser.Logging.NLog")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("MediaBrowser.Logging.NLog")]
-[assembly: AssemblyCopyright("Copyright © 2013")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("095763bf-68a9-4d89-ad01-d0e3c1f5c11f")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
\ No newline at end of file
diff --git a/MediaBrowser.Logging.NLog/packages.config b/MediaBrowser.Logging.NLog/packages.config
deleted file mode 100644
index ede36938cc..0000000000
--- a/MediaBrowser.Logging.NLog/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index 2cdb5789b4..2fe257aaf1 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -1,6 +1,7 @@
using BDInfo;
using MediaBrowser.ClickOnce;
using MediaBrowser.Common.Implementations;
+using MediaBrowser.Common.Implementations.Logging;
using MediaBrowser.Common.Implementations.ScheduledTasks;
using MediaBrowser.Common.Implementations.Serialization;
using MediaBrowser.Common.IO;
@@ -10,7 +11,6 @@ using MediaBrowser.Common.Net;
using MediaBrowser.Common.ScheduledTasks;
using MediaBrowser.Controller;
using MediaBrowser.IsoMounter;
-using MediaBrowser.Logging.Nlog;
using MediaBrowser.Model.IO;
using MediaBrowser.Model.Logging;
using MediaBrowser.Model.MediaInfo;
diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
index 3c82943bd8..9492fcfe0f 100644
--- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
+++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
@@ -278,10 +278,6 @@
{5356ae30-6a6e-4a64-81e3-f76c50595e64}
MediaBrowser.IsoMounter
-
- {67310740-0ec4-4dc2-9921-33df38b20167}
- MediaBrowser.Logging.NLog
-
{7eeeb4bb-f3e8-48fc-b4c5-70f0fff8329b}
MediaBrowser.Model
diff --git a/MediaBrowser.sln b/MediaBrowser.sln
index 3105614f88..9221a7a347 100644
--- a/MediaBrowser.sln
+++ b/MediaBrowser.sln
@@ -39,8 +39,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.IsoMounter", "
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.Installer", "MediaBrowser.Installer\MediaBrowser.Installer.csproj", "{3879F78A-D6F6-45E5-B2A8-D8DCF2DABB74}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.Logging.NLog", "MediaBrowser.Logging.NLog\MediaBrowser.Logging.NLog.csproj", "{67310740-0EC4-4DC2-9921-33DF38B20167}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.ClickOnce", "MediaBrowser.ClickOnce\MediaBrowser.ClickOnce.csproj", "{CC96BF3E-0BDA-4809-BC4B-BB6D418F4A84}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.Networking", "MediaBrowser.Networking\MediaBrowser.Networking.csproj", "{7C11010E-179A-49B7-BFB2-F1656F5E71AD}"
@@ -251,20 +249,6 @@ Global
{3879F78A-D6F6-45E5-B2A8-D8DCF2DABB74}.Release|Win32.ActiveCfg = Release|Any CPU
{3879F78A-D6F6-45E5-B2A8-D8DCF2DABB74}.Release|x64.ActiveCfg = Release|Any CPU
{3879F78A-D6F6-45E5-B2A8-D8DCF2DABB74}.Release|x86.ActiveCfg = Release|Any CPU
- {67310740-0EC4-4DC2-9921-33DF38B20167}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {67310740-0EC4-4DC2-9921-33DF38B20167}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {67310740-0EC4-4DC2-9921-33DF38B20167}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {67310740-0EC4-4DC2-9921-33DF38B20167}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {67310740-0EC4-4DC2-9921-33DF38B20167}.Debug|Win32.ActiveCfg = Debug|Any CPU
- {67310740-0EC4-4DC2-9921-33DF38B20167}.Debug|x64.ActiveCfg = Debug|Any CPU
- {67310740-0EC4-4DC2-9921-33DF38B20167}.Debug|x86.ActiveCfg = Debug|Any CPU
- {67310740-0EC4-4DC2-9921-33DF38B20167}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {67310740-0EC4-4DC2-9921-33DF38B20167}.Release|Any CPU.Build.0 = Release|Any CPU
- {67310740-0EC4-4DC2-9921-33DF38B20167}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {67310740-0EC4-4DC2-9921-33DF38B20167}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {67310740-0EC4-4DC2-9921-33DF38B20167}.Release|Win32.ActiveCfg = Release|Any CPU
- {67310740-0EC4-4DC2-9921-33DF38B20167}.Release|x64.ActiveCfg = Release|Any CPU
- {67310740-0EC4-4DC2-9921-33DF38B20167}.Release|x86.ActiveCfg = Release|Any CPU
{CC96BF3E-0BDA-4809-BC4B-BB6D418F4A84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CC96BF3E-0BDA-4809-BC4B-BB6D418F4A84}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CC96BF3E-0BDA-4809-BC4B-BB6D418F4A84}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
diff --git a/Nuget/MediaBrowser.ApiClient.nuspec b/Nuget/MediaBrowser.ApiClient.nuspec
index a13bfd84c7..6b38b9aaba 100644
--- a/Nuget/MediaBrowser.ApiClient.nuspec
+++ b/Nuget/MediaBrowser.ApiClient.nuspec
@@ -2,7 +2,7 @@
MediaBrowser.ApiClient
- 3.0.0.7-beta
+ 3.0.0.8-beta
MediaBrowser.ApiClient
Media Browser Team
scottisafool,Luke
diff --git a/Nuget/MediaBrowser.Common.Internal.nuspec b/Nuget/MediaBrowser.Common.Internal.nuspec
index 18e8068df2..a291bc907a 100644
--- a/Nuget/MediaBrowser.Common.Internal.nuspec
+++ b/Nuget/MediaBrowser.Common.Internal.nuspec
@@ -22,7 +22,6 @@
-