From 54b58d16639daa050f4e52e6b566f4d62fb94f4e Mon Sep 17 00:00:00 2001
From: Kent Green <King-of-Spades@users.noreply.github.com>
Date: Tue, 1 Dec 2020 20:16:01 -0800
Subject: [PATCH] update to latest stable tooling

---
 .../FormsGallery.Android.csproj               | 89 +++++++++++--------
 .../FormsGallery.Android/packages.config      | 39 ++++----
 FormsGallery/FormsGallery/FormsGallery.csproj |  4 +-
 3 files changed, 74 insertions(+), 58 deletions(-)

diff --git a/FormsGallery/FormsGallery.Android/FormsGallery.Android.csproj b/FormsGallery/FormsGallery.Android/FormsGallery.Android.csproj
index 4414fa8..9610c69 100644
--- a/FormsGallery/FormsGallery.Android/FormsGallery.Android.csproj
+++ b/FormsGallery/FormsGallery.Android/FormsGallery.Android.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\Xamarin.AndroidX.Migration.1.0.8\build\monoandroid90\Xamarin.AndroidX.Migration.props" Condition="Exists('..\..\packages\Xamarin.AndroidX.Migration.1.0.8\build\monoandroid90\Xamarin.AndroidX.Migration.props')" />
   <Import Project="..\..\packages\Xamarin.Forms.4.8.0.1687\build\Xamarin.Forms.props" Condition="Exists('..\..\packages\Xamarin.Forms.4.8.0.1687\build\Xamarin.Forms.props')" />
-  <Import Project="..\..\packages\Xamarin.AndroidX.Migration.1.0.0.1\build\monoandroid90\Xamarin.AndroidX.Migration.props" Condition="Exists('..\..\packages\Xamarin.AndroidX.Migration.1.0.0.1\build\monoandroid90\Xamarin.AndroidX.Migration.props')" />
   <Import Project="..\..\packages\Xamarin.Build.Download.0.10.0\build\Xamarin.Build.Download.props" Condition="Exists('..\..\packages\Xamarin.Build.Download.0.10.0\build\Xamarin.Build.Download.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -35,8 +35,9 @@
     <WarningLevel>4</WarningLevel>
     <AndroidLinkMode>None</AndroidLinkMode>
     <JavaMaximumHeapSize>1G</JavaMaximumHeapSize>
-<AndroidUseSharedRuntime>true</AndroidUseSharedRuntime>
-<AndroidSupportedAbis>arm64-v8a;armeabi-v7a;x86;x86_64</AndroidSupportedAbis>
+<AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
+<AndroidSupportedAbis>armeabi-v7a</AndroidSupportedAbis>
+<EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>portable</DebugType>
@@ -173,61 +174,61 @@
       <HintPath>..\..\packages\Xamarin.Android.Support.ViewPager.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.ViewPager.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.AndroidX.MultiDex">
-      <HintPath>..\..\packages\Xamarin.AndroidX.MultiDex.2.0.1.1\lib\monoandroid90\Xamarin.AndroidX.MultiDex.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.AndroidX.MultiDex.2.0.1.5\lib\monoandroid90\Xamarin.AndroidX.MultiDex.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.AndroidX.Annotation">
-      <HintPath>..\..\packages\Xamarin.AndroidX.Annotation.1.1.0.1\lib\monoandroid90\Xamarin.AndroidX.Annotation.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.AndroidX.Annotation.1.1.0.7\lib\monoandroid90\Xamarin.AndroidX.Annotation.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.AndroidX.Arch.Core.Common">
-      <HintPath>..\..\packages\Xamarin.AndroidX.Arch.Core.Common.2.1.0.1\lib\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.AndroidX.Arch.Core.Common.2.1.0.6\lib\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.AndroidX.Arch.Core.Runtime">
-      <HintPath>..\..\packages\Xamarin.AndroidX.Arch.Core.Runtime.2.1.0.1\lib\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.AndroidX.Arch.Core.Runtime.2.1.0.6\lib\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.AndroidX.CardView">
       <HintPath>..\..\packages\Xamarin.AndroidX.CardView.1.0.0.1\lib\monoandroid90\Xamarin.AndroidX.CardView.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.AndroidX.Collection">
-      <HintPath>..\..\packages\Xamarin.AndroidX.Collection.1.1.0.1\lib\monoandroid90\Xamarin.AndroidX.Collection.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.AndroidX.Collection.1.1.0.5\lib\monoandroid90\Xamarin.AndroidX.Collection.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.AndroidX.CursorAdapter">
       <HintPath>..\..\packages\Xamarin.AndroidX.CursorAdapter.1.0.0.1\lib\monoandroid90\Xamarin.AndroidX.CursorAdapter.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.AndroidX.DocumentFile">
