From 67501d021e7018ba42f514ad04209691536564fb Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 15 Oct 2013 23:04:59 -0400 Subject: [PATCH] update to nlog 2.1.0 --- MediaBrowser.Api/UserLibrary/ItemsService.cs | 4 ++-- .../MediaBrowser.Common.Implementations.csproj | 7 ++++--- MediaBrowser.Common.Implementations/packages.config | 2 +- MediaBrowser.Model/ApiClient/IServerEvents.cs | 4 ++++ MediaBrowser.Providers/Music/FanArtArtistProvider.cs | 2 +- MediaBrowser.ServerApplication/LibraryExplorer.xaml.cs | 1 - .../MediaBrowser.ServerApplication.csproj | 4 ++-- MediaBrowser.ServerApplication/packages.config | 2 +- Nuget/MediaBrowser.Common.Internal.nuspec | 2 +- 9 files changed, 16 insertions(+), 12 deletions(-) diff --git a/MediaBrowser.Api/UserLibrary/ItemsService.cs b/MediaBrowser.Api/UserLibrary/ItemsService.cs index d55ba2e90c..aff12569f1 100644 --- a/MediaBrowser.Api/UserLibrary/ItemsService.cs +++ b/MediaBrowser.Api/UserLibrary/ItemsService.cs @@ -836,12 +836,12 @@ namespace MediaBrowser.Api.UserLibrary { if (imageType == ImageType.Backdrop) { - return item.BackdropImagePaths != null && item.BackdropImagePaths.Count > 0; + return item.BackdropImagePaths.Count > 0; } if (imageType == ImageType.Screenshot) { - return item.ScreenshotImagePaths != null && item.ScreenshotImagePaths.Count > 0; + return item.ScreenshotImagePaths.Count > 0; } return item.HasImage(imageType); diff --git a/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj b/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj index c2553c1482..3ec330d9ce 100644 --- a/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj +++ b/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj @@ -37,6 +37,10 @@ Always + + False + ..\packages\NLog.2.1.0\lib\net45\NLog.dll + ..\packages\sharpcompress.0.10.1.3\lib\net40\SharpCompress.dll @@ -47,9 +51,6 @@ - - ..\packages\NLog.2.0.1.2\lib\net45\NLog.dll - ..\packages\ServiceStack.Text.3.9.62\lib\net35\ServiceStack.Text.dll diff --git a/MediaBrowser.Common.Implementations/packages.config b/MediaBrowser.Common.Implementations/packages.config index d03cb14e07..8716325bf4 100644 --- a/MediaBrowser.Common.Implementations/packages.config +++ b/MediaBrowser.Common.Implementations/packages.config @@ -1,6 +1,6 @@  - + diff --git a/MediaBrowser.Model/ApiClient/IServerEvents.cs b/MediaBrowser.Model/ApiClient/IServerEvents.cs index 23ec515596..f10e920526 100644 --- a/MediaBrowser.Model/ApiClient/IServerEvents.cs +++ b/MediaBrowser.Model/ApiClient/IServerEvents.cs @@ -100,5 +100,9 @@ namespace MediaBrowser.Model.ApiClient /// Occurs when [user data changed]. /// event EventHandler UserDataChanged; + /// + /// Occurs when [connected]. + /// + event EventHandler Connected; } } diff --git a/MediaBrowser.Providers/Music/FanArtArtistProvider.cs b/MediaBrowser.Providers/Music/FanArtArtistProvider.cs index 2d52ad1bd7..5ba0608de5 100644 --- a/MediaBrowser.Providers/Music/FanArtArtistProvider.cs +++ b/MediaBrowser.Providers/Music/FanArtArtistProvider.cs @@ -338,7 +338,7 @@ namespace MediaBrowser.Providers.Music if (nodes != null) { var numBackdrops = 0; - item.BackdropImagePaths = new List(); + item.BackdropImagePaths.Clear(); foreach (XmlNode node in nodes) { path = node.Value; diff --git a/MediaBrowser.ServerApplication/LibraryExplorer.xaml.cs b/MediaBrowser.ServerApplication/LibraryExplorer.xaml.cs index 600d80cb5c..a3d4706893 100644 --- a/MediaBrowser.ServerApplication/LibraryExplorer.xaml.cs +++ b/MediaBrowser.ServerApplication/LibraryExplorer.xaml.cs @@ -237,7 +237,6 @@ namespace MediaBrowser.ServerApplication { previews.Add(new PreviewItem(item.GetImage(ImageType.Thumb), "Thumb")); } - if (item.BackdropImagePaths != null) previews.AddRange( item.BackdropImagePaths.Select( image => new PreviewItem(image, "Backdrop"))); diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj index dbf9109fd2..c39ee40a8c 100644 --- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj +++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj @@ -123,9 +123,9 @@ False ..\packages\MediaBrowser.IsoMounting.3.0.61\lib\net45\MediaBrowser.IsoMounter.dll - + False - ..\packages\NLog.2.0.1.2\lib\net45\NLog.dll + ..\packages\NLog.2.1.0\lib\net45\NLog.dll False diff --git a/MediaBrowser.ServerApplication/packages.config b/MediaBrowser.ServerApplication/packages.config index 29b2cce5f4..4af6fa65e0 100644 --- a/MediaBrowser.ServerApplication/packages.config +++ b/MediaBrowser.ServerApplication/packages.config @@ -2,7 +2,7 @@ - + diff --git a/Nuget/MediaBrowser.Common.Internal.nuspec b/Nuget/MediaBrowser.Common.Internal.nuspec index 34d010469f..29bac722d2 100644 --- a/Nuget/MediaBrowser.Common.Internal.nuspec +++ b/Nuget/MediaBrowser.Common.Internal.nuspec @@ -13,7 +13,7 @@ Copyright © Media Browser 2013 - +