[Housekeeping] Update main branch with latest 5.0.0 changes

.nuspec/Xamarin.Forms.Visual.Material.nuspec

@@ -22,8 +22,8 @@
       </group>
 
       <group targetFramework="MonoAndroid10.0">
-        <dependency id="Xamarin.AndroidX.Lifecycle.LiveData" version="[2.2.0.4,2.3)" />
-        <dependency id="Xamarin.Google.Android.Material" version="[1.2.1.1,1.3)" />
+        <dependency id="Xamarin.AndroidX.Lifecycle.LiveData" version="[2.3.1.1,2.4)" />
+        <dependency id="Xamarin.Google.Android.Material" version="[1.4.0.2,1.5)" />
       </group>
       <group targetFramework="Xamarin.iOS10">
         <dependency id="Xamarin.iOS.MaterialComponents" version="92.0.0"/>

.nuspec/Xamarin.Forms.nuspec

@@ -15,18 +15,18 @@
     <copyright>© Microsoft Corporation. All rights reserved.</copyright>
     <dependencies>
       <group targetFramework="MonoAndroid10.0">
-        <dependency id="Xamarin.AndroidX.Lifecycle.LiveData" version="[2.2.0.4,2.3)" />
-        <dependency id="Xamarin.Google.Android.Material" version="[1.2.1.1,1.3)" />
-        <dependency id="Xamarin.AndroidX.Legacy.Support.V4" version="[1.0.0.7,1.1)" />
-        <dependency id="Xamarin.AndroidX.Browser" version="[1.3.0.5,1.4)" />
+        <dependency id="Xamarin.AndroidX.Lifecycle.LiveData" version="[2.3.1.1,2.4)" />
+        <dependency id="Xamarin.Google.Android.Material" version="[1.4.0.2,1.5)" />
+        <dependency id="Xamarin.AndroidX.Legacy.Support.V4" version="[1.0.0.8,1.1)" />
+        <dependency id="Xamarin.AndroidX.Browser" version="[1.3.0.6,1.4)" />
 
         <!-- Because of a misspelled reference these all need to be explicitly included so the fixed version 
           is transitively loaded  https://github.com/xamarin/AndroidX/issues/283#issuecomment-788103573 -->
-        <dependency id="Xamarin.AndroidX.Core" version="[1.3.2.3,1.4)" />
-        <dependency id="Xamarin.AndroidX.CustomView" version="[1.1.0.6,1.2)" />
-        <dependency id="Xamarin.AndroidX.Preference" version="[1.1.1.8,1.2)" />
-        <dependency id="Xamarin.AndroidX.RecyclerView" version="[1.1.0.8,1.2)" />
-        <dependency id="Xamarin.AndroidX.Navigation.UI" version="[2.3.2.1,2.4)" />
+        <dependency id="Xamarin.AndroidX.Core" version="[1.6.0.1,1.7)" />
+        <dependency id="Xamarin.AndroidX.CustomView" version="[1.1.0.7,1.2)" />
+        <dependency id="Xamarin.AndroidX.Preference" version="[1.1.1.9,1.2)" />
+        <dependency id="Xamarin.AndroidX.RecyclerView" version="[1.2.1.1,1.3)" />
+        <dependency id="Xamarin.AndroidX.Navigation.UI" version="[2.3.5.1,2.4)" />
       </group>
       <group targetFramework="uap10.0.14393">
         <dependency id="NETStandard.Library" version="2.0.1"/>

.nuspec/Xamarin.Forms.targets

@@ -48,9 +48,9 @@
 
 	<Target Name="_ValidateNETFrameworkVersion"
 			BeforeTargets="_CheckForInvalidConfigurationAndPlatform"
-			Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' AND '$(TargetFrameworkVersion.Substring(1))' &lt; '4.6.1' AND '$(XFDisableFrameworkVersionValidation)' != 'True'">
+			Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' AND '$(TargetFrameworkVersion.Substring(1))' &lt; '4.6.1' AND '$(ProjectExt)' != '.wapproj' AND '$(XFDisableFrameworkVersionValidation)' != 'True'">
 		<Error Code="XF004"
