michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move class to new core project

Browse Source
This commit is contained in:
Luke Pulverenti 2016-11-11 00:23:15 -05:00
parent d55535fe43
commit 5bb864a0c4
13 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Emby.Server.Core/Emby.Server.Core.xproj
View File

@ -4,7 +4,6 @@
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>65aa7d67-8059-40cd-91f1-16d02687226c</ProjectGuid>
@ -13,9 +12,11 @@
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
</ItemGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>

2
MediaBrowser.Server.Startup.Common/StartupOptions.cs → Emby.Server.Core/StartupOptions.cs
View File

@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Linq;
namespace MediaBrowser.Server.Startup.Common
namespace Emby.Server.Core
{
public class StartupOptions
{

10
Emby.Server.Core/project.json
View File

@ -1,4 +1,4 @@
{
{
"version": "1.0.0-*",
"dependencies": {
@ -11,14 +11,18 @@
},
"dependencies": {
"MediaBrowser.Model": {
"target": "project"
}
}
},
"netstandard1.6": {
"imports": "dnxcore50",
"dependencies": {
"NETStandard.Library": "1.6.0",
"MediaBrowser.Model": {
"target": "project"
}
}
}
}

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

@ -61,6 +61,9 @@
<Reference Include="Emby.Common.Implementations">
<HintPath>..\ThirdParty\emby\Emby.Common.Implementations.dll</HintPath>
</Reference>
<Reference Include="Emby.Server.Core">
<HintPath>..\ThirdParty\emby\Emby.Server.Core.dll</HintPath>
</Reference>
<Reference Include="Mono.Posix, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Mono.Posix.4.0.0.0\lib\net40\Mono.Posix.dll</HintPath>

1
MediaBrowser.Server.Mono/Native/MonoApp.cs
View File

@ -7,6 +7,7 @@ using System;
using System.Collections.Generic;
using System.Reflection;
using System.Text.RegularExpressions;
using Emby.Server.Core;
using MediaBrowser.Model.System;
using MediaBrowser.Server.Startup.Common.Persistence;
using MediaBrowser.Server.Startup.Common.FFMpeg;

1
MediaBrowser.Server.Mono/Program.cs
View File

@ -14,6 +14,7 @@ using System.Security.Cryptography.X509Certificates;
using System.Threading.Tasks;
using Emby.Common.Implementations.IO;
using Emby.Common.Implementations.Logging;
using Emby.Server.Core;
namespace MediaBrowser.Server.Mono
{

1
MediaBrowser.Server.Startup.Common/ApplicationHost.cs
View File

@ -89,6 +89,7 @@ using Emby.Dlna.ContentDirectory;
using Emby.Dlna.Main;
using Emby.Dlna.MediaReceiverRegistrar;
using Emby.Dlna.Ssdp;
using Emby.Server.Core;
using Emby.Server.Implementations.Activity;
using Emby.Server.Implementations.Channels;
using Emby.Server.Implementations.Collections;

4
MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegLoader.cs
View File

@ -9,9 +9,7 @@ using System.IO;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using MediaBrowser.Common.IO;
using MediaBrowser.Controller.IO;
using MediaBrowser.Model.IO;
using Emby.Server.Core;
namespace MediaBrowser.Server.Startup.Common.FFMpeg
{

1
MediaBrowser.Server.Startup.Common/INativeApp.cs
View File

@ -2,6 +2,7 @@
using MediaBrowser.Model.Logging;
using System.Collections.Generic;
using System.Reflection;
using Emby.Server.Core;
using MediaBrowser.Server.Startup.Common.FFMpeg;
using MediaBrowser.Server.Startup.Common.Persistence;

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

@ -37,6 +37,9 @@
<Reference Include="Emby.Common.Implementations">
<HintPath>..\ThirdParty\emby\Emby.Common.Implementations.dll</HintPath>
</Reference>
<Reference Include="Emby.Server.Core">
<HintPath>..\ThirdParty\emby\Emby.Server.Core.dll</HintPath>
</Reference>
<Reference Include="INIFileParser, Version=2.3.0.0, Culture=neutral, PublicKeyToken=79af7b307b65cf3c, processorArchitecture=MSIL">
<HintPath>..\packages\ini-parser.2.3.0\lib\net20\INIFileParser.dll</HintPath>
<Private>True</Private>
@ -166,7 +169,6 @@
<Compile Include="Cryptography\X520Attributes.cs" />
<Compile Include="ServerApplicationPaths.cs" />
<Compile Include="Social\SharingRepository.cs" />
<Compile Include="StartupOptions.cs" />
<Compile Include="Sync\SyncRepository.cs" />
<Compile Include="SystemEvents.cs" />
<Compile Include="TextLocalizer.cs" />

1
MediaBrowser.ServerApplication/MainStartup.cs
View File

@ -20,6 +20,7 @@ using System.Threading.Tasks;
using System.Windows.Forms;
using Emby.Common.Implementations.IO;
using Emby.Common.Implementations.Logging;
using Emby.Server.Core;
using ImageMagickSharp;
using MediaBrowser.Common.Net;

3
MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
View File

@ -67,6 +67,9 @@
<Reference Include="Emby.Common.Implementations">
<HintPath>..\ThirdParty\emby\Emby.Common.Implementations.dll</HintPath>
</Reference>
<Reference Include="Emby.Server.Core">
<HintPath>..\ThirdParty\emby\Emby.Server.Core.dll</HintPath>
</Reference>
<Reference Include="ImageMagickSharp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\ImageMagickSharp.1.0.0.18\lib\net45\ImageMagickSharp.dll</HintPath>

1
MediaBrowser.ServerApplication/Native/WindowsApp.cs
View File

@ -8,6 +8,7 @@ using System.Diagnostics;
using System.IO;
using System.Reflection;
using System.Windows.Forms;
using Emby.Server.Core;
using MediaBrowser.Common.IO;
using MediaBrowser.Controller.IO;
using MediaBrowser.Model.IO;