-      <HintPath>..\..\packages\Xamarin.AndroidX.DocumentFile.1.0.1.1\lib\monoandroid90\Xamarin.AndroidX.DocumentFile.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.AndroidX.DocumentFile.1.0.1.5\lib\monoandroid90\Xamarin.AndroidX.DocumentFile.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.AndroidX.Interpolator">
       <HintPath>..\..\packages\Xamarin.AndroidX.Interpolator.1.0.0.1\lib\monoandroid90\Xamarin.AndroidX.Interpolator.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.AndroidX.Lifecycle.Common">
-      <HintPath>..\..\packages\Xamarin.AndroidX.Lifecycle.Common.2.2.0.1\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.Common.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.AndroidX.Lifecycle.Common.2.2.0.3\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.Common.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.AndroidX.Lifecycle.LiveData.Core">
-      <HintPath>..\..\packages\Xamarin.AndroidX.Lifecycle.LiveData.Core.2.1.0.1\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.Core.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.AndroidX.Lifecycle.LiveData.Core.2.2.0.3\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.Core.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.AndroidX.Lifecycle.LiveData">
       <HintPath>..\..\packages\Xamarin.AndroidX.Lifecycle.LiveData.2.1.0.1\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.AndroidX.Lifecycle.Runtime">
-      <HintPath>..\..\packages\Xamarin.AndroidX.Lifecycle.Runtime.2.2.0.1\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.Runtime.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.AndroidX.Lifecycle.Runtime.2.2.0.3\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.Runtime.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.AndroidX.Lifecycle.ViewModel">
-      <HintPath>..\..\packages\Xamarin.AndroidX.Lifecycle.ViewModel.2.1.0.1\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModel.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.AndroidX.Lifecycle.ViewModel.2.2.0.3\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModel.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.AndroidX.LocalBroadcastManager">
-      <HintPath>..\..\packages\Xamarin.AndroidX.LocalBroadcastManager.1.0.0.1\lib\monoandroid90\Xamarin.AndroidX.LocalBroadcastManager.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.AndroidX.LocalBroadcastManager.1.0.0.5\lib\monoandroid90\Xamarin.AndroidX.LocalBroadcastManager.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.AndroidX.Print">
-      <HintPath>..\..\packages\Xamarin.AndroidX.Print.1.0.0.1\lib\monoandroid90\Xamarin.AndroidX.Print.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.AndroidX.Print.1.0.0.5\lib\monoandroid90\Xamarin.AndroidX.Print.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.AndroidX.SavedState">
       <HintPath>..\..\packages\Xamarin.AndroidX.SavedState.1.0.0.1\lib\monoandroid90\Xamarin.AndroidX.SavedState.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.AndroidX.VersionedParcelable">
-      <HintPath>..\..\packages\Xamarin.AndroidX.VersionedParcelable.1.1.0.1\lib\monoandroid90\Xamarin.AndroidX.VersionedParcelable.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.AndroidX.VersionedParcelable.1.1.1.5\lib\monoandroid90\Xamarin.AndroidX.VersionedParcelable.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.AndroidX.Core">
-      <HintPath>..\..\packages\Xamarin.AndroidX.Core.1.2.0.1\lib\monoandroid90\Xamarin.AndroidX.Core.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.AndroidX.Core.1.3.2\lib\monoandroid90\Xamarin.AndroidX.Core.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.AndroidX.Activity">
       <HintPath>..\..\packages\Xamarin.AndroidX.Activity.1.0.0.1\lib\monoandroid90\Xamarin.AndroidX.Activity.dll</HintPath>
@@ -245,13 +246,13 @@
       <HintPath>..\..\packages\Xamarin.AndroidX.DrawerLayout.1.0.0.1\lib\monoandroid90\Xamarin.AndroidX.DrawerLayout.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.AndroidX.Loader">
-      <HintPath>..\..\packages\Xamarin.AndroidX.Loader.1.1.0.1\lib\monoandroid90\Xamarin.AndroidX.Loader.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.AndroidX.Loader.1.1.0.5\lib\monoandroid90\Xamarin.AndroidX.Loader.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.AndroidX.Legacy.Support.Core.Utils">
-      <HintPath>..\..\packages\Xamarin.AndroidX.Legacy.Support.Core.Utils.1.0.0.1\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.Utils.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.AndroidX.Legacy.Support.Core.Utils.1.0.0.5\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.Utils.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.AndroidX.Media">
-      <HintPath>..\..\packages\Xamarin.AndroidX.Media.1.1.0.1\lib\monoandroid90\Xamarin.AndroidX.Media.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.AndroidX.Media.1.2.0\lib\monoandroid90\Xamarin.AndroidX.Media.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.AndroidX.RecyclerView">
       <HintPath>..\..\packages\Xamarin.AndroidX.RecyclerView.1.1.0.1\lib\monoandroid90\Xamarin.AndroidX.RecyclerView.dll</HintPath>
