Skip to content

Commit 7384826

Browse files
martijn00martijn00
committed
Cleanup and update
1 parent 5b0bc13 commit 7384826

24 files changed

+35
-56
lines changed

‎Directory.Build.props

+8-7
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,15 @@
2121
<Version>4.0.0</Version>
2222

2323
<!--<Nullable>enable</Nullable>-->
24+
<ImplicitUsings>enable</ImplicitUsings>
2425
<LangVersion>10.0</LangVersion>
2526
<NoWarn>$(NoWarn);1591;1701;1702;1705;VSX1000;CS0109;CS0108;CS0618;CS0114;NU1603</NoWarn>
2627
<Platform>AnyCPU</Platform>
2728

29+
<EnableNETAnalyzers>true</EnableNETAnalyzers>
30+
<AnalysisLevel>latest</AnalysisLevel>
31+
<AnalysisMode>AllEnabledByDefault</AnalysisMode>
32+
2833
<IsTestProject>$(MSBuildProjectName.Contains('UnitTest'))</IsTestProject>
2934
<IsLibraryProject>$(MSBuildProjectName.Contains('Lottie'))</IsLibraryProject>
3035

@@ -62,7 +67,7 @@
6267

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

6873
<PropertyGroup>
@@ -74,19 +79,15 @@
7479
</ItemGroup>
7580

7681
<ItemGroup>
77-
<PackageReference Include="Roslynator.Analyzers" Version="3.2.0">
82+
<PackageReference Include="Roslynator.Analyzers" Version="4.0.2">
7883
<PrivateAssets>all</PrivateAssets>
7984
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
8085
</PackageReference>
8186
<PackageReference Include="AsyncFixer" Version="1.5.1">
8287
<PrivateAssets>all</PrivateAssets>
8388
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
8489
</PackageReference>
85-
<!--<PackageReference Include="IDisposableAnalyzers" Version="3.3.1">
86-
<PrivateAssets>all</PrivateAssets>
87-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
88-
</PackageReference>-->
89-
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.2">
90+
<PackageReference Include="IDisposableAnalyzers" Version="4.0.1">
9091
<PrivateAssets>all</PrivateAssets>
9192
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
9293
</PackageReference>

‎Directory.Build.targets

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
</PropertyGroup>
1414
<PropertyGroup Condition="$(TargetFramework.StartsWith('uap'))">
1515
<DefineConstants>$(DefineConstants);NETFX_CORE;XAML;WINDOWS;WINDOWS_UWP;UWP</DefineConstants>
16-
<TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
17-
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
16+
<TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
17+
<TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
1818
</PropertyGroup>
1919
<PropertyGroup Condition="$(TargetFramework.StartsWith('xamarin.ios'))">
2020
<DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;APPLE;IOS</DefineConstants>

‎Lottie.Forms/AnimationView.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using System;
2-
using System.IO;
1+
using System.IO;
32
using System.Reflection;
43
using System.Windows.Input;
54
using Xamarin.Forms;

‎Lottie.Forms/AnimationViewExtensions.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
using System;
2-
using System.IO;
3-
using System.Linq;
1+
using System.IO;
42
using System.Reflection;
53

64
namespace Lottie.Forms

