lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2265 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2016-11-01 15:08:40 -04:00 committed by GitHub
commit 1d62c4302e
15 changed files with 189 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

206
MediaBrowser.LocalMetadata/Savers/BaseXmlSaver.cs
View File

@ -407,17 +407,17 @@ namespace MediaBrowser.LocalMetadata.Savers
} }
} }
//if (hasProductionLocations.ProductionLocations.Count > 0) if (item.ProductionLocations.Count > 0)
//{ {
// builder.Append("<Countries>"); writer.WriteStartElement("Countries");
// foreach (var name in hasProductionLocations.ProductionLocations) foreach (var name in item.ProductionLocations)
// { {
// builder.Append("<Country>" + SecurityElement.Escape(name) + "</Country>"); writer.WriteElementString("Country", name);
// } }
// builder.Append("</Countries>"); writer.WriteEndElement();
//} }
var hasDisplayOrder = item as IHasDisplayOrder; var hasDisplayOrder = item as IHasDisplayOrder;
if (hasDisplayOrder != null && !string.IsNullOrEmpty(hasDisplayOrder.DisplayOrder)) if (hasDisplayOrder != null && !string.IsNullOrEmpty(hasDisplayOrder.DisplayOrder))
@ -425,17 +425,17 @@ namespace MediaBrowser.LocalMetadata.Savers
writer.WriteElementString("DisplayOrder", hasDisplayOrder.DisplayOrder); writer.WriteElementString("DisplayOrder", hasDisplayOrder.DisplayOrder);
} }
//var hasMetascore = item as IHasMetascore; var hasMetascore = item as IHasMetascore;
//if (hasMetascore != null && hasMetascore.Metascore.HasValue) if (hasMetascore != null && hasMetascore.Metascore.HasValue)
//{ {
// builder.Append("<Metascore>" + SecurityElement.Escape(hasMetascore.Metascore.Value.ToString(UsCulture)) + "</Metascore>"); writer.WriteElementString("Metascore", hasMetascore.Metascore.Value.ToString(UsCulture));
//} }
//var hasAwards = item as IHasAwards; var hasAwards = item as IHasAwards;
//if (hasAwards != null && !string.IsNullOrEmpty(hasAwards.AwardSummary)) if (hasAwards != null && !string.IsNullOrEmpty(hasAwards.AwardSummary))
//{ {
// builder.Append("<AwardSummary>" + SecurityElement.Escape(hasAwards.AwardSummary) + "</AwardSummary>"); writer.WriteElementString("AwardSummary", hasAwards.AwardSummary);
//} }
var hasBudget = item as IHasBudget; var hasBudget = item as IHasBudget;
if (hasBudget != null) if (hasBudget != null)
@ -451,14 +451,14 @@ namespace MediaBrowser.LocalMetadata.Savers
} }
} }
//if (item.CommunityRating.HasValue) if (item.CommunityRating.HasValue)
//{ {
// builder.Append("<Rating>" + SecurityElement.Escape(item.CommunityRating.Value.ToString(UsCulture)) + "</Rating>"); writer.WriteElementString("Rating", item.CommunityRating.Value.ToString(UsCulture));
//} }
//if (item.VoteCount.HasValue) if (item.VoteCount.HasValue)
//{ {
// builder.Append("<VoteCount>" + SecurityElement.Escape(item.VoteCount.Value.ToString(UsCulture)) + "</VoteCount>"); writer.WriteElementString("VoteCount", item.VoteCount.Value.ToString(UsCulture));
//} }
if (item.ProductionYear.HasValue && !(item is Person)) if (item.ProductionYear.HasValue && !(item is Person))
{ {
@ -470,76 +470,76 @@ namespace MediaBrowser.LocalMetadata.Savers
writer.WriteElementString("Website", item.HomePageUrl); writer.WriteElementString("Website", item.HomePageUrl);
} }
//var hasAspectRatio = item as IHasAspectRatio; var hasAspectRatio = item as IHasAspectRatio;
//if (hasAspectRatio != null) if (hasAspectRatio != null)
//{ {
// if (!string.IsNullOrEmpty(hasAspectRatio.AspectRatio)) if (!string.IsNullOrEmpty(hasAspectRatio.AspectRatio))
// { {
// builder.Append("<AspectRatio>" + SecurityElement.Escape(hasAspectRatio.AspectRatio) + "</AspectRatio>"); writer.WriteElementString("AspectRatio", hasAspectRatio.AspectRatio);
// } }
//} }
//if (!string.IsNullOrEmpty(item.PreferredMetadataLanguage)) if (!string.IsNullOrEmpty(item.PreferredMetadataLanguage))
//{ {
// builder.Append("<Language>" + SecurityElement.Escape(item.PreferredMetadataLanguage) + "</Language>"); writer.WriteElementString("Language", item.PreferredMetadataLanguage);
//} }
//if (!string.IsNullOrEmpty(item.PreferredMetadataCountryCode)) if (!string.IsNullOrEmpty(item.PreferredMetadataCountryCode))
//{ {
// builder.Append("<CountryCode>" + SecurityElement.Escape(item.PreferredMetadataCountryCode) + "</CountryCode>"); writer.WriteElementString("CountryCode", item.PreferredMetadataCountryCode);
//} }
//// Use original runtime here, actual file runtime later in MediaInfo // Use original runtime here, actual file runtime later in MediaInfo
//var runTimeTicks = item.RunTimeTicks; var runTimeTicks = item.RunTimeTicks;
//if (runTimeTicks.HasValue) if (runTimeTicks.HasValue)
//{ {
// var timespan = TimeSpan.FromTicks(runTimeTicks.Value); var timespan = TimeSpan.FromTicks(runTimeTicks.Value);
// builder.Append("<RunningTime>" + Convert.ToInt32(timespan.TotalMinutes).ToString(UsCulture) + "</RunningTime>"); writer.WriteElementString("RunningTime", Convert.ToInt32(timespan.TotalMinutes).ToString(UsCulture));
//} }
//if (item.ProviderIds != null) if (item.ProviderIds != null)
//{ {
// foreach (var providerKey in item.ProviderIds.Keys) foreach (var providerKey in item.ProviderIds.Keys)
// { {
// var providerId = item.ProviderIds[providerKey]; var providerId = item.ProviderIds[providerKey];
// if (!string.IsNullOrEmpty(providerId)) if (!string.IsNullOrEmpty(providerId))
// { {
// builder.Append(string.Format("<{0}>{1}</{0}>", providerKey + "Id", SecurityElement.Escape(providerId))); writer.WriteElementString(providerKey + "Id", providerId);
// } }
// } }
//} }
//if (!string.IsNullOrWhiteSpace(item.Tagline)) if (!string.IsNullOrWhiteSpace(item.Tagline))
//{ {
// builder.Append("<Taglines>"); writer.WriteStartElement("Taglines");
// builder.Append("<Tagline>" + SecurityElement.Escape(item.Tagline) + "</Tagline>"); writer.WriteElementString("Tagline", item.Tagline);
// builder.Append("</Taglines>"); writer.WriteEndElement();
//} }
//if (item.Genres.Count > 0) if (item.Genres.Count > 0)
//{ {
// builder.Append("<Genres>"); writer.WriteStartElement("Genres");
// foreach (var genre in item.Genres) foreach (var genre in item.Genres)
// { {
// builder.Append("<Genre>" + SecurityElement.Escape(genre) + "</Genre>"); writer.WriteElementString("Genre", genre);
// } }
// builder.Append("</Genres>"); writer.WriteEndElement();
//} }
//if (item.Studios.Count > 0) if (item.Studios.Count > 0)
//{ {
// builder.Append("<Studios>"); writer.WriteStartElement("Studios");
// foreach (var studio in item.Studios) foreach (var studio in item.Studios)
// { {
// builder.Append("<Studio>" + SecurityElement.Escape(studio) + "</Studio>"); writer.WriteElementString("Studio", studio);
// } }
// builder.Append("</Studios>"); writer.WriteEndElement();
//} }
if (item.Tags.Count > 0) if (item.Tags.Count > 0)
{ {
@ -565,29 +565,29 @@ namespace MediaBrowser.LocalMetadata.Savers
writer.WriteEndElement(); writer.WriteEndElement();
} }
//var people = libraryManager.GetPeople(item); var people = libraryManager.GetPeople(item);
//if (people.Count > 0) if (people.Count > 0)
//{ {
// builder.Append("<Persons>"); writer.WriteStartElement("Persons");
// foreach (var person in people) foreach (var person in people)
// { {
// builder.Append("<Person>"); writer.WriteStartElement("Person");
// builder.Append("<Name>" + SecurityElement.Escape(person.Name) + "</Name>"); writer.WriteElementString("Name", person.Name);
// builder.Append("<Type>" + SecurityElement.Escape(person.Type) + "</Type>"); writer.WriteElementString("Type", person.Type);
// builder.Append("<Role>" + SecurityElement.Escape(person.Role) + "</Role>"); writer.WriteElementString("Role", person.Role);
// if (person.SortOrder.HasValue) if (person.SortOrder.HasValue)
// { {
// builder.Append("<SortOrder>" + SecurityElement.Escape(person.SortOrder.Value.ToString(UsCulture)) + "</SortOrder>"); writer.WriteElementString("SortOrder", person.SortOrder.Value.ToString(UsCulture));
// } }
// builder.Append("</Person>"); writer.WriteEndElement();
// } }
// builder.Append("</Persons>"); writer.WriteEndElement();
//} }
var boxset = item as BoxSet; var boxset = item as BoxSet;
if (boxset != null) if (boxset != null)