@@ -328,6 +329,15 @@
     <Reference Include="Xamarin.GooglePlayServices.Tasks">
       <HintPath>..\..\packages\Xamarin.GooglePlayServices.Tasks.117.0.2\lib\monoandroid90\Xamarin.GooglePlayServices.Tasks.dll</HintPath>
     </Reference>
+    <Reference Include="Xamarin.Google.Guava.ListenableFuture">
+      <HintPath>..\..\packages\Xamarin.Google.Guava.ListenableFuture.1.0.0.2\lib\monoandroid50\Xamarin.Google.Guava.ListenableFuture.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.AndroidX.MediaRouter">
+      <HintPath>..\..\packages\Xamarin.AndroidX.MediaRouter.1.2.0\lib\monoandroid90\Xamarin.AndroidX.MediaRouter.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.AndroidX.Palette">
+      <HintPath>..\..\packages\Xamarin.AndroidX.Palette.1.0.0.5\lib\monoandroid90\Xamarin.AndroidX.Palette.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MainActivity.cs" />
@@ -408,31 +418,16 @@
   <Import Project="..\..\packages\Xamarin.Android.Support.VersionedParcelable.28.0.0.3\build\monoandroid90\Xamarin.Android.Support.VersionedParcelable.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.VersionedParcelable.28.0.0.3\build\monoandroid90\Xamarin.Android.Support.VersionedParcelable.targets')" />
   <Import Project="..\..\packages\Xamarin.Android.Support.ViewPager.28.0.0.3\build\monoandroid90\Xamarin.Android.Support.ViewPager.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.ViewPager.28.0.0.3\build\monoandroid90\Xamarin.Android.Support.ViewPager.targets')" />
   <Import Project="..\..\packages\Xamarin.Build.Download.0.10.0\build\Xamarin.Build.Download.targets" Condition="Exists('..\..\packages\Xamarin.Build.Download.0.10.0\build\Xamarin.Build.Download.targets')" />
-  <Import Project="..\..\packages\Xamarin.AndroidX.MultiDex.2.0.1.1\build\monoandroid90\Xamarin.AndroidX.MultiDex.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.MultiDex.2.0.1.1\build\monoandroid90\Xamarin.AndroidX.MultiDex.targets')" />
-  <Import Project="..\..\packages\Xamarin.AndroidX.Migration.1.0.0.1\build\monoandroid90\Xamarin.AndroidX.Migration.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.Migration.1.0.0.1\build\monoandroid90\Xamarin.AndroidX.Migration.targets')" />
-  <Import Project="..\..\packages\Xamarin.AndroidX.Annotation.1.1.0.1\build\monoandroid90\Xamarin.AndroidX.Annotation.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.Annotation.1.1.0.1\build\monoandroid90\Xamarin.AndroidX.Annotation.targets')" />
-  <Import Project="..\..\packages\Xamarin.AndroidX.Arch.Core.Common.2.1.0.1\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.Arch.Core.Common.2.1.0.1\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.targets')" />
-  <Import Project="..\..\packages\Xamarin.AndroidX.Arch.Core.Runtime.2.1.0.1\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.Arch.Core.Runtime.2.1.0.1\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.targets')" />
   <Import Project="..\..\packages\Xamarin.AndroidX.CardView.1.0.0.1\build\monoandroid90\Xamarin.AndroidX.CardView.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.CardView.1.0.0.1\build\monoandroid90\Xamarin.AndroidX.CardView.targets')" />
-  <Import Project="..\..\packages\Xamarin.AndroidX.Collection.1.1.0.1\build\monoandroid90\Xamarin.AndroidX.Collection.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.Collection.1.1.0.1\build\monoandroid90\Xamarin.AndroidX.Collection.targets')" />
   <Import Project="..\..\packages\Xamarin.AndroidX.CursorAdapter.1.0.0.1\build\monoandroid90\Xamarin.AndroidX.CursorAdapter.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.CursorAdapter.1.0.0.1\build\monoandroid90\Xamarin.AndroidX.CursorAdapter.targets')" />
-  <Import Project="..\..\packages\Xamarin.AndroidX.DocumentFile.1.0.1.1\build\monoandroid90\Xamarin.AndroidX.DocumentFile.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.DocumentFile.1.0.1.1\build\monoandroid90\Xamarin.AndroidX.DocumentFile.targets')" />
   <Import Project="..\..\packages\Xamarin.AndroidX.Interpolator.1.0.0.1\build\monoandroid90\Xamarin.AndroidX.Interpolator.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.Interpolator.1.0.0.1\build\monoandroid90\Xamarin.AndroidX.Interpolator.targets')" />
