Cleanup and update

Baseflow · Jan 30, 2022 · 7384826 · 7384826
1 parent 5b0bc13
commit 7384826
Show file tree

Hide file tree

Showing 24 changed files with 35 additions and 56 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -21,10 +21,15 @@
     <Version>4.0.0</Version>
 
     <!--<Nullable>enable</Nullable>-->
+    <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('Lottie'))</IsLibraryProject>
 
@@ -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>
@@ -74,19 +79,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Roslynator.Analyzers" Version="3.2.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.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>

diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -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>

diff --git a/Lottie.Forms/AnimationView.cs b/Lottie.Forms/AnimationView.cs
@@ -1,5 +1,4 @@
-using System;
-using System.IO;
+using System.IO;
 using System.Reflection;
 using System.Windows.Input;
 using Xamarin.Forms;

diff --git a/Lottie.Forms/AnimationViewExtensions.cs b/Lottie.Forms/AnimationViewExtensions.cs
@@ -1,6 +1,4 @@
-using System;
-using System.IO;
-using System.Linq;
+using System.IO;
 using System.Reflection;
 
 namespace Lottie.Forms

diff --git a/Lottie.Forms/ILottieComposition.cs b/Lottie.Forms/ILottieComposition.cs
@@ -1,5 +1,4 @@
-using System;
-namespace Lottie.Forms
+namespace Lottie.Forms
 {
     public interface ILottieComposition : IDisposable
     {

diff --git a/Lottie.Forms/Lottie.Forms.csproj b/Lottie.Forms/Lottie.Forms.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;xamarin.ios10;xamarin.mac20;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>

diff --git a/Lottie.Forms/Platforms/Android/AnimationViewExtensions.cs b/Lottie.Forms/Platforms/Android/AnimationViewExtensions.cs
@@ -1,5 +1,4 @@
-using System;
-using System.IO;
+using System.IO;
 using Com.Airbnb.Lottie;
 
 namespace Lottie.Forms.Platforms.Android

diff --git a/Lottie.Forms/Platforms/Android/AnimationViewRenderer.cs b/Lottie.Forms/Platforms/Android/AnimationViewRenderer.cs
@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel;
+using System.ComponentModel;
 using Com.Airbnb.Lottie;
 using Lottie.Forms;
 using Lottie.Forms.Platforms.Android;

diff --git a/Lottie.Forms/Platforms/Android/AnimatorListener.cs b/Lottie.Forms/Platforms/Android/AnimatorListener.cs
@@ -1,5 +1,4 @@
-using System;
-using Android.Animation;
+using Android.Animation;
 using Android.Runtime;
 
 namespace Lottie.Forms.Platforms.Android

diff --git a/Lottie.Forms/Platforms/Android/AnimatorUpdateListener.cs b/Lottie.Forms/Platforms/Android/AnimatorUpdateListener.cs
@@ -1,5 +1,4 @@
-using System;
-using Android.Animation;
+using Android.Animation;
 using Android.Runtime;
 
 namespace Lottie.Forms.Platforms.Android

diff --git a/Lottie.Forms/Platforms/Android/ClickListener.cs b/Lottie.Forms/Platforms/Android/ClickListener.cs
@@ -1,5 +1,4 @@
-using System;
-using Android.Runtime;
+using Android.Runtime;
 using static Android.Views.View;
 
 namespace Lottie.Forms.Platforms.Android

diff --git a/Lottie.Forms/Platforms/Android/LottieFailureListener.cs b/Lottie.Forms/Platforms/Android/LottieFailureListener.cs
@@ -1,5 +1,4 @@
-using System;
-using Android.Runtime;
+using Android.Runtime;
 using Com.Airbnb.Lottie;
 
 namespace Lottie.Forms.Platforms.Android

diff --git a/Lottie.Forms/Platforms/Android/LottieOnCompositionLoadedListener.cs b/Lottie.Forms/Platforms/Android/LottieOnCompositionLoadedListener.cs
@@ -1,5 +1,4 @@
-using System;
-using Android.Runtime;
+using Android.Runtime;
 using Com.Airbnb.Lottie;
 
 namespace Lottie.Forms.Platforms.Android

diff --git a/Lottie.Forms/Platforms/Ios/AnimationViewExtensions.cs b/Lottie.Forms/Platforms/Ios/AnimationViewExtensions.cs
@@ -1,5 +1,4 @@
-using System;
-using System.IO;
+using System.IO;
 using Airbnb.Lottie;
 using Foundation;
 

diff --git a/Lottie.Forms/Platforms/Ios/AnimationViewRenderer.cs b/Lottie.Forms/Platforms/Ios/AnimationViewRenderer.cs
@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel;
+using System.ComponentModel;
 using Airbnb.Lottie;
 using Foundation;
 using Lottie.Forms;
@@ -192,12 +191,12 @@ private void AnimationCompletionBlock(bool animationFinished)
                     return;
 
                 Element.InvokeFinishedAnimation();
-                
+
                 // Can be null depending if the user callback is executed very quickly 
                 // and disposes the Xamarin.Forms page containing the Lottie view
                 if (_animationView == null || Element == null)
                     return;
-                
+
                 if (Element.RepeatMode == RepeatMode.Infinite)
                 {
                     Element.InvokeRepeatAnimation();

diff --git a/Lottie.Forms/Platforms/Mac/AnimationViewExtensions.cs b/Lottie.Forms/Platforms/Mac/AnimationViewExtensions.cs
@@ -1,5 +1,4 @@
-using System;
-using System.IO;
+using System.IO;
 using Airbnb.Lottie;
 using Foundation;
 

diff --git a/Lottie.Forms/Platforms/Tizen/AnimationViewExtensions.cs b/Lottie.Forms/Platforms/Tizen/AnimationViewExtensions.cs
@@ -1,5 +1,4 @@
-using System;
-using System.IO;
+using System.IO;
 using ElottieSharp;
 using Xamarin.Forms.Platform.Tizen;
 

diff --git a/Lottie.Forms/Platforms/Uap/AnimationViewExtensions.cs b/Lottie.Forms/Platforms/Uap/AnimationViewExtensions.cs
@@ -1,6 +1,4 @@
-using System;
-using System.IO;
-using System.Threading.Tasks;
+using System.IO;
 using Microsoft.Toolkit.Uwp.UI.Lottie;
 using Microsoft.UI.Xaml.Controls;
 

diff --git a/Lottie.Forms/Platforms/Uap/AnimationViewRenderer.cs b/Lottie.Forms/Platforms/Uap/AnimationViewRenderer.cs
@@ -1,6 +1,4 @@
-using System;
-using System.ComponentModel;
-using System.Threading.Tasks;
+using System.ComponentModel;
 using Lottie.Forms;
 using Lottie.Forms.Platforms.Uap;
 using Microsoft.UI.Xaml.Controls;

diff --git a/Lottie.Forms/Platforms/Wpf/AnimationViewExtensions.cs b/Lottie.Forms/Platforms/Wpf/AnimationViewExtensions.cs
@@ -1,5 +1,4 @@
-using System;
-using System.IO;
+using System.IO;
 using LottieSharp;
 
 namespace Lottie.Forms.Platforms.Wpf

diff --git a/Samples/Forms/Example.Forms.Droid/Example.Forms.Droid.csproj b/Samples/Forms/Example.Forms.Droid/Example.Forms.Droid.csproj
@@ -93,14 +93,12 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Xamarin.Build.Download">
-      <Version>0.10.0</Version>
+      <Version>0.11.0</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.Forms">
-      <Version>4.5.0.657</Version>
+      <Version>5.0.0.2012</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.3.1.3" />
-    <PackageReference Include="Xamarin.AndroidX.Legacy.Support.Core.UI" Version="1.0.0" />
-    <PackageReference Include="Xamarin.AndroidX.Migration" Version="1.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Lottie.Android\Lottie.Android.csproj">

diff --git a/Samples/Forms/Example.Forms.Mac/Example.Forms.Mac.csproj b/Samples/Forms/Example.Forms.Mac/Example.Forms.Mac.csproj
@@ -116,7 +116,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Xamarin.Forms">
-      <Version>4.5.0.657</Version>
+      <Version>5.0.0.2012</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/Samples/Forms/Example.Forms.iOS/Example.Forms.iOS.csproj b/Samples/Forms/Example.Forms.iOS/Example.Forms.iOS.csproj
@@ -126,7 +126,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Xamarin.Forms">
-      <Version>4.5.0.657</Version>
+      <Version>5.0.0.2012</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/Samples/Native/Example.Droid/Example.Droid.csproj b/Samples/Native/Example.Droid/Example.Droid.csproj
@@ -158,7 +158,7 @@
       <Version>1.0.0</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.AndroidX.AppCompat">
-      <Version>1.1.0</Version>
+      <Version>1.3.1.3</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.AndroidX.Migration" Version="1.0.0" />
   </ItemGroup>