From db22ff1240a41737bc8efc5f2efd2786a996b9bd Mon Sep 17 00:00:00 2001 From: Martijn van Dijk Date: Wed, 4 Mar 2020 12:15:59 -0500 Subject: [PATCH] Updates --- Directory.build.props | 4 +- Directory.build.targets | 79 ++++++++++--------- .../MediaManager.AzureMediaServices.csproj | 2 +- ...anager.FFmpegMediaMetadataRetriever.csproj | 2 +- MediaManager.Forms/MediaManager.Forms.csproj | 19 ++--- MediaManager.Forms/VideoView.cs | 16 ++-- .../MediaManager.Reactive.csproj | 2 +- .../MediaManager.UnitTest.csproj | 2 +- MediaManager/MediaManager.csproj | 10 +-- .../MediaSession/MediaBrowserService.cs | 1 + Samples/Directory.build.targets | 79 ++++++++++--------- .../ElementPlayer.Core.csproj | 2 +- .../ElementPlayer.Forms.Android.csproj | 4 +- .../ElementPlayer.Forms.UI.csproj | 4 +- .../ElementPlayer.Forms.UWP.csproj | 4 +- .../ElementPlayer.Forms.Wpf.csproj | 2 +- .../ElementPlayer.Forms.iOS.csproj | 4 +- 17 files changed, 119 insertions(+), 117 deletions(-) diff --git a/Directory.build.props b/Directory.build.props index e7279d88..be5e5109 100644 --- a/Directory.build.props +++ b/Directory.build.props @@ -15,7 +15,7 @@ git $(AssemblyName) ($(TargetFramework)) en - 0.9.6 + 0.9.7 AnyCPU @@ -81,7 +81,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Directory.build.targets b/Directory.build.targets index 211c0e8f..886b4b22 100644 --- a/Directory.build.targets +++ b/Directory.build.targets @@ -1,39 +1,42 @@ - - - $(DefineConstants);NETSTANDARD;PORTABLE - - - $(DefineConstants);NET;WPF;XAML - - - $(DefineConstants);NETFX_CORE;XAML;WINDOWS;WINDOWS_UWP;UWP - 10.0.16299.0 - 10.0.16299.0 - - - $(DefineConstants);MONO;UIKIT;COCOA;APPLE;IOS - - - $(DefineConstants);MONO;COCOA;APPLE;MAC - - - $(DefineConstants);MONO;UIKIT;COCOA;APPLE;TVOS - - - $(DefineConstants);MONO;UIKIT;COCOA;APPLE;WATCHOS - - - $(DefineConstants);MONO;ANDROID - Resources - Resource - Resources\Resource.designer.cs - - - $(DefineConstants);NETCOREAPP - - - $(DefineConstants);TIZEN - Tizen - v4.0 - + + + $(DefineConstants);NETSTANDARD;PORTABLE + + + $(DefineConstants);NET;WPF;XAML + + + $(DefineConstants);NET;NET5 + + + $(DefineConstants);NETFX_CORE;XAML;WINDOWS;WINDOWS_UWP;UWP + 10.0.18362.0 + 10.0.18362.0 + + + $(DefineConstants);MONO;UIKIT;COCOA;APPLE;IOS + + + $(DefineConstants);MONO;COCOA;APPLE;MAC + + + $(DefineConstants);MONO;COCOA;APPLE;TVOS + + + $(DefineConstants);MONO;COCOA;APPLE;WATCHOS + + + $(DefineConstants);MONO;ANDROID + Resources + Resource + Resources\Resource.designer.cs + + + $(DefineConstants);NETCOREAPP + + + $(DefineConstants);TIZEN + Tizen + v4.0 + \ No newline at end of file diff --git a/MediaManager.AzureMediaServices/MediaManager.AzureMediaServices.csproj b/MediaManager.AzureMediaServices/MediaManager.AzureMediaServices.csproj index ad786310..f8446a5f 100644 --- a/MediaManager.AzureMediaServices/MediaManager.AzureMediaServices.csproj +++ b/MediaManager.AzureMediaServices/MediaManager.AzureMediaServices.csproj @@ -5,7 +5,7 @@ - netstandard2.0;monoandroid90; + netstandard2.0;monoandroid10.0; netstandard2.0;uap10.0.16299 netstandard2.0;xamarin.ios10 netstandard2.0;xamarin.ios10;xamarin.mac20;xamarin.tvos10 diff --git a/MediaManager.FFmpegMediaMetadataRetriever/MediaManager.FFmpegMediaMetadataRetriever.csproj b/MediaManager.FFmpegMediaMetadataRetriever/MediaManager.FFmpegMediaMetadataRetriever.csproj index cf1691b5..9dbe5355 100644 --- a/MediaManager.FFmpegMediaMetadataRetriever/MediaManager.FFmpegMediaMetadataRetriever.csproj +++ b/MediaManager.FFmpegMediaMetadataRetriever/MediaManager.FFmpegMediaMetadataRetriever.csproj @@ -1,6 +1,6 @@  - monoandroid90 + monoandroid10.0 diff --git a/MediaManager.Forms/MediaManager.Forms.csproj b/MediaManager.Forms/MediaManager.Forms.csproj index 4a8a70be..d9adea6b 100644 --- a/MediaManager.Forms/MediaManager.Forms.csproj +++ b/MediaManager.Forms/MediaManager.Forms.csproj @@ -1,12 +1,12 @@  - netstandard2.0;xamarin.ios10;xamarin.mac20;xamarin.tvos10;monoandroid90;tizen40;uap10.0.16299;net472 - netstandard2.0;xamarin.ios10;xamarin.mac20;xamarin.tvos10;monoandroid90;tizen40 + netstandard2.0;xamarin.ios10;xamarin.mac20;xamarin.tvos10;monoandroid10.0;tizen40 + uap10.0.18362;net472;$(TargetFrameworks) - netstandard2.0;monoandroid90; - netstandard2.0;uap10.0.16299 + netstandard2.0;monoandroid10.0; + netstandard2.0;uap10.0.18362 netstandard2.0;xamarin.ios10 netstandard2.0;xamarin.ios10;xamarin.mac20;xamarin.tvos10 @@ -21,7 +21,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -92,12 +92,7 @@ - - - - - - + diff --git a/MediaManager.Forms/VideoView.cs b/MediaManager.Forms/VideoView.cs index a88e9ee6..44f8cfe8 100644 --- a/MediaManager.Forms/VideoView.cs +++ b/MediaManager.Forms/VideoView.cs @@ -28,7 +28,7 @@ public VideoView() MediaManager.MediaPlayer.PropertyChanged += MediaPlayer_PropertyChanged; } - private void MediaPlayer_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e) + protected virtual void MediaPlayer_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e) { switch (e.PropertyName) { @@ -53,7 +53,7 @@ private void MediaPlayer_PropertyChanged(object sender, System.ComponentModel.Pr } } - private void MediaManager_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e) + protected virtual void MediaManager_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e) { switch (e.PropertyName) { @@ -77,29 +77,29 @@ private void MediaManager_PropertyChanged(object sender, System.ComponentModel.P } } - private void MediaQueue_QueueChanged(object sender, QueueChangedEventArgs e) + protected virtual void MediaQueue_QueueChanged(object sender, QueueChangedEventArgs e) { //var queue = MediaManager.MediaQueue.ToList(); //if (Source != queue) // Source = queue; } - private void MediaManager_MediaItemChanged(object sender, MediaItemEventArgs e) + protected virtual void MediaManager_MediaItemChanged(object sender, MediaItemEventArgs e) { Current = e.MediaItem; } - private void MediaManager_StateChanged(object sender, StateChangedEventArgs e) + protected virtual void MediaManager_StateChanged(object sender, StateChangedEventArgs e) { State = e.State; } - private void MediaManager_PositionChanged(object sender, PositionChangedEventArgs e) + protected virtual void MediaManager_PositionChanged(object sender, Playback.PositionChangedEventArgs e) { Position = e.Position; } - private void MediaManager_BufferedChanged(object sender, BufferedChangedEventArgs e) + protected virtual void MediaManager_BufferedChanged(object sender, BufferedChangedEventArgs e) { Buffered = e.Buffered; } @@ -301,7 +301,7 @@ private static async void OnVideoPlaceholderPropertyChanged(BindableObject binda #endif } - public void Dispose() + public virtual void Dispose() { MediaManager.BufferedChanged -= MediaManager_BufferedChanged; MediaManager.PositionChanged -= MediaManager_PositionChanged; diff --git a/MediaManager.Reactive/MediaManager.Reactive.csproj b/MediaManager.Reactive/MediaManager.Reactive.csproj index 68787349..09021d38 100644 --- a/MediaManager.Reactive/MediaManager.Reactive.csproj +++ b/MediaManager.Reactive/MediaManager.Reactive.csproj @@ -5,7 +5,7 @@ - netstandard2.0;monoandroid90; + netstandard2.0;monoandroid10.0; netstandard2.0;uap10.0.16299 netstandard2.0;xamarin.ios10 netstandard2.0;xamarin.ios10;xamarin.mac20;xamarin.tvos10 diff --git a/MediaManager.UnitTest/MediaManager.UnitTest.csproj b/MediaManager.UnitTest/MediaManager.UnitTest.csproj index 00d22c6a..cb980106 100644 --- a/MediaManager.UnitTest/MediaManager.UnitTest.csproj +++ b/MediaManager.UnitTest/MediaManager.UnitTest.csproj @@ -7,7 +7,7 @@ - + all diff --git a/MediaManager/MediaManager.csproj b/MediaManager/MediaManager.csproj index 4a1dcd20..a7bd8963 100644 --- a/MediaManager/MediaManager.csproj +++ b/MediaManager/MediaManager.csproj @@ -1,12 +1,12 @@  - netstandard2.0;xamarin.ios10;xamarin.mac20;xamarin.tvos10;monoandroid90;tizen40;uap10.0.16299;net472 - netstandard2.0;xamarin.ios10;xamarin.mac20;xamarin.tvos10;monoandroid90;tizen40 + netstandard2.0;xamarin.ios10;xamarin.mac20;xamarin.tvos10;monoandroid10.0;tizen40 + uap10.0.18362;net472;$(TargetFrameworks) - netstandard2.0;monoandroid90; - netstandard2.0;uap10.0.16299 + netstandard2.0;monoandroid10.0; + netstandard2.0;uap10.0.18362 netstandard2.0;xamarin.ios10 netstandard2.0;xamarin.ios10;xamarin.mac20;xamarin.tvos10 @@ -108,7 +108,7 @@ - + diff --git a/MediaManager/Platforms/Android/MediaSession/MediaBrowserService.cs b/MediaManager/Platforms/Android/MediaSession/MediaBrowserService.cs index cc39e3fb..781ca323 100644 --- a/MediaManager/Platforms/Android/MediaSession/MediaBrowserService.cs +++ b/MediaManager/Platforms/Android/MediaSession/MediaBrowserService.cs @@ -6,6 +6,7 @@ using Android.Support.V4.Content; using Android.Support.V4.Media; using Android.Support.V4.Media.Session; +using AndroidX.Media; using Com.Google.Android.Exoplayer2.UI; using MediaManager.Platforms.Android.Media; diff --git a/Samples/Directory.build.targets b/Samples/Directory.build.targets index ce225160..886b4b22 100644 --- a/Samples/Directory.build.targets +++ b/Samples/Directory.build.targets @@ -1,39 +1,42 @@ - - - $(DefineConstants);NETSTANDARD;PORTABLE - - - $(DefineConstants);NET;WPF;XAML - - - $(DefineConstants);NETFX_CORE;XAML;WINDOWS;WINDOWS_UWP;UWP - 10.0.16299.0 - 10.0.16299.0 - - - $(DefineConstants);MONO;UIKIT;COCOA;APPLE;IOS - - - $(DefineConstants);MONO;COCOA;APPLE;MAC - - - $(DefineConstants);MONO;UIKIT;COCOA;APPLE;TVOS - - - $(DefineConstants);MONO;UIKIT;COCOA;APPLE;WATCHOS - - - $(DefineConstants);MONO;ANDROID - Resources - Resource - Resources\Resource.designer.cs - - - $(DefineConstants);NETCOREAPP - - - $(DefineConstants);TIZEN - Tizen - v4.0 - + + + $(DefineConstants);NETSTANDARD;PORTABLE + + + $(DefineConstants);NET;WPF;XAML + + + $(DefineConstants);NET;NET5 + + + $(DefineConstants);NETFX_CORE;XAML;WINDOWS;WINDOWS_UWP;UWP + 10.0.18362.0 + 10.0.18362.0 + + + $(DefineConstants);MONO;UIKIT;COCOA;APPLE;IOS + + + $(DefineConstants);MONO;COCOA;APPLE;MAC + + + $(DefineConstants);MONO;COCOA;APPLE;TVOS + + + $(DefineConstants);MONO;COCOA;APPLE;WATCHOS + + + $(DefineConstants);MONO;ANDROID + Resources + Resource + Resources\Resource.designer.cs + + + $(DefineConstants);NETCOREAPP + + + $(DefineConstants);TIZEN + Tizen + v4.0 + \ No newline at end of file diff --git a/Samples/ElementPlayer.Core/ElementPlayer.Core.csproj b/Samples/ElementPlayer.Core/ElementPlayer.Core.csproj index e890c158..647f2ed7 100644 --- a/Samples/ElementPlayer.Core/ElementPlayer.Core.csproj +++ b/Samples/ElementPlayer.Core/ElementPlayer.Core.csproj @@ -21,7 +21,7 @@ - + diff --git a/Samples/ElementPlayer.Forms.Android/ElementPlayer.Forms.Android.csproj b/Samples/ElementPlayer.Forms.Android/ElementPlayer.Forms.Android.csproj index 17d1bfa4..4197a102 100644 --- a/Samples/ElementPlayer.Forms.Android/ElementPlayer.Forms.Android.csproj +++ b/Samples/ElementPlayer.Forms.Android/ElementPlayer.Forms.Android.csproj @@ -61,7 +61,7 @@ 6.4.2 - + @@ -69,7 +69,7 @@ - + diff --git a/Samples/ElementPlayer.Forms.UI/ElementPlayer.Forms.UI.csproj b/Samples/ElementPlayer.Forms.UI/ElementPlayer.Forms.UI.csproj index 65936c5f..ddfe103a 100644 --- a/Samples/ElementPlayer.Forms.UI/ElementPlayer.Forms.UI.csproj +++ b/Samples/ElementPlayer.Forms.UI/ElementPlayer.Forms.UI.csproj @@ -12,8 +12,8 @@ - - + + diff --git a/Samples/ElementPlayer.Forms.UWP/ElementPlayer.Forms.UWP.csproj b/Samples/ElementPlayer.Forms.UWP/ElementPlayer.Forms.UWP.csproj index 848b9c1d..0efe7cdb 100644 --- a/Samples/ElementPlayer.Forms.UWP/ElementPlayer.Forms.UWP.csproj +++ b/Samples/ElementPlayer.Forms.UWP/ElementPlayer.Forms.UWP.csproj @@ -148,9 +148,9 @@ 6.4.2 - + - + diff --git a/Samples/ElementPlayer.Forms.Wpf/ElementPlayer.Forms.Wpf.csproj b/Samples/ElementPlayer.Forms.Wpf/ElementPlayer.Forms.Wpf.csproj index 477747fd..66fc9c14 100644 --- a/Samples/ElementPlayer.Forms.Wpf/ElementPlayer.Forms.Wpf.csproj +++ b/Samples/ElementPlayer.Forms.Wpf/ElementPlayer.Forms.Wpf.csproj @@ -99,7 +99,7 @@ 6.4.2 - 4.2.0.815419 + 4.5.0.356 diff --git a/Samples/ElementPlayer.Forms.iOS/ElementPlayer.Forms.iOS.csproj b/Samples/ElementPlayer.Forms.iOS/ElementPlayer.Forms.iOS.csproj index 51beb89f..d5550564 100644 --- a/Samples/ElementPlayer.Forms.iOS/ElementPlayer.Forms.iOS.csproj +++ b/Samples/ElementPlayer.Forms.iOS/ElementPlayer.Forms.iOS.csproj @@ -157,8 +157,8 @@ 6.4.2 - - + +