-  <Import Project="..\..\packages\Xamarin.AndroidX.Lifecycle.LiveData.Core.2.1.0.1\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.Core.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.Lifecycle.LiveData.Core.2.1.0.1\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.Core.targets')" />
   <Import Project="..\..\packages\Xamarin.AndroidX.Lifecycle.LiveData.2.1.0.1\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.Lifecycle.LiveData.2.1.0.1\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.targets')" />
-  <Import Project="..\..\packages\Xamarin.AndroidX.Lifecycle.ViewModel.2.1.0.1\build\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModel.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.Lifecycle.ViewModel.2.1.0.1\build\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModel.targets')" />
-  <Import Project="..\..\packages\Xamarin.AndroidX.LocalBroadcastManager.1.0.0.1\build\monoandroid90\Xamarin.AndroidX.LocalBroadcastManager.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.LocalBroadcastManager.1.0.0.1\build\monoandroid90\Xamarin.AndroidX.LocalBroadcastManager.targets')" />
-  <Import Project="..\..\packages\Xamarin.AndroidX.Print.1.0.0.1\build\monoandroid90\Xamarin.AndroidX.Print.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.Print.1.0.0.1\build\monoandroid90\Xamarin.AndroidX.Print.targets')" />
   <Import Project="..\..\packages\Xamarin.AndroidX.SavedState.1.0.0.1\build\monoandroid90\Xamarin.AndroidX.SavedState.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.SavedState.1.0.0.1\build\monoandroid90\Xamarin.AndroidX.SavedState.targets')" />
-  <Import Project="..\..\packages\Xamarin.AndroidX.VersionedParcelable.1.1.0.1\build\monoandroid90\Xamarin.AndroidX.VersionedParcelable.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.VersionedParcelable.1.1.0.1\build\monoandroid90\Xamarin.AndroidX.VersionedParcelable.targets')" />
   <Import Project="..\..\packages\Xamarin.AndroidX.Activity.1.0.0.1\build\monoandroid90\Xamarin.AndroidX.Activity.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.Activity.1.0.0.1\build\monoandroid90\Xamarin.AndroidX.Activity.targets')" />
   <Import Project="..\..\packages\Xamarin.AndroidX.AsyncLayoutInflater.1.0.0.1\build\monoandroid90\Xamarin.AndroidX.AsyncLayoutInflater.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.AsyncLayoutInflater.1.0.0.1\build\monoandroid90\Xamarin.AndroidX.AsyncLayoutInflater.targets')" />
   <Import Project="..\..\packages\Xamarin.AndroidX.CustomView.1.0.0.1\build\monoandroid90\Xamarin.AndroidX.CustomView.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.CustomView.1.0.0.1\build\monoandroid90\Xamarin.AndroidX.CustomView.targets')" />
   <Import Project="..\..\packages\Xamarin.AndroidX.CoordinatorLayout.1.1.0.1\build\monoandroid90\Xamarin.AndroidX.CoordinatorLayout.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.CoordinatorLayout.1.1.0.1\build\monoandroid90\Xamarin.AndroidX.CoordinatorLayout.targets')" />
   <Import Project="..\..\packages\Xamarin.AndroidX.DrawerLayout.1.0.0.1\build\monoandroid90\Xamarin.AndroidX.DrawerLayout.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.DrawerLayout.1.0.0.1\build\monoandroid90\Xamarin.AndroidX.DrawerLayout.targets')" />
-  <Import Project="..\..\packages\Xamarin.AndroidX.Loader.1.1.0.1\build\monoandroid90\Xamarin.AndroidX.Loader.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.Loader.1.1.0.1\build\monoandroid90\Xamarin.AndroidX.Loader.targets')" />
-  <Import Project="..\..\packages\Xamarin.AndroidX.Legacy.Support.Core.Utils.1.0.0.1\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.Utils.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.Legacy.Support.Core.Utils.1.0.0.1\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.Utils.targets')" />
-  <Import Project="..\..\packages\Xamarin.AndroidX.Media.1.1.0.1\build\monoandroid90\Xamarin.AndroidX.Media.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.Media.1.1.0.1\build\monoandroid90\Xamarin.AndroidX.Media.targets')" />
   <Import Project="..\..\packages\Xamarin.AndroidX.RecyclerView.1.1.0.1\build\monoandroid90\Xamarin.AndroidX.RecyclerView.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.RecyclerView.1.1.0.1\build\monoandroid90\Xamarin.AndroidX.RecyclerView.targets')" />
   <Import Project="..\..\packages\Xamarin.AndroidX.SlidingPaneLayout.1.0.0.1\build\monoandroid90\Xamarin.AndroidX.SlidingPaneLayout.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.SlidingPaneLayout.1.0.0.1\build\monoandroid90\Xamarin.AndroidX.SlidingPaneLayout.targets')" />
   <Import Project="..\..\packages\Xamarin.AndroidX.SwipeRefreshLayout.1.0.0.1\build\monoandroid90\Xamarin.AndroidX.SwipeRefreshLayout.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.SwipeRefreshLayout.1.0.0.1\build\monoandroid90\Xamarin.AndroidX.SwipeRefreshLayout.targets')" />
