feat: Add support for Android10 and AndroidX

BREAKING CHANGE: All targets are now using the AndroidX support libraries. If your
application uses explicit references to support libraries, you'll to upgrade
those as well.

Uno upgraded from:
    - Xamarin.Android.Support.v4
    - Xamarin.Android.Support.v7.AppCompat
    - Xamarin.Android.Support.v7.RecyclerView

To :
    - Xamarin.AndroidX.Legacy.Support.V4
    - Xamarin.AndroidX.AppCompat
    - Xamarin.AndroidX.RecyclerView
    - Xamarin.AndroidX.Fragment

build/Uno.UI.Build.csproj

@@ -169,7 +169,7 @@
 	</Target>
 
 	<Target Name="ValidatePackage" AfterTargets="UnoBuild" Condition="'$(BuildingInsideVisualStudio)'==''">
-		<Exec Command="dotnet tool install --global Uno.PackageDiff --version 1.0.0-dev.18" IgnoreExitCode="true" />
+		<Exec Command="dotnet tool install --global Uno.PackageDiff --version 1.0.0-dev.32" IgnoreExitCode="true" />
 		<Exec Command="generatepkgdiff --base=Uno.UI --other=Uno.UI.$(GITVERSION_FullSemVer).nupkg --diffignore=PackageDiffIgnore.xml --outfile=$(OutputDir)\ApiDiff.$(GITVERSION_FullSemVer).md" />
 	</Target>
 

build/Uno.UI.Lottie.nuspec

@@ -62,5 +62,6 @@
 	<file src="..\src\AddIns\Uno.UI.Lottie\bin\Release\xamarinios10\Uno.UI.Lottie.dll" target="lib\xamarinios10" />
 	<file src="..\src\AddIns\Uno.UI.Lottie\bin\Release\xamarinmac20\Uno.UI.Lottie.dll" target="lib\xamarinmac20" />
 	<file src="..\src\AddIns\Uno.UI.Lottie\bin\Release\MonoAndroid90\Uno.UI.Lottie.dll" target="lib\MonoAndroid90" />
+	<file src="..\src\AddIns\Uno.UI.Lottie\bin\Release\MonoAndroid10.0\Uno.UI.Lottie.dll" target="lib\MonoAndroid10.0" />
   </files>
 </package>

doc/articles/controls/ListViewBase.md

@@ -159,7 +159,7 @@ ScrollViewer + ScrollContentPresenter.
 
 | Uno class | Android base class | iOS base class | Description |
 | --- | --- | --- | --- |
-| NativeListViewBase | Android.Support.V7.Widget.RecyclerView | UIKit.UICollectionView | Native list view, parent of item views. |
+| NativeListViewBase | AndroidX.RecyclerView.Widget.RecyclerView | UIKit.UICollectionView | Native list view, parent of item views. |
 | ItemsStackPanelLayout(ItemsWrapGridLayout) | RecyclerView.LayoutManager | UIKit.UICollectionViewLayout | Tells NativeListViewBase how to lay out its items. Bridge for ItemsStackPanel(ItemsWrapGrid). |
 | NativeListViewBaseAdapter(Android), ListViewBaseSource(iOS) | RecyclerView.Adapter | UIKit.UICollectionViewSource | Handles creation and reuse of item views. No direct UWP equivalent. |
 | ScrollingViewCache | RecyclerView.ViewCacheExtension | - | Additional virtualization handling on Android which optimizes scroll performance. |

src/AddIns/Uno.UI.Lottie/Uno.UI.Lottie.csproj

@@ -1,8 +1,8 @@
 <Project Sdk="MSBuild.Sdk.Extras" ToolsVersion="15.0">
 
 	<PropertyGroup>