‎Lottie.Forms/ILottieComposition.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using System;
2-
namespace Lottie.Forms
1+
namespace Lottie.Forms
32
{
43
public interface ILottieComposition : IDisposable
54
{

‎Lottie.Forms/Lottie.Forms.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="MSBuild.Sdk.Extras">
22
<PropertyGroup>
33
<TargetFrameworks>netstandard2.0;xamarin.ios10;xamarin.mac20;monoandroid10.0;tizen40</TargetFrameworks>
4-
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">uap10.0.17763;net472;netcoreapp3.1;$(TargetFrameworks)</TargetFrameworks>
4+
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">uap10.0.18362;net472;netcoreapp3.1;$(TargetFrameworks)</TargetFrameworks>
55
</PropertyGroup>
66

77
<PropertyGroup>

‎Lottie.Forms/Platforms/Android/AnimationViewExtensions.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using System;
2-
using System.IO;
1+
using System.IO;
32
using Com.Airbnb.Lottie;
43

54
namespace Lottie.Forms.Platforms.Android

‎Lottie.Forms/Platforms/Android/AnimationViewRenderer.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using System;
2-
using System.ComponentModel;
1+
using System.ComponentModel;
32
using Com.Airbnb.Lottie;
43
using Lottie.Forms;
54
using Lottie.Forms.Platforms.Android;

‎Lottie.Forms/Platforms/Android/AnimatorListener.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using System;
2-
using Android.Animation;
1+
using Android.Animation;
32
using Android.Runtime;
43

54
namespace Lottie.Forms.Platforms.Android

‎Lottie.Forms/Platforms/Android/AnimatorUpdateListener.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using System;
2-
using Android.Animation;
1+
using Android.Animation;
32
using Android.Runtime;
43

54
namespace Lottie.Forms.Platforms.Android

‎Lottie.Forms/Platforms/Android/ClickListener.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using System;
2-
using Android.Runtime;
1+
using Android.Runtime;
32
using static Android.Views.View;
43

54
namespace Lottie.Forms.Platforms.Android

‎Lottie.Forms/Platforms/Android/LottieFailureListener.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using System;
2-
using Android.Runtime;
1+
using Android.Runtime;
32
using Com.Airbnb.Lottie;
43

54
namespace Lottie.Forms.Platforms.Android

‎Lottie.Forms/Platforms/Android/LottieOnCompositionLoadedListener.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using System;
2-
using Android.Runtime;
1+
using Android.Runtime;
32
using Com.Airbnb.Lottie;
43

54
namespace Lottie.Forms.Platforms.Android

‎Lottie.Forms/Platforms/Ios/AnimationViewExtensions.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using System;
2-
using System.IO;
1+
using System.IO;
32
using Airbnb.Lottie;
43
using Foundation;
54

‎Lottie.Forms/Platforms/Ios/AnimationViewRenderer.cs

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using System;
2-
using System.ComponentModel;
1+
using System.ComponentModel;
32
using Airbnb.Lottie;
43
using Foundation;
54
using Lottie.Forms;
@@ -192,12 +191,12 @@ private void AnimationCompletionBlock(bool animationFinished)
192191
return;
193192

194193
Element.InvokeFinishedAnimation();
195-
194+
196195
// Can be null depending if the user callback is executed very quickly
197196
// and disposes the Xamarin.Forms page containing the Lottie view
198197
if (_animationView == null || Element == null)
199198
return;
200-
199+
201200
if (Element.RepeatMode == RepeatMode.Infinite)
202201
{
203202
Element.InvokeRepeatAnimation();

‎Lottie.Forms/Platforms/Mac/AnimationViewExtensions.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using System;
2-
using System.IO;
1+
using System.IO;
32
using Airbnb.Lottie;
43
using Foundation;
54

‎Lottie.Forms/Platforms/Tizen/AnimationViewExtensions.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using System;
2-
using System.IO;
1+
using System.IO;
32
using ElottieSharp;
43
using Xamarin.Forms.Platform.Tizen;
54

‎Lottie.Forms/Platforms/Uap/AnimationViewExtensions.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
using System;
2-
using System.IO;
3-
using System.Threading.Tasks;
1+
using System.IO;
42
using Microsoft.Toolkit.Uwp.UI.Lottie;
53
using Microsoft.UI.Xaml.Controls;
64

‎Lottie.Forms/Platforms/Uap/AnimationViewRenderer.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
using System;
2-
using System.ComponentModel;
3-
using System.Threading.Tasks;
1+
using System.ComponentModel;
42
using Lottie.Forms;
53
using Lottie.Forms.Platforms.Uap;
64
using Microsoft.UI.Xaml.Controls;

‎Lottie.Forms/Platforms/Wpf/AnimationViewExtensions.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using System;
2-
using System.IO;
1+
using System.IO;
32
using LottieSharp;
43

54
namespace Lottie.Forms.Platforms.Wpf

‎Samples/Forms/Example.Forms.Droid/Example.Forms.Droid.csproj

+2-4
Original file line numberDiff line numberDiff line change
@@ -93,14 +93,12 @@
9393
</ItemGroup>
9494
<ItemGroup>
9595
<PackageReference Include="Xamarin.Build.Download">
96-
<Version>0.10.0</Version>
96+
<Version>0.11.0</Version>
9797
</PackageReference>
9898
<PackageReference Include="Xamarin.Forms">
99-
<Version>4.5.0.657</Version>
99+
<Version>5.0.0.2012</Version>
100100
</PackageReference>
101101
<PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.3.1.3" />
102-
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.Core.UI" Version="1.0.0" />
103-
<PackageReference Include="Xamarin.AndroidX.Migration" Version="1.0.0" />
104102
</ItemGroup>
105103
<ItemGroup>
106104
<ProjectReference Include="..\..\..\Lottie.Android\Lottie.Android.csproj">

‎Samples/Forms/Example.Forms.Mac/Example.Forms.Mac.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
</ItemGroup>
117117
<ItemGroup>
118118
<PackageReference Include="Xamarin.Forms">
119-
<Version>4.5.0.657</Version>
119+
<Version>5.0.0.2012</Version>
120120
</PackageReference>
121121
</ItemGroup>
122122
<ItemGroup>

‎Samples/Forms/Example.Forms.iOS/Example.Forms.iOS.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
</ItemGroup>
127127
<ItemGroup>
128128
<PackageReference Include="Xamarin.Forms">
129-
<Version>4.5.0.657</Version>
129+
<Version>5.0.0.2012</Version>
130130
</PackageReference>
131131
</ItemGroup>
132132
<ItemGroup>

‎Samples/Native/Example.Droid/Example.Droid.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158
<Version>1.0.0</Version>
159159
</PackageReference>
160160
<PackageReference Include="Xamarin.AndroidX.AppCompat">
161-
<Version>1.1.0</Version>
161+
<Version>1.3.1.3</Version>
162162
</PackageReference>
163163
<PackageReference Include="Xamarin.AndroidX.Migration" Version="1.0.0" />
164164
</ItemGroup>

0 commit comments

Comments
 (0)