Merge branch 'main' into effects/touch

Author: AndreiMisiukevich

XamarinCommunityToolkit.UnitTests/Xamarin.CommunityToolkit.UnitTests.csproj

@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net461</TargetFrameworks>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
     <PackageReference Include="NSubstitute" Version="4.2.2" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">

XamarinCommunityToolkit/Views/AvatarView/AvatarView.shared.cs

@@ -1,5 +1,7 @@
 using Xamarin.Forms;
 using static System.Math;
+using System.Threading;
+using System;
 
 namespace Xamarin.CommunityToolkit.UI.Views
 {
@@ -185,7 +187,19 @@ async void OnValuePropertyChanged(bool shouldUpdateSource)
 				if (Image.Source == Source)
 					Image.Source = null;
 
-				Image.IsVisible = await imageSourceValidator.IsImageSourceValidAsync(Source);
+				try
+				{
+					Image.IsVisible = await imageSourceValidator.IsImageSourceValidAsync(Source);
+				}
+				catch (OperationCanceledException)
+				{
+					Xamarin.Forms.Internals.Log.Warning("CancellationException", "IsImageSourceValidAsync was cancelled.");
+				}
+				catch (System.Exception ex)
+				{
+					Xamarin.Forms.Internals.Log.Warning("Error", ex.Message);
+					throw;
+				}
 				Image.Source = Source;
 			}
 			Image.Aspect = Aspect;

XamarinCommunityToolkit/Xamarin.CommunityToolkit.csproj

@@ -78,6 +78,7 @@
     <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
     <PackageReference Include="System.ComponentModel" Version="4.3.0" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+    <PackageReference Update="NETStandard.Library" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard2.0')) ">
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
@@ -156,7 +157,6 @@
     <Compile Include="**\*.wpf.cs" />
     <Compile Include="**\*.wpf.*.cs" />
     <PackageReference Include="Xamarin.Forms.Platform.WPF" Version="4.7.0.968" />
-    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('net471')) ">