@@ -448,11 +443,29 @@
   <Import Project="..\..\packages\Xamarin.AndroidX.Transition.1.2.0.1\build\monoandroid90\Xamarin.AndroidX.Transition.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.Transition.1.2.0.1\build\monoandroid90\Xamarin.AndroidX.Transition.targets')" />
   <Import Project="..\..\packages\Xamarin.Google.Android.Material.1.0.0.1\build\monoandroid90\Xamarin.Google.Android.Material.targets" Condition="Exists('..\..\packages\Xamarin.Google.Android.Material.1.0.0.1\build\monoandroid90\Xamarin.Google.Android.Material.targets')" />
   <Import Project="..\..\packages\Xamarin.Forms.4.8.0.1687\build\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.4.8.0.1687\build\Xamarin.Forms.targets')" />
-  <Import Project="..\..\packages\Xamarin.AndroidX.Lifecycle.Common.2.2.0.1\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Common.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.Lifecycle.Common.2.2.0.1\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Common.targets')" />
-  <Import Project="..\..\packages\Xamarin.AndroidX.Lifecycle.Runtime.2.2.0.1\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Runtime.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.Lifecycle.Runtime.2.2.0.1\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Runtime.targets')" />
-  <Import Project="..\..\packages\Xamarin.AndroidX.Core.1.2.0.1\build\monoandroid90\Xamarin.AndroidX.Core.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.Core.1.2.0.1\build\monoandroid90\Xamarin.AndroidX.Core.targets')" />
   <Import Project="..\..\packages\Xamarin.GooglePlayServices.Basement.117.2.1\build\MonoAndroid90\Xamarin.GooglePlayServices.Basement.targets" Condition="Exists('..\..\packages\Xamarin.GooglePlayServices.Basement.117.2.1\build\MonoAndroid90\Xamarin.GooglePlayServices.Basement.targets')" />
   <Import Project="..\..\packages\Xamarin.GooglePlayServices.Tasks.117.0.2\build\MonoAndroid90\Xamarin.GooglePlayServices.Tasks.targets" Condition="Exists('..\..\packages\Xamarin.GooglePlayServices.Tasks.117.0.2\build\MonoAndroid90\Xamarin.GooglePlayServices.Tasks.targets')" />
   <Import Project="..\..\packages\Xamarin.GooglePlayServices.Base.117.2.1\build\MonoAndroid90\Xamarin.GooglePlayServices.Base.targets" Condition="Exists('..\..\packages\Xamarin.GooglePlayServices.Base.117.2.1\build\MonoAndroid90\Xamarin.GooglePlayServices.Base.targets')" />
   <Import Project="..\..\packages\Xamarin.GooglePlayServices.Maps.117.0.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Maps.targets" Condition="Exists('..\..\packages\Xamarin.GooglePlayServices.Maps.117.0.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Maps.targets')" />
