diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-10-15 23:04:59 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-10-15 23:04:59 -0400 |
| commit | 67501d021e7018ba42f514ad04209691536564fb (patch) | |
| tree | 3a61f36d459b0be6b4213bc3791b9155df78a328 | |
| parent | 28bb5c7903425b4dcedcc299609702c534647089 (diff) | |
update to nlog 2.1.0
9 files changed, 16 insertions, 12 deletions
diff --git a/MediaBrowser.Api/UserLibrary/ItemsService.cs b/MediaBrowser.Api/UserLibrary/ItemsService.cs index d55ba2e90..aff12569f 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 c2553c148..3ec330d9c 100644 --- a/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj +++ b/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj @@ -37,6 +37,10 @@ <RunPostBuildEvent>Always</RunPostBuildEvent> </PropertyGroup> <ItemGroup> + <Reference Include="NLog, Version=2.1.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL"> + <SpecificVersion>False</SpecificVersion> + <HintPath>..\packages\NLog.2.1.0\lib\net45\NLog.dll</HintPath> + </Reference> <Reference Include="SharpCompress"> <HintPath>..\packages\sharpcompress.0.10.1.3\lib\net40\SharpCompress.dll</HintPath> </Reference> @@ -47,9 +51,6 @@ <Reference Include="System.Net" /> <Reference Include="System.Net.Http" /> <Reference Include="System.Xml" /> - <Reference Include="NLog"> - <HintPath>..\packages\NLog.2.0.1.2\lib\net45\NLog.dll</HintPath> - </Reference> <Reference Include="ServiceStack.Text"> <HintPath>..\packages\ServiceStack.Text.3.9.62\lib\net35\ServiceStack.Text.dll</HintPath> </Reference> diff --git a/MediaBrowser.Common.Implementations/packages.config b/MediaBrowser.Common.Implementations/packages.config index d03cb14e0..8716325bf 100644 --- a/MediaBrowser.Common.Implementations/packages.config +++ b/MediaBrowser.Common.Implementations/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="NLog" version="2.0.1.2" targetFramework="net45" /> + <package id="NLog" version="2.1.0" targetFramework="net45" /> <package id="ServiceStack.Text" version="3.9.62" targetFramework="net45" /> <package id="sharpcompress" version="0.10.1.3" targetFramework="net45" /> <package id="SimpleInjector" version="2.3.5" targetFramework="net45" /> diff --git a/MediaBrowser.Model/ApiClient/IServerEvents.cs b/MediaBrowser.Model/ApiClient/IServerEvents.cs index 23ec51559..f10e92052 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]. /// </summary> event EventHandler<UserDataChangedEventArgs> UserDataChanged; + /// <summary> + /// Occurs when [connected]. + /// </summary> + event EventHandler<EventArgs> Connected; } } diff --git a/MediaBrowser.Providers/Music/FanArtArtistProvider.cs b/MediaBrowser.Providers/Music/FanArtArtistProvider.cs index 2d52ad1bd..5ba0608de 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<string>(); + 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 600d80cb5..a3d470689 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 dbf9109fd..c39ee40a8 100644 --- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj +++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj @@ -123,9 +123,9 @@ <SpecificVersion>False</SpecificVersion> <HintPath>..\packages\MediaBrowser.IsoMounting.3.0.61\lib\net45\MediaBrowser.IsoMounter.dll</HintPath> </Reference> - <Reference Include="NLog, Version=2.0.1.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL"> + <Reference Include="NLog, Version=2.1.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\packages\NLog.2.0.1.2\lib\net45\NLog.dll</HintPath> + <HintPath>..\packages\NLog.2.1.0\lib\net45\NLog.dll</HintPath> </Reference> <Reference Include="pfmclrapi, Version=0.0.0.0, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> diff --git a/MediaBrowser.ServerApplication/packages.config b/MediaBrowser.ServerApplication/packages.config index 29b2cce5f..4af6fa65e 100644 --- a/MediaBrowser.ServerApplication/packages.config +++ b/MediaBrowser.ServerApplication/packages.config @@ -2,7 +2,7 @@ <packages> <package id="Hardcodet.Wpf.TaskbarNotification" version="1.0.4.0" targetFramework="net45" /> <package id="MediaBrowser.IsoMounting" version="3.0.61" targetFramework="net45" /> - <package id="NLog" version="2.0.1.2" targetFramework="net45" /> + <package id="NLog" version="2.1.0" targetFramework="net45" /> <package id="ServiceStack" version="3.9.62" targetFramework="net45" /> <package id="ServiceStack.Common" version="3.9.62" targetFramework="net45" /> <package id="ServiceStack.OrmLite.SqlServer" version="3.9.44" targetFramework="net45" /> diff --git a/Nuget/MediaBrowser.Common.Internal.nuspec b/Nuget/MediaBrowser.Common.Internal.nuspec index 34d010469..29bac722d 100644 --- a/Nuget/MediaBrowser.Common.Internal.nuspec +++ b/Nuget/MediaBrowser.Common.Internal.nuspec @@ -13,7 +13,7 @@ <copyright>Copyright © Media Browser 2013</copyright> <dependencies> <dependency id="MediaBrowser.Common" version="3.0.225" /> - <dependency id="NLog" version="2.0.1.2" /> + <dependency id="NLog" version="2.1.0" /> <dependency id="ServiceStack.Text" version="3.9.58" /> <dependency id="SimpleInjector" version="2.3.2" /> <dependency id="sharpcompress" version="0.10.1.3" /> |
