diff --git a/Directory.Build.props b/Directory.Build.props index c9bd8060..e29bcec6 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -18,12 +18,17 @@ https://github.com/Baseflow/XamarinMediaManager git $(AssemblyName) ($(TargetFramework)) - 1.0.9 + 1.1.0 - 8.0 + enable + 10.0 $(NoWarn);1591;1701;1702;1705;VSX1000;CS0109;CS0108;CS0618;CS0114;NU1603 AnyCPU + + true + latest + AllEnabledByDefault $(MSBuildProjectName.Contains('UnitTest')) $(MSBuildProjectName.Contains('MediaManager')) @@ -62,7 +67,7 @@ - + @@ -74,19 +79,15 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + 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 6ab4851a..3f65f85a 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -13,8 +13,8 @@ $(DefineConstants);NETFX_CORE;XAML;WINDOWS;WINDOWS_UWP;UWP - 10.0.17763.0 - 10.0.17763.0 + 10.0.18362.0 + 10.0.18362.0 $(DefineConstants);MONO;UIKIT;COCOA;APPLE;IOS diff --git a/MediaManager.Forms/MediaManager.Forms.csproj b/MediaManager.Forms/MediaManager.Forms.csproj index 931224bb..ab9eff95 100644 --- a/MediaManager.Forms/MediaManager.Forms.csproj +++ b/MediaManager.Forms/MediaManager.Forms.csproj @@ -1,7 +1,7 @@  netstandard2.0;xamarin.ios10;xamarin.mac20;xamarin.tvos10;monoandroid10.0;tizen40 - uap10.0.17763;net472;netcoreapp3.1;$(TargetFrameworks) + uap10.0.18362;net472;netcoreapp3.1;$(TargetFrameworks) @@ -16,7 +16,7 @@ - + @@ -27,13 +27,13 @@ - + - + diff --git a/MediaManager.UnitTest/MediaManager.UnitTest.csproj b/MediaManager.UnitTest/MediaManager.UnitTest.csproj index 8bd4e500..29ee6902 100644 --- a/MediaManager.UnitTest/MediaManager.UnitTest.csproj +++ b/MediaManager.UnitTest/MediaManager.UnitTest.csproj @@ -7,13 +7,13 @@ - + all runtime; build; native; contentfiles; analyzers - + diff --git a/MediaManager/MediaManager.csproj b/MediaManager/MediaManager.csproj index 28b3cf76..2167ff0e 100644 --- a/MediaManager/MediaManager.csproj +++ b/MediaManager/MediaManager.csproj @@ -1,7 +1,7 @@  netstandard2.0;xamarin.ios10;xamarin.mac20;xamarin.tvos10;monoandroid10.0;tizen40 - uap10.0.17763;net472;netcoreapp3.1;$(TargetFrameworks) + uap10.0.18362;net472;netcoreapp3.1;$(TargetFrameworks) @@ -33,6 +33,7 @@ + diff --git a/MediaManager/MediaManagerBase.cs b/MediaManager/MediaManagerBase.cs index 6ef17c16..8a42c434 100644 --- a/MediaManager/MediaManagerBase.cs +++ b/MediaManager/MediaManagerBase.cs @@ -12,6 +12,7 @@ using MediaManager.Player; using MediaManager.Queue; using MediaManager.Volume; +using Timer = System.Timers.Timer; namespace MediaManager { diff --git a/Samples/ElementPlayer.Android/ElementPlayer.Android.csproj b/Samples/ElementPlayer.Android/ElementPlayer.Android.csproj index f3b5ffd2..69c39f36 100644 --- a/Samples/ElementPlayer.Android/ElementPlayer.Android.csproj +++ b/Samples/ElementPlayer.Android/ElementPlayer.Android.csproj @@ -21,6 +21,7 @@ Properties\AndroidManifest.xml Resources Assets + armeabi-v7a;arm64-v8a True @@ -34,7 +35,6 @@ None true d8 - true true 1G @@ -100,57 +100,57 @@ - 7.1.2 + 8.0.2 - 7.1.2 + 8.0.2 - 7.1.2 + 8.0.2 - 7.1.2 + 8.0.2 - 1.3.0.3 + 1.6.0.3 - 1.0.0.5 + 1.0.0.11 - 1.0.0.5 + 1.0.0.10 - + - 1.2.5.3 + 1.3.6.3 - 1.1.0.5 + 1.4.3 - 1.0.0.5 + 1.0.0.12 - 1.0.0.5 + 1.0.0.10 - 1.2.0.4 + 1.3.1.3 - 1.1.0.5 + 1.2.5.2 - 1.0.0.5 + 1.0.0.10 - 1.1.0.5 + 1.2.1.3 - + - 1.2.0.2 + 1.3.0.8 - 2.2.0.3 + 2.3.1.3 diff --git a/Samples/ElementPlayer.Core/ElementPlayer.Core.csproj b/Samples/ElementPlayer.Core/ElementPlayer.Core.csproj index b63a10e6..84703fd4 100644 --- a/Samples/ElementPlayer.Core/ElementPlayer.Core.csproj +++ b/Samples/ElementPlayer.Core/ElementPlayer.Core.csproj @@ -18,10 +18,10 @@ - - - - + + + + diff --git a/Samples/ElementPlayer.Forms.Android/ElementPlayer.Forms.Android.csproj b/Samples/ElementPlayer.Forms.Android/ElementPlayer.Forms.Android.csproj index f8fc05f9..aa243ff8 100644 --- a/Samples/ElementPlayer.Forms.Android/ElementPlayer.Forms.Android.csproj +++ b/Samples/ElementPlayer.Forms.Android/ElementPlayer.Forms.Android.csproj @@ -20,6 +20,7 @@ Xamarin.Android.Net.AndroidClientHandler + armeabi-v7a;arm64-v8a true @@ -51,7 +52,6 @@ true d8 1G - armeabi-v7a;arm64-v8a @@ -65,26 +65,26 @@ - 7.1.2 + 8.0.2 - - - - - - - - - - + + + + + + + + + + - 2.2.0.3 + 2.3.1.3 - 1.2.5.3 + 1.3.6.3 - 1.1.0.5 + 1.4.3 diff --git a/Samples/ElementPlayer.Forms.Mac/ElementPlayer.Forms.Mac.csproj b/Samples/ElementPlayer.Forms.Mac/ElementPlayer.Forms.Mac.csproj index 702bd307..b9863331 100644 --- a/Samples/ElementPlayer.Forms.Mac/ElementPlayer.Forms.Mac.csproj +++ b/Samples/ElementPlayer.Forms.Mac/ElementPlayer.Forms.Mac.csproj @@ -116,7 +116,7 @@ - 7.1.2 + 8.0.2 diff --git a/Samples/ElementPlayer.Forms.UI/ElementPlayer.Forms.UI.csproj b/Samples/ElementPlayer.Forms.UI/ElementPlayer.Forms.UI.csproj index 04b16f6c..ab18f507 100644 --- a/Samples/ElementPlayer.Forms.UI/ElementPlayer.Forms.UI.csproj +++ b/Samples/ElementPlayer.Forms.UI/ElementPlayer.Forms.UI.csproj @@ -11,9 +11,9 @@ - - - + + + diff --git a/Samples/ElementPlayer.Forms.UWP/ElementPlayer.Forms.UWP.csproj b/Samples/ElementPlayer.Forms.UWP/ElementPlayer.Forms.UWP.csproj index fb3aeab9..0298e515 100644 --- a/Samples/ElementPlayer.Forms.UWP/ElementPlayer.Forms.UWP.csproj +++ b/Samples/ElementPlayer.Forms.UWP/ElementPlayer.Forms.UWP.csproj @@ -146,11 +146,11 @@ - 7.1.2 + 8.0.2 - - - + + + diff --git a/Samples/ElementPlayer.Forms.WPFCore/ElementPlayer.Forms.WPFCore.csproj b/Samples/ElementPlayer.Forms.WPFCore/ElementPlayer.Forms.WPFCore.csproj index f8e544ae..d062ad3d 100644 --- a/Samples/ElementPlayer.Forms.WPFCore/ElementPlayer.Forms.WPFCore.csproj +++ b/Samples/ElementPlayer.Forms.WPFCore/ElementPlayer.Forms.WPFCore.csproj @@ -19,8 +19,8 @@ - - + + diff --git a/Samples/ElementPlayer.Forms.Wpf/ElementPlayer.Forms.Wpf.csproj b/Samples/ElementPlayer.Forms.Wpf/ElementPlayer.Forms.Wpf.csproj index 349e2511..8671ecbe 100644 --- a/Samples/ElementPlayer.Forms.Wpf/ElementPlayer.Forms.Wpf.csproj +++ b/Samples/ElementPlayer.Forms.Wpf/ElementPlayer.Forms.Wpf.csproj @@ -96,10 +96,10 @@ - 7.1.2 + 8.0.2 - 4.7.0.968 + 5.0.0.2012 diff --git a/Samples/ElementPlayer.Forms.iOS/ElementPlayer.Forms.iOS.csproj b/Samples/ElementPlayer.Forms.iOS/ElementPlayer.Forms.iOS.csproj index c32f2750..051d010f 100644 --- a/Samples/ElementPlayer.Forms.iOS/ElementPlayer.Forms.iOS.csproj +++ b/Samples/ElementPlayer.Forms.iOS/ElementPlayer.Forms.iOS.csproj @@ -155,10 +155,10 @@ - 7.1.2 + 8.0.2 - - + + diff --git a/Samples/ElementPlayer.Mac/ElementPlayer.Mac.csproj b/Samples/ElementPlayer.Mac/ElementPlayer.Mac.csproj index 0eab1bff..d250111d 100644 --- a/Samples/ElementPlayer.Mac/ElementPlayer.Mac.csproj +++ b/Samples/ElementPlayer.Mac/ElementPlayer.Mac.csproj @@ -98,13 +98,13 @@ - 7.1.2 + 8.0.2 - 7.1.2 + 8.0.2 - 7.1.2 + 8.0.2 diff --git a/Samples/ElementPlayer.TvOS/ElementPlayer.TvOS.csproj b/Samples/ElementPlayer.TvOS/ElementPlayer.TvOS.csproj index e341fbb3..ba43ef0a 100644 --- a/Samples/ElementPlayer.TvOS/ElementPlayer.TvOS.csproj +++ b/Samples/ElementPlayer.TvOS/ElementPlayer.TvOS.csproj @@ -204,13 +204,13 @@ - 7.1.2 + 8.0.2 - 7.1.2 + 8.0.2 - 7.1.2 + 8.0.2 diff --git a/Samples/ElementPlayer.Uwp/ElementPlayer.Uwp.csproj b/Samples/ElementPlayer.Uwp/ElementPlayer.Uwp.csproj index 6a8fdb93..81b74dd3 100644 --- a/Samples/ElementPlayer.Uwp/ElementPlayer.Uwp.csproj +++ b/Samples/ElementPlayer.Uwp/ElementPlayer.Uwp.csproj @@ -152,10 +152,10 @@ - 6.2.11 + 6.2.12 - 7.1.2 + 8.0.2 diff --git a/Samples/ElementPlayer.WPFCore/ElementPlayer.WPFCore.csproj b/Samples/ElementPlayer.WPFCore/ElementPlayer.WPFCore.csproj index 12067d5d..d23697b9 100644 --- a/Samples/ElementPlayer.WPFCore/ElementPlayer.WPFCore.csproj +++ b/Samples/ElementPlayer.WPFCore/ElementPlayer.WPFCore.csproj @@ -22,10 +22,10 @@ - - - - + + + + diff --git a/Samples/ElementPlayer.Wpf/ElementPlayer.Wpf.csproj b/Samples/ElementPlayer.Wpf/ElementPlayer.Wpf.csproj index 65d453f1..2b5e1e43 100644 --- a/Samples/ElementPlayer.Wpf/ElementPlayer.Wpf.csproj +++ b/Samples/ElementPlayer.Wpf/ElementPlayer.Wpf.csproj @@ -128,16 +128,16 @@ - 1.1.19 + 1.1.39 - 7.1.2 + 8.0.2 - 1.2.7 + 2.0.4 - 3.2.0 + 4.3.0 diff --git a/Samples/ElementPlayer.iOS/ElementPlayer.iOS.csproj b/Samples/ElementPlayer.iOS/ElementPlayer.iOS.csproj index 1064749e..b2e41b67 100644 --- a/Samples/ElementPlayer.iOS/ElementPlayer.iOS.csproj +++ b/Samples/ElementPlayer.iOS/ElementPlayer.iOS.csproj @@ -155,13 +155,13 @@ - 7.1.2 + 8.0.2 - 7.1.2 + 8.0.2 - 7.1.2 + 8.0.2 diff --git a/global.json b/global.json index fec540a8..f3cb0dc9 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "msbuild-sdks": { - "MSBuild.Sdk.Extras": "3.0.23" + "MSBuild.Sdk.Extras": "3.0.44" } } \ No newline at end of file