-		<TargetFrameworks>xamarinmac20;MonoAndroid90;xamarinios10;net461;netstandard2.0</TargetFrameworks>
-		<TargetFrameworksCI>xamarinmac20;MonoAndroid90;xamarinios10;net461;netstandard2.0</TargetFrameworksCI>
+		<TargetFrameworks>xamarinmac20;MonoAndroid10.0;xamarinios10;net461;netstandard2.0</TargetFrameworks>
+		<TargetFrameworksCI>xamarinmac20;MonoAndroid90;MonoAndroid10.0;xamarinios10;net461;netstandard2.0</TargetFrameworksCI>
 		<NoWarn>$(NoWarn);NU1701</NoWarn>
 		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 		<Deterministic>true</Deterministic>
@@ -37,7 +37,7 @@
 	  <ProjectReference Include="..\..\Uno.UI\Uno.UI.csproj" />
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)' == 'MonoAndroid90'">
+	<ItemGroup Condition="'$(TargetFramework)' == 'MonoAndroid90' or '$(TargetFramework)' == 'MonoAndroid10.0' ">
 		<PackageReference Include="Com.Airbnb.Android.Lottie" Version="3.0.4" PrivateAssets="none" />
 	</ItemGroup>
 

src/Directory.Build.targets

@@ -37,4 +37,19 @@
     <PackageReference Update="Xamarin.DuoSdk" Version="0.0.3.4" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'MonoAndroid90'">
+	<PackageReference Update="Xamarin.AndroidX.Legacy.Support.v4" Version="1.0.0"/>
+	<PackageReference Update="Xamarin.AndroidX.AppCompat" Version="1.1.0" />
+	<PackageReference Update="Xamarin.AndroidX.RecyclerView" Version="1.1.0"/>
+	<PackageReference Update="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.2.0" />
+	<PackageReference Update="Xamarin.AndroidX.Fragment" Version="1.1.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'MonoAndroid10.0'">
+	<PackageReference Update="Xamarin.AndroidX.Legacy.Support.v4" Version="1.0.0"/>
+	<PackageReference Update="Xamarin.AndroidX.AppCompat" Version="1.1.0" />
+	<PackageReference Update="Xamarin.AndroidX.RecyclerView" Version="1.1.0"/>
+	<PackageReference Update="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.2.0" />
+  </ItemGroup>
+
 </Project>

src/SamplesApp/SamplesApp.Droid/Properties/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="uno.platform.unosampleapp" android:versionCode="1" android:versionName="1.0" android:installLocation="auto">
-	<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28" />
+	<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="29" />
 	<!-- NOTE: Add permissions in AssemblyInfo.cs -->
 	<application android:label="SamplesApp"></application>
 	<meta-data android:name="com.google.android.geo.API_KEY" android:value="YOUR API KEY" />
-</manifest>
+</manifest>

src/SamplesApp/SamplesApp.Droid/SamplesApp.Droid.csproj

@@ -15,7 +15,7 @@
     <AndroidApplication>true</AndroidApplication>
     <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-    <TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <AndroidUseIntermediateDesignerFile>True</AndroidUseIntermediateDesignerFile>
     <ResourcesDirectory>..\SamplesApp.Shared\Strings</ResourcesDirectory>

src/SolutionTemplate/UnoLibraryTemplate/CrossTargetedLibrary.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="MSBuild.Sdk.Extras/2.0.54">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;xamarinios10;monoandroid90;uap10.0.16299</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;xamarinios10;MonoAndroid90;monoandroid10.0;uap10.0.16299</TargetFrameworks>
 
 		<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
 		<GenerateLibraryLayout>true</GenerateLibraryLayout>
@@ -11,7 +11,7 @@
 		<DefineConstants>$(DefineConstants);__WASM__</DefineConstants>
 	</PropertyGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)'=='xamarinios10' or '$(TargetFramework)'=='monoandroid90' or '$(TargetFramework)'=='netstandard2.0'">
