open-source-mirrors
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update to nlog 2.1.0

Browse Source
pull/702/head
Luke Pulverenti 12 years ago
parent 28bb5c7903
commit 67501d021e
9 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File

4
MediaBrowser.Api/UserLibrary/ItemsService.cs
Unescape View File

@ -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);

7
MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj
Unescape View File

@ -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>

2
MediaBrowser.Common.Implementations/packages.config
Unescape View File

@ -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" />

4
MediaBrowser.Model/ApiClient/IServerEvents.cs
Unescape View File

@ -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;
}
}

2
MediaBrowser.Providers/Music/FanArtArtistProvider.cs
Unescape View File

@ -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;

1
MediaBrowser.ServerApplication/LibraryExplorer.xaml.cs
Unescape View File

@ -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")));

4
MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
Unescape View File

@ -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>

2
MediaBrowser.ServerApplication/packages.config
Unescape View File

@ -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" />

2
Nuget/MediaBrowser.Common.Internal.nuspec
Unescape View File

@ -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" />

Write Preview
Loading…
Cancel
Save