diff --git a/MediaBrowser.Api/MediaBrowser.Api.csproj b/MediaBrowser.Api/MediaBrowser.Api.csproj
index 295cc78e9..7fa631e21 100644
--- a/MediaBrowser.Api/MediaBrowser.Api.csproj
+++ b/MediaBrowser.Api/MediaBrowser.Api.csproj
@@ -49,9 +49,9 @@
Always
-
+
False
- ..\packages\morelinq.1.1.0\lib\net35\MoreLinq.dll
+ ..\packages\morelinq.1.1.1\lib\net35\MoreLinq.dll
diff --git a/MediaBrowser.Api/packages.config b/MediaBrowser.Api/packages.config
index 6df166204..0cdb26bd5 100644
--- a/MediaBrowser.Api/packages.config
+++ b/MediaBrowser.Api/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
index 70ed5c319..bfd8c1f82 100644
--- a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
+++ b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
@@ -581,7 +581,7 @@ namespace MediaBrowser.Common.Implementations
protected void RegisterSingleInstance(T obj, bool manageLifetime = true)
where T : class
{
- Container.RegisterSingle(obj);
+ Container.RegisterSingleton(obj);
if (manageLifetime)
{
@@ -607,7 +607,7 @@ namespace MediaBrowser.Common.Implementations
protected void RegisterSingleInstance(Func func)
where T : class
{
- Container.RegisterSingle(func);
+ Container.RegisterSingleton(func);
}
void IDependencyContainer.Register(Type typeInterface, Type typeImplementation)
diff --git a/MediaBrowser.Common.Implementations/Logging/NlogManager.cs b/MediaBrowser.Common.Implementations/Logging/NlogManager.cs
index 698792802..6d4cd06cb 100644
--- a/MediaBrowser.Common.Implementations/Logging/NlogManager.cs
+++ b/MediaBrowser.Common.Implementations/Logging/NlogManager.cs
@@ -170,7 +170,7 @@ namespace MediaBrowser.Common.Implementations.Logging
///
/// The name.
/// ILogger.
- public ILogger GetLogger(string name)
+ public Model.Logging.ILogger GetLogger(string name)
{
return new NLogger(name, this);
}
diff --git a/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj b/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj
index e603ea373..e765b1ca3 100644
--- a/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj
+++ b/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj
@@ -48,18 +48,17 @@
Always
-
+
False
- ..\packages\NLog.3.2.1\lib\net45\NLog.dll
+ ..\packages\NLog.4.1.0\lib\net45\NLog.dll
False
..\ThirdParty\SharpCompress\SharpCompress.dll
-
+
False
- ..\packages\SimpleInjector.2.8.0\lib\net45\SimpleInjector.dll
- True
+ ..\packages\SimpleInjector.3.0.5\lib\net45\SimpleInjector.dll
diff --git a/MediaBrowser.Common.Implementations/packages.config b/MediaBrowser.Common.Implementations/packages.config
index e57c874f2..151a3a36d 100644
--- a/MediaBrowser.Common.Implementations/packages.config
+++ b/MediaBrowser.Common.Implementations/packages.config
@@ -1,5 +1,5 @@
-
-
+
+
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 24309734f..f898f8015 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -51,9 +51,9 @@
..\packages\Interfaces.IO.1.0.0.5\lib\portable-net45+sl4+wp71+win8+wpa81\Interfaces.IO.dll
-
+
False
- ..\packages\morelinq.1.1.0\lib\net35\MoreLinq.dll
+ ..\packages\morelinq.1.1.1\lib\net35\MoreLinq.dll
diff --git a/MediaBrowser.Controller/packages.config b/MediaBrowser.Controller/packages.config
index 8846b5a06..c320ed9d9 100644
--- a/MediaBrowser.Controller/packages.config
+++ b/MediaBrowser.Controller/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/MediaBrowser.Providers/MediaBrowser.Providers.csproj b/MediaBrowser.Providers/MediaBrowser.Providers.csproj
index 1d323e567..1d12426b9 100644
--- a/MediaBrowser.Providers/MediaBrowser.Providers.csproj
+++ b/MediaBrowser.Providers/MediaBrowser.Providers.csproj
@@ -53,9 +53,9 @@
False
..\packages\MediaBrowser.BdInfo.1.0.0.10\lib\net35\DvdLib.dll
-
+
False
- ..\packages\morelinq.1.1.0\lib\net35\MoreLinq.dll
+ ..\packages\morelinq.1.1.1\lib\net35\MoreLinq.dll
..\packages\taglib.2.1.0.0\lib\policy.2.0.taglib-sharp.dll
diff --git a/MediaBrowser.Providers/packages.config b/MediaBrowser.Providers/packages.config
index be21e92dc..fe2b571a4 100644
--- a/MediaBrowser.Providers/packages.config
+++ b/MediaBrowser.Providers/packages.config
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index f0312cef6..11dd7c28d 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -56,9 +56,9 @@
False
..\packages\Mono.Nat.1.2.24.0\lib\net40\Mono.Nat.dll
-
+
False
- ..\packages\morelinq.1.1.0\lib\net35\MoreLinq.dll
+ ..\packages\morelinq.1.1.1\lib\net35\MoreLinq.dll
..\packages\Patterns.Logging.1.0.0.2\lib\portable-net45+sl4+wp71+win8+wpa81\Patterns.Logging.dll
diff --git a/MediaBrowser.Server.Implementations/packages.config b/MediaBrowser.Server.Implementations/packages.config
index 92388c99e..758791868 100644
--- a/MediaBrowser.Server.Implementations/packages.config
+++ b/MediaBrowser.Server.Implementations/packages.config
@@ -3,7 +3,7 @@
-
+
\ No newline at end of file
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 2ba831c3f..caed0f5e6 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -57,9 +57,8 @@
..\ThirdParty\ServiceStack\ServiceStack.Interfaces.dll
-
- False
- ..\packages\WebMarkupMin.Core.0.9.12\lib\net40\WebMarkupMin.Core.dll
+
+ ..\packages\WebMarkupMin.Core.1.0.0\lib\net40\WebMarkupMin.Core.dll
@@ -300,6 +299,9 @@
PreserveNewest
+
+ PreserveNewest
+
PreserveNewest
@@ -1153,9 +1155,6 @@
PreserveNewest
-
- PreserveNewest
-
PreserveNewest
diff --git a/MediaBrowser.WebDashboard/packages.config b/MediaBrowser.WebDashboard/packages.config
index 48f68789b..cb5a32347 100644
--- a/MediaBrowser.WebDashboard/packages.config
+++ b/MediaBrowser.WebDashboard/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/Nuget/MediaBrowser.Common.Internal.nuspec b/Nuget/MediaBrowser.Common.Internal.nuspec
index f92e05492..558f7f5ca 100644
--- a/Nuget/MediaBrowser.Common.Internal.nuspec
+++ b/Nuget/MediaBrowser.Common.Internal.nuspec
@@ -14,7 +14,7 @@
-
+