Skip to content

Commit 26c0be6

Browse files
LukePulverentiLukePulverenti
authored
Merge pull request #3296 from MediaBrowser/dev
Dev
2 parents f75e05f + 89d1b02 commit 26c0be6

File tree

806 files changed

+565
-51973
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

806 files changed

+565
-51973
lines changed

‎BDInfo/BDInfo.csproj

+8-5
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<DefaultLanguage>en-US</DefaultLanguage>
1414
<FileAlignment>512</FileAlignment>
1515
<TargetFrameworkProfile />
16-
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
16+
<TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
1717
</PropertyGroup>
1818
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1919
<DebugSymbols>true</DebugSymbols>
@@ -33,6 +33,12 @@
3333
<WarningLevel>4</WarningLevel>
3434
</PropertyGroup>
3535
<ItemGroup>
36+
<Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
37+
<HintPath>..\packages\MediaBrowser.Common.3.3.42-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
38+
</Reference>
39+
<Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
40+
<HintPath>..\packages\MediaBrowser.Common.3.3.42-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
41+
</Reference>
3642
<Reference Include="System" />
3743
<Reference Include="System.Configuration" />
3844
<Reference Include="System.Core" />
@@ -66,10 +72,7 @@
6672
<Compile Include="TSStreamFile.cs" />
6773
</ItemGroup>
6874
<ItemGroup>
69-
<ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj">
70-
<Project>{7eeeb4bb-f3e8-48fc-b4c5-70f0fff8329b}</Project>
71-
<Name>MediaBrowser.Model</Name>
72-
</ProjectReference>
75+
<None Include="packages.config" />
7376
</ItemGroup>
7477
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
7578
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎BDInfo/packages.config

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="MediaBrowser.Common" version="3.3.42-beta" targetFramework="net47" />
4+
</packages>

‎DvdLib/DvdLib.csproj

+19-8
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@
1212
<AssemblyName>DvdLib</AssemblyName>
1313
<DefaultLanguage>en-US</DefaultLanguage>
1414
<FileAlignment>512</FileAlignment>
15-
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
16-
<TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
17-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
15+
<TargetFrameworkProfile />
16+
<TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
1817
</PropertyGroup>
1918
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2019
<DebugSymbols>true</DebugSymbols>
@@ -49,14 +48,26 @@
4948
<Compile Include="Ifo\UserOperation.cs" />
5049
<Compile Include="Ifo\VideoAttributes.cs" />
5150
<Compile Include="Properties\AssemblyInfo.cs" />
51+
<Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
52+
<HintPath>..\packages\MediaBrowser.Common.3.3.42-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
53+
</Reference>
54+
<Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
55+
<HintPath>..\packages\MediaBrowser.Common.3.3.42-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
56+
</Reference>
57+
<Reference Include="System" />
58+
<Reference Include="System.Configuration" />
59+
<Reference Include="System.Core" />
60+
<Reference Include="System.Runtime.Serialization" />
61+
<Reference Include="System.Xml.Linq" />
62+
<Reference Include="System.Data.DataSetExtensions" />
63+
<Reference Include="Microsoft.CSharp" />
64+
<Reference Include="System.Data" />
65+
<Reference Include="System.Xml" />
5266
</ItemGroup>
5367
<ItemGroup>
54-
<ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj">
55-
<Project>{7eeeb4bb-f3e8-48fc-b4c5-70f0fff8329b}</Project>
56-
<Name>MediaBrowser.Model</Name>
57-
</ProjectReference>
68+
<None Include="packages.config" />
5869
</ItemGroup>
59-
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
70+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
6071
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
6172
Other similar extension points exist, see Microsoft.Common.targets.
6273
<Target Name="BeforeBuild">

‎DvdLib/DvdLib.nuget.targets

-6
This file was deleted.

‎DvdLib/packages.config

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="MediaBrowser.Common" version="3.3.42-beta" targetFramework="net47" />
4+
</packages>

‎Emby.Dlna/ContentDirectory/ControlHandler.cs

