unkin/jellyfin-ha-src
4
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases Wiki Activity

add more to .net core solution

Browse Source
This commit is contained in:
Luke Pulverenti
2016-10-25 23:59:51 -04:00
parent ec4bb53acb
commit 049dca644d
33 changed files with 27130 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Emby.Drawing/Emby.Drawing.csproj
-3
View File
@@ -36,9 +36,6 @@
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\ImageMagickSharp.1.0.0.18\lib\net45\ImageMagickSharp.dll</HintPath> <HintPath>..\packages\ImageMagickSharp.1.0.0.18\lib\net45\ImageMagickSharp.dll</HintPath>
</Reference> </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>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
Emby.Drawing/packages.config
-1
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="ImageMagickSharp" version="1.0.0.18" targetFramework="net45" /> <package id="ImageMagickSharp" version="1.0.0.18" targetFramework="net45" />
<package id="Patterns.Logging" version="1.0.0.2" targetFramework="net45" />
</packages> </packages>
Emby.Server.sln
+27
View File
@@ -18,6 +18,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.Common", "Medi
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.Controller", "MediaBrowser.Controller\MediaBrowser.Controller.csproj", "{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.Controller", "MediaBrowser.Controller\MediaBrowser.Controller.csproj", "{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.XbmcMetadata", "MediaBrowser.XbmcMetadata\MediaBrowser.XbmcMetadata.csproj", "{23499896-B135-4527-8574-C26E926EA99E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.LocalMetadata", "MediaBrowser.LocalMetadata\MediaBrowser.LocalMetadata.csproj", "{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.WebDashboard", "MediaBrowser.WebDashboard\MediaBrowser.WebDashboard.csproj", "{5624B7B5-B5A7-41D8-9F10-CC5611109619}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@@ -49,6 +55,24 @@ Global
{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Release Mono|Any CPU.Build.0 = Release Mono|Any CPU {17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Release Mono|Any CPU.Build.0 = Release Mono|Any CPU
{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Release|Any CPU.ActiveCfg = Release|Any CPU {17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Release|Any CPU.Build.0 = Release|Any CPU {17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Release|Any CPU.Build.0 = Release|Any CPU
{23499896-B135-4527-8574-C26E926EA99E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{23499896-B135-4527-8574-C26E926EA99E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{23499896-B135-4527-8574-C26E926EA99E}.Release Mono|Any CPU.ActiveCfg = Release|Any CPU
{23499896-B135-4527-8574-C26E926EA99E}.Release Mono|Any CPU.Build.0 = Release|Any CPU
{23499896-B135-4527-8574-C26E926EA99E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{23499896-B135-4527-8574-C26E926EA99E}.Release|Any CPU.Build.0 = Release|Any CPU
{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Release Mono|Any CPU.ActiveCfg = Release|Any CPU
{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Release Mono|Any CPU.Build.0 = Release|Any CPU
{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Release|Any CPU.Build.0 = Release|Any CPU
{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Release Mono|Any CPU.ActiveCfg = Release Mono|Any CPU
{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Release Mono|Any CPU.Build.0 = Release Mono|Any CPU
{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
@@ -58,5 +82,8 @@ Global
{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B} = {8ADD772F-F0A4-4A53-9B2F-AF4A4C585839} {7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B} = {8ADD772F-F0A4-4A53-9B2F-AF4A4C585839}
{9142EEFA-7570-41E1-BFCC-468BB571AF2F} = {8ADD772F-F0A4-4A53-9B2F-AF4A4C585839} {9142EEFA-7570-41E1-BFCC-468BB571AF2F} = {8ADD772F-F0A4-4A53-9B2F-AF4A4C585839}
{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2} = {8ADD772F-F0A4-4A53-9B2F-AF4A4C585839} {17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2} = {8ADD772F-F0A4-4A53-9B2F-AF4A4C585839}
{23499896-B135-4527-8574-C26E926EA99E} = {8ADD772F-F0A4-4A53-9B2F-AF4A4C585839}
{7EF9F3E0-697D-42F3-A08F-19DEB5F84392} = {8ADD772F-F0A4-4A53-9B2F-AF4A4C585839}
{5624B7B5-B5A7-41D8-9F10-CC5611109619} = {8ADD772F-F0A4-4A53-9B2F-AF4A4C585839}
EndGlobalSection EndGlobalSection
EndGlobal EndGlobal
MediaBrowser.Api/MediaBrowser.Api.csproj
-6
View File
@@ -46,9 +46,6 @@
<RunPostBuildEvent>Always</RunPostBuildEvent> <RunPostBuildEvent>Always</RunPostBuildEvent>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Patterns.Logging">
<HintPath>..\packages\Patterns.Logging.1.0.0.2\lib\portable-net45+sl4+wp71+win8+wpa81\Patterns.Logging.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
@@ -191,9 +188,6 @@
<Name>MediaBrowser.Server.Implementations</Name> <Name>MediaBrowser.Server.Implementations</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup> <PropertyGroup>
<PostBuildEvent> <PostBuildEvent>
MediaBrowser.Api/packages.config
-4
View File
@@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Patterns.Logging" version="1.0.0.2" targetFramework="net45" />
</packages>
MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj
-3
View File
@@ -70,9 +70,6 @@
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Net" /> <Reference Include="System.Net" />
<Reference Include="System.Text.Json">
<HintPath>..\ThirdParty\fastjsonparser\System.Text.Json.dll</HintPath>
</Reference>
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Reference Include="ServiceStack.Text"> <Reference Include="ServiceStack.Text">
<HintPath>..\ThirdParty\ServiceStack.Text\ServiceStack.Text.dll</HintPath> <HintPath>..\ThirdParty\ServiceStack.Text\ServiceStack.Text.dll</HintPath>
MediaBrowser.Common/MediaBrowser.Common.nuget.targets
+6
View File
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Target Name="EmitMSBuildWarning" BeforeTargets="Build">
<Warning Text="Packages containing MSBuild targets and props files cannot be fully installed in projects targeting multiple frameworks. The MSBuild targets and props files have been ignored." />
</Target>
</Project>
MediaBrowser.Common/project.json
+15 -5
View File
@@ -1,7 +1,17 @@
{ {
"supports": {}, "frameworks":{
"dependencies": {}, "netstandard1.6":{
"frameworks": { "dependencies":{
".NETPortable,Version=v4.5,Profile=Profile7": {} "NETStandard.Library":"1.6.0",
} }
},
".NETPortable,Version=v4.5,Profile=Profile7":{
"buildOptions": {
"define": [ ]
},
"frameworkAssemblies":{
}
}
}
} }
MediaBrowser.Common/project.lock.json
+3956 -3
View File
File diff suppressed because it is too large Load Diff
MediaBrowser.Controller/MediaBrowser.Controller.nuget.targets
+6
View File
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Target Name="EmitMSBuildWarning" BeforeTargets="Build">
<Warning Text="Packages containing MSBuild targets and props files cannot be fully installed in projects targeting multiple frameworks. The MSBuild targets and props files have been ignored." />
</Target>
</Project>
MediaBrowser.Controller/project.json
+15 -5
View File
@@ -1,7 +1,17 @@
{ {
"supports": {}, "frameworks":{
"dependencies": {}, "netstandard1.6":{
"frameworks": { "dependencies":{
".NETPortable,Version=v4.5,Profile=Profile7": {} "NETStandard.Library":"1.6.0",
} }
},
".NETPortable,Version=v4.5,Profile=Profile7":{
"buildOptions": {
"define": [ ]
},
"frameworkAssemblies":{
}
}
}
} }
MediaBrowser.Controller/project.lock.json
+3956 -3
View File
File diff suppressed because it is too large Load Diff
MediaBrowser.Dlna/MediaBrowser.Dlna.csproj
-6
View File
@@ -39,9 +39,6 @@
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Patterns.Logging">
<HintPath>..\packages\Patterns.Logging.1.0.0.2\lib\portable-net45+sl4+wp71+win8+wpa81\Patterns.Logging.dll</HintPath>
</Reference>
<Reference Include="Rssdp.NetFx40"> <Reference Include="Rssdp.NetFx40">
<HintPath>..\ThirdParty\rssdp\Rssdp.NetFx40.dll</HintPath> <HintPath>..\ThirdParty\rssdp\Rssdp.NetFx40.dll</HintPath>
</Reference> </Reference>
@@ -52,9 +49,7 @@
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Net.Http" /> <Reference Include="System.Net.Http" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@@ -193,7 +188,6 @@
<EmbeddedResource Include="Images\people480.png" /> <EmbeddedResource Include="Images\people480.png" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="packages.config" />
<EmbeddedResource Include="Profiles\Json\BubbleUPnp.json" /> <EmbeddedResource Include="Profiles\Json\BubbleUPnp.json" />
<EmbeddedResource Include="Profiles\Json\Default.json" /> <EmbeddedResource Include="Profiles\Json\Default.json" />
<EmbeddedResource Include="Profiles\Json\Denon AVR.json" /> <EmbeddedResource Include="Profiles\Json\Denon AVR.json" />
MediaBrowser.Dlna/packages.config
-4
View File
@@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Patterns.Logging" version="1.0.0.2" targetFramework="net45" />
</packages>
MediaBrowser.LocalMetadata/MediaBrowser.LocalMetadata.csproj
-9
View File
@@ -32,15 +32,9 @@
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Patterns.Logging">
<HintPath>..\packages\Patterns.Logging.1.0.0.2\lib\portable-net45+sl4+wp71+win8+wpa81\Patterns.Logging.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@@ -96,9 +90,6 @@
<Name>MediaBrowser.Model</Name> <Name>MediaBrowser.Model</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.
MediaBrowser.LocalMetadata/packages.config
-4
View File
@@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Patterns.Logging" version="1.0.0.2" targetFramework="net45" />
</packages>
MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj
-3
View File
@@ -45,9 +45,6 @@
<HintPath>..\packages\MediaBrowser.BdInfo.1.0.1\lib\portable-net46+win10\DvdLib.dll</HintPath> <HintPath>..\packages\MediaBrowser.BdInfo.1.0.1\lib\portable-net46+win10\DvdLib.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </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>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
MediaBrowser.MediaEncoding/packages.config
-1
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="MediaBrowser.BdInfo" version="1.0.1" targetFramework="net46" /> <package id="MediaBrowser.BdInfo" version="1.0.1" targetFramework="net46" />
<package id="Patterns.Logging" version="1.0.0.2" targetFramework="net45" />
</packages> </packages>
MediaBrowser.Model/MediaBrowser.Model.nuget.targets
+6
View File
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Target Name="EmitMSBuildWarning" BeforeTargets="Build">
<Warning Text="Packages containing MSBuild targets and props files cannot be fully installed in projects targeting multiple frameworks. The MSBuild targets and props files have been ignored." />
</Target>
</Project>
MediaBrowser.Model/project.json
+15 -5
View File
@@ -1,7 +1,17 @@
{ {
"supports": {}, "frameworks":{
"dependencies": {}, "netstandard1.6":{
"frameworks": { "dependencies":{
".NETPortable,Version=v4.5,Profile=Profile7": {} "NETStandard.Library":"1.6.0",
} }
},
".NETPortable,Version=v4.5,Profile=Profile7":{
"buildOptions": {
"define": [ ]
},
"frameworkAssemblies":{
}
}
}
} }
MediaBrowser.Model/project.lock.json
+4017 -3
View File
File diff suppressed because it is too large Load Diff
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
-5
View File
@@ -45,11 +45,6 @@
<PropertyGroup> <PropertyGroup>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent> <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<Reference Include="Patterns.Logging">
<HintPath>..\packages\Patterns.Logging.1.0.0.2\lib\portable-net45+sl4+wp71+win8+wpa81\Patterns.Logging.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="..\SharedVersion.cs"> <Compile Include="..\SharedVersion.cs">
<Link>Properties\SharedVersion.cs</Link> <Link>Properties\SharedVersion.cs</Link>
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.nuget.targets
+6
View File
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Target Name="EmitMSBuildWarning" BeforeTargets="Build">
<Warning Text="Packages containing MSBuild targets and props files cannot be fully installed in projects targeting multiple frameworks. The MSBuild targets and props files have been ignored." />
</Target>
</Project>
MediaBrowser.WebDashboard/project.json
+15 -5
View File
@@ -1,7 +1,17 @@
{ {
"supports": {}, "frameworks":{
"dependencies": {}, "netstandard1.6":{
"frameworks": { "dependencies":{
".NETPortable,Version=v4.5,Profile=Profile7": {} "NETStandard.Library":"1.6.0",
} }
},
".NETPortable,Version=v4.5,Profile=Profile7":{
"buildOptions": {
"define": [ ]
},
"frameworkAssemblies":{
}
}
}
} }
MediaBrowser.WebDashboard/project.lock.json
+3956 -3
View File
File diff suppressed because it is too large Load Diff
MediaBrowser.XbmcMetadata/MediaBrowser.XbmcMetadata.nuget.targets
+6
View File
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Target Name="EmitMSBuildWarning" BeforeTargets="Build">
<Warning Text="Packages containing MSBuild targets and props files cannot be fully installed in projects targeting multiple frameworks. The MSBuild targets and props files have been ignored." />
</Target>
</Project>
MediaBrowser.XbmcMetadata/project.json
+15 -5
View File
@@ -1,7 +1,17 @@
{ {
"supports": {}, "frameworks":{
"dependencies": {}, "netstandard1.6":{
"frameworks": { "dependencies":{
".NETPortable,Version=v4.5,Profile=Profile7": {} "NETStandard.Library":"1.6.0",
} }
},
".NETPortable,Version=v4.5,Profile=Profile7":{
"buildOptions": {
"define": [ ]
},
"frameworkAssemblies":{
}
}
}
} }
MediaBrowser.XbmcMetadata/project.lock.json
+3956 -3
View File
File diff suppressed because it is too large Load Diff
MediaBrowser.sln
-3
View File
@@ -63,9 +63,6 @@ EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Nat", "Mono.Nat\Mono.Nat.csproj", "{D7453B88-2266-4805-B39B-2B5A2A33E1BA}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Nat", "Mono.Nat\Mono.Nat.csproj", "{D7453B88-2266-4805-B39B-2B5A2A33E1BA}"
EndProject EndProject
Global Global
GlobalSection(Performance) = preSolution
HasPerformanceSessions = true
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
Debug|Mixed Platforms = Debug|Mixed Platforms Debug|Mixed Platforms = Debug|Mixed Platforms
src/Emby.Server/Emby.Server.xproj
+8 -3
View File
@@ -4,7 +4,6 @@
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion> <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath> <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" /> <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>ddaff431-0b3d-4857-8762-990a32dc8472</ProjectGuid> <ProjectGuid>ddaff431-0b3d-4857-8762-990a32dc8472</ProjectGuid>
@@ -13,9 +12,15 @@
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath> <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
<ProjectReference Include="..\..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
<ProjectReference Include="..\..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
<ProjectReference Include="..\..\MediaBrowser.WebDashboard\MediaBrowser.WebDashboard.csproj" />
<ProjectReference Include="..\..\MediaBrowser.XbmcMetadata\MediaBrowser.XbmcMetadata.csproj" />
</ItemGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" /> <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
</Project> </Project>
src/Emby.Server/project.fragment.lock.json
+6987
View File
File diff suppressed because it is too large Load Diff
src/Emby.Server/project.json
+19 -2
View File
@@ -1,4 +1,4 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"buildOptions": { "buildOptions": {
"emitEntryPoint": true "emitEntryPoint": true
@@ -13,7 +13,24 @@
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {
"imports": "dnxcore50" "imports": "dnxcore50",
"dependencies": {
"MediaBrowser.Common": {
"target": "project"
},
"MediaBrowser.Controller": {
"target": "project"
},
"MediaBrowser.Model": {
"target": "project"
},
"MediaBrowser.WebDashboard": {
"target": "project"
},
"MediaBrowser.XbmcMetadata": {
"target": "project"
}
}
} }
} }
} }
src/Emby.Server/project.lock.json
+143 -32
View File
@@ -400,7 +400,7 @@
"ref/netstandard1.6/System.AppContext.dll": {} "ref/netstandard1.6/System.AppContext.dll": {}
}, },
"runtime": { "runtime": {
"lib/netstandard1.6/_._": {} "lib/netstandard1.6/System.AppContext.dll": {}
} }
}, },
"System.Buffers/4.0.0": { "System.Buffers/4.0.0": {
@@ -416,7 +416,7 @@
"lib/netstandard1.1/System.Buffers.dll": {} "lib/netstandard1.1/System.Buffers.dll": {}
}, },
"runtime": { "runtime": {
"lib/netstandard1.1/_._": {} "lib/netstandard1.1/System.Buffers.dll": {}
} }
}, },
"System.Collections/4.0.11": { "System.Collections/4.0.11": {
@@ -448,7 +448,7 @@
"ref/netstandard1.3/System.Collections.Concurrent.dll": {} "ref/netstandard1.3/System.Collections.Concurrent.dll": {}
}, },
"runtime": { "runtime": {
"lib/netstandard1.3/_._": {} "lib/netstandard1.3/System.Collections.Concurrent.dll": {}
} }
}, },
"System.Collections.Immutable/1.2.0": { "System.Collections.Immutable/1.2.0": {
@@ -541,7 +541,7 @@
"lib/netstandard1.3/System.Diagnostics.DiagnosticSource.dll": {} "lib/netstandard1.3/System.Diagnostics.DiagnosticSource.dll": {}
}, },
"runtime": { "runtime": {
"lib/netstandard1.3/_._": {} "lib/netstandard1.3/System.Diagnostics.DiagnosticSource.dll": {}
} }
}, },
"System.Diagnostics.FileVersionInfo/4.0.0": { "System.Diagnostics.FileVersionInfo/4.0.0": {
@@ -704,7 +704,11 @@
"ref/netstandard1.3/System.Globalization.Extensions.dll": {} "ref/netstandard1.3/System.Globalization.Extensions.dll": {}
}, },
"runtimeTargets": { "runtimeTargets": {
"runtimes/win/lib/netstandard1.3/_._": { "runtimes/unix/lib/netstandard1.3/System.Globalization.Extensions.dll": {
"assetType": "runtime",
"rid": "unix"
},
"runtimes/win/lib/netstandard1.3/System.Globalization.Extensions.dll": {
"assetType": "runtime", "assetType": "runtime",
"rid": "win" "rid": "win"
} }
@@ -745,7 +749,11 @@
"ref/netstandard1.3/System.IO.Compression.dll": {} "ref/netstandard1.3/System.IO.Compression.dll": {}
}, },
"runtimeTargets": { "runtimeTargets": {
"runtimes/win/lib/netstandard1.3/_._": { "runtimes/unix/lib/netstandard1.3/System.IO.Compression.dll": {
"assetType": "runtime",
"rid": "unix"
},
"runtimes/win/lib/netstandard1.3/System.IO.Compression.dll": {
"assetType": "runtime", "assetType": "runtime",
"rid": "win" "rid": "win"
} }
@@ -768,7 +776,7 @@
"ref/netstandard1.3/System.IO.Compression.ZipFile.dll": {} "ref/netstandard1.3/System.IO.Compression.ZipFile.dll": {}
}, },
"runtime": { "runtime": {
"lib/netstandard1.3/_._": {} "lib/netstandard1.3/System.IO.Compression.ZipFile.dll": {}
} }
}, },
"System.IO.FileSystem/4.0.1": { "System.IO.FileSystem/4.0.1": {
@@ -796,7 +804,7 @@
"ref/netstandard1.3/System.IO.FileSystem.Primitives.dll": {} "ref/netstandard1.3/System.IO.FileSystem.Primitives.dll": {}
}, },
"runtime": { "runtime": {
"lib/netstandard1.3/_._": {} "lib/netstandard1.3/System.IO.FileSystem.Primitives.dll": {}
} }
}, },
"System.IO.FileSystem.Watcher/4.0.0": { "System.IO.FileSystem.Watcher/4.0.0": {
@@ -887,7 +895,7 @@
"ref/netstandard1.6/System.Linq.dll": {} "ref/netstandard1.6/System.Linq.dll": {}
}, },
"runtime": { "runtime": {
"lib/netstandard1.6/_._": {} "lib/netstandard1.6/System.Linq.dll": {}
} }
}, },
"System.Linq.Expressions/4.1.0": { "System.Linq.Expressions/4.1.0": {
@@ -915,7 +923,7 @@
"ref/netstandard1.6/System.Linq.Expressions.dll": {} "ref/netstandard1.6/System.Linq.Expressions.dll": {}
}, },
"runtime": { "runtime": {
"lib/netstandard1.6/_._": {} "lib/netstandard1.6/System.Linq.Expressions.dll": {}
} }
}, },
"System.Linq.Parallel/4.0.1": { "System.Linq.Parallel/4.0.1": {
@@ -992,7 +1000,11 @@
"ref/netstandard1.3/System.Net.Http.dll": {} "ref/netstandard1.3/System.Net.Http.dll": {}
}, },
"runtimeTargets": { "runtimeTargets": {
"runtimes/win/lib/netstandard1.3/_._": { "runtimes/unix/lib/netstandard1.6/System.Net.Http.dll": {
"assetType": "runtime",
"rid": "unix"
},
"runtimes/win/lib/netstandard1.3/System.Net.Http.dll": {
"assetType": "runtime", "assetType": "runtime",
"rid": "win" "rid": "win"
} }
@@ -1164,7 +1176,7 @@
"ref/netstandard1.3/System.ObjectModel.dll": {} "ref/netstandard1.3/System.ObjectModel.dll": {}
}, },
"runtime": { "runtime": {
"lib/netstandard1.3/_._": {} "lib/netstandard1.3/System.ObjectModel.dll": {}
} }
}, },
"System.Reflection/4.1.0": { "System.Reflection/4.1.0": {
@@ -1214,7 +1226,7 @@
"ref/netstandard1.1/_._": {} "ref/netstandard1.1/_._": {}
}, },
"runtime": { "runtime": {
"lib/netstandard1.3/_._": {} "lib/netstandard1.3/System.Reflection.Emit.dll": {}
} }
}, },
"System.Reflection.Emit.ILGeneration/4.0.1": { "System.Reflection.Emit.ILGeneration/4.0.1": {
@@ -1228,7 +1240,7 @@
"ref/netstandard1.0/_._": {} "ref/netstandard1.0/_._": {}
}, },
"runtime": { "runtime": {
"lib/netstandard1.3/_._": {} "lib/netstandard1.3/System.Reflection.Emit.ILGeneration.dll": {}
} }
}, },
"System.Reflection.Emit.Lightweight/4.0.1": { "System.Reflection.Emit.Lightweight/4.0.1": {
@@ -1243,7 +1255,7 @@
"ref/netstandard1.0/_._": {} "ref/netstandard1.0/_._": {}
}, },
"runtime": { "runtime": {
"lib/netstandard1.3/_._": {} "lib/netstandard1.3/System.Reflection.Emit.Lightweight.dll": {}
} }
}, },
"System.Reflection.Extensions/4.0.1": { "System.Reflection.Extensions/4.0.1": {
@@ -1305,7 +1317,7 @@
"ref/netstandard1.5/System.Reflection.TypeExtensions.dll": {} "ref/netstandard1.5/System.Reflection.TypeExtensions.dll": {}
}, },
"runtime": { "runtime": {
"lib/netstandard1.5/_._": {} "lib/netstandard1.5/System.Reflection.TypeExtensions.dll": {}
} }
}, },
"System.Resources.Reader/4.0.0": { "System.Resources.Reader/4.0.0": {
@@ -1398,7 +1410,11 @@
"ref/netstandard1.1/System.Runtime.InteropServices.RuntimeInformation.dll": {} "ref/netstandard1.1/System.Runtime.InteropServices.RuntimeInformation.dll": {}
}, },
"runtimeTargets": { "runtimeTargets": {
"runtimes/win/lib/netstandard1.1/_._": { "runtimes/unix/lib/netstandard1.1/System.Runtime.InteropServices.RuntimeInformation.dll": {
"assetType": "runtime",
"rid": "unix"
},
"runtimes/win/lib/netstandard1.1/System.Runtime.InteropServices.RuntimeInformation.dll": {
"assetType": "runtime", "assetType": "runtime",
"rid": "win" "rid": "win"
} }
@@ -1430,7 +1446,7 @@
"ref/netstandard1.1/System.Runtime.Numerics.dll": {} "ref/netstandard1.1/System.Runtime.Numerics.dll": {}
}, },
"runtime": { "runtime": {
"lib/netstandard1.3/_._": {} "lib/netstandard1.3/System.Runtime.Numerics.dll": {}
} }
}, },
"System.Security.Claims/4.0.1": { "System.Security.Claims/4.0.1": {
@@ -1472,7 +1488,11 @@
"ref/netstandard1.6/System.Security.Cryptography.Algorithms.dll": {} "ref/netstandard1.6/System.Security.Cryptography.Algorithms.dll": {}
}, },
"runtimeTargets": { "runtimeTargets": {
"runtimes/win/lib/netstandard1.6/_._": { "runtimes/unix/lib/netstandard1.6/System.Security.Cryptography.Algorithms.dll": {
"assetType": "runtime",
"rid": "unix"
},
"runtimes/win/lib/netstandard1.6/System.Security.Cryptography.Algorithms.dll": {
"assetType": "runtime", "assetType": "runtime",
"rid": "win" "rid": "win"
} }
@@ -1497,7 +1517,11 @@
"ref/netstandard1.6/_._": {} "ref/netstandard1.6/_._": {}
}, },
"runtimeTargets": { "runtimeTargets": {
"runtimes/win/lib/netstandard1.6/_._": { "runtimes/unix/lib/netstandard1.6/System.Security.Cryptography.Cng.dll": {
"assetType": "runtime",
"rid": "unix"
},
"runtimes/win/lib/netstandard1.6/System.Security.Cryptography.Cng.dll": {
"assetType": "runtime", "assetType": "runtime",
"rid": "win" "rid": "win"
} }
@@ -1524,7 +1548,11 @@
"ref/netstandard1.3/_._": {} "ref/netstandard1.3/_._": {}
}, },
"runtimeTargets": { "runtimeTargets": {
"runtimes/win/lib/netstandard1.3/_._": { "runtimes/unix/lib/netstandard1.3/System.Security.Cryptography.Csp.dll": {
"assetType": "runtime",
"rid": "unix"
},
"runtimes/win/lib/netstandard1.3/System.Security.Cryptography.Csp.dll": {
"assetType": "runtime", "assetType": "runtime",
"rid": "win" "rid": "win"
} }
@@ -1550,7 +1578,11 @@
"ref/netstandard1.3/System.Security.Cryptography.Encoding.dll": {} "ref/netstandard1.3/System.Security.Cryptography.Encoding.dll": {}
}, },
"runtimeTargets": { "runtimeTargets": {
"runtimes/win/lib/netstandard1.3/_._": { "runtimes/unix/lib/netstandard1.3/System.Security.Cryptography.Encoding.dll": {
"assetType": "runtime",
"rid": "unix"
},
"runtimes/win/lib/netstandard1.3/System.Security.Cryptography.Encoding.dll": {
"assetType": "runtime", "assetType": "runtime",
"rid": "win" "rid": "win"
} }
@@ -1577,10 +1609,10 @@
"ref/netstandard1.6/_._": {} "ref/netstandard1.6/_._": {}
}, },
"runtime": { "runtime": {
"lib/netstandard1.6/_._": {} "lib/netstandard1.6/System.Security.Cryptography.OpenSsl.dll": {}
}, },
"runtimeTargets": { "runtimeTargets": {
"runtimes/unix/lib/netstandard1.6/_._": { "runtimes/unix/lib/netstandard1.6/System.Security.Cryptography.OpenSsl.dll": {
"assetType": "runtime", "assetType": "runtime",
"rid": "unix" "rid": "unix"
} }
@@ -1601,7 +1633,7 @@
"ref/netstandard1.3/System.Security.Cryptography.Primitives.dll": {} "ref/netstandard1.3/System.Security.Cryptography.Primitives.dll": {}
}, },
"runtime": { "runtime": {
"lib/netstandard1.3/_._": {} "lib/netstandard1.3/System.Security.Cryptography.Primitives.dll": {}
} }
}, },
"System.Security.Cryptography.X509Certificates/4.1.0": { "System.Security.Cryptography.X509Certificates/4.1.0": {
@@ -1637,7 +1669,11 @@
"ref/netstandard1.4/System.Security.Cryptography.X509Certificates.dll": {} "ref/netstandard1.4/System.Security.Cryptography.X509Certificates.dll": {}
}, },
"runtimeTargets": { "runtimeTargets": {
"runtimes/win/lib/netstandard1.6/_._": { "runtimes/unix/lib/netstandard1.6/System.Security.Cryptography.X509Certificates.dll": {
"assetType": "runtime",
"rid": "unix"
},
"runtimes/win/lib/netstandard1.6/System.Security.Cryptography.X509Certificates.dll": {
"assetType": "runtime", "assetType": "runtime",
"rid": "win" "rid": "win"
} }
@@ -1746,7 +1782,7 @@
"ref/netstandard1.6/System.Text.RegularExpressions.dll": {} "ref/netstandard1.6/System.Text.RegularExpressions.dll": {}
}, },
"runtime": { "runtime": {
"lib/netstandard1.6/_._": {} "lib/netstandard1.6/System.Text.RegularExpressions.dll": {}
} }
}, },
"System.Threading/4.0.11": { "System.Threading/4.0.11": {
@@ -1759,7 +1795,7 @@
"ref/netstandard1.3/System.Threading.dll": {} "ref/netstandard1.3/System.Threading.dll": {}
}, },
"runtime": { "runtime": {
"lib/netstandard1.3/_._": {} "lib/netstandard1.3/System.Threading.dll": {}
} }
}, },
"System.Threading.Overlapped/4.0.1": { "System.Threading.Overlapped/4.0.1": {
@@ -1824,7 +1860,7 @@
"lib/netstandard1.0/System.Threading.Tasks.Extensions.dll": {} "lib/netstandard1.0/System.Threading.Tasks.Extensions.dll": {}
}, },
"runtime": { "runtime": {
"lib/netstandard1.0/_._": {} "lib/netstandard1.0/System.Threading.Tasks.Extensions.dll": {}
} }
}, },
"System.Threading.Tasks.Parallel/4.0.1": { "System.Threading.Tasks.Parallel/4.0.1": {
@@ -1905,7 +1941,7 @@
"ref/netstandard1.3/System.Xml.ReaderWriter.dll": {} "ref/netstandard1.3/System.Xml.ReaderWriter.dll": {}
}, },
"runtime": { "runtime": {
"lib/netstandard1.3/_._": {} "lib/netstandard1.3/System.Xml.ReaderWriter.dll": {}
} }
}, },
"System.Xml.XDocument/4.0.11": { "System.Xml.XDocument/4.0.11": {
@@ -1928,7 +1964,7 @@
"ref/netstandard1.3/System.Xml.XDocument.dll": {} "ref/netstandard1.3/System.Xml.XDocument.dll": {}
}, },
"runtime": { "runtime": {
"lib/netstandard1.3/_._": {} "lib/netstandard1.3/System.Xml.XDocument.dll": {}
} }
}, },
"System.Xml.XmlDocument/4.0.1": { "System.Xml.XmlDocument/4.0.1": {
@@ -1991,6 +2027,50 @@
"runtime": { "runtime": {
"lib/netstandard1.3/_._": {} "lib/netstandard1.3/_._": {}
} }
},
"MediaBrowser.Common/1.0.0": {
"type": "project",
"framework": ".NETStandard,Version=v1.6",
"dependencies": {
"MediaBrowser.Model": "1.0.0",
"NETStandard.Library": "1.6.0"
}
},
"MediaBrowser.Controller/1.0.0": {
"type": "project",
"framework": ".NETStandard,Version=v1.6",
"dependencies": {
"MediaBrowser.Common": "1.0.0",
"MediaBrowser.Model": "1.0.0",
"NETStandard.Library": "1.6.0"
}
},
"MediaBrowser.Model/1.0.0": {
"type": "project",
"framework": ".NETStandard,Version=v1.6",
"dependencies": {
"NETStandard.Library": "1.6.0"
}
},
"MediaBrowser.WebDashboard/1.0.0": {
"type": "project",
"framework": ".NETStandard,Version=v1.6",
"dependencies": {
"MediaBrowser.Common": "1.0.0",
"MediaBrowser.Controller": "1.0.0",
"MediaBrowser.Model": "1.0.0",
"NETStandard.Library": "1.6.0"
}
},
"MediaBrowser.XbmcMetadata/1.0.0": {
"type": "project",
"framework": ".NETStandard,Version=v1.6",
"dependencies": {
"MediaBrowser.Common": "1.0.0",
"MediaBrowser.Controller": "1.0.0",
"MediaBrowser.Model": "1.0.0",
"NETStandard.Library": "1.6.0"
}
} }
} }
}, },
@@ -6585,13 +6665,44 @@
"ref/xamarintvos10/_._", "ref/xamarintvos10/_._",
"ref/xamarinwatchos10/_._" "ref/xamarinwatchos10/_._"
] ]
},
"MediaBrowser.Common/1.0.0": {
"type": "project",
"path": "../../MediaBrowser.Common/project.json",
"msbuildProject": "../../MediaBrowser.Common/MediaBrowser.Common.csproj"
},
"MediaBrowser.Controller/1.0.0": {
"type": "project",
"path": "../../MediaBrowser.Controller/project.json",
"msbuildProject": "../../MediaBrowser.Controller/MediaBrowser.Controller.csproj"
},
"MediaBrowser.Model/1.0.0": {
"type": "project",
"path": "../../MediaBrowser.Model/project.json",
"msbuildProject": "../../MediaBrowser.Model/MediaBrowser.Model.csproj"
},
"MediaBrowser.WebDashboard/1.0.0": {
"type": "project",
"path": "../../MediaBrowser.WebDashboard/project.json",
"msbuildProject": "../../MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj"
},
"MediaBrowser.XbmcMetadata/1.0.0": {
"type": "project",
"path": "../../MediaBrowser.XbmcMetadata/project.json",
"msbuildProject": "../../MediaBrowser.XbmcMetadata/MediaBrowser.XbmcMetadata.csproj"
} }
}, },
"projectFileDependencyGroups": { "projectFileDependencyGroups": {
"": [ "": [
"Microsoft.NETCore.App >= 1.0.1" "Microsoft.NETCore.App >= 1.0.1"
], ],
".NETCoreApp,Version=v1.0": [] ".NETCoreApp,Version=v1.0": [
"MediaBrowser.Common",
"MediaBrowser.Controller",
"MediaBrowser.Model",
"MediaBrowser.WebDashboard",
"MediaBrowser.XbmcMetadata"
]
}, },
"tools": {}, "tools": {},
"projectFileToolGroups": {} "projectFileToolGroups": {}