-			Text="XF requires .NETFramework >= v4.6.1. You have '$(TargetFrameworkVersion)'" />
+			Text="Xamarin.Forms requires .NETFramework >= v4.6.1. You have '$(TargetFrameworkVersion)'" />
 	</Target>
 
 	<!-- XamlG -->

DualScreen/DualScreen.Android/DualScreen.Android.csproj

@@ -115,9 +115,9 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.7" />    
-    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.2.0.4" />
-    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.2.1.1" />
+    <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.8" />    
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.3.1.1" />
+    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.4.0.2" />
   </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\values\colors.xml" />

EmbeddingTestBeds/Embedding.Droid/Directory.Build.targets

@@ -1,9 +1,9 @@
 <Project>
   <ItemGroup>
-    <PackageReference Include="Xamarin.AndroidX.Browser" Version="1.3.0.5" />
-    <PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.1" />
-    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.1.0.1" />
-    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.2.1.1" />
-    <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.7" />
+    <PackageReference Include="Xamarin.AndroidX.Browser" Version="1.3.0.6" />
+    <PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.8" />
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.3.1.1" />
+    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.4.0.2" />
+    <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.8" />
   </ItemGroup>
 </Project>

Stubs/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android (Forwarders).csproj

@@ -22,9 +22,9 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'MonoAndroid10.0'">
-    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.2.0.4" />
-    <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.7" />
-    <PackageReference Include="Xamarin.AndroidX.RecyclerView" Version="1.1.0.8" />
-    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.2.1.1" />
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.3.1.1" />
+    <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.8" />
+    <PackageReference Include="Xamarin.AndroidX.RecyclerView" Version="1.2.1.1" />
+    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.4.0.2" />
   </ItemGroup>
 </Project>

Xamarin.Forms.ControlGallery.Android/Directory.Build.targets

@@ -1,10 +1,10 @@
 <Project>
   <ItemGroup>
-    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.2.0.4" />
-    <PackageReference Include="Xamarin.AndroidX.Browser" Version="1.3.0.5" />
-    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.2.1.1" />
-    <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.7" />
-    <PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.6" />
+    <PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.8" />    
+    <PackageReference Include="Xamarin.AndroidX.Browser" Version="1.3.0.6" />
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.3.1.1" />
+    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.4.0.2" />
+    <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.8" />
   </ItemGroup>
   <Import Project="Nuget.Build.targets" />
   <Import Project="..\Nuget.targets" Condition="'$(FromSource)' == 'false'" />

Xamarin.Forms.ControlGallery.Android/Nuget.Build.targets

@@ -5,10 +5,10 @@
         </PackageReference>
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.1.0" />
-        <PackageReference Include="Xamarin.AndroidX.Browser" Version="1.3.0.5" />
-        <PackageReference Include="Xamarin.Google.Android.Material" Version="1.2.1.1" />
-        <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.7" />
-        <PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0" />
+        <PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.8" />    
+    <PackageReference Include="Xamarin.AndroidX.Browser" Version="1.3.0.6" />
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.3.1.1" />
+    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.4.0.2" />
+    <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.8" />
     </ItemGroup>
 </Project>

Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj

@@ -347,12 +347,12 @@
     </PackageReference>
     <PackageReference Include="Xam.Plugin.DeviceInfo">
       <Version>3.0.2</Version>
-    </PackageReference>
-    <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.7" />
-    <PackageReference Include="Xamarin.AndroidX.Core" Version="1.3.2.3" />
-    <PackageReference Include="Xamarin.AndroidX.CustomView" Version="1.1.0.6" />
-    <PackageReference Include="Xamarin.AndroidX.Preference" Version="1.1.1.8" />
-    <PackageReference Include="Xamarin.AndroidX.RecyclerView" Version="1.1.0.8" />
+    </PackageReference>  
+    <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.8" />
+    <PackageReference Include="Xamarin.AndroidX.Core" Version="1.6.0.1" />
+    <PackageReference Include="Xamarin.AndroidX.CustomView" Version="1.1.0.7" />
+    <PackageReference Include="Xamarin.AndroidX.Preference" Version="1.1.1.9" />
+    <PackageReference Include="Xamarin.AndroidX.RecyclerView" Version="1.2.1.1" />
   </ItemGroup>
   <ItemGroup>
     <AndroidAsset Include="Assets\fonts\ionicons.ttf">

Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Github5623.xaml.cs