+	<ItemGroup Condition="'$(TargetFramework)'=='xamarinios10' or '$(TargetFramework)'=='MonoAndroid90' or '$(TargetFramework)'=='monoandroid10.0' or '$(TargetFramework)'=='netstandard2.0'">
 		<PackageReference Include="Uno.UI" Version="1.46.196-dev.2440" />
 	</ItemGroup>
 

src/SourceGenerators/System.Xaml/Uno.Xaml.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="MSBuild.Sdk.Extras" ToolsVersion="15.0">
 	<PropertyGroup>
-		<TargetFrameworks>xamarinmac20;net461;xamarinios10;MonoAndroid90;netstandard2.0</TargetFrameworks>
-		<TargetFrameworksCI>net461;MonoAndroid80;MonoAndroid90;xamarinios10;netstandard2.0;xamarinmac20</TargetFrameworksCI>
+		<TargetFrameworks>xamarinmac20;net461;xamarinios10;MonoAndroid10.0;netstandard2.0</TargetFrameworks>
+		<TargetFrameworksCI>net461;MonoAndroid90;MonoAndroid10.0;xamarinios10;netstandard2.0;xamarinmac20</TargetFrameworksCI>
 		<DisableBuildTargetFramework>true</DisableBuildTargetFramework>
 
 		<AndroidUseIntermediateDesignerFile>True</AndroidUseIntermediateDesignerFile>

src/SourceGenerators/Uno.UI.SourceGenerators/DependencyObject/DependencyObjectGenerator.cs

@@ -50,7 +50,7 @@ public SerializationMethodsGenerator(SourceGeneratorContext context)
 				_androidViewSymbol = comp.GetTypeByMetadataName("Android.Views.View");
 				_javaObjectSymbol = comp.GetTypeByMetadataName("Java.Lang.Object");
 				_androidActivitySymbol = comp.GetTypeByMetadataName("Android.App.Activity");
-				_androidFragmentSymbol = comp.GetTypeByMetadataName("Android.Support.V4.App.Fragment");
+				_androidFragmentSymbol = comp.GetTypeByMetadataName("AndroidX.Fragment.App.Fragment");
 			    _bindableAttributeSymbol = comp.GetTypeByMetadataName("Windows.UI.Xaml.Data.BindableAttribute");
 				_iFrameworkElementSymbol = comp.GetTypeByMetadataName(XamlConstants.Types.IFrameworkElement);
 			}

src/SourceGenerators/XamlGenerationTests.Core/XamlGenerationTests.Core.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="MSBuild.Sdk.Extras" ToolsVersion="15.0">
 	<PropertyGroup>
-		<TargetFrameworks>MonoAndroid90;xamarinios10;netstandard2.0</TargetFrameworks>
-		<TargetFrameworksCI>MonoAndroid90;xamarinios10</TargetFrameworksCI>
+		<TargetFrameworks>MonoAndroid10.0;xamarinios10;netstandard2.0</TargetFrameworks>
+		<TargetFrameworksCI>MonoAndroid90;MonoAndroid10.0;xamarinios10;netstandard2.0</TargetFrameworksCI>
 	</PropertyGroup>
 
 	<PropertyGroup>
@@ -22,15 +22,15 @@
 	</PropertyGroup>
 
 	<ItemGroup Condition=" '$(TargetFramework)' == 'MonoAndroid90'">
-		<PackageReference Include="Xamarin.Android.Support.v4">
-			<Version>28.0.0.1</Version>
-		</PackageReference>
-		<PackageReference Include="Xamarin.Android.Support.v7.AppCompat">
-			<Version>28.0.0.1</Version>
-		</PackageReference>
-		<PackageReference Include="Xamarin.Android.Support.v7.RecyclerView">
-			<Version>28.0.0.1</Version>
-		</PackageReference>
+		<PackageReference Include="Xamarin.AndroidX.Legacy.Support.v4"/>
+		<PackageReference Include="Xamarin.AndroidX.AppCompat"/>
+		<PackageReference Include="Xamarin.AndroidX.RecyclerView"/>
+	</ItemGroup>
+
+	<ItemGroup Condition=" '$(TargetFramework)' == 'MonoAndroid10.0'">
+		<PackageReference Include="Xamarin.AndroidX.Legacy.Support.v4"/>
+		<PackageReference Include="Xamarin.AndroidX.AppCompat"/>
+		<PackageReference Include="Xamarin.AndroidX.RecyclerView"/>
 	</ItemGroup>
 
 	<ItemGroup>

