Skip to content

Commit b26781f

Browse files
LukePulverentiLukePulverenti
authored
Merge pull request #3312 from MediaBrowser/dev
Dev
2 parents 8518dd7 + a932ebf commit b26781f

File tree

2,277 files changed

+2361620
-290
lines changed

Some content is hidden

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

2,277 files changed

+2361620
-290
lines changed

‎BDInfo/BDInfo.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@
3434
</PropertyGroup>
3535
<ItemGroup>
3636
<Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
37-
<HintPath>..\packages\MediaBrowser.Common.3.3.45-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
37+
<HintPath>..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
3838
</Reference>
3939
<Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
40-
<HintPath>..\packages\MediaBrowser.Common.3.3.45-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
40+
<HintPath>..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
4141
</Reference>
4242
<Reference Include="System" />
4343
<Reference Include="System.Configuration" />

‎BDInfo/packages.config

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

‎DvdLib/DvdLib.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@
4949
<Compile Include="Ifo\VideoAttributes.cs" />
5050
<Compile Include="Properties\AssemblyInfo.cs" />
5151
<Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
52-
<HintPath>..\packages\MediaBrowser.Common.3.3.45-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
52+
<HintPath>..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
5353
</Reference>
5454
<Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
55-
<HintPath>..\packages\MediaBrowser.Common.3.3.45-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
55+
<HintPath>..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
5656
</Reference>
5757
<Reference Include="System" />
5858
<Reference Include="System.Configuration" />

‎DvdLib/packages.config

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

‎Emby.Dlna/Emby.Dlna.csproj

+3-6
Original file line numberDiff line numberDiff line change
@@ -174,13 +174,13 @@
174174
</ItemGroup>
175175
<ItemGroup>
176176
<Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
177-
<HintPath>..\packages\MediaBrowser.Common.3.3.45-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
177+
<HintPath>..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
178178
</Reference>
179179
<Reference Include="MediaBrowser.Controller, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
180-
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.45-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
180+
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
181181
</Reference>
182182
<Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
183-
<HintPath>..\packages\MediaBrowser.Common.3.3.45-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
183+
<HintPath>..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
184184
</Reference>
185185
<Reference Include="System" />
186186
<Reference Include="System.Configuration" />
@@ -189,9 +189,6 @@
189189
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
190190
</Reference>
191191
<Reference Include="System.Runtime.Serialization" />
192-
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
193-
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.0\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
194-
</Reference>
195192
<Reference Include="System.Xml.Linq" />
196193
<Reference Include="System.Data.DataSetExtensions" />
197194
<Reference Include="Microsoft.CSharp" />

‎Emby.Dlna/PlayTo/Device.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ private DeviceService GetAvTransportService()
239239
services.FirstOrDefault(s => (s.ServiceType ?? string.Empty).StartsWith("urn:schemas-upnp-org:service:AVTransport", StringComparison.OrdinalIgnoreCase));
240240
}
241241

