Skip to content

Commit

Permalink
Updates
Browse files Browse the repository at this point in the history
  • Loading branch information
martijn00 committed Jan 31, 2022
1 parent 7e84a4a commit ae5e649
Show file tree
Hide file tree
Showing 22 changed files with 96 additions and 93 deletions.
21 changes: 11 additions & 10 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,17 @@
<RepositoryUrl>https://github.com/Baseflow/XamarinMediaManager</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<Product>$(AssemblyName) ($(TargetFramework))</Product>
<Version>1.0.9</Version>
<Version>1.1.0</Version>

<!--<Nullable>enable</Nullable>-->
<LangVersion>8.0</LangVersion>
<ImplicitUsings>enable</ImplicitUsings>
<LangVersion>10.0</LangVersion>
<NoWarn>$(NoWarn);1591;1701;1702;1705;VSX1000;CS0109;CS0108;CS0618;CS0114;NU1603</NoWarn>
<Platform>AnyCPU</Platform>

<EnableNETAnalyzers>true</EnableNETAnalyzers>
<AnalysisLevel>latest</AnalysisLevel>
<AnalysisMode>AllEnabledByDefault</AnalysisMode>

<IsTestProject>$(MSBuildProjectName.Contains('UnitTest'))</IsTestProject>
<IsLibraryProject>$(MSBuildProjectName.Contains('MediaManager'))</IsLibraryProject>
Expand Down Expand Up @@ -62,7 +67,7 @@

<ItemGroup Condition="'$(IsTestProject)' != 'true' and '$(SourceLinkEnabled)' != 'false' and '$(IsLibraryProject)' == 'true'">
<PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.3" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
</ItemGroup>

<PropertyGroup>
Expand All @@ -74,19 +79,15 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Roslynator.Analyzers" Version="3.0.0">
<PackageReference Include="Roslynator.Analyzers" Version="4.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="AsyncFixer" Version="1.3.0">
<PackageReference Include="AsyncFixer" Version="1.5.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<!--<PackageReference Include="IDisposableAnalyzers" Version="3.3.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>-->
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.2">
<PackageReference Include="IDisposableAnalyzers" Version="4.0.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
4 changes: 2 additions & 2 deletions Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('uap'))">
<DefineConstants>$(DefineConstants);NETFX_CORE;XAML;WINDOWS;WINDOWS_UWP;UWP</DefineConstants>
<TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
<TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('xamarin.ios'))">
<DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;APPLE;IOS</DefineConstants>
Expand Down
8 changes: 4 additions & 4 deletions MediaManager.Forms/MediaManager.Forms.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;xamarin.ios10;xamarin.mac20;xamarin.tvos10;monoandroid10.0;tizen40</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">uap10.0.17763;net472;netcoreapp3.1;$(TargetFrameworks)</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">uap10.0.18362;net472;netcoreapp3.1;$(TargetFrameworks)</TargetFrameworks>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -16,7 +16,7 @@
<Import Project="$(SolutionDir)netcore.targets" Condition=" $(TargetFramework.StartsWith('netcoreapp3.1'))" />

<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.5.0.657" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2012" />
<Compile Remove="Platforms\**\*.cs" />
<None Include="Platforms\**\*.cs" />
<None Include="Resources\*.cs" />
Expand All @@ -27,13 +27,13 @@
<ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) And '$(OS)' == 'Windows_NT'">
<Compile Include="Platforms\Net\**\*.cs" />
<Compile Include="Platforms\Wpf\**\*.cs" />
<PackageReference Include="Xamarin.Forms.Platform.WPF" Version="4.5.0.657" />
<PackageReference Include="Xamarin.Forms.Platform.WPF" Version="5.0.0.2012" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('netcoreapp3')) And '$(OS)' == 'Windows_NT'">
<Compile Include="Platforms\Net\**\*.cs" />
<Compile Include="Platforms\Wpf\**\*.cs" />
<PackageReference Include="Xamarin.Forms.Platform.WPF" Version="4.5.0.657" />
<PackageReference Include="Xamarin.Forms.Platform.WPF" Version="5.0.0.2012" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('uap')) And '$(OS)' == 'Windows_NT'">
Expand Down
4 changes: 2 additions & 2 deletions MediaManager.UnitTest/MediaManager.UnitTest.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="XunitXml.TestLogger" Version="2.1.26" />
<PackageReference Include="XunitXml.TestLogger" Version="3.0.70" />
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
</ItemGroup>

