mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-05 21:37:10 -04:00
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Conflicts: MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.Api.dll MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.ApiInteraction.Javascript.dll MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.Server.Sqlite.dll MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.Server.WorldWeatherOnline.dll MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.WebDashboard.dll
This commit is contained in:
commit
84507736a0
1
.gitignore
vendored
1
.gitignore
vendored
@ -145,6 +145,7 @@ publish/
|
|||||||
# NuGet Packages Directory
|
# NuGet Packages Directory
|
||||||
## TODO: If you have NuGet Package Restore enabled, uncomment the next line
|
## TODO: If you have NuGet Package Restore enabled, uncomment the next line
|
||||||
packages/
|
packages/
|
||||||
|
dlls/
|
||||||
|
|
||||||
# Windows Azure Build Output
|
# Windows Azure Build Output
|
||||||
csx
|
csx
|
||||||
|
@ -98,6 +98,9 @@
|
|||||||
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
|
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
|
||||||
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
|
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
|
||||||
<Import Project="..\packages\Microsoft.Bcl.Build.1.0.0-rc\tools\Microsoft.Bcl.Build.targets" />
|
<Import Project="..\packages\Microsoft.Bcl.Build.1.0.0-rc\tools\Microsoft.Bcl.Build.targets" />
|
||||||
|
<PropertyGroup>
|
||||||
|
<PostBuildEvent>xcopy "$(TargetPath)" "$(SolutionDir)\Nuget\dlls\" /y /d /r /i</PostBuildEvent>
|
||||||
|
</PropertyGroup>
|
||||||
<!-- 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.
|
||||||
<Target Name="BeforeBuild">
|
<Target Name="BeforeBuild">
|
||||||
|
@ -656,7 +656,7 @@ namespace MediaBrowser.ApiInteraction
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="itemId">The item id.</param>
|
/// <param name="itemId">The item id.</param>
|
||||||
/// <param name="userId">The user id.</param>
|
/// <param name="userId">The user id.</param>
|
||||||
/// <returns>Task{DtoUserItemData}.</returns>
|
/// <returns>Task{UserItemDataDto}.</returns>
|
||||||
/// <exception cref="System.ArgumentNullException">itemId</exception>
|
/// <exception cref="System.ArgumentNullException">itemId</exception>
|
||||||
public Task<UserItemDataDto> ReportPlaybackStartAsync(string itemId, Guid userId)
|
public Task<UserItemDataDto> ReportPlaybackStartAsync(string itemId, Guid userId)
|
||||||
{
|
{
|
||||||
@ -686,7 +686,7 @@ namespace MediaBrowser.ApiInteraction
|
|||||||
/// <param name="itemId">The item id.</param>
|
/// <param name="itemId">The item id.</param>
|
||||||
/// <param name="userId">The user id.</param>
|
/// <param name="userId">The user id.</param>
|
||||||
/// <param name="positionTicks">The position ticks.</param>
|
/// <param name="positionTicks">The position ticks.</param>
|
||||||
/// <returns>Task{DtoUserItemData}.</returns>
|
/// <returns>Task{UserItemDataDto}.</returns>
|
||||||
/// <exception cref="System.ArgumentNullException">itemId</exception>
|
/// <exception cref="System.ArgumentNullException">itemId</exception>
|
||||||
public Task<UserItemDataDto> ReportPlaybackProgressAsync(string itemId, Guid userId, long? positionTicks)
|
public Task<UserItemDataDto> ReportPlaybackProgressAsync(string itemId, Guid userId, long? positionTicks)
|
||||||
{
|
{
|
||||||
@ -718,7 +718,7 @@ namespace MediaBrowser.ApiInteraction
|
|||||||
/// <param name="itemId">The item id.</param>
|
/// <param name="itemId">The item id.</param>
|
||||||
/// <param name="userId">The user id.</param>
|
/// <param name="userId">The user id.</param>
|
||||||
/// <param name="positionTicks">The position ticks.</param>
|
/// <param name="positionTicks">The position ticks.</param>
|
||||||
/// <returns>Task{DtoUserItemData}.</returns>
|
/// <returns>Task{UserItemDataDto}.</returns>
|
||||||
/// <exception cref="System.ArgumentNullException">itemId</exception>
|
/// <exception cref="System.ArgumentNullException">itemId</exception>
|
||||||
public Task<UserItemDataDto> ReportPlaybackStoppedAsync(string itemId, Guid userId, long? positionTicks)
|
public Task<UserItemDataDto> ReportPlaybackStoppedAsync(string itemId, Guid userId, long? positionTicks)
|
||||||
{
|
{
|
||||||
@ -749,7 +749,7 @@ namespace MediaBrowser.ApiInteraction
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="itemId">The item id.</param>
|
/// <param name="itemId">The item id.</param>
|
||||||
/// <param name="userId">The user id.</param>
|
/// <param name="userId">The user id.</param>
|
||||||
/// <returns>Task{DtoUserItemData}.</returns>
|
/// <returns>Task{UserItemDataDto}.</returns>
|
||||||
/// <exception cref="System.ArgumentNullException">itemId</exception>
|
/// <exception cref="System.ArgumentNullException">itemId</exception>
|
||||||
public Task ClearUserItemRatingAsync(string itemId, Guid userId)
|
public Task ClearUserItemRatingAsync(string itemId, Guid userId)
|
||||||
{
|
{
|
||||||
@ -774,7 +774,7 @@ namespace MediaBrowser.ApiInteraction
|
|||||||
/// <param name="itemId">The item id.</param>
|
/// <param name="itemId">The item id.</param>
|
||||||
/// <param name="userId">The user id.</param>
|
/// <param name="userId">The user id.</param>
|
||||||
/// <param name="likes">if set to <c>true</c> [likes].</param>
|
/// <param name="likes">if set to <c>true</c> [likes].</param>
|
||||||
/// <returns>Task{DtoUserItemData}.</returns>
|
/// <returns>Task{UserItemDataDto}.</returns>
|
||||||
/// <exception cref="System.ArgumentNullException">itemId</exception>
|
/// <exception cref="System.ArgumentNullException">itemId</exception>
|
||||||
public Task<UserItemDataDto> UpdateUserItemRatingAsync(string itemId, Guid userId, bool likes)
|
public Task<UserItemDataDto> UpdateUserItemRatingAsync(string itemId, Guid userId, bool likes)
|
||||||
{
|
{
|
||||||
|
@ -75,6 +75,9 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
|
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
|
||||||
|
<PropertyGroup>
|
||||||
|
<PostBuildEvent>xcopy "$(TargetPath)" "$(SolutionDir)\Nuget\dlls\" /y /d /r /i</PostBuildEvent>
|
||||||
|
</PropertyGroup>
|
||||||
<!-- 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.
|
||||||
<Target Name="BeforeBuild">
|
<Target Name="BeforeBuild">
|
||||||
|
@ -228,6 +228,9 @@
|
|||||||
<ItemGroup />
|
<ItemGroup />
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
|
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
|
||||||
|
<PropertyGroup>
|
||||||
|
<PostBuildEvent>xcopy "$(TargetPath)" "$(SolutionDir)\Nuget\dlls\" /y /d /r /i</PostBuildEvent>
|
||||||
|
</PropertyGroup>
|
||||||
<!-- 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.
|
||||||
<Target Name="BeforeBuild">
|
<Target Name="BeforeBuild">
|
||||||
|
@ -227,8 +227,7 @@
|
|||||||
<ItemGroup />
|
<ItemGroup />
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<PostBuildEvent>
|
<PostBuildEvent>xcopy "$(TargetPath)" "$(SolutionDir)\Nuget\dlls\" /y /d /r /i</PostBuildEvent>
|
||||||
</PostBuildEvent>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<PreBuildEvent>
|
<PreBuildEvent>
|
||||||
|
@ -4,7 +4,7 @@ using ProtoBuf;
|
|||||||
namespace MediaBrowser.Model.Dto
|
namespace MediaBrowser.Model.Dto
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Class DtoUserItemData
|
/// Class UserItemDataDto
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[ProtoContract]
|
[ProtoContract]
|
||||||
public class UserItemDataDto : INotifyPropertyChanged
|
public class UserItemDataDto : INotifyPropertyChanged
|
||||||
|
@ -125,8 +125,7 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
|
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<PostBuildEvent>
|
<PostBuildEvent>xcopy "$(TargetPath)" "$(SolutionDir)\Nuget\dlls\" /y /d /r /i</PostBuildEvent>
|
||||||
</PostBuildEvent>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
|
<Import Project="$(SolutionDir)\.nuget\nuget.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.
|
||||||
|
@ -66,7 +66,7 @@
|
|||||||
<ApplicationManifest>app.manifest</ApplicationManifest>
|
<ApplicationManifest>app.manifest</ApplicationManifest>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<RunPostBuildEvent>Always</RunPostBuildEvent>
|
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<ManifestCertificateThumbprint>9633DCDB4A07D3328EFB99299C6DFB1823EBC4BE</ManifestCertificateThumbprint>
|
<ManifestCertificateThumbprint>9633DCDB4A07D3328EFB99299C6DFB1823EBC4BE</ManifestCertificateThumbprint>
|
||||||
@ -373,7 +373,22 @@
|
|||||||
<ItemGroup />
|
<ItemGroup />
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<PostBuildEvent>xcopy "$(SolutionDir)\packages\System.Data.SQLite.1.0.84.0\content\net40\x86\SQLite.Interop.dll" "$(TargetDir)" /y</PostBuildEvent>
|
<PostBuildEvent>xcopy "$(SolutionDir)\packages\System.Data.SQLite.1.0.84.0\content\net40\x86\SQLite.Interop.dll" "$(TargetDir)" /y
|
||||||
|
|
||||||
|
if $(ConfigurationName) == Release (
|
||||||
|
xcopy "$(TargetDir)*.dll" "$(SolutionDir)..\Deploy\Server\System" /y
|
||||||
|
mkdir "$(SolutionDir)..\Deploy\Server\System\x64"
|
||||||
|
xcopy "$(TargetDir)x64" "$(SolutionDir)..\Deploy\Server\System\x64" /y
|
||||||
|
|
||||||
|
mkdir "$(SolutionDir)..\Deploy\Server\System\x86"
|
||||||
|
xcopy "$(TargetDir)x86" "$(SolutionDir)..\Deploy\Server\System\x86" /y
|
||||||
|
|
||||||
|
mkdir "$(SolutionDir)..\Deploy\Server\System\CorePlugins"
|
||||||
|
xcopy "$(TargetDir)CorePlugins" "$(SolutionDir)..\Deploy\Server\System\CorePlugins" /y
|
||||||
|
|
||||||
|
del
|
||||||
|
"$(SolutionDir)7za" a -tzip "$(SolutionDir)..\Deploy\MBServer.zip" "$(SolutionDir)..\Deploy\Server\*"
|
||||||
|
)</PostBuildEvent>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
|
<Import Project="$(SolutionDir)\.nuget\nuget.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.
|
||||||
|
@ -97,6 +97,9 @@
|
|||||||
</Page>
|
</Page>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
|
<PropertyGroup>
|
||||||
|
<PostBuildEvent>xcopy "$(TargetPath)" "$(SolutionDir)\Nuget\dlls\" /y /d /r /i</PostBuildEvent>
|
||||||
|
</PropertyGroup>
|
||||||
<!-- 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.
|
||||||
<Target Name="BeforeBuild">
|
<Target Name="BeforeBuild">
|
||||||
|
@ -1311,6 +1311,9 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
|
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
|
||||||
|
<PropertyGroup>
|
||||||
|
<PostBuildEvent>xcopy "$(TargetPath)" "$(SolutionDir)\Nuget\dlls\" /y /d /r /i</PostBuildEvent>
|
||||||
|
</PropertyGroup>
|
||||||
<!-- 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.
|
||||||
<Target Name="BeforeBuild">
|
<Target Name="BeforeBuild">
|
||||||
|
Binary file not shown.
Before Width: | Height: | Size: 58 KiB |
BIN
MediaBrowser.WebDashboard/Html/css/images/mblogoicon.png
Normal file
BIN
MediaBrowser.WebDashboard/Html/css/images/mblogoicon.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 41 KiB |
BIN
MediaBrowser.WebDashboard/Html/css/images/mblogotextblack.png
Normal file
BIN
MediaBrowser.WebDashboard/Html/css/images/mblogotextblack.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 23 KiB |
BIN
MediaBrowser.WebDashboard/Html/css/images/mblogotextwhite.png
Normal file
BIN
MediaBrowser.WebDashboard/Html/css/images/mblogotextwhite.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 23 KiB |
Binary file not shown.
Before Width: | Height: | Size: 58 KiB |
@ -100,10 +100,15 @@ pre, textarea.pre {
|
|||||||
padding: 10px 0 10px 10px;
|
padding: 10px 0 10px 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.imgLogo {
|
.imgLogoIcon {
|
||||||
height: 45px;
|
height: 45px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.imgLogoText {
|
||||||
|
height: 45px;
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
.ui-popup-container {
|
.ui-popup-container {
|
||||||
z-index: 99999;
|
z-index: 99999;
|
||||||
@ -268,10 +273,15 @@ form, .readOnlyContent {
|
|||||||
|
|
||||||
@media all and (min-width: 650px) {
|
@media all and (min-width: 650px) {
|
||||||
|
|
||||||
.imgLogo {
|
.imgLogoIcon {
|
||||||
height: 60px;
|
height: 60px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.imgLogoText {
|
||||||
|
height: 60px;
|
||||||
|
display: inline;
|
||||||
|
}
|
||||||
|
|
||||||
.header {
|
.header {
|
||||||
padding-left: 30px;
|
padding-left: 30px;
|
||||||
padding-top: 20px;
|
padding-top: 20px;
|
||||||
|
@ -677,11 +677,11 @@ var Dashboard = {
|
|||||||
|
|
||||||
if (page.hasClass('standalonePage')) {
|
if (page.hasClass('standalonePage')) {
|
||||||
|
|
||||||
headerHtml += '<img class="imgLogo" src="css/images/mblogoblackfull.png" />';
|
headerHtml += '<img class="imgLogoIcon" src="css/images/mblogoicon.png" /><img class="imgLogoText" src="css/images/mblogotextblack.png" />';
|
||||||
}
|
}
|
||||||
else if (isLibraryPage) {
|
else if (isLibraryPage) {
|
||||||
|
|
||||||
headerHtml += '<img class="imgLogo" src="css/images/mblogowhitefull.png" />';
|
headerHtml += '<img class="imgLogoIcon" src="css/images/mblogoicon.png" /><img class="imgLogoText" src="css/images/mblogotextwhite.png" />';
|
||||||
}
|
}
|
||||||
headerHtml += '</a>';
|
headerHtml += '</a>';
|
||||||
|
|
||||||
|
@ -159,12 +159,6 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<EmbeddedResource Include="Html\scripts\IndexPage.js" />
|
<EmbeddedResource Include="Html\scripts\IndexPage.js" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
|
||||||
<EmbeddedResource Include="Html\css\images\mblogowhitefull.png" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<EmbeddedResource Include="Html\css\images\mblogoblackfull.png" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<EmbeddedResource Include="Html\css\images\defaultCollectionImage.png" />
|
<EmbeddedResource Include="Html\css\images\defaultCollectionImage.png" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
@ -395,6 +389,9 @@
|
|||||||
<EmbeddedResource Include="Html\css\images\itemDetails\videoDefault.png" />
|
<EmbeddedResource Include="Html\css\images\itemDetails\videoDefault.png" />
|
||||||
<EmbeddedResource Include="Html\css\images\itemDetails\audioDefault.png" />
|
<EmbeddedResource Include="Html\css\images\itemDetails\audioDefault.png" />
|
||||||
<EmbeddedResource Include="Html\css\images\itemDetails\gameDefault.png" />
|
<EmbeddedResource Include="Html\css\images\itemDetails\gameDefault.png" />
|
||||||
|
<Content Include="Html\css\images\mblogoicon.png" />
|
||||||
|
<Content Include="Html\css\images\mblogotextblack.png" />
|
||||||
|
<Content Include="Html\css\images\mblogotextwhite.png" />
|
||||||
<Content Include="Html\css\images\stars.png" />
|
<Content Include="Html\css\images\stars.png" />
|
||||||
<EmbeddedResource Include="Html\scripts\MediaPlayer.js" />
|
<EmbeddedResource Include="Html\scripts\MediaPlayer.js" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
30
Nuget/MediaBrowser.ApiClient.nuspec
Normal file
30
Nuget/MediaBrowser.ApiClient.nuspec
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
|
||||||
|
<metadata>
|
||||||
|
<id>MediaBrowser.ApiClient</id>
|
||||||
|
<version>3.0.0.0-beta</version>
|
||||||
|
<title>MediaBrowser.ApiInteraction</title>
|
||||||
|
<authors>Media Browser Team</authors>
|
||||||
|
<owners>Luke</owners>
|
||||||
|
<requireLicenseAcceptance>false</requireLicenseAcceptance>
|
||||||
|
<description>Description</description>
|
||||||
|
<copyright>Copyright © 2012</copyright>
|
||||||
|
<dependencies>
|
||||||
|
<group>
|
||||||
|
<dependency id="protobuf-net" version="2.0.0.621" />
|
||||||
|
</group>
|
||||||
|
<group targetFramework=".NETFramework4.5">
|
||||||
|
<dependency id="ServiceStack.Text" version="3.9.37" />
|
||||||
|
</group>
|
||||||
|
<group targetFramework=".NETPortable0.0-net45+sl4+wp71+win8">
|
||||||
|
<dependency id="Newtonsoft.Json" version="4.5.11" />
|
||||||
|
<dependency id="Microsoft.Bcl.Async" version="1.0.14-rc" />
|
||||||
|
<dependency id="Microsoft.Net.Http" version="2.1.3-beta" />
|
||||||
|
</group>
|
||||||
|
</dependencies>
|
||||||
|
</metadata>
|
||||||
|
<files>
|
||||||
|
<file src="dlls\MediaBrowser.ApiInteraction.dll" target="lib\net45\MediaBrowser.ApiInteraction.dll" />
|
||||||
|
<file src="dlls\MediaBrowser.ApiInteraction.Portable.dll" target="lib\portable-net45+sl4+wp71+win8\MediaBrowser.ApiInteraction.Portable.dll" />
|
||||||
|
</files>
|
||||||
|
</package>
|
18
Nuget/MediaBrowser.Common.nuspec
Normal file
18
Nuget/MediaBrowser.Common.nuspec
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
|
||||||
|
<metadata>
|
||||||
|
<id>MediaBrowser.Common</id>
|
||||||
|
<version>1.0.1</version>
|
||||||
|
<title>MediaBrowser.Common</title>
|
||||||
|
<authors>Media Browser Team</authors>
|
||||||
|
<owners />
|
||||||
|
<projectUrl>https://github.com/MediaBrowser/MediaBrowser</projectUrl>
|
||||||
|
<requireLicenseAcceptance>false</requireLicenseAcceptance>
|
||||||
|
<description>Contains common model objects and interfaces used by all Media Browser solutions.</description>
|
||||||
|
</metadata>
|
||||||
|
<files>
|
||||||
|
<file src="dlls\MediaBrowser.Common.dll" target="lib\net45\MediaBrowser.Common.dll" />
|
||||||
|
<file src="dlls\MediaBrowser.Model.dll" target="lib\net45\MediaBrowser.Model.dll" />
|
||||||
|
<file src="dlls\MediaBrowser.Model.dll" target="lib\portable-net4+sl4+wp7+win8\MediaBrowser.Model.dll" />
|
||||||
|
</files>
|
||||||
|
</package>
|
@ -1 +0,0 @@
|
|||||||
da3d30d634468465d8995ba6cb1c0872959b3e9c
|
|
19
Nuget/MediaBrowser.Server.Core.nuspec
Normal file
19
Nuget/MediaBrowser.Server.Core.nuspec
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
|
||||||
|
<metadata>
|
||||||
|
<id>MediaBrowser.Server.Core</id>
|
||||||
|
<version>1.0.0</version>
|
||||||
|
<title>Media Browser.Server.Core</title>
|
||||||
|
<authors>Media Browser Team</authors>
|
||||||
|
<owners />
|
||||||
|
<projectUrl>https://github.com/MediaBrowser/MediaBrowser</projectUrl>
|
||||||
|
<requireLicenseAcceptance>false</requireLicenseAcceptance>
|
||||||
|
<description>Contains core components required to build plugins for Media Browser Server.</description>
|
||||||
|
<dependencies>
|
||||||
|
<dependency id="MediaBrowser.Common" version="1.0.1" />
|
||||||
|
</dependencies>
|
||||||
|
</metadata>
|
||||||
|
<files>
|
||||||
|
<file src="dlls\MediaBrowser.Controller.dll" target="lib\net45\MediaBrowser.Controller.dll" />
|
||||||
|
</files>
|
||||||
|
</package>
|
20
Nuget/MediaBrowser.Theater.Core.nuspec
Normal file
20
Nuget/MediaBrowser.Theater.Core.nuspec
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
|
||||||
|
<metadata>
|
||||||
|
<id>MediaBrowser.Theater.Core</id>
|
||||||
|
<version>1.0.0</version>
|
||||||
|
<title>MediaBrowser.Theater.Core</title>
|
||||||
|
<authors>Media Browser Team</authors>
|
||||||
|
<owners />
|
||||||
|
<projectUrl>https://github.com/MediaBrowser/MediaBrowser.Theater</projectUrl>
|
||||||
|
<requireLicenseAcceptance>false</requireLicenseAcceptance>
|
||||||
|
<description>Contains components required to build plugins for Media Browser Theater.</description>
|
||||||
|
<dependencies>
|
||||||
|
<dependency id="MediaBrowser.Common" version="1.0.1" />
|
||||||
|
</dependencies>
|
||||||
|
</metadata>
|
||||||
|
<files>
|
||||||
|
<file src="dlls\MediaBrowser.UI.Controls.dll" target="lib\net45\MediaBrowser.UI.Controls.dll" />
|
||||||
|
<file src="dlls\MediaBrowser.UI.dll" target="lib\net45\MediaBrowser.UI.dll" />
|
||||||
|
</files>
|
||||||
|
</package>
|
Loading…
Reference in New Issue
Block a user