242-
private async ValueTask<bool> SetMute(bool mute, CancellationToken cancellationToken)
242+
private async Task<bool> SetMute(bool mute, CancellationToken cancellationToken)
243243
{
244244
var rendererCommands = await GetRenderingProtocolAsync(cancellationToken).ConfigureAwait(false);
245245

‎Emby.Dlna/PlayTo/PlayToController.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,7 @@ private PlaylistItem GetPlaylistItem(BaseItem item, List<MediaSourceInfo> mediaS
595595
/// </summary>
596596
/// <param name="items">The items.</param>
597597
/// <returns></returns>
598-
private async ValueTask<bool> PlayItems(IEnumerable<PlaylistItem> items)
598+
private async Task<bool> PlayItems(IEnumerable<PlaylistItem> items)
599599
{
600600
Playlist.Clear();
601601
Playlist.AddRange(items);

‎Emby.Dlna/Profiles/LgTvProfile.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public LgTvProfile()
5353
{
5454
new DirectPlayProfile
5555
{
56-
Container = "ts,mpegts,avi,mkv",
56+
Container = "ts,mpegts,avi,mkv,m2ts",
5757
VideoCodec = "h264",
5858
AudioCodec = "aac,ac3,eac3,mp3,dca,dts",
5959
Type = DlnaProfileType.Video

‎Emby.Dlna/Profiles/Xml/LG Smart TV.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
3535
<XmlRootAttributes />
3636
<DirectPlayProfiles>
37-
<DirectPlayProfile container="ts,mpegts,avi,mkv" audioCodec="aac,ac3,eac3,mp3,dca,dts" videoCodec="h264" type="Video" />
37+
<DirectPlayProfile container="ts,mpegts,avi,mkv,m2ts" audioCodec="aac,ac3,eac3,mp3,dca,dts" videoCodec="h264" type="Video" />
3838
<DirectPlayProfile container="mp4,m4v" audioCodec="aac,ac3,eac3,mp3,dca,dts" videoCodec="h264,mpeg4" type="Video" />
3939
<DirectPlayProfile container="mp3" type="Audio" />
4040
<DirectPlayProfile container="jpeg" type="Photo" />

‎Emby.Dlna/packages.config

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="MediaBrowser.Common" version="3.3.45-beta" targetFramework="net47" />
4-
<package id="MediaBrowser.Server.Core" version="3.3.45-beta" targetFramework="net47" />
3+
<package id="MediaBrowser.Common" version="3.3.46-beta" targetFramework="net47" />
4+
<package id="MediaBrowser.Server.Core" version="3.3.46-beta" targetFramework="net47" />
55
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.0" targetFramework="net47" />
6-
<package id="System.Threading.Tasks.Extensions" version="4.5.0" targetFramework="net47" />
76
</packages>

‎Emby.Drawing.ImageMagick/Emby.Drawing.ImageMagick.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@
3535
<HintPath>..\packages\ImageMagickSharp.1.0.0.19\lib\net45\ImageMagickSharp.dll</HintPath>
3636
</Reference>
3737
<Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
38-
<HintPath>..\packages\MediaBrowser.Common.3.3.45-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
38+
<HintPath>..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
3939
</Reference>
4040
<Reference Include="MediaBrowser.Controller, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
41-
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.45-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
41+
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
4242
</Reference>
4343
<Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
44-
<HintPath>..\packages\MediaBrowser.Common.3.3.45-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
44+
<HintPath>..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
4545
</Reference>
4646
<Reference Include="System" />
4747
<Reference Include="System.Core" />

‎Emby.Drawing.ImageMagick/packages.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="ImageMagickSharp" version="1.0.0.19" targetFramework="net452" />
4-
<package id="MediaBrowser.Common" version="3.3.45-beta" targetFramework="net47" />
5-
<package id="MediaBrowser.Server.Core" version="3.3.45-beta" targetFramework="net47" />
4+
<package id="MediaBrowser.Common" version="3.3.46-beta" targetFramework="net47" />
5+
<package id="MediaBrowser.Server.Core" version="3.3.46-beta" targetFramework="net47" />
66
</packages>

‎Emby.Drawing.Skia/Emby.Drawing.Skia.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@
4343
<Compile Include="StripCollageBuilder.cs" />
4444
<Compile Include="UnplayedCountIndicator.cs" />
4545
<Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
46-
<HintPath>..\packages\MediaBrowser.Common.3.3.45-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
46+
<HintPath>..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
4747
</Reference>
4848
<Reference Include="MediaBrowser.Controller, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
49-
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.45-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
49+
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
5050
</Reference>
5151
<Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
52-
<HintPath>..\packages\MediaBrowser.Common.3.3.45-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
52+
<HintPath>..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
5353
</Reference>
5454
<Reference Include="System" />
5555
<Reference Include="System.Configuration" />

‎Emby.Drawing.Skia/packages.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="MediaBrowser.Common" version="3.3.45-beta" targetFramework="net47" />
4-
<package id="MediaBrowser.Server.Core" version="3.3.45-beta" targetFramework="net47" />
3+
<package id="MediaBrowser.Common" version="3.3.46-beta" targetFramework="net47" />
4+
<package id="MediaBrowser.Server.Core" version="3.3.46-beta" targetFramework="net47" />
55
<package id="SkiaSharp" version="1.58.1" targetFramework="portable45-net45+win8" requireReinstallation="true" />
66
</packages>

‎Emby.Drawing/Emby.Drawing.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@
4141
</ItemGroup>
4242
<ItemGroup>
4343
<Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
44-
<HintPath>..\packages\MediaBrowser.Common.3.3.45-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
44+
<HintPath>..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
4545
</Reference>
4646
<Reference Include="MediaBrowser.Controller, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
47-
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.45-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
47+
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
4848
</Reference>
4949
<Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
50-
<HintPath>..\packages\MediaBrowser.Common.3.3.45-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
50+
<HintPath>..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
5151
</Reference>
5252
<Reference Include="System" />
5353
<Reference Include="System.Configuration" />

‎Emby.Drawing/packages.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="MediaBrowser.Common" version="3.3.45-beta" targetFramework="net47" />
4-
<package id="MediaBrowser.Server.Core" version="3.3.45-beta" targetFramework="net47" />
3+
<package id="MediaBrowser.Common" version="3.3.46-beta" targetFramework="net47" />
4+
<package id="MediaBrowser.Server.Core" version="3.3.46-beta" targetFramework="net47" />
55
</packages>

‎Emby.Photos/Emby.Photos.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@
3232
</PropertyGroup>
3333
<ItemGroup>
3434
<Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
35-
<HintPath>..\packages\MediaBrowser.Common.3.3.45-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
35+
<HintPath>..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
3636
</Reference>
3737
<Reference Include="MediaBrowser.Controller, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
38-
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.45-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
38+
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
3939
</Reference>
4040
<Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
41-
<HintPath>..\packages\MediaBrowser.Common.3.3.45-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
41+
<HintPath>..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
4242
</Reference>
4343
<Reference Include="TagLib.Portable">
4444
<HintPath>..\ThirdParty\taglib\TagLib.Portable.dll</HintPath>

‎Emby.Photos/packages.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="MediaBrowser.Common" version="3.3.45-beta" targetFramework="net47" />
4-
<package id="MediaBrowser.Server.Core" version="3.3.45-beta" targetFramework="net47" />
3+
<package id="MediaBrowser.Common" version="3.3.46-beta" targetFramework="net47" />
4+
<package id="MediaBrowser.Server.Core" version="3.3.46-beta" targetFramework="net47" />
55
</packages>

0 commit comments

Comments
 (0)