+9-9
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ private QueryResult<BaseItem> GetChildrenSorted(BaseItem item, User user, Search
459459
{
460460
Limit = limit,
461461
StartIndex = startIndex,
462-
OrderBy = sortOrders.Select(i => new Tuple<string, SortOrder>(i, sort.SortOrder)).ToArray(),
462+
OrderBy = sortOrders.Select(i => new ValueTuple<string, SortOrder>(i, sort.SortOrder)).ToArray(),
463463
User = user,
464464
Recursive = true,
465465
IsMissing = false,
@@ -869,10 +869,10 @@ private QueryResult<ServerItem> GetMovieContinueWatching(BaseItem parent, User u
869869
query.Parent = parent;
870870
query.SetUser(user);
871871

872-
query.OrderBy = new Tuple<string, SortOrder>[]
872+
query.OrderBy = new ValueTuple<string, SortOrder>[]
873873
{
874-
new Tuple<string, SortOrder> (ItemSortBy.DatePlayed, SortOrder.Descending),
875-
new Tuple<string, SortOrder> (ItemSortBy.SortName, SortOrder.Ascending)
874+
new ValueTuple<string, SortOrder> (ItemSortBy.DatePlayed, SortOrder.Descending),
875+
new ValueTuple<string, SortOrder> (ItemSortBy.SortName, SortOrder.Ascending)
876876
};
877877

878878
query.IsResumable = true;
@@ -1118,7 +1118,7 @@ private QueryResult<ServerItem> GetMusicPlaylists(BaseItem parent, User user, In
11181118

11191119
private QueryResult<ServerItem> GetMusicLatest(BaseItem parent, User user, InternalItemsQuery query)
11201120
{
1121-
query.OrderBy = new Tuple<string, SortOrder>[] { };
1121+
query.OrderBy = new ValueTuple<string, SortOrder>[] { };
11221122

11231123
var items = _userViewManager.GetLatestItems(new LatestItemsQuery
11241124
{
@@ -1135,7 +1135,7 @@ private QueryResult<ServerItem> GetMusicLatest(BaseItem parent, User user, Inter
11351135

11361136
private QueryResult<ServerItem> GetNextUp(BaseItem parent, User user, InternalItemsQuery query)
11371137
{
1138-
query.OrderBy = new Tuple<string, SortOrder>[] { };
1138+
query.OrderBy = new ValueTuple<string, SortOrder>[] { };
11391139

11401140
var result = _tvSeriesManager.GetNextUp(new NextUpQuery
11411141
{
@@ -1150,7 +1150,7 @@ private QueryResult<ServerItem> GetNextUp(BaseItem parent, User user, InternalIt
11501150

11511151
private QueryResult<ServerItem> GetTvLatest(BaseItem parent, User user, InternalItemsQuery query)
11521152
{
1153-
query.OrderBy = new Tuple<string, SortOrder>[] { };
1153+
query.OrderBy = new ValueTuple<string, SortOrder>[] { };
11541154

11551155
var items = _userViewManager.GetLatestItems(new LatestItemsQuery
11561156
{
@@ -1167,7 +1167,7 @@ private QueryResult<ServerItem> GetTvLatest(BaseItem parent, User user, Internal
11671167

11681168
private QueryResult<ServerItem> GetMovieLatest(BaseItem parent, User user, InternalItemsQuery query)
11691169
{
1170-
query.OrderBy = new Tuple<string, SortOrder>[] { };
1170+
query.OrderBy = new ValueTuple<string, SortOrder>[] { };
11711171

11721172
var items = _userViewManager.GetLatestItems(new LatestItemsQuery
11731173
{
@@ -1277,7 +1277,7 @@ private void SetSorting(InternalItemsQuery query, SortCriteria sort, bool isPreS
12771277
sortOrders.Add(ItemSortBy.SortName);
12781278
}
12791279

1280-
query.OrderBy = sortOrders.Select(i => new Tuple<string, SortOrder>(i, sort.SortOrder)).ToArray();
1280+
query.OrderBy = sortOrders.Select(i => new ValueTuple<string, SortOrder>(i, sort.SortOrder)).ToArray();
12811281
}
12821282

12831283
private QueryResult<ServerItem> ApplyPaging(QueryResult<ServerItem> result, int? startIndex, int? limit)

‎Emby.Dlna/Emby.Dlna.csproj

+13-13
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<DefaultLanguage>en-US</DefaultLanguage>
1414
<FileAlignment>512</FileAlignment>
1515
<TargetFrameworkProfile />
16-
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
16+
<TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
1717
</PropertyGroup>
1818
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1919
<DebugSymbols>true</DebugSymbols>
@@ -129,18 +129,6 @@
129129
<EmbeddedResource Include="Images\people480.png" />
130130
</ItemGroup>
131131
<ItemGroup>
132-
<ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj">
133-
<Project>{9142eefa-7570-41e1-bfcc-468bb571af2f}</Project>
134-
<Name>MediaBrowser.Common</Name>
135-
</ProjectReference>
136-
<ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj">
137-
<Project>{17e1f4e6-8abd-4fe5-9ecf-43d4b6087ba2}</Project>
138-
<Name>MediaBrowser.Controller</Name>
139-
</ProjectReference>
140-
<ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj">
141-
<Project>{7eeeb4bb-f3e8-48fc-b4c5-70f0fff8329b}</Project>
142-
<Name>MediaBrowser.Model</Name>
143-
</ProjectReference>
144132
<ProjectReference Include="..\RSSDP\RSSDP.csproj">
145133
<Project>{21002819-c39a-4d3e-be83-2a276a77fb1f}</Project>
146134
<Name>RSSDP</Name>
@@ -177,6 +165,15 @@
177165
<EmbeddedResource Include="Profiles\Xml\Xbox One.xml" />
178166
</ItemGroup>
179167
<ItemGroup>
168+
<Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
169+
<HintPath>..\packages\MediaBrowser.Common.3.3.42-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
170+
</Reference>
171+
<Reference Include="MediaBrowser.Controller, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
172+
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.42-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
173+
</Reference>
174+
<Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
175+
<HintPath>..\packages\MediaBrowser.Common.3.3.42-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
176+
</Reference>
180177
<Reference Include="System" />
181178
<Reference Include="System.Configuration" />
182179
<Reference Include="System.Core" />
@@ -191,6 +188,9 @@
191188
<ItemGroup>
192189
<EmbeddedResource Include="Profiles\Xml\Marantz.xml" />
193190
</ItemGroup>
191+
<ItemGroup>
192+
<None Include="packages.config" />
193+
</ItemGroup>
194194
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
195195
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
196196
Other similar extension points exist, see Microsoft.Common.targets.

‎Emby.Dlna/Profiles/DefaultProfile.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
namespace Emby.Dlna.Profiles
77
{
8-
[XmlRoot("Profile")]
8+
[System.Xml.Serialization.XmlRoot("Profile")]
99
public class DefaultProfile : DeviceProfile
1010
{
1111
public DefaultProfile()

‎Emby.Dlna/Profiles/DenonAvrProfile.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
namespace Emby.Dlna.Profiles
55
{
6-
[XmlRoot("Profile")]
6+
[System.Xml.Serialization.XmlRoot("Profile")]
77
public class DenonAvrProfile : DefaultProfile
88
{
99
public DenonAvrProfile()

‎Emby.Dlna/Profiles/DirectTvProfile.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
namespace Emby.Dlna.Profiles
55
{
6-
[XmlRoot("Profile")]
6+
[System.Xml.Serialization.XmlRoot("Profile")]
77
public class DirectTvProfile : DefaultProfile
88
{
99
public DirectTvProfile()

‎Emby.Dlna/Profiles/DishHopperJoeyProfile.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
namespace Emby.Dlna.Profiles
55
{
6-
[XmlRoot("Profile")]
6+
[System.Xml.Serialization.XmlRoot("Profile")]
77
public class DishHopperJoeyProfile : DefaultProfile
88
{
99
public DishHopperJoeyProfile()

‎Emby.Dlna/Profiles/Foobar2000Profile.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
namespace Emby.Dlna.Profiles
55
{
6-
[XmlRoot("Profile")]
6+
[System.Xml.Serialization.XmlRoot("Profile")]
77
public class Foobar2000Profile : DefaultProfile
88
{
99
public Foobar2000Profile()

‎Emby.Dlna/Profiles/LgTvProfile.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
namespace Emby.Dlna.Profiles
55
{
6-
[XmlRoot("Profile")]
6+
[System.Xml.Serialization.XmlRoot("Profile")]
77
public class LgTvProfile : DefaultProfile
88
{
99
public LgTvProfile()

‎Emby.Dlna/Profiles/LinksysDMA2100Profile.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
namespace Emby.Dlna.Profiles
55
{
6-
[XmlRoot("Profile")]
6+
[System.Xml.Serialization.XmlRoot("Profile")]
77
public class LinksysDMA2100Profile : DefaultProfile
88
{
99
public LinksysDMA2100Profile()

‎Emby.Dlna/Profiles/MarantzProfile.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
namespace Emby.Dlna.Profiles
55
{
6-
[XmlRoot("Profile")]
6+
[System.Xml.Serialization.XmlRoot("Profile")]
77
public class MarantzProfile : DefaultProfile
88
{
99
public MarantzProfile()

‎Emby.Dlna/Profiles/MediaMonkeyProfile.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
namespace Emby.Dlna.Profiles
55
{
6-
[XmlRoot("Profile")]
6+
[System.Xml.Serialization.XmlRoot("Profile")]
77
public class MediaMonkeyProfile : DefaultProfile
88
{
99
public MediaMonkeyProfile()

‎Emby.Dlna/Profiles/PanasonicVieraProfile.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
namespace Emby.Dlna.Profiles
55
{
6-
[XmlRoot("Profile")]
6+
[System.Xml.Serialization.XmlRoot("Profile")]
77
public class PanasonicVieraProfile : DefaultProfile
88
{
99
public PanasonicVieraProfile()

‎Emby.Dlna/Profiles/PopcornHourProfile.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
namespace Emby.Dlna.Profiles
55
{
6-
[XmlRoot("Profile")]
6+
[System.Xml.Serialization.XmlRoot("Profile")]
77
public class PopcornHourProfile : DefaultProfile
88
{
99
public PopcornHourProfile()

‎Emby.Dlna/Profiles/SamsungSmartTvProfile.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
namespace Emby.Dlna.Profiles
55
{
6-
[XmlRoot("Profile")]
6+
[System.Xml.Serialization.XmlRoot("Profile")]
77
public class SamsungSmartTvProfile : DefaultProfile
88
{
99
public SamsungSmartTvProfile()

‎Emby.Dlna/Profiles/SharpSmartTvProfile.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
namespace Emby.Dlna.Profiles
55
{
6-
[XmlRoot("Profile")]
6+
[System.Xml.Serialization.XmlRoot("Profile")]
77
public class SharpSmartTvProfile : DefaultProfile
88
{
99
public SharpSmartTvProfile()

‎Emby.Dlna/Profiles/SonyBlurayPlayer2013.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
namespace Emby.Dlna.Profiles
55
{
6-
[XmlRoot("Profile")]
6+
[System.Xml.Serialization.XmlRoot("Profile")]
77
public class SonyBlurayPlayer2013 : DefaultProfile
88
{
99
public SonyBlurayPlayer2013()

‎Emby.Dlna/Profiles/SonyBlurayPlayer2014.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
namespace Emby.Dlna.Profiles
55
{
6-
[XmlRoot("Profile")]
6+
[System.Xml.Serialization.XmlRoot("Profile")]
77
public class SonyBlurayPlayer2014 : DefaultProfile
88
{
99
public SonyBlurayPlayer2014()

‎Emby.Dlna/Profiles/SonyBlurayPlayer2015.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
namespace Emby.Dlna.Profiles
55
{
6-
[XmlRoot("Profile")]
6+
[System.Xml.Serialization.XmlRoot("Profile")]
77
public class SonyBlurayPlayer2015 : DefaultProfile
88
{
99
public SonyBlurayPlayer2015()

‎Emby.Dlna/Profiles/SonyBlurayPlayer2016.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
namespace Emby.Dlna.Profiles
55
{
6-
[XmlRoot("Profile")]
6+
[System.Xml.Serialization.XmlRoot("Profile")]
77
public class SonyBlurayPlayer2016 : DefaultProfile
88
{
99
public SonyBlurayPlayer2016()

‎Emby.Dlna/Profiles/SonyBlurayPlayerProfile.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
namespace Emby.Dlna.Profiles
55
{
6-
[XmlRoot("Profile")]
6+
[System.Xml.Serialization.XmlRoot("Profile")]
77
public class SonyBlurayPlayerProfile : DefaultProfile
88
{
99
public SonyBlurayPlayerProfile()

‎Emby.Dlna/Profiles/SonyBravia2010Profile.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
namespace Emby.Dlna.Profiles
55
{
6-
[XmlRoot("Profile")]
6+
[System.Xml.Serialization.XmlRoot("Profile")]
77
public class SonyBravia2010Profile : DefaultProfile
88
{
99
public SonyBravia2010Profile()

‎Emby.Dlna/Profiles/SonyBravia2011Profile.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
namespace Emby.Dlna.Profiles
55
{
6-
[XmlRoot("Profile")]
6+
[System.Xml.Serialization.XmlRoot("Profile")]
77
public class SonyBravia2011Profile : DefaultProfile
88
{
99
public SonyBravia2011Profile()

0 commit comments

Comments
 (0)