src/SourceGenerators/XamlGenerationTests/XamlGenerationTests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="MSBuild.Sdk.Extras" ToolsVersion="15.0">
 	<PropertyGroup>
-		<TargetFrameworks>MonoAndroid90;xamarinios10;netstandard2.0</TargetFrameworks>
-		<TargetFrameworksCI>MonoAndroid90;xamarinios10</TargetFrameworksCI>
+		<TargetFrameworks>MonoAndroid10.0;xamarinios10;netstandard2.0</TargetFrameworks>
+		<TargetFrameworksCI>MonoAndroid90;MonoAndroid10.0;xamarinios10;netstandard2.0</TargetFrameworksCI>
 	</PropertyGroup>
 
 	<PropertyGroup>
@@ -22,15 +22,15 @@
 	</PropertyGroup>
 
 	<ItemGroup Condition=" '$(TargetFramework)' == 'MonoAndroid90'">
-		<PackageReference Include="Xamarin.Android.Support.v4">
-			<Version>28.0.0.1</Version>
-		</PackageReference>
-		<PackageReference Include="Xamarin.Android.Support.v7.AppCompat">
-			<Version>28.0.0.1</Version>
-		</PackageReference>
-		<PackageReference Include="Xamarin.Android.Support.v7.RecyclerView">
-			<Version>28.0.0.1</Version>
-		</PackageReference>
+		<PackageReference Include="Xamarin.AndroidX.Legacy.Support.v4"/>
+		<PackageReference Include="Xamarin.AndroidX.AppCompat"/>
+		<PackageReference Include="Xamarin.AndroidX.RecyclerView"/>
+	</ItemGroup>
+
+	<ItemGroup Condition=" '$(TargetFramework)' == 'MonoAndroid10.0'">
+		<PackageReference Include="Xamarin.AndroidX.Legacy.Support.v4"/>
+		<PackageReference Include="Xamarin.AndroidX.AppCompat"/>
+		<PackageReference Include="Xamarin.AndroidX.RecyclerView"/>
 	</ItemGroup>
 
 	<ItemGroup>

src/TargetFrameworkSelection.targets

@@ -18,10 +18,13 @@
     <!-- Used when evaluation compatibility between referenced projects -->
     <_OverrideTargetFrameworksDependency Include="GetTargetFrameworkProperties" />
 
-    <!-- this target has been introduced in VS15.5 -->
-    <_OverrideTargetFrameworksDependency Include="GetTargetFrameworks" />
+	<!-- this target has been introduced in VS15.5 -->
+	<_OverrideTargetFrameworksDependency Include="GetTargetFrameworks" />
+
+	<!-- this target has been introduced in VS16.4 -->
+	<_OverrideTargetFrameworksDependency Include="CollectPackageReferences" />
 
-    <!--This items get executed by the nuget Restore target-->
+	<!--This items get executed by the nuget Restore target-->
     <_OverrideTargetFrameworksDependency Include="_GenerateRestoreGraphProjectEntry" />
     <_OverrideTargetFrameworksDependency Include="_GenerateRestoreGraph" />
     <_OverrideTargetFrameworksDependency Include="_IsProjectRestoreSupported" />

src/Uno.Foundation/Uno.Foundation.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="MSBuild.Sdk.Extras" ToolsVersion="15.0">
   <PropertyGroup>