@@ -20,7 +20,6 @@ namespace Xamarin.Forms.Controls.Issues
 {
 #if UITEST
 	[Category(UITestCategories.CollectionView)]
-	[Category(UITestCategories.UwpIgnore)]
 	[NUnit.Framework.Category(Core.UITests.UITestCategories.Github5000)]
 #endif
 #if APP

Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue11113.xaml.cs

@@ -10,9 +10,6 @@
 
 namespace Xamarin.Forms.Controls
 {
-#if UITEST
-	[Category(UITestCategories.CarouselView)]
-#endif
 	[Preserve(AllMembers = true)]
 	[Issue(IssueTracker.Github, 11113, "[Bug][iOS] Path: TranslateTransform has no effect on iOS", PlatformAffected.iOS)]
 	public partial class Issue11113 : TestContentPage

Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue11795.xaml

@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<controls:TestContentPage
+    xmlns:controls="clr-namespace:Xamarin.Forms.Controls"
+    xmlns="http://xamarin.com/schemas/2014/forms"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:d="http://xamarin.com/schemas/2014/forms/design"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d"
+    Title="Issue 11795"
+    x:Class="Xamarin.Forms.Controls.Issues.Issue11795">
+    <controls:TestContentPage.Resources>
+        <ResourceDictionary>
+
+            <LinearGradientBrush x:Key="LinearBrush" StartPoint="0, 0" EndPoint="1, 0">
+                <LinearGradientBrush.GradientStops>
+                    <GradientStop Color="YellowGreen" Offset="0.1"/>
+                    <GradientStop Color="Green" Offset="0.9"/>
+                </LinearGradientBrush.GradientStops>
+            </LinearGradientBrush>
+
+            <Style TargetType="Slider">
+                <Setter Property="MinimumTrackColor" Value="LightGray" />
+                <Setter Property="MaximumTrackColor" Value="Gray" />
+            </Style>
+
+        </ResourceDictionary>
+    </controls:TestContentPage.Resources>
+    <StackLayout>
+        <Label
+            Padding="12"
+            BackgroundColor="Black"
+            TextColor="White"
+            Text="Modify the Brush Offset values. If you modify the gradient, the test has passed."/>
+          <Grid>
+              <!-- EXPLORER -->
+              <Grid>
+                  <Grid.RowDefinitions>
+                      <RowDefinition Height="Auto" />
+                      <RowDefinition Height="*" />
+                  </Grid.RowDefinitions>
+                  <StackLayout
+                      Grid.Row="0"
+                      Margin="12, 0"
+                      Padding="12">
+                      <Label
+                          Text="Color BoxView"
+                          FontSize="Micro"/>
+                      <BoxView
+                          x:Name="SolidBoxView"
+                          HeightRequest="60"
+                          WidthRequest="120"
+                          CornerRadius="12"
+                          BackgroundColor="Red"/>
+                      <Label
+                          Text="Gradient BoxView"
+                          FontSize="Micro"/>
+                      <BoxView
+                          x:Name="GradientBoxView"
+                          HeightRequest="60"
+                          WidthRequest="120"
+                          CornerRadius="12"
+                          Background="{StaticResource LinearBrush}"/>
+                      <Label
+                          Text="Color Frame"
+                          FontSize="Micro"/>
+                      <Frame
+                          x:Name="SolidFrame"
+                          HasShadow="True"
+                          HeightRequest="60"
+                          WidthRequest="120"
+                          CornerRadius="12"
+                          Padding="6"
+                          BackgroundColor="Red">
+                          <Grid>
+                              <Label
+                                  HorizontalOptions="Center"
+                                  VerticalOptions="Center"
+                                  TextColor="White"
+                                  Text="Color"/>
+                          </Grid>
+                      </Frame>
+                      <Label
+                          Text="Gradient Frame"
+                          FontSize="Micro"/>
+                      <Frame
+                          x:Name="GradientFrame"
+                          HasShadow="True"
+                          HeightRequest="60"
+                          WidthRequest="120"
+                          CornerRadius="12"
+                          Padding="6"
+                          Background="{StaticResource LinearBrush}">
+                          <Grid>
+                              <Label
+                                  HorizontalOptions="Center"
+                                  VerticalOptions="Center"
+                                  Text="LinearGradientBrush"/>
+                          </Grid>
+                      </Frame>
+                  </StackLayout>
+                  <ScrollView
+                      Grid.Row="1"
+                      Margin="12, 0"
+                      Padding="12">
+                     <StackLayout>
+                         <Label
+                             Text="Color 1 Offset"/>
+                         <Slider
+                             x:Name="Offset1Slider"
+                             Minimum="0.0"
+                             Maximum="1.0"
+                             Value="0.1"
+                             ValueChanged="OnOffset1SliderValueChanged"/>
+                         <Label
+                             Text="Color 2 Offset"/>
+                         <Slider
+                             x:Name="Offset2Slider"
+                             Minimum="0.0"
+                             Margin="1.0"
+                             Value="0.9"
+                             ValueChanged="OnOffset2SliderValueChanged"/>
+                      </StackLayout>
+                  </ScrollView>
+              </Grid>
+          </Grid>
+    </StackLayout>
+</controls:TestContentPage>

Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue11795.xaml.cs

@@ -0,0 +1,74 @@
+using Xamarin.Forms.CustomAttributes;
+using Xamarin.Forms.Internals;
+using Xamarin.Forms.Xaml;
+
+#if UITEST
+using Xamarin.UITest;
+using Xamarin.UITest.Queries;
+using NUnit.Framework;
+using Xamarin.Forms.Core.UITests;
+#endif
+
+namespace Xamarin.Forms.Controls.Issues
+{
+#if UITEST
+	[Category(UITestCategories.Brush)]
+#endif
+#if APP
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+#endif
+	[Preserve(AllMembers = true)]
+	[Issue(IssueTracker.Github, 11795, "[Bug] Brushes API - gradient offset does nothing on Android", PlatformAffected.Android)]
+	public partial class Issue11795 : TestContentPage
+	{
+#if APP
+		float _offset1, _offset2;
+#endif
+		public Issue11795()
+		{
+#if APP
+			Title = "Issue 11795";
+			InitializeComponent();
+
+			_offset1 = 0.1f;
+			_offset2 = 0.9f;
+#endif
+		}
+
+		protected override void Init()
+		{
+
+		}
+
+#if APP
+		void OnOffset1SliderValueChanged(object sender, ValueChangedEventArgs e)
+		{
+			_offset1 = (float)e.NewValue;
+			UpdateBackground(_offset1, _offset2);
+		}
+
+		void OnOffset2SliderValueChanged(object sender, ValueChangedEventArgs e)
+		{
+			_offset2 = (float)e.NewValue;
+			UpdateBackground(_offset1, _offset2);
+		}
+
+		void UpdateBackground(float offset1, float offset2)
+		{
+			LinearGradientBrush linearGradient = new LinearGradientBrush
+			{
+				StartPoint = new Point(0, 0),
+				EndPoint = new Point(1, 0),
+				GradientStops = new GradientStopCollection
+				{
+					new GradientStop { Color = Color.YellowGreen, Offset = offset1 },
+					new GradientStop { Color = Color.Green, Offset = offset2 }
+				}
+			};
+
+			GradientBoxView.Background = linearGradient;
+			GradientFrame.Background = linearGradient;
+		}
+#endif
+	}
+}