+  <Import Project="..\..\packages\Xamarin.AndroidX.MultiDex.2.0.1.5\build\monoandroid90\Xamarin.AndroidX.MultiDex.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.MultiDex.2.0.1.5\build\monoandroid90\Xamarin.AndroidX.MultiDex.targets')" />
+  <Import Project="..\..\packages\Xamarin.AndroidX.Migration.1.0.8\build\monoandroid90\Xamarin.AndroidX.Migration.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.Migration.1.0.8\build\monoandroid90\Xamarin.AndroidX.Migration.targets')" />
+  <Import Project="..\..\packages\Xamarin.AndroidX.Annotation.1.1.0.7\build\monoandroid90\Xamarin.AndroidX.Annotation.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.Annotation.1.1.0.7\build\monoandroid90\Xamarin.AndroidX.Annotation.targets')" />
+  <Import Project="..\..\packages\Xamarin.AndroidX.Arch.Core.Common.2.1.0.6\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.Arch.Core.Common.2.1.0.6\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.targets')" />
+  <Import Project="..\..\packages\Xamarin.AndroidX.Collection.1.1.0.5\build\monoandroid90\Xamarin.AndroidX.Collection.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.Collection.1.1.0.5\build\monoandroid90\Xamarin.AndroidX.Collection.targets')" />
+  <Import Project="..\..\packages\Xamarin.AndroidX.Lifecycle.Common.2.2.0.3\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Common.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.Lifecycle.Common.2.2.0.3\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Common.targets')" />
+  <Import Project="..\..\packages\Xamarin.AndroidX.Lifecycle.Runtime.2.2.0.3\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Runtime.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.Lifecycle.Runtime.2.2.0.3\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Runtime.targets')" />
+  <Import Project="..\..\packages\Xamarin.AndroidX.VersionedParcelable.1.1.1.5\build\monoandroid90\Xamarin.AndroidX.VersionedParcelable.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.VersionedParcelable.1.1.1.5\build\monoandroid90\Xamarin.AndroidX.VersionedParcelable.targets')" />
+  <Import Project="..\..\packages\Xamarin.AndroidX.Core.1.3.2\build\monoandroid90\Xamarin.AndroidX.Core.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.Core.1.3.2\build\monoandroid90\Xamarin.AndroidX.Core.targets')" />
+  <Import Project="..\..\packages\Xamarin.AndroidX.Media.1.2.0\build\monoandroid90\Xamarin.AndroidX.Media.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.Media.1.2.0\build\monoandroid90\Xamarin.AndroidX.Media.targets')" />
+  <Import Project="..\..\packages\Xamarin.Google.Guava.ListenableFuture.1.0.0.2\build\monoandroid50\Xamarin.Google.Guava.ListenableFuture.targets" Condition="Exists('..\..\packages\Xamarin.Google.Guava.ListenableFuture.1.0.0.2\build\monoandroid50\Xamarin.Google.Guava.ListenableFuture.targets')" />
+  <Import Project="..\..\packages\Xamarin.AndroidX.MediaRouter.1.2.0\build\monoandroid90\Xamarin.AndroidX.MediaRouter.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.MediaRouter.1.2.0\build\monoandroid90\Xamarin.AndroidX.MediaRouter.targets')" />
+  <Import Project="..\..\packages\Xamarin.AndroidX.Arch.Core.Runtime.2.1.0.6\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.Arch.Core.Runtime.2.1.0.6\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.targets')" />
+  <Import Project="..\..\packages\Xamarin.AndroidX.DocumentFile.1.0.1.5\build\monoandroid90\Xamarin.AndroidX.DocumentFile.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.DocumentFile.1.0.1.5\build\monoandroid90\Xamarin.AndroidX.DocumentFile.targets')" />
+  <Import Project="..\..\packages\Xamarin.AndroidX.Lifecycle.LiveData.Core.2.2.0.3\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.Core.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.Lifecycle.LiveData.Core.2.2.0.3\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.Core.targets')" />
+  <Import Project="..\..\packages\Xamarin.AndroidX.Lifecycle.ViewModel.2.2.0.3\build\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModel.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.Lifecycle.ViewModel.2.2.0.3\build\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModel.targets')" />
+  <Import Project="..\..\packages\Xamarin.AndroidX.LocalBroadcastManager.1.0.0.5\build\monoandroid90\Xamarin.AndroidX.LocalBroadcastManager.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.LocalBroadcastManager.1.0.0.5\build\monoandroid90\Xamarin.AndroidX.LocalBroadcastManager.targets')" />
+  <Import Project="..\..\packages\Xamarin.AndroidX.Print.1.0.0.5\build\monoandroid90\Xamarin.AndroidX.Print.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.Print.1.0.0.5\build\monoandroid90\Xamarin.AndroidX.Print.targets')" />
+  <Import Project="..\..\packages\Xamarin.AndroidX.Loader.1.1.0.5\build\monoandroid90\Xamarin.AndroidX.Loader.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.Loader.1.1.0.5\build\monoandroid90\Xamarin.AndroidX.Loader.targets')" />
+  <Import Project="..\..\packages\Xamarin.AndroidX.Legacy.Support.Core.Utils.1.0.0.5\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.Utils.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.Legacy.Support.Core.Utils.1.0.0.5\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.Utils.targets')" />
+  <Import Project="..\..\packages\Xamarin.AndroidX.Palette.1.0.0.5\build\monoandroid90\Xamarin.AndroidX.Palette.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.Palette.1.0.0.5\build\monoandroid90\Xamarin.AndroidX.Palette.targets')" />
 </Project>
diff --git a/FormsGallery/FormsGallery.Android/packages.config b/FormsGallery/FormsGallery.Android/packages.config
index f5151cd..3a0ae45 100644
--- a/FormsGallery/FormsGallery.Android/packages.config
+++ b/FormsGallery/FormsGallery.Android/packages.config
@@ -40,37 +40,39 @@
   <package id="Xamarin.Android.Support.VersionedParcelable" version="28.0.0.3" targetFramework="monoandroid11.0" />
   <package id="Xamarin.Android.Support.ViewPager" version="28.0.0.3" targetFramework="monoandroid11.0" />
   <package id="Xamarin.AndroidX.Activity" version="1.0.0.1" targetFramework="monoandroid11.0" />