Expand Down
3 changes: 2 additions & 1 deletion MediaManager/MediaManager.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;xamarin.ios10;xamarin.mac20;xamarin.tvos10;monoandroid10.0;tizen40</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">uap10.0.17763;net472;netcoreapp3.1;$(TargetFrameworks)</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">uap10.0.18362;net472;netcoreapp3.1;$(TargetFrameworks)</TargetFrameworks>
</PropertyGroup>

<PropertyGroup>
Expand Down Expand Up @@ -33,6 +33,7 @@
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System.Xaml" />
<Reference Include="System.Net.Http" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('netcoreapp3')) And '$(OS)' == 'Windows_NT'">
Expand Down
1 change: 1 addition & 0 deletions MediaManager/MediaManagerBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
using MediaManager.Player;
using MediaManager.Queue;
using MediaManager.Volume;
using Timer = System.Timers.Timer;

namespace MediaManager
{
Expand Down
40 changes: 20 additions & 20 deletions Samples/ElementPlayer.Android/ElementPlayer.Android.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
<AndroidSupportedAbis>armeabi-v7a;arm64-v8a</AndroidSupportedAbis>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
Expand All @@ -34,7 +35,6 @@
<AndroidLinkMode>None</AndroidLinkMode>
<EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
<AndroidDexTool>d8</AndroidDexTool>
<AndroidSupportedAbis />
<AndroidUseAapt2>true</AndroidUseAapt2>
<AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
<JavaMaximumHeapSize>1G</JavaMaximumHeapSize>
Expand Down Expand Up @@ -100,57 +100,57 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="MvvmCross">
<Version>7.1.2</Version>
<Version>8.0.2</Version>
</PackageReference>
<PackageReference Include="MvvmCross.DroidX.RecyclerView">
<Version>7.1.2</Version>
<Version>8.0.2</Version>
</PackageReference>
<PackageReference Include="MvvmCross.Plugin.Json">
<Version>7.1.2</Version>
<Version>8.0.2</Version>
</PackageReference>
<PackageReference Include="MvvmCross.Plugin.Visibility">
<Version>7.1.2</Version>
<Version>8.0.2</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.Core">
<Version>1.3.0.3</Version>
<Version>1.6.0.3</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.Core.UI">
<Version>1.0.0.5</Version>
<Version>1.0.0.11</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.Core.Utils">
<Version>1.0.0.5</Version>
<Version>1.0.0.10</Version>
</PackageReference>
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.0.0.1" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.4.0.4" />
<PackageReference Include="Xamarin.AndroidX.Fragment">
<Version>1.2.5.3</Version>
<Version>1.3.6.3</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.Media">
<Version>1.1.0.5</Version>
<Version>1.4.3</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.Leanback">
<Version>1.0.0.5</Version>
<Version>1.0.0.12</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4">
<Version>1.0.0.5</Version>
<Version>1.0.0.10</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.AppCompat">
<Version>1.2.0.4</Version>
<Version>1.3.1.3</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.MediaRouter">
<Version>1.1.0.5</Version>
<Version>1.2.5.2</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.Palette">
<Version>1.0.0.5</Version>
<Version>1.0.0.10</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.RecyclerView">
<Version>1.1.0.5</Version>
<Version>1.2.1.3</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.Migration" Version="1.0.7.1" />
<PackageReference Include="Xamarin.AndroidX.Migration" Version="1.0.8" />
<PackageReference Include="Xamarin.AndroidX.Browser">
<Version>1.2.0.2</Version>
<Version>1.3.0.8</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData">
<Version>2.2.0.3</Version>
<Version>2.3.1.3</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions Samples/ElementPlayer.Core/ElementPlayer.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="MvvmCross" Version="7.1.2" />
<PackageReference Include="MvvmCross.Plugin.Json" Version="7.1.2" />
<PackageReference Include="MvvmCross.Plugin.Visibility" Version="7.1.2" />
<PackageReference Include="Xamarin.Forms" Version="4.7.0.968" />
<PackageReference Include="MvvmCross" Version="8.0.2" />
<PackageReference Include="MvvmCross.Plugin.Json" Version="8.0.2" />
<PackageReference Include="MvvmCross.Plugin.Visibility" Version="8.0.2" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2012" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
<AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<AndroidSupportedAbis>armeabi-v7a;arm64-v8a</AndroidSupportedAbis>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -51,7 +52,6 @@
<AndroidUseAapt2>true</AndroidUseAapt2>
<AndroidDexTool>d8</AndroidDexTool>
<JavaMaximumHeapSize>1G</JavaMaximumHeapSize>
<AndroidSupportedAbis>armeabi-v7a;arm64-v8a</AndroidSupportedAbis>
</PropertyGroup>
<ItemGroup>
<Reference Include="Mono.Android" />
Expand All @@ -65,26 +65,26 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="MvvmCross.Forms">
<Version>7.1.2</Version>
<Version>8.0.2</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms" Version="4.7.0.968" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.0.0.1" />
<PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.2.0.4" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.5" />
<PackageReference Include="Xamarin.AndroidX.CardView" Version="1.0.0.5" />
<PackageReference Include="Xamarin.AndroidX.MediaRouter" Version="1.1.0.5" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.Core.Utils" Version="1.0.0.5" />
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.2.0.2" />
<PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
<PackageReference Include="Xamarin.AndroidX.Migration" Version="1.0.7.1" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2012" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.4.0.4" />
<PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.3.1.3" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.10" />
<PackageReference Include="Xamarin.AndroidX.CardView" Version="1.0.0.11" />
<PackageReference Include="Xamarin.AndroidX.MediaRouter" Version="1.2.5.2" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.Core.Utils" Version="1.0.0.10" />
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.3.0.8" />
<PackageReference Include="Xamarin.Essentials" Version="1.7.1" />
<PackageReference Include="Xamarin.AndroidX.Migration" Version="1.0.8" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData">
<Version>2.2.0.3</Version>
<Version>2.3.1.3</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.Fragment">
<Version>1.2.5.3</Version>
<Version>1.3.6.3</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.Media">
<Version>1.1.0.5</Version>
<Version>1.4.3</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="MvvmCross.Forms">
<Version>7.1.2</Version>
<Version>8.0.2</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
Expand Down
6 changes: 3 additions & 3 deletions Samples/ElementPlayer.Forms.UI/ElementPlayer.Forms.UI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MvvmCross.Forms" Version="7.1.2" />
<PackageReference Include="Xamarin.Forms" Version="4.7.0.968" />
<PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
<PackageReference Include="MvvmCross.Forms" Version="8.0.2" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2012" />
<PackageReference Include="Xamarin.Essentials" Version="1.7.1" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,11 +146,11 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="MvvmCross.Forms">
<Version>7.1.2</Version>
<Version>8.0.2</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms" Version="4.7.0.968" />
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.11" />
<PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2012" />
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.12" />
<PackageReference Include="Xamarin.Essentials" Version="1.7.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\MediaManager.Forms\MediaManager.Forms.csproj">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="MvvmCross.Forms.Platforms.Wpf" Version="7.1.2" />
<PackageReference Include="Xamarin.Forms.Platform.WPF" Version="4.7.0.968" />
<PackageReference Include="MvvmCross.Forms.Platforms.Wpf" Version="8.0.2" />
<PackageReference Include="Xamarin.Forms.Platform.WPF" Version="5.0.0.2012" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="MvvmCross.Forms.Platforms.Wpf">
<Version>7.1.2</Version>
<Version>8.0.2</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms.Platform.WPF">
<Version>4.7.0.968</Version>
<Version>5.0.0.2012</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -155,10 +155,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="MvvmCross.Forms">
<Version>7.1.2</Version>
<Version>8.0.2</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms" Version="4.7.0.968" />
<PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2012" />
<PackageReference Include="Xamarin.Essentials" Version="1.7.1" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions Samples/ElementPlayer.Mac/ElementPlayer.Mac.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,13 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="MvvmCross">
<Version>7.1.2</Version>
<Version>8.0.2</Version>
</PackageReference>
<PackageReference Include="MvvmCross.Plugin.Json">
<Version>7.1.2</Version>
<Version>8.0.2</Version>
</PackageReference>
<PackageReference Include="MvvmCross.Plugin.Visibility">
<Version>7.1.2</Version>
<Version>8.0.2</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
Loading

0 comments on commit ae5e649

Please sign in to comment.