23
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
View File

@ -121,6 +121,11 @@ namespace MediaBrowser.MediaEncoding.Encoder
{ {
get get
{ {
if (_hasExternalEncoder)
{
return "External";
}
if (string.IsNullOrWhiteSpace(FFMpegPath)) if (string.IsNullOrWhiteSpace(FFMpegPath))
{ {
return null; return null;
@ -185,6 +190,12 @@ namespace MediaBrowser.MediaEncoding.Encoder
{ {
ConfigureEncoderPaths(); ConfigureEncoderPaths();
if (_hasExternalEncoder)
{
LogPaths();
return;
}
// If the path was passed in, save it into config now. // If the path was passed in, save it into config now.
var encodingOptions = GetEncodingOptions(); var encodingOptions = GetEncodingOptions();
var appPath = encodingOptions.EncoderAppPath; var appPath = encodingOptions.EncoderAppPath;
@ -194,7 +205,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
if (!string.IsNullOrWhiteSpace(valueToSave)) if (!string.IsNullOrWhiteSpace(valueToSave))
{ {
// if using system variable, don't save this. // if using system variable, don't save this.
if (IsSystemInstalledPath(valueToSave)) if (IsSystemInstalledPath(valueToSave) || _hasExternalEncoder)
{ {
valueToSave = null; valueToSave = null;
} }
@ -209,6 +220,11 @@ namespace MediaBrowser.MediaEncoding.Encoder
public async Task UpdateEncoderPath(string path, string pathType) public async Task UpdateEncoderPath(string path, string pathType)
{ {
if (_hasExternalEncoder)
{
return;
}
Tuple<string, string> newPaths; Tuple<string, string> newPaths;
if (string.Equals(pathType, "system", StringComparison.OrdinalIgnoreCase)) if (string.Equals(pathType, "system", StringComparison.OrdinalIgnoreCase))
@ -265,6 +281,11 @@ namespace MediaBrowser.MediaEncoding.Encoder
private void ConfigureEncoderPaths() private void ConfigureEncoderPaths()
{ {
if (_hasExternalEncoder)
{
return;
}
var appPath = GetEncodingOptions().EncoderAppPath; var appPath = GetEncodingOptions().EncoderAppPath;
if (string.IsNullOrWhiteSpace(appPath)) if (string.IsNullOrWhiteSpace(appPath))

32
MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
View File

@ -781,24 +781,24 @@ namespace MediaBrowser.MediaEncoding.Probing
} }
} }
var conductor = FFProbeHelpers.GetDictionaryValue(tags, "conductor"); //var conductor = FFProbeHelpers.GetDictionaryValue(tags, "conductor");
if (!string.IsNullOrWhiteSpace(conductor)) //if (!string.IsNullOrWhiteSpace(conductor))
{ //{
foreach (var person in Split(conductor, false)) // foreach (var person in Split(conductor, false))
{ // {
audio.People.Add(new BaseItemPerson { Name = person, Type = PersonType.Conductor }); // audio.People.Add(new BaseItemPerson { Name = person, Type = PersonType.Conductor });
} // }
} //}
var lyricist = FFProbeHelpers.GetDictionaryValue(tags, "lyricist"); //var lyricist = FFProbeHelpers.GetDictionaryValue(tags, "lyricist");
//if (!string.IsNullOrWhiteSpace(lyricist))
//{
// foreach (var person in Split(lyricist, false))
// {
// audio.People.Add(new BaseItemPerson { Name = person, Type = PersonType.Lyricist });
// }
//}
if (!string.IsNullOrWhiteSpace(lyricist))
{
foreach (var person in Split(lyricist, false))
{
audio.People.Add(new BaseItemPerson { Name = person, Type = PersonType.Lyricist });
}
}
// Check for writer some music is tagged that way as alternative to composer/lyricist // Check for writer some music is tagged that way as alternative to composer/lyricist
var writer = FFProbeHelpers.GetDictionaryValue(tags, "writer"); var writer = FFProbeHelpers.GetDictionaryValue(tags, "writer");

14
MediaBrowser.Providers/Movies/GenericMovieDbInfo.cs
View File

@ -26,16 +26,16 @@ namespace MediaBrowser.Providers.Movies
private readonly ILogger _logger; private readonly ILogger _logger;
private readonly IJsonSerializer _jsonSerializer; private readonly IJsonSerializer _jsonSerializer;
private readonly ILibraryManager _libraryManager; private readonly ILibraryManager _libraryManager;
private readonly IFileSystem _fileSystem; private readonly IFileSystem _fileSystem;
private readonly CultureInfo _usCulture = new CultureInfo("en-US"); private readonly CultureInfo _usCulture = new CultureInfo("en-US");
public GenericMovieDbInfo(ILogger logger, IJsonSerializer jsonSerializer, ILibraryManager libraryManager, IFileSystem fileSystem) public GenericMovieDbInfo(ILogger logger, IJsonSerializer jsonSerializer, ILibraryManager libraryManager, IFileSystem fileSystem)
{ {
_logger = logger; _logger = logger;
_jsonSerializer = jsonSerializer; _jsonSerializer = jsonSerializer;
_libraryManager = libraryManager; _libraryManager = libraryManager;
_fileSystem = fileSystem; _fileSystem = fileSystem;
} }
public async Task<MetadataResult<T>> GetMetadata(ItemLookupInfo itemId, CancellationToken cancellationToken) public async Task<MetadataResult<T>> GetMetadata(ItemLookupInfo itemId, CancellationToken cancellationToken)
@ -271,6 +271,8 @@ namespace MediaBrowser.Providers.Movies
//and the rest from crew //and the rest from crew
if (movieData.casts != null && movieData.casts.crew != null) if (movieData.casts != null && movieData.casts.crew != null)
{ {
var keepTypes = new[] { PersonType.Director, PersonType.Writer, PersonType.Producer };
foreach (var person in movieData.casts.crew) foreach (var person in movieData.casts.crew)
{ {
// Normalize this // Normalize this
@ -280,6 +282,12 @@ namespace MediaBrowser.Providers.Movies
type = PersonType.Writer; type = PersonType.Writer;
} }
if (!keepTypes.Contains(type ?? string.Empty, StringComparer.OrdinalIgnoreCase) &&
!keepTypes.Contains(person.job ?? string.Empty, StringComparer.OrdinalIgnoreCase))
{
continue;
}
var personInfo = new PersonInfo var personInfo = new PersonInfo
{ {
Name = person.name.Trim(), Name = person.name.Trim(),

20
MediaBrowser.Providers/TV/TheMovieDb/MovieDbEpisodeProvider.cs
View File

@ -1,4 +1,5 @@
using MediaBrowser.Model.IO; using System;
using MediaBrowser.Model.IO;
using MediaBrowser.Common.Net; using MediaBrowser.Common.Net;
using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities;
@ -166,9 +167,24 @@ namespace MediaBrowser.Providers.TV
//and the rest from crew //and the rest from crew
if (credits.crew != null) if (credits.crew != null)
{ {
var keepTypes = new[] { PersonType.Director, PersonType.Writer, PersonType.Producer };
foreach (var person in credits.crew) foreach (var person in credits.crew)
{ {
result.AddPerson(new PersonInfo { Name = person.name.Trim(), Role = person.job, Type = person.department }); // Normalize this
var type = person.department;
if (string.Equals(type, "writing", StringComparison.OrdinalIgnoreCase))
{
type = PersonType.Writer;
}
if (!keepTypes.Contains(type ?? string.Empty, StringComparer.OrdinalIgnoreCase) &&
!keepTypes.Contains(person.job ?? string.Empty, StringComparer.OrdinalIgnoreCase))
{
continue;
}
result.AddPerson(new PersonInfo { Name = person.name.Trim(), Role = person.job, Type = type });
} }
} }
} }

6
MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
View File

@ -64,8 +64,9 @@
<Reference Include="Mono.Nat"> <Reference Include="Mono.Nat">
<HintPath>..\ThirdParty\emby\Mono.Nat.dll</HintPath> <HintPath>..\ThirdParty\emby\Mono.Nat.dll</HintPath>
</Reference> </Reference>
<Reference Include="Patterns.Logging"> <Reference Include="Patterns.Logging, Version=1.0.6149.1756, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Patterns.Logging.1.0.0.2\lib\portable-net45+sl4+wp71+win8+wpa81\Patterns.Logging.dll</HintPath> <HintPath>..\packages\Patterns.Logging.1.0.0.4\lib\portable-net45+dnxcore50+sl4+wp71+win8+wpa81\Patterns.Logging.dll</HintPath>
<Private>True</Private>
</Reference> </Reference>
<Reference Include="ServiceStack.Api.Swagger"> <Reference Include="ServiceStack.Api.Swagger">
<HintPath>..\ThirdParty\ServiceStack\ServiceStack.Api.Swagger.dll</HintPath> <HintPath>..\ThirdParty\ServiceStack\ServiceStack.Api.Swagger.dll</HintPath>
@ -89,7 +90,6 @@
<Reference Include="System.Net" /> <Reference Include="System.Net" />
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Security" /> <Reference Include="System.Security" />
<Reference Include="System.Transactions" />
<Reference Include="System.Web" /> <Reference Include="System.Web" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Reference Include="ServiceStack"> <Reference Include="ServiceStack">

2
MediaBrowser.Server.Implementations/packages.config
View File

@ -4,7 +4,7 @@
<package id="ini-parser" version="2.3.0" targetFramework="net45" /> <package id="ini-parser" version="2.3.0" targetFramework="net45" />
<package id="MediaBrowser.Naming" version="1.0.0.57" targetFramework="net46" /> <package id="MediaBrowser.Naming" version="1.0.0.57" targetFramework="net46" />
<package id="Microsoft.IO.RecyclableMemoryStream" version="1.1.0.0" targetFramework="net46" /> <package id="Microsoft.IO.RecyclableMemoryStream" version="1.1.0.0" targetFramework="net46" />
<package id="Patterns.Logging" version="1.0.0.2" targetFramework="net45" /> <package id="Patterns.Logging" version="1.0.0.4" targetFramework="net46" />
<package id="SocketHttpListener" version="1.0.0.40" targetFramework="net45" /> <package id="SocketHttpListener" version="1.0.0.40" targetFramework="net45" />
<package id="UniversalDetector" version="1.0.1" targetFramework="net46" /> <package id="UniversalDetector" version="1.0.1" targetFramework="net46" />
</packages> </packages>

6
MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
View File

@ -69,9 +69,9 @@
<HintPath>..\packages\NLog.4.4.0-betaV15\lib\net45\NLog.dll</HintPath> <HintPath>..\packages\NLog.4.4.0-betaV15\lib\net45\NLog.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="Patterns.Logging, Version=1.0.5494.41209, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Patterns.Logging, Version=1.0.6149.1756, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <HintPath>..\packages\Patterns.Logging.1.0.0.4\lib\portable-net45+dnxcore50+sl4+wp71+win8+wpa81\Patterns.Logging.dll</HintPath>
<HintPath>..\packages\Patterns.Logging.1.0.0.2\lib\portable-net45+sl4+wp71+win8+wpa81\Patterns.Logging.dll</HintPath> <Private>True</Private>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="ServiceStack.Interfaces"> <Reference Include="ServiceStack.Interfaces">

2
MediaBrowser.Server.Mono/packages.config
View File

@ -2,5 +2,5 @@
<packages> <packages>
<package id="Mono.Posix" version="4.0.0.0" targetFramework="net45" /> <package id="Mono.Posix" version="4.0.0.0" targetFramework="net45" />
<package id="NLog" version="4.4.0-betaV15" targetFramework="net46" /> <package id="NLog" version="4.4.0-betaV15" targetFramework="net46" />
<package id="Patterns.Logging" version="1.0.0.2" targetFramework="net45" /> <package id="Patterns.Logging" version="1.0.0.4" targetFramework="net46" />
</packages> </packages>

6
MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj
View File

@ -42,9 +42,9 @@
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Mono.Posix.4.0.0.0\lib\net40\Mono.Posix.dll</HintPath> <HintPath>..\packages\Mono.Posix.4.0.0.0\lib\net40\Mono.Posix.dll</HintPath>
</Reference> </Reference>
<Reference Include="Patterns.Logging, Version=1.0.5494.41209, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Patterns.Logging, Version=1.0.6149.1756, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <HintPath>..\packages\Patterns.Logging.1.0.0.4\lib\portable-net45+dnxcore50+sl4+wp71+win8+wpa81\Patterns.Logging.dll</HintPath>
<HintPath>..\packages\Patterns.Logging.1.0.0.2\lib\portable-net45+sl4+wp71+win8+wpa81\Patterns.Logging.dll</HintPath> <Private>True</Private>
</Reference> </Reference>
<Reference Include="RSSDP"> <Reference Include="RSSDP">
<HintPath>..\ThirdParty\emby\RSSDP.dll</HintPath> <HintPath>..\ThirdParty\emby\RSSDP.dll</HintPath>

2
MediaBrowser.Server.Startup.Common/packages.config
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="Mono.Posix" version="4.0.0.0" targetFramework="net45" /> <package id="Mono.Posix" version="4.0.0.0" targetFramework="net45" />
<package id="Patterns.Logging" version="1.0.0.2" targetFramework="net45" /> <package id="Patterns.Logging" version="1.0.0.4" targetFramework="net46" />
<package id="SimpleInjector" version="3.2.4" targetFramework="net46" /> <package id="SimpleInjector" version="3.2.4" targetFramework="net46" />
</packages> </packages>

6
MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
View File

@ -75,9 +75,9 @@
<HintPath>..\packages\NLog.4.4.0-betaV15\lib\net45\NLog.dll</HintPath> <HintPath>..\packages\NLog.4.4.0-betaV15\lib\net45\NLog.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="Patterns.Logging, Version=1.0.5494.41209, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Patterns.Logging, Version=1.0.6149.1756, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <HintPath>..\packages\Patterns.Logging.1.0.0.4\lib\portable-net45+dnxcore50+sl4+wp71+win8+wpa81\Patterns.Logging.dll</HintPath>
<HintPath>..\packages\Patterns.Logging.1.0.0.2\lib\portable-net45+sl4+wp71+win8+wpa81\Patterns.Logging.dll</HintPath> <Private>True</Private>
</Reference> </Reference>
<Reference Include="ServiceStack.Interfaces"> <Reference Include="ServiceStack.Interfaces">
<HintPath>..\ThirdParty\ServiceStack\ServiceStack.Interfaces.dll</HintPath> <HintPath>..\ThirdParty\ServiceStack\ServiceStack.Interfaces.dll</HintPath>

2
MediaBrowser.ServerApplication/packages.config
View File

@ -2,6 +2,6 @@
<packages> <packages>
<package id="ImageMagickSharp" version="1.0.0.18" targetFramework="net45" /> <package id="ImageMagickSharp" version="1.0.0.18" targetFramework="net45" />
<package id="NLog" version="4.4.0-betaV15" targetFramework="net462" /> <package id="NLog" version="4.4.0-betaV15" targetFramework="net462" />
<package id="Patterns.Logging" version="1.0.0.2" targetFramework="net45" /> <package id="Patterns.Logging" version="1.0.0.4" targetFramework="net462" />
<package id="System.Data.SQLite.Core" version="1.0.103" targetFramework="net462" /> <package id="System.Data.SQLite.Core" version="1.0.103" targetFramework="net462" />
</packages> </packages>

2
Nuget/MediaBrowser.Common.nuspec
View File

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"> <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata> <metadata>
<id>MediaBrowser.Common</id> <id>MediaBrowser.Common</id>
<version>3.0.680</version> <version>3.0.681</version>
<title>Emby.Common</title> <title>Emby.Common</title>
<authors>Emby Team</authors> <authors>Emby Team</authors>
<owners>ebr,Luke,scottisafool</owners> <owners>ebr,Luke,scottisafool</owners>

4
Nuget/MediaBrowser.Server.Core.nuspec
View File

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"> <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata> <metadata>
<id>MediaBrowser.Server.Core</id> <id>MediaBrowser.Server.Core</id>
<version>3.0.680</version> <version>3.0.681</version>
<title>Emby.Server.Core</title> <title>Emby.Server.Core</title>
<authors>Emby Team</authors> <authors>Emby Team</authors>
<owners>ebr,Luke,scottisafool</owners> <owners>ebr,Luke,scottisafool</owners>
@ -12,7 +12,7 @@
<description>Contains core components required to build plugins for Emby Server.</description> <description>Contains core components required to build plugins for Emby Server.</description>
<copyright>Copyright © Emby 2013</copyright> <copyright>Copyright © Emby 2013</copyright>
<dependencies> <dependencies>
<dependency id="MediaBrowser.Common" version="3.0.680" /> <dependency id="MediaBrowser.Common" version="3.0.681" />
</dependencies> </dependencies>
</metadata> </metadata>
<files> <files>