-  <package id="Xamarin.AndroidX.Annotation" version="1.1.0.1" targetFramework="monoandroid11.0" />
+  <package id="Xamarin.AndroidX.Annotation" version="1.1.0.7" targetFramework="monoandroid11.0" />
   <package id="Xamarin.AndroidX.AppCompat" version="1.1.0.1" targetFramework="monoandroid11.0" />
   <package id="Xamarin.AndroidX.AppCompat.AppCompatResources" version="1.1.0.1" targetFramework="monoandroid11.0" />
-  <package id="Xamarin.AndroidX.Arch.Core.Common" version="2.1.0.1" targetFramework="monoandroid11.0" />
-  <package id="Xamarin.AndroidX.Arch.Core.Runtime" version="2.1.0.1" targetFramework="monoandroid11.0" />
+  <package id="Xamarin.AndroidX.Arch.Core.Common" version="2.1.0.6" targetFramework="monoandroid11.0" />
+  <package id="Xamarin.AndroidX.Arch.Core.Runtime" version="2.1.0.6" targetFramework="monoandroid11.0" />
   <package id="Xamarin.AndroidX.AsyncLayoutInflater" version="1.0.0.1" targetFramework="monoandroid11.0" />
   <package id="Xamarin.AndroidX.Browser" version="1.0.0.1" targetFramework="monoandroid11.0" />
   <package id="Xamarin.AndroidX.CardView" version="1.0.0.1" targetFramework="monoandroid11.0" />
-  <package id="Xamarin.AndroidX.Collection" version="1.1.0.1" targetFramework="monoandroid11.0" />
+  <package id="Xamarin.AndroidX.Collection" version="1.1.0.5" targetFramework="monoandroid11.0" />
   <package id="Xamarin.AndroidX.CoordinatorLayout" version="1.1.0.1" targetFramework="monoandroid11.0" />
-  <package id="Xamarin.AndroidX.Core" version="1.2.0.1" targetFramework="monoandroid11.0" />
+  <package id="Xamarin.AndroidX.Core" version="1.3.2" targetFramework="monoandroid11.0" />
   <package id="Xamarin.AndroidX.CursorAdapter" version="1.0.0.1" targetFramework="monoandroid11.0" />
   <package id="Xamarin.AndroidX.CustomView" version="1.0.0.1" targetFramework="monoandroid11.0" />
-  <package id="Xamarin.AndroidX.DocumentFile" version="1.0.1.1" targetFramework="monoandroid11.0" />
+  <package id="Xamarin.AndroidX.DocumentFile" version="1.0.1.5" targetFramework="monoandroid11.0" />
   <package id="Xamarin.AndroidX.DrawerLayout" version="1.0.0.1" targetFramework="monoandroid11.0" />
   <package id="Xamarin.AndroidX.Fragment" version="1.1.0.1" targetFramework="monoandroid11.0" />
   <package id="Xamarin.AndroidX.Interpolator" version="1.0.0.1" targetFramework="monoandroid11.0" />
   <package id="Xamarin.AndroidX.Legacy.Support.Core.UI" version="1.0.0.1" targetFramework="monoandroid11.0" />
-  <package id="Xamarin.AndroidX.Legacy.Support.Core.Utils" version="1.0.0.1" targetFramework="monoandroid11.0" />
+  <package id="Xamarin.AndroidX.Legacy.Support.Core.Utils" version="1.0.0.5" targetFramework="monoandroid11.0" />
   <package id="Xamarin.AndroidX.Legacy.Support.V4" version="1.0.0.1" targetFramework="monoandroid11.0" />
-  <package id="Xamarin.AndroidX.Lifecycle.Common" version="2.2.0.1" targetFramework="monoandroid11.0" />
+  <package id="Xamarin.AndroidX.Lifecycle.Common" version="2.2.0.3" targetFramework="monoandroid11.0" />
   <package id="Xamarin.AndroidX.Lifecycle.LiveData" version="2.1.0.1" targetFramework="monoandroid11.0" />
