Merge 4.8.0 to 5.0.0

Author: rmarinho

Xamarin.Forms.ControlGallery.WPF/Xamarin.Forms.ControlGallery.WPF.csproj

@@ -7,8 +7,8 @@
     <OutputType>WinExe</OutputType>
     <UseWPF>true</UseWPF>
     <AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
-    <GenerateAssemblyInfo>true</GenerateAssemblyInfo>    
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>  
+    <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <PropertyGroup>
     <NoWarn>$(NoWarn);NU1701</NoWarn>

Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32898.cs

@@ -24,7 +24,7 @@ public class Bugzilla32898 : TestContentPage
 		Label _result;
 		const string Success = "Success";
 		const string Fail = "Fail";
-		const int Timeout = 10000;
+		const int Timeout = 20000;
 
 		protected override void Init()
 		{
@@ -86,7 +86,7 @@ async void StartTrackPage2()
 		[Test]
 		public void Issu32898Test()
 		{
-			var timeout = Timeout + 5000; // Give this a little slop to set the result text
+			var timeout = Timeout; // Give this a little slop to set the result text
 			RunningApp.WaitForElement(Success, timeout: TimeSpan.FromMilliseconds(timeout));
 		}
 #endif

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

@@ -36,7 +36,7 @@
                                     <ColumnDefinition Width="Auto" />
                                     <ColumnDefinition Width="*" />
                                 </Grid.ColumnDefinitions>
-                                <Image Aspect="AspectFill" AutomationId="MonkeyImages">
+                                <Image Aspect="AspectFit" AutomationId="MonkeyImages">
                                     <Image.Source>
                                         <UriImageSource Uri="{Binding Image}" CachingEnabled="False"></UriImageSource>
                                     </Image.Source>

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

@@ -50,15 +50,17 @@ public void MonkiesShouldLoad()
 			{
 				var images = RunningApp.WaitForElement("MonkeyImages");
 
-				if (images[0].Rect.Height < 50 || images[0].Rect.Width < 50)
+				if (images[0].Rect.Height < 20 || images[0].Rect.Width < 20)
 					return null;
 
 				return images;
 			});
 
+			monkeyImages = monkeyImages ?? RunningApp.WaitForElement("MonkeyImages");
+
 			Assert.IsNotNull(monkeyImages);
-			Assert.GreaterOrEqual(monkeyImages[0].Rect.Height, 50);
-			Assert.GreaterOrEqual(monkeyImages[0].Rect.Width, 50);
+			Assert.GreaterOrEqual(monkeyImages[0].Rect.Height, 20);
+			Assert.GreaterOrEqual(monkeyImages[0].Rect.Width, 20);
 		}
 #endif
 	}
@@ -133,8 +135,46 @@ async Task GetMonkeysAsync()
 			try
 			{
 				IsBusy = true;
-				var json = await Client.GetStringAsync("https://montemagno.com/monkeys.json");
-				Monkey[] monkeys = Monkey.FromJson(json);
+				await Task.Delay(500);
+				Monkey[] monkeys = new[]
+				{
+					new Monkey()
+					{
+						Details = "Climbs high buildings and enjoys swatting at planes",
+						Latitude = 42,
+						Longitude = 42,
+						Location = "Empire State Building",
+						Name = "King Kong",
+						Image = "https://github.com/xamarin/Xamarin.Forms/blob/17881ec93d6b3fb0ee5e1a2be46d7eeadef23529/Xamarin.Forms.ControlGallery.Android/Resources/drawable/Fruits.jpg?raw=true"
+					},
+					new Monkey()
+					{
+						Details = "Monkeys aren't donkeys, Quit messing with my head!",
+						Latitude = 42,
+						Longitude = 42,
+						Location = "The 90s",
+						Name = "Donkey Kong",
+						Image = "https://github.com/xamarin/Xamarin.Forms/blob/17881ec93d6b3fb0ee5e1a2be46d7eeadef23529/Xamarin.Forms.ControlGallery.Android/Resources/drawable/FlowerBuds.jpg?raw=true"
+					},
+					new Monkey()
+					{
+						Details = "Grape Ape, Grape Ape! Grape Ape, Grape Ape! Grape Ape, Grape Ape! Grape Ape, Grape Ape!",
+						Latitude = 42,
+						Longitude = 42,
+						Location = "Sunday Mornings",
+						Name = "Grape Ape",
+						Image = "https://github.com/xamarin/Xamarin.Forms/blob/17881ec93d6b3fb0ee5e1a2be46d7eeadef23529/Xamarin.Forms.ControlGallery.Android/Resources/drawable/games.png?raw=true"
+					},
+					new Monkey()
+					{
+						Details = "Pretty but easily persuaded into doing others biddings",
+						Latitude = 42,
+						Longitude = 42,
+						Location = "The Sky",
+						Name = "Flying Monkey",
+						Image = "https://github.com/xamarin/Xamarin.Forms/blob/17881ec93d6b3fb0ee5e1a2be46d7eeadef23529/Xamarin.Forms.ControlGallery.Android/Resources/drawable/gear.png?raw=true"
+					},
+				};
 
 				Monkeys.Clear();
 				foreach (var monkey in monkeys)

Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/PerformanceGallery.cs

@@ -192,7 +192,7 @@ void NextButton_Clicked(object sender, EventArgs e)
 			ViewModel.RunTest(_TestCases[_TestNumber++]);
 		}
 
-#if UITEST
+#if false && UITEST
 
 		double TopThreshold => 1 + Threshold;
 		double BottomThreshold => 1 - Threshold;

Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ShellBackButtonBehavior.cs