-    <TargetFrameworks>xamarinmac20;xamarinios10;MonoAndroid90;net461;netstandard2.0</TargetFrameworks>
-		<TargetFrameworksCI>MonoAndroid90;xamarinios10;net461;netstandard2.0;xamarinmac20</TargetFrameworksCI>
+    <TargetFrameworks>xamarinmac20;xamarinios10;MonoAndroid10.0;net461;netstandard2.0</TargetFrameworks>
+		<TargetFrameworksCI>MonoAndroid90;MonoAndroid10.0;xamarinios10;net461;netstandard2.0;xamarinmac20</TargetFrameworksCI>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(UnoTargetFrameworkOverride)'!=''">

src/Uno.UI-Android-only.slnf

@@ -9,6 +9,7 @@
       "SamplesApp\\SamplesApp.UITests\\SamplesApp.UITests.csproj",
       "SamplesApp\\SamplesApp.UnitTests.Shared\\SamplesApp.UnitTests.Shared.shproj",
       "SamplesApp\\UITests.Shared\\UITests.Shared.shproj",
+      "SourceGenerators\\System.Xaml\\Uno.Xaml.csproj",
       "SourceGenerators\\Uno.UI.SourceGenerators\\Uno.UI.SourceGenerators.csproj",
       "SourceGenerators\\Uno.UI.Tasks\\Uno.UI.Tasks.csproj",
       "T4Generator\\T4Generator.csproj",

src/Uno.UI.BindingHelper.Android/Uno.UI.BindingHelper.Android.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="MSBuild.Sdk.Extras" ToolsVersion="15.0">
 	<PropertyGroup>
-		<TargetFrameworks>MonoAndroid90;net461;xamarinios10;netstandard2.0;xamarinmac20</TargetFrameworks>
+		<TargetFrameworks>MonoAndroid90;MonoAndroid10.0;net461;xamarinios10;netstandard2.0;xamarinmac20</TargetFrameworks>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<NoWarn>1701;1702;1705;109</NoWarn>
 
@@ -10,7 +10,7 @@
 		<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
 		<Deterministic>true</Deterministic>
 
-		<IsBindingProject Condition="'$(TargetFramework)' == 'MonoAndroid90'">true</IsBindingProject>
+		<IsBindingProject Condition="'$(TargetFramework)' == 'MonoAndroid90' or '$(TargetFramework)' == 'MonoAndroid10.0'">true</IsBindingProject>
 		<_isWindows>$([MSBuild]::IsOsPlatform(Windows))</_isWindows>
 	</PropertyGroup>
 
@@ -28,12 +28,15 @@
 	</ItemGroup>
 
 	<ItemGroup Condition=" '$(TargetFramework)' == 'MonoAndroid90'">
-		<PackageReference Include="Xamarin.Android.Support.v4">
-			<Version>28.0.0.1</Version>
-		</PackageReference>
-		<PackageReference Include="Xamarin.Android.Support.v7.RecyclerView">
-			<Version>28.0.0.1</Version>
-		</PackageReference>
+		<PackageReference Include="Xamarin.AndroidX.Legacy.Support.v4"/>
+		<PackageReference Include="Xamarin.AndroidX.AppCompat"/>
+		<PackageReference Include="Xamarin.AndroidX.RecyclerView"/>
+	</ItemGroup>
+
+	<ItemGroup Condition=" '$(TargetFramework)' == 'MonoAndroid10.0'">
+		<PackageReference Include="Xamarin.AndroidX.Legacy.Support.v4"/>
+		<PackageReference Include="Xamarin.AndroidX.AppCompat"/>
+		<PackageReference Include="Xamarin.AndroidX.RecyclerView"/>
 	</ItemGroup>
 
 	<ItemGroup>
@@ -93,13 +96,8 @@
 		<_CompileUnoJavaAfterTargets Include="_ExtractLibraryProjectImports"/> <!-- This target generates the \lp\**\classes.jar -->
 	</ItemGroup>
 