-  <package id="Xamarin.AndroidX.Lifecycle.LiveData.Core" version="2.1.0.1" targetFramework="monoandroid11.0" />
-  <package id="Xamarin.AndroidX.Lifecycle.Runtime" version="2.2.0.1" targetFramework="monoandroid11.0" />
-  <package id="Xamarin.AndroidX.Lifecycle.ViewModel" version="2.1.0.1" targetFramework="monoandroid11.0" />
-  <package id="Xamarin.AndroidX.Loader" version="1.1.0.1" targetFramework="monoandroid11.0" />
-  <package id="Xamarin.AndroidX.LocalBroadcastManager" version="1.0.0.1" targetFramework="monoandroid11.0" />
-  <package id="Xamarin.AndroidX.Media" version="1.1.0.1" targetFramework="monoandroid11.0" />
-  <package id="Xamarin.AndroidX.Migration" version="1.0.0.1" targetFramework="monoandroid11.0" />
-  <package id="Xamarin.AndroidX.MultiDex" version="2.0.1.1" targetFramework="monoandroid11.0" />
-  <package id="Xamarin.AndroidX.Print" version="1.0.0.1" targetFramework="monoandroid11.0" />
+  <package id="Xamarin.AndroidX.Lifecycle.LiveData.Core" version="2.2.0.3" targetFramework="monoandroid11.0" />
+  <package id="Xamarin.AndroidX.Lifecycle.Runtime" version="2.2.0.3" targetFramework="monoandroid11.0" />
+  <package id="Xamarin.AndroidX.Lifecycle.ViewModel" version="2.2.0.3" targetFramework="monoandroid11.0" />
+  <package id="Xamarin.AndroidX.Loader" version="1.1.0.5" targetFramework="monoandroid11.0" />
+  <package id="Xamarin.AndroidX.LocalBroadcastManager" version="1.0.0.5" targetFramework="monoandroid11.0" />
+  <package id="Xamarin.AndroidX.Media" version="1.2.0" targetFramework="monoandroid11.0" />
+  <package id="Xamarin.AndroidX.MediaRouter" version="1.2.0" targetFramework="monoandroid11.0" />
+  <package id="Xamarin.AndroidX.Migration" version="1.0.8" targetFramework="monoandroid11.0" />
+  <package id="Xamarin.AndroidX.MultiDex" version="2.0.1.5" targetFramework="monoandroid11.0" />
+  <package id="Xamarin.AndroidX.Palette" version="1.0.0.5" targetFramework="monoandroid11.0" />
+  <package id="Xamarin.AndroidX.Print" version="1.0.0.5" targetFramework="monoandroid11.0" />
   <package id="Xamarin.AndroidX.RecyclerView" version="1.1.0.1" targetFramework="monoandroid11.0" />
   <package id="Xamarin.AndroidX.SavedState" version="1.0.0.1" targetFramework="monoandroid11.0" />
   <package id="Xamarin.AndroidX.SlidingPaneLayout" version="1.0.0.1" targetFramework="monoandroid11.0" />
@@ -78,12 +80,13 @@
   <package id="Xamarin.AndroidX.Transition" version="1.2.0.1" targetFramework="monoandroid11.0" />
   <package id="Xamarin.AndroidX.VectorDrawable" version="1.1.0.1" targetFramework="monoandroid11.0" />
   <package id="Xamarin.AndroidX.VectorDrawable.Animated" version="1.1.0.1" targetFramework="monoandroid11.0" />
-  <package id="Xamarin.AndroidX.VersionedParcelable" version="1.1.0.1" targetFramework="monoandroid11.0" />
+  <package id="Xamarin.AndroidX.VersionedParcelable" version="1.1.1.5" targetFramework="monoandroid11.0" />
   <package id="Xamarin.AndroidX.ViewPager" version="1.0.0.1" targetFramework="monoandroid11.0" />
   <package id="Xamarin.Build.Download" version="0.10.0" targetFramework="monoandroid11.0" />
   <package id="Xamarin.Forms" version="4.8.0.1687" targetFramework="monoandroid11.0" />
   <package id="Xamarin.Forms.Maps" version="4.8.0.1687" targetFramework="monoandroid11.0" />
   <package id="Xamarin.Google.Android.Material" version="1.0.0.1" targetFramework="monoandroid11.0" />
+  <package id="Xamarin.Google.Guava.ListenableFuture" version="1.0.0.2" targetFramework="monoandroid11.0" />
   <package id="Xamarin.GooglePlayServices.Base" version="117.2.1" targetFramework="monoandroid11.0" />
   <package id="Xamarin.GooglePlayServices.Basement" version="117.2.1" targetFramework="monoandroid11.0" />
   <package id="Xamarin.GooglePlayServices.Maps" version="117.0.0" targetFramework="monoandroid11.0" />
diff --git a/FormsGallery/FormsGallery/FormsGallery.csproj b/FormsGallery/FormsGallery/FormsGallery.csproj
index 6f609ab..c54dd3b 100644
--- a/FormsGallery/FormsGallery/FormsGallery.csproj
+++ b/FormsGallery/FormsGallery/FormsGallery.csproj
@@ -144,7 +144,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms.Maps" Version="4.7.0.1260" />
-    <PackageReference Include="Xamarin.Forms" Version="4.7.0.1260" />
+    <PackageReference Include="Xamarin.Forms.Maps" Version="4.8.0.1687" />
+    <PackageReference Include="Xamarin.Forms" Version="4.8.0.1687" />
   </ItemGroup>
 </Project>
\ No newline at end of file