[net10.0] Merge main to net10

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -42,7 +42,10 @@ body:
       label: Version with bug
       description: In what version do you see this issue? Run `dotnet workload list` to find your version.
       options:
+        - 10.0.0-preview.3
+        - 10.0.0-preview.2
         - 10.0.0-preview.1
+        - 9.0.60 SR6
         - 9.0.50 SR5
         - 9.0.40 SR4
         - 9.0.30 SR3
@@ -165,7 +168,10 @@ body:
         - 9.0.30 SR3
         - 9.0.40 SR4
         - 9.0.50 SR5
+        - 9.0.60 SR6
         - 10.0.0-preview.1
+        - 10.0.0-preview.2
+        - 10.0.0-preview.3
     validations:
       required: true
   - type: dropdown

src/Controls/tests/TestCases.HostApp/Issues/Issue10222.cs

@@ -64,9 +64,7 @@ async void InitCV()
 
 					cv.ScrollTo(items.Count - 1);
 
-					//give the cv time to scroll
-					var rand = new Random();
-					await Task.Delay(rand.Next(10, 200));
+					await Task.Delay(200);
 
 					await Navigation.PopAsync(false);
 

src/Controls/tests/TestCases.Shared.Tests/Tests/DragAndDropUITests.cs

@@ -360,6 +360,12 @@ public void DropEventCoordinates()
 			App.WaitForElement("Green");
 			App.DragAndDrop("Blue", "Green");
 
+			// Wait for all UI elements to confirm drag and drop operation completion
+			App.WaitForElement("DropRelativeLayout");
+			App.WaitForElement("DropRelativeScreen");
+			App.WaitForElement("DropRelativeLabel");
+			App.WaitForElement("DragStartRelativeScreen");
+
 			var dropRelativeToLayout = GetCoordinatesFromLabel(App.FindElement("DropRelativeLayout").GetText());
 			var dropRelativeToScreen = GetCoordinatesFromLabel(App.FindElement("DropRelativeScreen").GetText());
 			var dropRelativeToLabel = GetCoordinatesFromLabel(App.FindElement("DropRelativeLabel").GetText());

src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue10222.cs

@@ -18,8 +18,8 @@ public void Issue10222Test()
 	{
 		App.WaitForElement("goTo");
 		App.Tap("goTo");
-		App.WaitForElement("items1");
-		App.WaitForElement("goTo");
+		App.WaitForElement("items1", timeout: TimeSpan.FromSeconds(1));
+		App.WaitForElement("goTo", timeout: TimeSpan.FromSeconds(2));
 	}
 }
 #endif

src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/XFIssue/ShellInsets.cs

@@ -129,6 +129,7 @@ public void PaddingWithoutSafeArea()
 		Assert.That(zeroPadding, Is.EqualTo(1));
 		App.WaitForElement(ResetButton);
 		App.Tap(ResetButton);
+	    App.WaitForElement(PaddingEntry);
 		App.EnterText(PaddingEntry, "100");
 		App.WaitForElement(PaddingTest);
 		App.Tap(PaddingTest);