-	<Target Name="_CompileUnoJava"
-					Condition="'$(DesignTimeBuild)' != 'true'"
-					BeforeTargets="@(_CompileUnoJavaBeforeTargets)"
-					AfterTargets="@(_CompileUnoJavaAfterTargets)"
-					Inputs="@(_JavaFile)"
-					Outputs="@(EmbeddedJar)"
-					DependsOnTargets="_CompileUnoJavaCreateOutputs;@(XamarinBuildRestoreResources)">
+	<Target Name="_CompileUnoJava" Condition="'$(DesignTimeBuild)' != 'true'" BeforeTargets="@(_CompileUnoJavaBeforeTargets)" AfterTargets="@(_CompileUnoJavaAfterTargets)" Inputs="@(_JavaFile)" Outputs="@(EmbeddedJar)" DependsOnTargets="_CompileUnoJavaCreateOutputs;@(XamarinBuildRestoreResources)">
+
 
 		<ItemGroup>
 			<_AndroidJar Include="%ProgramFiles(x86)%\Reference Assemblies\Microsoft\Framework\MonoAndroid\$(TargetFrameworkVersion)\mono.android.jar" />
@@ -121,7 +119,7 @@
 			<_flattenAndroidJar Condition="!$(_isWindows)">@(_AndroidJar, ':')</_flattenAndroidJar>
 			<_flattenAndroidJar Condition="$(_isWindows)">@(_AndroidJar)</_flattenAndroidJar>
 
-			<_CompileCommand>&quot;$(_JavaCBinPath)&quot; -g -source $(_javaVersion) -d .\$(IntermediateOutputPath)\unoclasses -target $(_javaVersion) -J-Dfile.encoding=UTF8 -classpath "$(_flattenAndroidJar)" -bootclasspath "$(_AndroidSdkDirectory)platforms\android-$(_AndroidApiLevel)\android.jar" -encoding UTF-8 .\Uno\UI\*.java</_CompileCommand>
+			<_CompileCommand>"$(_JavaCBinPath)" -g -source $(_javaVersion) -d .\$(IntermediateOutputPath)\unoclasses -target $(_javaVersion) -J-Dfile.encoding=UTF8 -classpath "$(_flattenAndroidJar)" -bootclasspath "$(_AndroidSdkDirectory)platforms\android-$(_AndroidApiLevel)\android.jar" -encoding UTF-8 .\Uno\UI\*.java</_CompileCommand>
 		</PropertyGroup>
 
 		<Error Text="The Android SDK for API level $(_AndroidApiLevel) is not installed. Install it through the Android SDK manager." Condition="!Exists('$(_AndroidSdkDirectory)platforms\android-$(_AndroidApiLevel)\android.jar')" />

src/Uno.UI.BindingHelper.Android/Uno/UI/UnoMotionHelper.java

@@ -448,7 +448,7 @@ private static final boolean isMotionInView(MotionEvent e, View view) {
 			return false;
 		}
 
