alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-20 00:55:13 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

make model project portable

Browse Source
This commit is contained in:
Luke Pulverenti
2016-10-21 22:08:34 -04:00
parent f8c603d5eb
commit c7f559f8ce
166 changed files with 1184 additions and 5477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Server.Implementations/Channels/ChannelPostScanTask.cs
View File

@@ -4,12 +4,12 @@ using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Channels;
using MediaBrowser.Model.Logging;
using MoreLinq;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using MediaBrowser.Model.Extensions;
namespace MediaBrowser.Server.Implementations.Channels
{

2
MediaBrowser.Server.Implementations/Collections/CollectionImageProvider.cs
View File

@@ -7,11 +7,11 @@ using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Server.Implementations.Photos;
using MoreLinq;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using CommonIO;
using MediaBrowser.Model.Extensions;
namespace MediaBrowser.Server.Implementations.Collections
{

2
MediaBrowser.Server.Implementations/Connect/ConnectEntryPoint.cs
View File

@@ -12,7 +12,7 @@ using System.Net.Sockets;
using System.Text;
using System.Threading.Tasks;
using CommonIO;
using MediaBrowser.Common.Threading;
using MediaBrowser.Controller.Threading;
namespace MediaBrowser.Server.Implementations.Connect
{

2
MediaBrowser.Server.Implementations/Dto/DtoService.cs
View File

@@ -19,13 +19,13 @@ using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using MediaBrowser.Model.Querying;
using MediaBrowser.Model.Sync;
using MoreLinq;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using CommonIO;
using MediaBrowser.Model.Extensions;
namespace MediaBrowser.Server.Implementations.Dto
{

2
MediaBrowser.Server.Implementations/EntryPoints/ExternalPortForwarding.cs
View File

@@ -8,7 +8,7 @@ using System;
using System.Collections.Generic;
using System.Globalization;
using System.Net;
using MediaBrowser.Common.Threading;
using MediaBrowser.Controller.Threading;
using MediaBrowser.Model.Events;
namespace MediaBrowser.Server.Implementations.EntryPoints

2
MediaBrowser.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs
View File

@@ -4,12 +4,12 @@ using MediaBrowser.Controller.Plugins;
using MediaBrowser.Controller.Session;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using MoreLinq;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Model.Extensions;
namespace MediaBrowser.Server.Implementations.EntryPoints
{

2
MediaBrowser.Server.Implementations/EntryPoints/LoadRegistrations.cs
View File

@@ -3,7 +3,7 @@ using MediaBrowser.Controller.Plugins;
using MediaBrowser.Model.Logging;
using System;
using System.Threading.Tasks;
using MediaBrowser.Common.Threading;
using MediaBrowser.Controller.Threading;
namespace MediaBrowser.Server.Implementations.EntryPoints
{

2
MediaBrowser.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs
View File

@@ -5,12 +5,12 @@ using MediaBrowser.Controller.Session;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using MediaBrowser.Model.Session;
using MoreLinq;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using MediaBrowser.Model.Extensions;
namespace MediaBrowser.Server.Implementations.EntryPoints
{

2
MediaBrowser.Server.Implementations/IO/FileRefresher.cs
View File

@@ -10,9 +10,9 @@ using MediaBrowser.Common.ScheduledTasks;
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Extensions;
using MediaBrowser.Model.Logging;
using MediaBrowser.Server.Implementations.ScheduledTasks;
using MoreLinq;
namespace MediaBrowser.Server.Implementations.IO
{

2
MediaBrowser.Server.Implementations/Intros/DefaultIntroProvider.cs
View File

@@ -13,7 +13,7 @@ using System.IO;
using System.Linq;
using System.Threading.Tasks;
using CommonIO;
using MoreLinq;
using MediaBrowser.Model.Extensions;
namespace MediaBrowser.Server.Implementations.Intros
{

1
MediaBrowser.Server.Implementations/Library/LibraryManager.cs
View File

@@ -40,7 +40,6 @@ using MediaBrowser.Model.Extensions;
using MediaBrowser.Model.Library;
using MediaBrowser.Model.Net;
using MediaBrowser.Server.Implementations.Library.Resolvers;
using MoreLinq;
using SortOrder = MediaBrowser.Model.Entities.SortOrder;
using VideoResolver = MediaBrowser.Naming.Video.VideoResolver;
using MediaBrowser.Common.Configuration;

2
MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
View File

@@ -19,7 +19,6 @@ using MediaBrowser.Model.LiveTv;
using MediaBrowser.Model.Logging;
using MediaBrowser.Model.Querying;
using MediaBrowser.Model.Serialization;
using MoreLinq;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
@@ -35,6 +34,7 @@ using MediaBrowser.Common.Security;
using MediaBrowser.Controller.Entities.Movies;
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Model.Events;
using MediaBrowser.Model.Extensions;
using MediaBrowser.Server.Implementations.LiveTv.Listings;
namespace MediaBrowser.Server.Implementations.LiveTv

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

@@ -11,7 +11,7 @@
<AssemblyName>MediaBrowser.Server.Implementations</AssemblyName>
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<ReleaseVersion>
</ReleaseVersion>
<TargetFrameworkProfile />
@@ -61,9 +61,6 @@
<HintPath>..\packages\MediaBrowser.Naming.1.0.0.55\lib\portable-net45+sl4+wp71+win8+wpa81\MediaBrowser.Naming.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="MoreLinq">
<HintPath>..\packages\morelinq.1.4.0\lib\net35\MoreLinq.dll</HintPath>
</Reference>
<Reference Include="Patterns.Logging">
<HintPath>..\packages\Patterns.Logging.1.0.0.2\lib\portable-net45+sl4+wp71+win8+wpa81\Patterns.Logging.dll</HintPath>
</Reference>

2
MediaBrowser.Server.Implementations/News/NewsEntryPoint.cs
View File

@@ -16,7 +16,7 @@ using System.Threading;
using System.Threading.Tasks;
using System.Xml;
using CommonIO;
using MediaBrowser.Common.Threading;
using MediaBrowser.Controller.Threading;
namespace MediaBrowser.Server.Implementations.News
{

2
MediaBrowser.Server.Implementations/Playlists/PlaylistImageProvider.cs
View File

@@ -7,12 +7,12 @@ using MediaBrowser.Controller.Playlists;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Server.Implementations.Photos;
using MoreLinq;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using CommonIO;
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Extensions;
using MediaBrowser.Model.Querying;
namespace MediaBrowser.Server.Implementations.Playlists

2
MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs
View File

@@ -16,7 +16,6 @@ using MediaBrowser.Model.MediaInfo;
using MediaBrowser.Model.Querying;
using MediaBrowser.Model.Session;
using MediaBrowser.Model.Sync;
using MoreLinq;
using System;
using System.Collections.Generic;
using System.Globalization;
@@ -25,6 +24,7 @@ using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using CommonIO;
using MediaBrowser.Model.Extensions;
namespace MediaBrowser.Server.Implementations.Sync
{

6
MediaBrowser.Server.Implementations/Sync/SyncManager.cs
View File

@@ -21,7 +21,6 @@ using MediaBrowser.Model.Querying;
using MediaBrowser.Model.Serialization;
using MediaBrowser.Model.Sync;
using MediaBrowser.Model.Users;
using MoreLinq;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
@@ -602,7 +601,10 @@ namespace MediaBrowser.Server.Implementations.Sync
if (query.AddMetadata)
{
result.Items.ForEach(FillMetadata);
foreach (var item in result.Items)
{
FillMetadata(item);
}
}
return result;

6
MediaBrowser.Server.Implementations/Udp/UdpServer.cs
View File

@@ -10,6 +10,7 @@ using System.Net;
using System.Net.Sockets;
using System.Text;
using System.Threading.Tasks;
using MediaBrowser.Common.Implementations.Networking;
namespace MediaBrowser.Server.Implementations.Udp
{
@@ -310,7 +311,10 @@ namespace MediaBrowser.Server.Implementations.Udp
try
{
await _udpClient.SendAsync(bytes, bytes.Length, _networkManager.Parse(remoteEndPoint)).ConfigureAwait(false);
// Need to do this until Common will compile with this method
var nativeNetworkManager = (BaseNetworkManager) _networkManager;
await _udpClient.SendAsync(bytes, bytes.Length, nativeNetworkManager.Parse(remoteEndPoint)).ConfigureAwait(false);
_logger.Info("Udp message sent to {0}", remoteEndPoint);
}

2
MediaBrowser.Server.Implementations/UserViews/CollectionFolderImageProvider.cs
View File

@@ -6,7 +6,6 @@ using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Server.Implementations.Photos;
using MoreLinq;
using System;
using System.Collections.Generic;
using System.IO;
@@ -16,6 +15,7 @@ using CommonIO;
using MediaBrowser.Controller.Collections;
using MediaBrowser.Controller.Entities.Movies;
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Extensions;
using MediaBrowser.Model.Querying;
namespace MediaBrowser.Server.Implementations.UserViews

2
MediaBrowser.Server.Implementations/UserViews/DynamicImageProvider.cs
View File

@@ -7,7 +7,6 @@ using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Server.Implementations.Photos;
using MoreLinq;
using System;
using System.Collections.Generic;
using System.IO;
@@ -15,6 +14,7 @@ using System.Linq;
using System.Threading.Tasks;
using CommonIO;
using MediaBrowser.Controller.LiveTv;
using MediaBrowser.Model.Extensions;
namespace MediaBrowser.Server.Implementations.UserViews
{

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

@@ -8,4 +8,4 @@
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/></startup></configuration>

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

@@ -5,7 +5,6 @@
<package id="ini-parser" version="2.3.0" targetFramework="net45" />
<package id="Interfaces.IO" version="1.0.0.5" targetFramework="net45" />
<package id="MediaBrowser.Naming" version="1.0.0.55" targetFramework="net45" />
<package id="morelinq" version="1.4.0" targetFramework="net45" />
<package id="Patterns.Logging" version="1.0.0.2" targetFramework="net45" />
<package id="SimpleInjector" version="3.2.2" targetFramework="net45" />
<package id="SocketHttpListener" version="1.0.0.40" targetFramework="net45" />