@@ -48,7 +48,12 @@ public class BackButtonPage : ContentPage
 		{
 			BackButtonBehavior behavior = new BackButtonBehavior();
 			Entry _commandParameter;
-			Label _commandResult = new Label() { AutomationId = CommandResultId };
+			Label _commandResult = new Label()
+			{
+				AutomationId = CommandResultId,
+				BackgroundColor = Color.LightBlue,
+				Text = "Label"
+			};
 
 			public BackButtonPage()
 			{
@@ -224,13 +229,28 @@ public void CommandTest()
 			RunningApp.EnterText(EntryCommandParameter, "parameter");
 			ShowFlyout();
 
-			var commandResult = RunningApp.WaitForElement(CommandResultId)[0].ReadText();
+			// API 19 workaround
+			var commandResult = RunningApp.QueryUntilPresent(() =>
+			{
+				ShowFlyout();
+				if (RunningApp.WaitForElement(CommandResultId)[0].ReadText() == "parameter")
+					return RunningApp.WaitForElement(CommandResultId);
+
+				return null;
+			})?.FirstOrDefault()?.ReadText();
 
 			Assert.AreEqual("parameter", commandResult);
 			RunningApp.EnterText(EntryCommandParameter, "canexecutetest");
 			RunningApp.Tap(ToggleCommandCanExecuteId);
 
-			commandResult = RunningApp.WaitForElement(CommandResultId)[0].ReadText();
+			commandResult = RunningApp.QueryUntilPresent(() =>
+			{
+				if (RunningApp.WaitForElement(CommandResultId)[0].ReadText() == "parameter")
+					return RunningApp.WaitForElement(CommandResultId);
+
+				return null;
+			})?.FirstOrDefault()?.ReadText();
+
 			Assert.AreEqual("parameter", commandResult);
 		}
 
@@ -241,13 +261,22 @@ public void CommandWorksWhenItsTheOnlyThingSet()
 			RunningApp.Tap(ToggleCommandId);
 			RunningApp.EnterText(EntryCommandParameter, "parameter");
 
+			// API 19 workaround
+			var commandResult = RunningApp.QueryUntilPresent(() =>
+			{
+
 #if __ANDROID__
-			base.TapBackArrow();
+				TapBackArrow();
 #else
-			RunningApp.Tap("Page 0");
+				RunningApp.Tap("Page 0");
 #endif
 
-			var commandResult = RunningApp.WaitForElement(CommandResultId)[0].ReadText();
+				if (RunningApp.WaitForElement(CommandResultId)[0].ReadText() == "parameter")
+					return RunningApp.WaitForElement(CommandResultId);
+
+				return null;
+			})?.FirstOrDefault()?.ReadText();
+
 			Assert.AreEqual(commandResult, "parameter");
 		}
 

Xamarin.Forms.Platform.Android/Extensions/BrushExtensions.cs

@@ -187,16 +187,16 @@ internal static void SetPaintGradient(this AView view, Brush brush)
 				Shape = new RectShape()
 			};
 
+			gradientStrokeDrawable.SetStroke(0, Color.Default.ToAndroid());
+
 			if (brush is SolidColorBrush solidColorBrush)
 			{
 				var color = solidColorBrush.Color.IsDefault ? Color.Default.ToAndroid() : solidColorBrush.Color.ToAndroid();
 				gradientStrokeDrawable.SetColor(color);
 			}
 			else
-			{
-				gradientStrokeDrawable.SetStroke(0, Color.Default.ToAndroid());
 				gradientStrokeDrawable.SetGradient(brush);
-			}
+
 			view.Background?.Dispose();
 			view.Background = gradientStrokeDrawable;
 		}

Xamarin.Forms.Platform.WPF/Properties/AssemblyInfo.cs

@@ -73,4 +73,14 @@
 [assembly: Xamarin.Forms.Dependency(typeof(ResourcesProvider))]
 [assembly: Xamarin.Forms.Dependency(typeof(Deserializer))]
 
-[assembly: AssemblyVersion("2.0.0.0")]
+[assembly: AssemblyVersion("2.0.0.0")]
+[assembly: AssemblyFileVersion(ThisAssembly.Git.BaseVersion.Major + "."
+			+ ThisAssembly.Git.BaseVersion.Minor + "."
+			+ ThisAssembly.Git.BaseVersion.Patch + "."
+			+ ThisAssembly.Git.Commits)]
+[assembly: AssemblyInformationalVersion(ThisAssembly.Git.SemVer.Major + "."
+			+ ThisAssembly.Git.SemVer.Minor + "."
+			+ ThisAssembly.Git.SemVer.Patch
+			+ ThisAssembly.Git.SemVer.DashLabel + "+"
+			+ ThisAssembly.Git.Commits + "-sha."
+			+ ThisAssembly.Git.Commit)]

azure-pipelines.yml

@@ -20,6 +20,7 @@ resources:
       type: github
       name: xamarin/yaml-templates
       endpoint: xamarin
+      ref: refs/heads/main # still defaults to master even though main is the main branch
 
 trigger:
   branches:

build/steps/build-sign.yml

@@ -12,7 +12,7 @@ parameters:
 steps:
   - checkout: none
     clean: true
- 
+
   - template: sign-artifacts/steps/v1.yml@xamarin-templates
     parameters:
       targetFolder: $(Build.ArtifactStagingDirectory)/nuget/signed
@@ -21,6 +21,7 @@ steps:
       jenkinsJob: sign-from-vsts
       artifactHost: 'https://dl.internalx.com/vsts-devdiv'
       githubToken: "$(github--pat--xamarinreleasemanager)"
+      CodeSignOverride: true
 
   - task: PublishBuildArtifacts@1
     displayName: 'Publish Artifact: nuget signed'