-		final Rect clipBounds = android.support.v4.view.ViewCompat.getClipBounds(view);
+		final Rect clipBounds = androidx.core.view.ViewCompat.getClipBounds(view);
 		if (clipBounds == null) {
 			return true;
 		} else{

src/Uno.UI.BindingHelper.Android/Uno/UI/UnoRecyclerView.java

@@ -2,7 +2,7 @@
 
 import android.content.Context;
 import android.graphics.Matrix;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.*;
 
 import java.lang.*;

src/Uno.UI.BindingHelper.Android/Uno/UI/UnoTwoDScrollView.java

@@ -41,7 +41,7 @@
 import android.widget.LinearLayout;
 import android.widget.OverScroller;
 import android.widget.TextView;
-import android.support.v4.widget.EdgeEffectCompat;
+import androidx.core.widget.EdgeEffectCompat;
 import android.util.Log;
 
 /**

src/Uno.UI.DualScreen/Uno.UI.DualScreen.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="MSBuild.Sdk.Extras" ToolsVersion="15.0">
   <PropertyGroup>
-		<TargetFrameworks>MonoAndroid90</TargetFrameworks>
-		<TargetFrameworksCI>MonoAndroid90</TargetFrameworksCI>
+		<TargetFrameworks>MonoAndroid10.0</TargetFrameworks>
+		<TargetFrameworksCI>MonoAndroid90;MonoAndroid10.0</TargetFrameworksCI>
 		<!--<GeneratePackageOnBuild Condition="'$(Configuration)'=='Release'">true</GeneratePackageOnBuild>-->
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 	</PropertyGroup>
@@ -41,7 +41,7 @@
 
 	<Import Project="..\Uno.CrossTargetting.props" />
 
-	<ItemGroup Condition=" '$(TargetFramework)' == 'MonoAndroid90'">
+	<ItemGroup Condition=" '$(TargetFramework)' == 'MonoAndroid90' or '$(TargetFramework)' == 'MonoAndroid10.0'">
 		<PackageReference Include="Xamarin.DuoSdk" />
 	</ItemGroup>
 

src/Uno.UI.Maps/Uno.UI.Maps.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="MSBuild.Sdk.Extras" ToolsVersion="15.0">
   <PropertyGroup>
-		<TargetFrameworks>MonoAndroid90;xamarinios10</TargetFrameworks>
-		<TargetFrameworksCI>MonoAndroid90;xamarinios10</TargetFrameworksCI>
+		<TargetFrameworks>MonoAndroid10.0;xamarinios10</TargetFrameworks>
+		<TargetFrameworksCI>MonoAndroid90;MonoAndroid10.0;xamarinios10</TargetFrameworksCI>
 		<GeneratePackageOnBuild Condition="'$(Configuration)'=='Release'">true</GeneratePackageOnBuild>
 	</PropertyGroup>
 
@@ -41,7 +41,13 @@
 	<ItemGroup Condition=" '$(TargetFramework)' == 'MonoAndroid90'">
 		<PackageReference Include="Xamarin.GooglePlayServices.Location" Version="71.1600.0" />
 		<PackageReference Include="Xamarin.GooglePlayServices.Maps" Version="71.1600.0" />
-		<PackageReference Include="Xamarin.Android.Support.v4" Version="28.0.0.1" PrivateAssets="none" />
+		<PackageReference Include="Xamarin.AndroidX.Legacy.Support.v4" PrivateAssets="none" />
+	</ItemGroup>
+
+	<ItemGroup Condition=" '$(TargetFramework)' == 'MonoAndroid10.0'">
+		<PackageReference Include="Xamarin.GooglePlayServices.Location" Version="71.1600.0" />
+		<PackageReference Include="Xamarin.GooglePlayServices.Maps" Version="71.1610.0" />
+		<PackageReference Include="Xamarin.AndroidX.Legacy.Support.v4" PrivateAssets="none" />
 	</ItemGroup>
 
 	<Import Project="..\Uno.CrossTargetting.props" />

src/Uno.UI.RemoteControl/Uno.UI.RemoteControl.csproj

@@ -1,8 +1,8 @@
 <Project Sdk="MSBuild.Sdk.Extras" ToolsVersion="15.0">
 
   <PropertyGroup>
-    <TargetFrameworks>xamarinmac20;xamarinios10;MonoAndroid90;netstandard2.0</TargetFrameworks>
-    <TargetFrameworksCI>MonoAndroid90;xamarinios10;net461;netstandard2.0;xamarinmac20</TargetFrameworksCI>
+    <TargetFrameworks>xamarinmac20;xamarinios10;MonoAndroid10.0;netstandard2.0</TargetFrameworks>
+    <TargetFrameworksCI>MonoAndroid90;MonoAndroid10.0;xamarinios10;net461;netstandard2.0;xamarinmac20</TargetFrameworksCI>
   </PropertyGroup>
 
 	<PropertyGroup Condition="'$(UnoTargetFrameworkOverride)'!=''">