From 4a9b908be5c4f749578d99ef7536d1f114eccd6c Mon Sep 17 00:00:00 2001
From: Ryan Davis <ryandavis.au@gmail.com>
Date: Thu, 15 Jun 2023 13:08:54 +1000
Subject: [PATCH 001/105] [essentials] ensure WebUtils.ParseQueryString
 captures fragment parameters

---
 .../src/Types/Shared/WebUtils.shared.cs       | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/Essentials/src/Types/Shared/WebUtils.shared.cs b/src/Essentials/src/Types/Shared/WebUtils.shared.cs
index c72ec2894ac6..2654b0b63e50 100644
--- a/src/Essentials/src/Types/Shared/WebUtils.shared.cs
+++ b/src/Essentials/src/Types/Shared/WebUtils.shared.cs
@@ -6,21 +6,31 @@ namespace Microsoft.Maui.ApplicationModel
 {
 	static class WebUtils
 	{
-		// The following method is a port of the logic found in https://source.dot.net/#Microsoft.AspNetCore.WebUtilities/src/Shared/QueryStringEnumerable.cs
-		// but refactored such that it:
-		//
-		// 1. avoids the IEnumerable overhead that isn't needed (the ASP.NET logic was clearly designed that way to offer a public API whereas we don't need that)
-		// 2. avoids the use of unsafe code
 		internal static IDictionary<string, string> ParseQueryString(Uri uri)
 		{
 			var parameters = new Dictionary<string, string>(StringComparer.Ordinal);
 
-			if (uri == null || string.IsNullOrEmpty(uri.Query))
+			if (uri == null)
 				return parameters;
 
 			// Note: Uri.Query starts with a '?'
-			var query = uri.Query.AsSpan(1);
+			if (!string.IsNullOrEmpty(uri.Query))
+				UnpackParameters(uri.Query.AsSpan(1), parameters);
+
+			// Note: Uri.Fragment starts with a '#'
+			if (!string.IsNullOrEmpty(uri.Fragment))
+				UnpackParameters(uri.Fragment.AsSpan(1), parameters);
+
+			return parameters;
+		}
 
+		// The following method is a port of the logic found in https://source.dot.net/#Microsoft.AspNetCore.WebUtilities/src/Shared/QueryStringEnumerable.cs
+		// but refactored such that it:
+		//
+		// 1. avoids the IEnumerable overhead that isn't needed (the ASP.NET logic was clearly designed that way to offer a public API whereas we don't need that)
+		// 2. avoids the use of unsafe code
+		static void UnpackParameters(ReadOnlySpan<char> query, Dictionary<string, string> parameters)
+		{
 			while (!query.IsEmpty)
 			{
 				int delimeterIndex = query.IndexOf('&');
@@ -66,8 +76,6 @@ internal static IDictionary<string, string> ParseQueryString(Uri uri)
 					parameters[name] = Uri.UnescapeDataString(value);
 				}
 			}
-
-			return parameters;
 		}
 
 		internal static Uri EscapeUri(Uri uri)

From 1ee73e85a398eb6f6d8ea4a7fc24a65f5cfd2a97 Mon Sep 17 00:00:00 2001
From: Rui Marinho <me@ruimarinho.net>
Date: Thu, 15 Jun 2023 11:27:49 +0100
Subject: [PATCH 002/105] [main] Updates to new released packages (#15648)

* Bump Microsoft.AspNetCore.Components.WebView from 7.0.5 to 7.0.7

Bumps [Microsoft.AspNetCore.Components.WebView](https://github.com/dotnet/aspnetcore) from 7.0.5 to 7.0.7.
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Changelog](https://github.com/dotnet/aspnetcore/blob/main/docs/ReleasePlanning.md)
- [Commits](https://github.com/dotnet/aspnetcore/compare/v7.0.5...v7.0.7)

---
updated-dependencies:
- dependency-name: Microsoft.AspNetCore.Components.WebView
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bumps to 7.0.7

* Update Versions.props

* Revert sdk bump

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 eng/Versions.props | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 955f0a4456ef..3e6b2282427b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -5,7 +5,7 @@
     <!-- dotnet/installer -->
     <MicrosoftDotnetSdkInternalPackageVersion>7.0.203</MicrosoftDotnetSdkInternalPackageVersion>
     <!-- dotnet/runtime -->
-    <MicrosoftNETCoreAppRefPackageVersion>7.0.5</MicrosoftNETCoreAppRefPackageVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>7.0.7</MicrosoftNETCoreAppRefPackageVersion>
     <!-- NOTE: should eventually revert back to $(MicrosoftNETCoreAppRefPackageVersion) in .NET 7 -->
     <MicrosoftExtensionsPackageVersion>7.0.0</MicrosoftExtensionsPackageVersion>
     <MicrosoftExtensionsServicingPackageVersion>7.0.0</MicrosoftExtensionsServicingPackageVersion>
@@ -20,24 +20,24 @@
     <!-- Samsung/Tizen.NET -->
     <SamsungTizenSdkPackageVersion>7.0.105</SamsungTizenSdkPackageVersion>
     <!-- emsdk -->
-    <MicrosoftNETWorkloadEmscriptenPackageVersion>7.0.5</MicrosoftNETWorkloadEmscriptenPackageVersion>
+    <MicrosoftNETWorkloadEmscriptenPackageVersion>7.0.7</MicrosoftNETWorkloadEmscriptenPackageVersion>
     <!-- wasdk -->
     <MicrosoftWindowsAppSDKPackageVersion>1.3.230502000</MicrosoftWindowsAppSDKPackageVersion>
     <MicrosoftWindowsSDKBuildToolsPackageVersion>10.0.22621.756</MicrosoftWindowsSDKBuildToolsPackageVersion>
     <MicrosoftGraphicsWin2DPackageVersion>1.0.5.1</MicrosoftGraphicsWin2DPackageVersion>
     <!-- Everything else -->
-    <MicrosoftAspNetCoreAuthorizationPackageVersion>7.0.5</MicrosoftAspNetCoreAuthorizationPackageVersion>
-    <MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>7.0.5</MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>
-    <MicrosoftAspNetCoreAuthorizationPackageVersion>7.0.5</MicrosoftAspNetCoreAuthorizationPackageVersion>
-    <MicrosoftAspNetCoreAuthenticationGooglePackageVersion>7.0.5</MicrosoftAspNetCoreAuthenticationGooglePackageVersion>
-    <MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>7.0.5</MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>
+    <MicrosoftAspNetCoreAuthorizationPackageVersion>7.0.7</MicrosoftAspNetCoreAuthorizationPackageVersion>
+    <MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>7.0.7</MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>
+    <MicrosoftAspNetCoreAuthorizationPackageVersion>7.0.7</MicrosoftAspNetCoreAuthorizationPackageVersion>
+    <MicrosoftAspNetCoreAuthenticationGooglePackageVersion>7.0.7</MicrosoftAspNetCoreAuthenticationGooglePackageVersion>
+    <MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>7.0.7</MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>
     <MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>7.0.1</MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>
     <MicrosoftAspNetCoreComponentsFormsPackageVersion>7.0.1</MicrosoftAspNetCoreComponentsFormsPackageVersion>
     <MicrosoftAspNetCoreComponentsPackageVersion>7.0.1</MicrosoftAspNetCoreComponentsPackageVersion>
-    <MicrosoftAspNetCoreComponentsWebPackageVersion>7.0.5</MicrosoftAspNetCoreComponentsWebPackageVersion>
-    <MicrosoftAspNetCoreComponentsWebViewPackageVersion>7.0.5</MicrosoftAspNetCoreComponentsWebViewPackageVersion>
+    <MicrosoftAspNetCoreComponentsWebPackageVersion>7.0.7</MicrosoftAspNetCoreComponentsWebPackageVersion>
+    <MicrosoftAspNetCoreComponentsWebViewPackageVersion>7.0.7</MicrosoftAspNetCoreComponentsWebViewPackageVersion>
     <MicrosoftAspNetCoreMetadataPackageVersion>7.0.1</MicrosoftAspNetCoreMetadataPackageVersion>
-    <MicrosoftJSInteropPackageVersion>7.0.5</MicrosoftJSInteropPackageVersion>
+    <MicrosoftJSInteropPackageVersion>7.0.7</MicrosoftJSInteropPackageVersion>
     <!-- Other packages -->
     <MicrosoftCodeAnalysisNetAnalyzersVersion>7.0.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
     <MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.3.4</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>

From 6dde0556a561f0564c709869114390bc92b25e8b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Jun 2023 11:36:56 +0100
Subject: [PATCH 003/105] Bump Microsoft.WindowsAppSDK from 1.3.230502000 to
 1.3.230602002 (#15639)

Bumps [Microsoft.WindowsAppSDK](https://github.com/microsoft/windowsappsdk) from 1.3.230502000 to 1.3.230602002.
- [Release notes](https://github.com/microsoft/windowsappsdk/releases)
- [Commits](https://github.com/microsoft/windowsappsdk/commits)

---
updated-dependencies:
- dependency-name: Microsoft.WindowsAppSDK
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 3e6b2282427b..c072d58788fc 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -22,7 +22,7 @@
     <!-- emsdk -->
     <MicrosoftNETWorkloadEmscriptenPackageVersion>7.0.7</MicrosoftNETWorkloadEmscriptenPackageVersion>
     <!-- wasdk -->
-    <MicrosoftWindowsAppSDKPackageVersion>1.3.230502000</MicrosoftWindowsAppSDKPackageVersion>
+    <MicrosoftWindowsAppSDKPackageVersion>1.3.230602002</MicrosoftWindowsAppSDKPackageVersion>
     <MicrosoftWindowsSDKBuildToolsPackageVersion>10.0.22621.756</MicrosoftWindowsSDKBuildToolsPackageVersion>
     <MicrosoftGraphicsWin2DPackageVersion>1.0.5.1</MicrosoftGraphicsWin2DPackageVersion>
     <!-- Everything else -->

From 2d50fc8873627caced4ade0a5939a90fc21331a7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Jun 2023 11:37:44 +0100
Subject: [PATCH 004/105] Bump System.Text.Json from 7.0.2 to 7.0.3 (#15641)

Bumps [System.Text.Json](https://github.com/dotnet/runtime) from 7.0.2 to 7.0.3.
- [Release notes](https://github.com/dotnet/runtime/releases)
- [Commits](https://github.com/dotnet/runtime/compare/v7.0.2...v7.0.3)

---
updated-dependencies:
- dependency-name: System.Text.Json
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index c072d58788fc..ddefcbc5c010 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -45,7 +45,7 @@
     <SystemNumericsVectorsVersion>4.5.0</SystemNumericsVectorsVersion>
     <SystemMemoryPackageVersion>4.5.5</SystemMemoryPackageVersion>
     <SystemBuffersPackageVersion>4.5.1</SystemBuffersPackageVersion>
-    <SystemTextJsonPackageVersion>7.0.2</SystemTextJsonPackageVersion>
+    <SystemTextJsonPackageVersion>7.0.3</SystemTextJsonPackageVersion>
     <SystemTextEncodingsWebPackageVersion>7.0.0</SystemTextEncodingsWebPackageVersion>
     <MicrosoftBclAsyncInterfacesPackageVersion>7.0.0</MicrosoftBclAsyncInterfacesPackageVersion>
     <SystemIOUnmanagedMemoryStreamPackageVersion>4.3.0</SystemIOUnmanagedMemoryStreamPackageVersion>

From 601fa4496375ba1e4385f95681d1c6f83c919222 Mon Sep 17 00:00:00 2001
From: "E.Z. Hart" <hartez@users.noreply.github.com>
Date: Thu, 15 Jun 2023 05:42:46 -0500
Subject: [PATCH 005/105] Fix sizing issues with CollectionView on Windows
 (#15587)

---
 .../Handlers/Items/ItemsViewHandler.Windows.cs   | 13 ++++++++++++-
 .../Windows/CollectionView/ItemsViewStyles.xaml  |  2 +-
 .../CollectionView/CollectionViewTests.cs        | 16 +++++++++-------
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/Controls/src/Core/Handlers/Items/ItemsViewHandler.Windows.cs b/src/Controls/src/Core/Handlers/Items/ItemsViewHandler.Windows.cs
index f6f742941c6a..70b906abc9bc 100644
--- a/src/Controls/src/Core/Handlers/Items/ItemsViewHandler.Windows.cs
+++ b/src/Controls/src/Core/Handlers/Items/ItemsViewHandler.Windows.cs
@@ -337,8 +337,19 @@ void ListViewLoaded(object sender, RoutedEventArgs e)
 
 		void UpdateVerticalScrollBarVisibility()
 		{
+			if (Element.VerticalScrollBarVisibility != ScrollBarVisibility.Default)
+			{
+				// If the value is changing to anything other than the default, record the default 
+				if (_defaultVerticalScrollVisibility == null)
+					_defaultVerticalScrollVisibility = ScrollViewer.GetVerticalScrollBarVisibility(Control);
+			}
+
 			if (_defaultVerticalScrollVisibility == null)
-				_defaultVerticalScrollVisibility = ScrollViewer.GetVerticalScrollBarVisibility(Control);
+			{
+				// If the default has never been recorded, then this has never been set to anything but the 
+				// default value; there's nothing to do.
+				return;
+			}
 
 			switch (Element.VerticalScrollBarVisibility)
 			{
diff --git a/src/Controls/src/Core/Platform/Windows/CollectionView/ItemsViewStyles.xaml b/src/Controls/src/Core/Platform/Windows/CollectionView/ItemsViewStyles.xaml
index e0b416e109c0..edc6f6fbed7e 100644
--- a/src/Controls/src/Core/Platform/Windows/CollectionView/ItemsViewStyles.xaml
+++ b/src/Controls/src/Core/Platform/Windows/CollectionView/ItemsViewStyles.xaml
@@ -99,7 +99,7 @@
     get to a point where we don't have to support these earlier versions, we can replace this style with just the 
     template. (See also FormsGridView.cs) -->
     <Style TargetType="local:FormsGridView">
-        <Setter Property="Padding" Value="0,0,0,10" />
+        <Setter Property="Padding" Value="0,0,0,0" />
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="TabNavigation" Value="Once" />
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
diff --git a/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.cs b/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.cs
index dbfa70b09cd0..cb60179cdd00 100644
--- a/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.cs
@@ -111,6 +111,7 @@ public async Task CollectionViewCanSizeToContent(CollectionViewSizingTestCase te
 			var collectionView = new CollectionView
 			{
 				ItemsLayout = itemsLayout,
+				Background = Colors.Red,
 				ItemTemplate = new DataTemplate(() => new Label() { HeightRequest = templateHeight, WidthRequest = templateWidth }),
 			};
 
@@ -142,6 +143,13 @@ await CreateHandlerAndAddToWindow<LayoutHandler>(layout, async handler =>
 					await WaitForUIUpdate(frame, collectionView);
 					frame = collectionView.Frame;
 
+#if WINDOWS
+					// On Windows, the ListView pops in and changes the frame, then actually
+					// loads in the data, which updates it again. So we need to wait for the second
+					// update before checking the size
+					await WaitForUIUpdate(frame, collectionView);
+					frame = collectionView.Frame;
+#endif
 					double expectedWidth = layoutOptions == LayoutOptions.Fill
 						? containerWidth
 						: Math.Min(itemsCount * templateWidth, containerWidth);
@@ -164,13 +172,7 @@ await CreateHandlerAndAddToWindow<LayoutHandler>(layout, async handler =>
 
 		public static IEnumerable<object[]> GenerateLayoutOptionsCombos()
 		{
-			var layoutOptions = new LayoutOptions[] {
-
-#if !WINDOWS
-				LayoutOptions.Center, LayoutOptions.Start, LayoutOptions.End,
-#endif
-
-				LayoutOptions.Fill };
+			var layoutOptions = new LayoutOptions[] { LayoutOptions.Center, LayoutOptions.Start, LayoutOptions.End, LayoutOptions.Fill };
 
 			foreach (var option in layoutOptions)
 			{

From cb4cbd477fe6fb86ab2b3f25f8293ed39f8d8c5a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Jun 2023 21:49:38 +0100
Subject: [PATCH 006/105] Bump Microsoft.CodeAnalysis.NetAnalyzers from 7.0.1
 to 7.0.3 (#15680)

Bumps [Microsoft.CodeAnalysis.NetAnalyzers](https://github.com/dotnet/roslyn-analyzers) from 7.0.1 to 7.0.3.
- [Release notes](https://github.com/dotnet/roslyn-analyzers/releases)
- [Changelog](https://github.com/dotnet/roslyn-analyzers/blob/main/PostReleaseActivities.md)
- [Commits](https://github.com/dotnet/roslyn-analyzers/commits)

---
updated-dependencies:
- dependency-name: Microsoft.CodeAnalysis.NetAnalyzers
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index ddefcbc5c010..10a2423f9da8 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -39,7 +39,7 @@
     <MicrosoftAspNetCoreMetadataPackageVersion>7.0.1</MicrosoftAspNetCoreMetadataPackageVersion>
     <MicrosoftJSInteropPackageVersion>7.0.7</MicrosoftJSInteropPackageVersion>
     <!-- Other packages -->
-    <MicrosoftCodeAnalysisNetAnalyzersVersion>7.0.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
+    <MicrosoftCodeAnalysisNetAnalyzersVersion>7.0.3</MicrosoftCodeAnalysisNetAnalyzersVersion>
     <MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.3.4</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
     <MicrosoftCodeAnalysisBannedApiAnalyzersVersion>3.3.4</MicrosoftCodeAnalysisBannedApiAnalyzersVersion>
     <SystemNumericsVectorsVersion>4.5.0</SystemNumericsVectorsVersion>

From cc1730a6addd2b285d7f493b35e87f307019b636 Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Fri, 16 Jun 2023 11:05:08 -0500
Subject: [PATCH 007/105] Workaround WinUI bug with adding/removing flyouts
 (#14985)

---
 .../Pages/Core/ContextFlyoutPage.xaml         |  4 +-
 .../Pages/Core/ContextFlyoutPage.xaml.cs      | 40 ++++++++--
 .../MenuFlyoutHandler.Windows.cs              | 13 ++++
 .../MenuFlyoutSubItemHandler.Windows.cs       | 75 ++++++++++++++-----
 .../net-windows/PublicAPI.Unshipped.txt       |  1 +
 5 files changed, 110 insertions(+), 23 deletions(-)

diff --git a/src/Controls/samples/Controls.Sample/Pages/Core/ContextFlyoutPage.xaml b/src/Controls/samples/Controls.Sample/Pages/Core/ContextFlyoutPage.xaml
index 7893db160737..37c516b0f831 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Core/ContextFlyoutPage.xaml
+++ b/src/Controls/samples/Controls.Sample/Pages/Core/ContextFlyoutPage.xaml
@@ -30,9 +30,11 @@
                 <FlyoutBase.ContextFlyout>
                     <MenuFlyout>
                         <MenuFlyoutItem Text="Add top-level menu items" Clicked="OnAddMenuClicked"></MenuFlyoutItem>
-                        <MenuFlyoutSubItem Text="Sub menu items go in here">
+                        <MenuFlyoutSubItem Text="Sub menu items go in here" x:Name="subMenu">
                             <MenuFlyoutItem Text="Add sub menu items below here" Clicked="OnAddSubMenuClicked"></MenuFlyoutItem>
                             <MenuFlyoutSeparator />
+                            <MenuFlyoutSeparator />
+                            <MenuFlyoutItem Text="Remove sub menu item above here" Clicked="OnRemoveSubMenuClicked" x:Name="removeSubMenuItems" IsEnabled="False"></MenuFlyoutItem>
                         </MenuFlyoutSubItem>
                     </MenuFlyout>
                 </FlyoutBase.ContextFlyout>
diff --git a/src/Controls/samples/Controls.Sample/Pages/Core/ContextFlyoutPage.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/Core/ContextFlyoutPage.xaml.cs
index 01e6f34eec8a..a0918215966a 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Core/ContextFlyoutPage.xaml.cs
+++ b/src/Controls/samples/Controls.Sample/Pages/Core/ContextFlyoutPage.xaml.cs
@@ -150,18 +150,48 @@ void OnAddMenuClicked(object sender, EventArgs e)
 		void OnAddSubMenuClicked(object sender, EventArgs e)
 		{
 			var subMenu = (MenuFlyoutSubItem)((MenuFlyoutItem)sender).Parent;
-			AddNewMenu(subMenu, "sub-menu");
+			AddNewMenu(subMenu, "sub-menu", subMenu.Count - 2, subMenu.Count % 2 == 0);
+			CheckSubMenu();
+		}
+		void OnRemoveSubMenuClicked(object sender, EventArgs e)
+		{
+			var subMenu = (MenuFlyoutSubItem)((MenuFlyoutItem)sender).Parent;
+			subMenu.RemoveAt(subMenu.Count - 3);
+			CheckSubMenu();
 		}
 
-		private void AddNewMenu(IList<IMenuElement> parent, string newItemType)
+		void CheckSubMenu()
+		{
+			removeSubMenuItems.IsEnabled = subMenu.Count > 4;
+		}
+
+		private void AddNewMenu(IList<IMenuElement> parent, string newItemType, int index = -1, bool subMenuItem = false)
 		{
 			var newItemLocalValue = newMenuItemCount;
-			var newMenuItem = new MenuFlyoutItem() { Text = $"New {newItemType} menu item #{newItemLocalValue}" };
-			newMenuItem.Clicked += (s, e) => DisplayAlert(
+			IMenuElement newMenuItem;
+			MenuFlyoutItem mfi = new MenuFlyoutItem() { Text = $"New {newItemType} menu item #{newItemLocalValue}" };
+
+			mfi.Clicked += (s, e) => DisplayAlert(
 				title: "New Menu Item Click",
 				message: $"The new menu item {newItemLocalValue} was clicked",
 				cancel: "OK");
-			parent.Add(newMenuItem);
+
+			if (!subMenuItem)
+			{
+				newMenuItem = mfi;
+			}
+			else
+			{
+				var subItem = new MenuFlyoutSubItem() { Text = $"New {newItemType} menu item #{newItemLocalValue}" };
+				newMenuItem = subItem;
+				subItem.Add(mfi);
+			}
+
+			if (index == -1)
+				parent.Add(newMenuItem);
+			else
+				parent.Insert(index, newMenuItem);
+
 			newMenuItemCount++;
 		}
 	}
diff --git a/src/Core/src/Handlers/MenuFlyoutHandler/MenuFlyoutHandler.Windows.cs b/src/Core/src/Handlers/MenuFlyoutHandler/MenuFlyoutHandler.Windows.cs
index 8e0616c31225..13d0fd4ebb61 100644
--- a/src/Core/src/Handlers/MenuFlyoutHandler/MenuFlyoutHandler.Windows.cs
+++ b/src/Core/src/Handlers/MenuFlyoutHandler/MenuFlyoutHandler.Windows.cs
@@ -9,6 +9,19 @@ protected override MenuFlyout CreatePlatformElement()
 			return new MenuFlyout();
 		}
 
+		protected override void DisconnectHandler(MenuFlyout platformView)
+		{
+			if (VirtualView is not null)
+			{
+				foreach (var item in VirtualView)
+				{
+					item.Handler?.DisconnectHandler();
+				}
+			}
+
+			base.DisconnectHandler(platformView);
+		}
+
 		public override void SetVirtualView(IElement view)
 		{
 			base.SetVirtualView(view);
diff --git a/src/Core/src/Handlers/MenuFlyoutSubItem/MenuFlyoutSubItemHandler.Windows.cs b/src/Core/src/Handlers/MenuFlyoutSubItem/MenuFlyoutSubItemHandler.Windows.cs
index 290a79face70..0a514b39801f 100644
--- a/src/Core/src/Handlers/MenuFlyoutSubItem/MenuFlyoutSubItemHandler.Windows.cs
+++ b/src/Core/src/Handlers/MenuFlyoutSubItem/MenuFlyoutSubItemHandler.Windows.cs
@@ -15,6 +15,14 @@ protected override MenuFlyoutSubItem CreatePlatformElement()
 
 		protected override void DisconnectHandler(MenuFlyoutSubItem PlatformView)
 		{
+			if (VirtualView is not null)
+			{
+				foreach (var item in VirtualView)
+				{
+					item.Handler?.DisconnectHandler();
+				}
+			}
+
 			base.DisconnectHandler(PlatformView);
 			PlatformView.Tapped -= OnTapped;
 		}
@@ -47,33 +55,66 @@ public static void MapSource(IMenuFlyoutSubItemHandler handler, IMenuFlyoutSubIt
 		public override void SetVirtualView(IElement view)
 		{
 			base.SetVirtualView(view);
-			Clear();
+			PlatformView.Items.Clear();
 
 			foreach (var item in ((IMenuFlyoutSubItem)view))
 			{
-				Add(item);
+				PlatformView.Items.Add((MenuFlyoutItemBase)item.ToPlatform(MauiContext!));
 			}
 		}
 
-		public void Add(IMenuElement view)
+		// workaround WinUI bug https://github.com/microsoft/microsoft-ui-xaml/issues/7797
+		void Reset()
 		{
-			PlatformView.Items.Add((MenuFlyoutItemBase)view.ToPlatform(MauiContext!));
-		}
+			if (VirtualView.Parent?.Handler is IElementHandler pvh)
+			{
+				var vv = VirtualView;
+				IList<MenuFlyoutItemBase>? items = null;
+				if (pvh.PlatformView is MenuFlyout mf)
+				{
+					items = mf.Items;
 
-		public void Remove(IMenuElement view)
-		{
-			if (view.Handler != null)
-				PlatformView.Items.Remove((MenuFlyoutItemBase)view.ToPlatform());
-		}
+				}
+				else if (pvh.PlatformView is MenuFlyoutSubItem mfsi)
+				{
+					items = mfsi.Items;
+				}
 
-		public void Clear()
-		{
-			PlatformView.Items.Clear();
-		}
+				if (items is not null)
+				{
+					var index = items.IndexOf(PlatformView);
 
-		public void Insert(int index, IMenuElement view)
-		{
-			PlatformView.Items.Insert(index, (MenuFlyoutItemBase)view.ToPlatform(MauiContext!));
+					if (index < 0)
+						return;
+
+					items.RemoveAt(index);
+
+					// You have to create the entire menu whenever adding/removing items.
+					// I tried to just remove and re-add this one item from the parent but that doesn't work.
+					// Also, if you try to reuse any MenuFlyoutItems on the new control it crashes.
+					//
+					// The following code crashes with a catastrophic failure.
+					//
+					// oldMenu.Items.Remove(item);					
+					// newMenu.Items.Add(item); 
+					// You have to create a new MenuFlyoutSubMenuItem and all of the children
+
+					vv.Handler?.DisconnectHandler();
+					items.Insert(index, (MenuFlyoutItemBase)vv.ToPlatform(MauiContext!));
+				}
+			}
 		}
+
+		public void Add(IMenuElement view) =>
+			Reset();
+
+		public void Remove(IMenuElement view) =>
+			Reset();
+
+		public void Clear() =>
+			Reset();
+
+		public void Insert(int index, IMenuElement view) =>
+			Reset();
 	}
 }
diff --git a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index 0c58a2568dd1..d65de1abcc17 100644
--- a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -17,6 +17,7 @@ Microsoft.Maui.Platform.ImageSourcePartLoader.ImageSourcePartLoader(Microsoft.Ma
 Microsoft.Maui.Platform.MauiWebView.MauiWebView(Microsoft.Maui.Handlers.WebViewHandler! handler) -> void
 Microsoft.Maui.SizeRequest.Equals(Microsoft.Maui.SizeRequest other) -> bool
 override Microsoft.Maui.Handlers.ContentViewHandler.DisconnectHandler(Microsoft.Maui.Platform.ContentPanel! platformView) -> void
+override Microsoft.Maui.Handlers.MenuFlyoutHandler.DisconnectHandler(Microsoft.UI.Xaml.Controls.MenuFlyout! platformView) -> void
 override Microsoft.Maui.Layouts.FlexBasis.Equals(object? obj) -> bool
 override Microsoft.Maui.Layouts.FlexBasis.GetHashCode() -> int
 override Microsoft.Maui.SizeRequest.Equals(object? obj) -> bool

From 68f968eba61b2809fc0e9b01a275266a80946951 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 17 Jun 2023 17:08:52 +0100
Subject: [PATCH 008/105] Bump Markdig from 0.23.0 to 0.31.0 (#15702)

Bumps [Markdig](https://github.com/xoofx/markdig) from 0.23.0 to 0.31.0.
- [Release notes](https://github.com/xoofx/markdig/releases)
- [Changelog](https://github.com/xoofx/markdig/blob/master/changelog.md)
- [Commits](https://github.com/xoofx/markdig/compare/0.23.0...0.31.0)

---
updated-dependencies:
- dependency-name: Markdig
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .../GraphicsTester.Portable/GraphicsTester.Portable.csproj    | 4 ++--
 src/Graphics/src/Text.Markdig/Graphics.Text.Markdig.csproj    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Graphics/samples/GraphicsTester.Portable/GraphicsTester.Portable.csproj b/src/Graphics/samples/GraphicsTester.Portable/GraphicsTester.Portable.csproj
index 3b45fb164aa8..fbab8c2627cb 100644
--- a/src/Graphics/samples/GraphicsTester.Portable/GraphicsTester.Portable.csproj
+++ b/src/Graphics/samples/GraphicsTester.Portable/GraphicsTester.Portable.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;$(_MauiDotNetTfm)</TargetFrameworks>
@@ -20,7 +20,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Markdig" Version="0.23.0" />
+    <PackageReference Include="Markdig" Version="0.31.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Graphics/src/Text.Markdig/Graphics.Text.Markdig.csproj b/src/Graphics/src/Text.Markdig/Graphics.Text.Markdig.csproj
index fe92927c5650..78825c0168a9 100644
--- a/src/Graphics/src/Text.Markdig/Graphics.Text.Markdig.csproj
+++ b/src/Graphics/src/Text.Markdig/Graphics.Text.Markdig.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Markdig" Version="0.23.0" />
+    <PackageReference Include="Markdig" Version="0.31.0" />
   </ItemGroup>
 
   <ItemGroup>

From c3f0b154f71bc03f7f866ca3bbc5656ab71abe58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Su=C3=A1rez?= <javiersuarezruiz@hotmail.com>
Date: Mon, 19 Jun 2023 11:50:59 +0200
Subject: [PATCH 009/105] Allow to remove the Image from iOS Button (#15624)

---
 .../Controls.Sample/Pages/Controls/ButtonPage.xaml   |  5 +++--
 .../Pages/Controls/ButtonPage.xaml.cs                | 12 ++++++++++++
 src/Core/src/Handlers/Button/ButtonHandler.iOS.cs    |  5 -----
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/ButtonPage.xaml b/src/Controls/samples/Controls.Sample/Pages/Controls/ButtonPage.xaml
index de275c254669..897238a8ee38 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/ButtonPage.xaml
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/ButtonPage.xaml
@@ -130,9 +130,10 @@
                 <Label
                     Text="Image Source"
                     Style="{StaticResource Headline}"/>
-                <Button 
+                <Button
+                    x:Name="ImageSourceButton"
                     ContentLayout="Top" TextColor="White" Background="Black" 
-                    ImageSource="settings.png" />
+                    ImageSource="settings.png" Clicked="Button_Clicked" />
                 <Label
                     Text="Image Source with Positioning"
                     Style="{StaticResource Headline}"/>
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/ButtonPage.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/Controls/ButtonPage.xaml.cs
index 8d1382b321bc..0bdd5c9db9c5 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/ButtonPage.xaml.cs
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/ButtonPage.xaml.cs
@@ -21,6 +21,18 @@ void OnButtonClicked(object sender, System.EventArgs e)
 			Debug.WriteLine("Clicked");
 		}
 
+		void Button_Clicked(System.Object sender, System.EventArgs e)
+		{
+			if (ImageSourceButton.ImageSource is null)
+			{
+				ImageSourceButton.ImageSource = "settings.png";
+			}
+			else
+			{
+				ImageSourceButton.ImageSource = null;
+			}
+		}
+
 		void OnPositionChange(object sender, System.EventArgs e)
 		{
 			var newPosition = ((int)positionChange.ContentLayout.Position) + 1;
diff --git a/src/Core/src/Handlers/Button/ButtonHandler.iOS.cs b/src/Core/src/Handlers/Button/ButtonHandler.iOS.cs
index fad540b53836..fe8c3cca6d4e 100644
--- a/src/Core/src/Handlers/Button/ButtonHandler.iOS.cs
+++ b/src/Core/src/Handlers/Button/ButtonHandler.iOS.cs
@@ -146,11 +146,6 @@ public static void MapImageSource(IButtonHandler handler, IImage image) =>
 
 		public static Task MapImageSourceAsync(IButtonHandler handler, IImage image)
 		{
-			if (image.Source == null)
-			{
-				return Task.CompletedTask;
-			}
-
 			return handler.ImageSourceLoader.UpdateImageSourceAsync();
 		}
 

From 439d6e663531b5584638db53680d3fd2bf286b02 Mon Sep 17 00:00:00 2001
From: MartyIX <203266+MartyIX@users.noreply.github.com>
Date: Mon, 19 Jun 2023 13:14:11 +0200
Subject: [PATCH 010/105] Disable for Mac Catalyst (#13814) 11744

---
 src/Essentials/src/FilePicker/FilePicker.ios.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Essentials/src/FilePicker/FilePicker.ios.cs b/src/Essentials/src/FilePicker/FilePicker.ios.cs
index 13039e914d4f..c27803341e12 100644
--- a/src/Essentials/src/FilePicker/FilePicker.ios.cs
+++ b/src/Essentials/src/FilePicker/FilePicker.ios.cs
@@ -38,11 +38,13 @@ async Task<IEnumerable<FileResult>> PlatformPickAsync(PickOptions options, bool
 				PickHandler = urls => GetFileResults(urls, tcs)
 			};
 
+#if !MACCATALYST
 			if (documentPicker.PresentationController != null)
 			{
 				documentPicker.PresentationController.Delegate =
 					new UIPresentationControllerDelegate(() => GetFileResults(null, tcs));
 			}
+#endif
 
 			var parentController = WindowStateManager.Default.GetCurrentUIViewController(true);
 

From dd7809058b8527056617671e1029b9d48c943ba4 Mon Sep 17 00:00:00 2001
From: Kangho Hur <kangho.hur@samsung.com>
Date: Mon, 19 Jun 2023 20:48:24 +0900
Subject: [PATCH 011/105] Update CODEOWNERS (#15008)

---
 .github/CODEOWNERS | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 9ba5ca99c686..5bfcacdcc7dc 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,11 +1,7 @@
 # Tizen
-/Xamarin.Forms.ControlGallery.Tizen/ @rookiejava
-/Stubs/Xamarin.Forms.Platform.Tizen/ @rookiejava
-/Xamarin.Forms.Platform.Tizen/ @rookiejava
-/Xamarin.Forms.Maps.Tizen/ @rookiejava
-/EmbeddingTestBeds/Embedding.Tizen/ @rookiejava
-/PagesGallery/PagesGallery.Tizen/ @rookiejava
-/Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific @rookiejava
+**/Tizen @rookiejava @myroot @shyunmin @sung-su @JoonghyunCho
+*.tizen.cs @rookiejava @myroot @shyunmin @sung-su @JoonghyunCho
+*.Tizen.cs @rookiejava @myroot @shyunmin @sung-su @JoonghyunCho
 
 # GTK
 /Xamarin.Forms.ControlGallery.GTK/ @jsuarezruiz

From 10b19902dd225556870b4c62d11358983574e099 Mon Sep 17 00:00:00 2001
From: "E.Z. Hart" <hartez@users.noreply.github.com>
Date: Mon, 19 Jun 2023 08:43:01 -0500
Subject: [PATCH 012/105] Hook up ScrollViewer event tracking in Windows
 CollectionView (#15555)

* Hook up ScrollViewer event tracking in Windows CollectionView

* Ensure ScrollViewChanged handler isn't getting hooked up twice
---
 .../Core/Handlers/Items/ItemsViewHandler.Windows.cs | 13 +++++++++++++
 .../CollectionView/CollectionViewTests.Windows.cs   |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/Controls/src/Core/Handlers/Items/ItemsViewHandler.Windows.cs b/src/Controls/src/Core/Handlers/Items/ItemsViewHandler.Windows.cs
index 70b906abc9bc..3335091dc0ee 100644
--- a/src/Controls/src/Core/Handlers/Items/ItemsViewHandler.Windows.cs
+++ b/src/Controls/src/Core/Handlers/Items/ItemsViewHandler.Windows.cs
@@ -55,6 +55,7 @@ protected override void ConnectHandler(ListViewBase platformView)
 		{
 			base.ConnectHandler(platformView);
 			VirtualView.ScrollToRequested += ScrollToRequested;
+			FindScrollViewer(ListViewBase);
 		}
 
 		protected override void DisconnectHandler(ListViewBase platformView)
@@ -313,6 +314,8 @@ protected virtual void UpdateItemsLayout()
 					}
 				}
 			}
+
+			FindScrollViewer(ListViewBase);
 		}
 
 		void FindScrollViewer(ListViewBase listView)
@@ -386,6 +389,16 @@ void UpdateHorizontalScrollBarVisibility()
 
 		protected virtual void OnScrollViewerFound(ScrollViewer scrollViewer)
 		{
+			if (_scrollViewer == scrollViewer)
+			{
+				return;
+			}
+
+			if (_scrollViewer != null)
+			{
+				_scrollViewer.ViewChanged -= ScrollViewChanged;
+			}
+
 			_scrollViewer = scrollViewer;
 			_scrollViewer.ViewChanged += ScrollViewChanged;
 		}
diff --git a/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.Windows.cs b/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.Windows.cs
index 0171e3cb899f..c45a9ad76ada 100644
--- a/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.Windows.cs
+++ b/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.Windows.cs
@@ -101,7 +101,7 @@ void ValidateItemContainerStyle(CollectionView collectionView)
 			Assert.Equal(0d, minHeight);
 		}
 
-		[Fact(Skip = "FIX FOR .NET8")]
+		[Fact]
 		public async Task ValidateSendRemainingItemsThresholdReached()
 		{
 			SetupBuilder();

From 503b5344c40e49b234c0c7a654881250ecdb550e Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Mon, 19 Jun 2023 08:43:38 -0500
Subject: [PATCH 013/105] [Windows] Fix issues setting Shell TabBar appearance
 (#15690)

* Windows bits

* - finish up WinUI tests

* Update TabbedPage.Windows.cs

* - cleanup tests

* - clean up shell handler apis

* - add samples
---
 .../Controls.Sample.Sandbox/SandboxShell.xaml |  18 ++-
 .../Core/ShellGalleries/ShellChromeGallery.cs |  19 +++
 .../ShellGalleries/ShellChromeGallery.xaml    |   3 +
 .../TabbedPage/TabbedPage.Windows.cs          |  12 +-
 .../Shell/ShellItemHandler.Windows.cs         |  94 +++++++-----
 .../Shell/ShellSectionHandler.Windows.cs      |   5 +-
 .../Windows/TabbedPage/TabbedPageStyle.xaml   |   2 +-
 .../net-windows/PublicAPI.Unshipped.txt       |   1 +
 .../Shell/ShellTabBarTests.Windows.cs         | 145 ++++++++++++++++++
 .../Elements/Shell/ShellTabBarTests.cs        |  14 ++
 .../Elements/Shell/ShellTests.Windows.cs      |   2 +
 .../Windows/NavigationViewExtensions.cs       |  84 +++++++++-
 .../Windows/NavigationViewItemViewModel.cs    |  72 ++++++++-
 .../net-windows/PublicAPI.Unshipped.txt       |   3 +
 14 files changed, 415 insertions(+), 59 deletions(-)
 create mode 100644 src/Controls/tests/DeviceTests/Elements/Shell/ShellTabBarTests.Windows.cs
 create mode 100644 src/Controls/tests/DeviceTests/Elements/Shell/ShellTabBarTests.cs

diff --git a/src/Controls/samples/Controls.Sample.Sandbox/SandboxShell.xaml b/src/Controls/samples/Controls.Sample.Sandbox/SandboxShell.xaml
index 98a3bdfff5f6..48b238dcf110 100644
--- a/src/Controls/samples/Controls.Sample.Sandbox/SandboxShell.xaml
+++ b/src/Controls/samples/Controls.Sample.Sandbox/SandboxShell.xaml
@@ -4,7 +4,19 @@
     x:Class="Maui.Controls.Sample.SandboxShell"
     xmlns:local="clr-namespace:Maui.Controls.Sample"
     x:Name="shell">
-    <FlyoutItem Title="Flyout Item Title">
-        <ShellContent ContentTemplate="{DataTemplate local:MainPage}"></ShellContent>
-    </FlyoutItem>
+    <TabBar Shell.TabBarForegroundColor="Green"
+        Shell.TabBarUnselectedColor="Red">
+        <Tab Title="MainPage1" Icon="groceries.png">
+            <ShellContent Icon="groceries.png"
+            Title="Home"
+            ContentTemplate="{DataTemplate local:MainPage}"
+            Route="MainPage" />
+        </Tab>
+        <Tab Title="MainPage2" Icon="dotnet_bot.png">
+            <ShellContent Icon="dotnet_bot.png"
+            Title="Home"
+            ContentTemplate="{DataTemplate local:MainPage}"
+            Route="MainPage" />
+        </Tab>
+    </TabBar>
 </Shell>
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample/Pages/Core/ShellGalleries/ShellChromeGallery.cs b/src/Controls/samples/Controls.Sample/Pages/Core/ShellGalleries/ShellChromeGallery.cs
index 544d76e02fad..a2e8602a4084 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Core/ShellGalleries/ShellChromeGallery.cs
+++ b/src/Controls/samples/Controls.Sample/Pages/Core/ShellGalleries/ShellChromeGallery.cs
@@ -6,6 +6,7 @@
 using System.Threading.Tasks;
 using Microsoft.Maui;
 using Microsoft.Maui.Controls;
+using Microsoft.Maui.Graphics;
 
 namespace Maui.Controls.Sample.Pages.ShellGalleries
 {
@@ -121,6 +122,24 @@ void OnToggleTabBar(object sender, EventArgs e)
 			Shell.SetTabBarIsVisible(this, !Shell.GetTabBarIsVisible(this));
 		}
 
+		void OnToggleTabBarTitleColor(object sender, EventArgs e)
+		{
+			var random = new Random();
+			Shell.SetTabBarTitleColor(Shell.Current.CurrentItem, Color.FromRgb(random.Next(0, 255), random.Next(0, 255), random.Next(0, 255)));
+		}
+
+		void OnToggleTabBarUnselectedColor(object sender, EventArgs e)
+		{
+			var random = new Random();
+			Shell.SetTabBarUnselectedColor(Shell.Current.CurrentItem, Color.FromRgb(random.Next(0, 255), random.Next(0, 255), random.Next(0, 255)));
+		}
+
+		void OnToggleTabBarForegroundColor(object sender, EventArgs e)
+		{
+			var random = new Random();
+			Shell.SetTabBarForegroundColor(Shell.Current.CurrentItem, Color.FromRgb(random.Next(0, 255), random.Next(0, 255), random.Next(0, 255)));
+		}
+
 		protected void AddSearchHandler(string placeholder)
 		{
 			var searchHandler = new CustomSearchHandler();
diff --git a/src/Controls/samples/Controls.Sample/Pages/Core/ShellGalleries/ShellChromeGallery.xaml b/src/Controls/samples/Controls.Sample/Pages/Core/ShellGalleries/ShellChromeGallery.xaml
index 46ba4dbef574..7fae4ca459cf 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Core/ShellGalleries/ShellChromeGallery.xaml
+++ b/src/Controls/samples/Controls.Sample/Pages/Core/ShellGalleries/ShellChromeGallery.xaml
@@ -46,6 +46,9 @@
                 Text="Flyout Header Behavior"
                 Style="{StaticResource Headline}"/>
             <Picker x:Name="flyoutHeaderBehavior" />
+            <Button Text="Toggle TabBarTitleColor" Clicked="OnToggleTabBarTitleColor" />
+            <Button Text="Toggle TabBarUnselectedColor" Clicked="OnToggleTabBarUnselectedColor" />
+            <Button Text="Toggle TabBarForegroundColor" Clicked="OnToggleTabBarForegroundColor" />
         </StackLayout>
     </views:BasePage.Content>
 
diff --git a/src/Controls/src/Core/HandlerImpl/TabbedPage/TabbedPage.Windows.cs b/src/Controls/src/Core/HandlerImpl/TabbedPage/TabbedPage.Windows.cs
index 0bab1bade764..72c9f028fc3b 100644
--- a/src/Controls/src/Core/HandlerImpl/TabbedPage/TabbedPage.Windows.cs
+++ b/src/Controls/src/Core/HandlerImpl/TabbedPage/TabbedPage.Windows.cs
@@ -282,16 +282,17 @@ internal static void MapBarBackgroundColor(ITabbedViewHandler handler, TabbedPag
 		internal static void MapBarTextColor(ITabbedViewHandler handler, TabbedPage view)
 		{
 			view._navigationView?.UpdateTopNavigationViewItemTextColor(view.BarTextColor?.AsPaint());
+			view._navigationView?.UpdateTopNavigationViewItemTextSelectedColor(view.BarTextColor?.AsPaint());
 		}
 
 		internal static void MapUnselectedTabColor(ITabbedViewHandler handler, TabbedPage view)
 		{
-			view._navigationView?.UpdateTopNavigationViewItemBackgroundUnselectedColor(view.UnselectedTabColor?.AsPaint());
+			view._navigationView?.UpdateTopNavigationViewItemUnselectedColor(view.UnselectedTabColor?.AsPaint());
 		}
 
 		internal static void MapSelectedTabColor(ITabbedViewHandler handler, TabbedPage view)
 		{
-			view._navigationView?.UpdateTopNavigationViewItemBackgroundSelectedColor(view.SelectedTabColor?.AsPaint());
+			view._navigationView?.UpdateTopNavigationViewItemSelectedColor(view.SelectedTabColor?.AsPaint());
 		}
 
 		internal static void MapItemsSource(ITabbedViewHandler handler, TabbedPage view)
@@ -316,9 +317,10 @@ internal static void MapItemsSource(ITabbedViewHandler handler, TabbedPage view)
 						vm.Icon = page.IconImageSource?.ToIconSource(handler.MauiContext!)?.CreateIconElement();
 						vm.Content = page.Title;
 						vm.Data = page;
-						vm.Foreground = view.BarTextColor?.AsPaint()?.ToPlatform();
-						vm.SelectedBackground = view.SelectedTabColor?.AsPaint()?.ToPlatform();
-						vm.UnselectedBackground = view.UnselectedTabColor?.AsPaint()?.ToPlatform();
+						vm.SelectedTitleColor = view.BarTextColor?.AsPaint()?.ToPlatform();
+						vm.UnselectedTitleColor = view.BarTextColor?.AsPaint()?.ToPlatform();
+						vm.SelectedForeground = view.SelectedTabColor?.AsPaint()?.ToPlatform();
+						vm.UnselectedForeground = view.UnselectedTabColor?.AsPaint()?.ToPlatform();
 					});
 
 				handler.UpdateValue(nameof(TabbedPage.CurrentPage));
diff --git a/src/Controls/src/Core/Handlers/Shell/ShellItemHandler.Windows.cs b/src/Controls/src/Core/Handlers/Shell/ShellItemHandler.Windows.cs
index d5c198beea2e..e6da6dfcc140 100644
--- a/src/Controls/src/Core/Handlers/Shell/ShellItemHandler.Windows.cs
+++ b/src/Controls/src/Core/Handlers/Shell/ShellItemHandler.Windows.cs
@@ -3,6 +3,7 @@
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using Microsoft.Maui.Controls.Platform;
+using Microsoft.Maui.Platform;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using WApp = Microsoft.UI.Xaml.Application;
@@ -26,8 +27,8 @@ public partial class ShellItemHandler : ElementHandler<ShellItem, FrameworkEleme
 		ObservableCollection<NavigationViewItemViewModel> _mainLevelTabs;
 		ShellItem? _shellItem;
 		SearchHandler? _currentSearchHandler;
-		MauiNavigationView? _mauiNavigationView;
-		MauiNavigationView ShellItemNavigationView => _mauiNavigationView!;
+		IShellAppearanceElement? _shellAppearanceElement;
+		MauiNavigationView ShellItemNavigationView => (PlatformView as MauiNavigationView)!;
 
 		public ShellItemHandler() : base(Mapper, CommandMapper)
 		{
@@ -36,30 +37,13 @@ public ShellItemHandler() : base(Mapper, CommandMapper)
 
 		protected override FrameworkElement CreatePlatformElement()
 		{
-			var platformView = new MauiNavigationView()
-			{
-				PaneDisplayMode = NavigationViewPaneDisplayMode.Top,
-				IsBackButtonVisible = NavigationViewBackButtonVisible.Collapsed,
-				IsSettingsVisible = false,
-				IsPaneToggleButtonVisible = false,
-				MenuItemTemplate = (UI.Xaml.DataTemplate)WApp.Current.Resources["TabBarNavigationViewMenuItem"],
-				MenuItemsSource = _mainLevelTabs
-			};
-
-			_mauiNavigationView = platformView;
-			platformView.SetApplicationResource("NavigationViewMinimalHeaderMargin", null);
-			platformView.SetApplicationResource("NavigationViewHeaderMargin", null);
-			platformView.SetApplicationResource("NavigationViewContentMargin", null);
-			platformView.SetApplicationResource("NavigationViewMinimalContentMargin", null);
-
-			_mauiNavigationView.Loaded += OnNavigationViewLoaded;
-			return platformView;
+			return new MauiNavigationView();
 		}
 
 		void OnNavigationViewLoaded(object sender, RoutedEventArgs e)
 		{
-			if (_mauiNavigationView != null)
-				_mauiNavigationView.Loaded -= OnNavigationViewLoaded;
+			if (PlatformView is not null)
+				PlatformView.Loaded -= OnNavigationViewLoaded;
 
 			UpdateSearchHandler();
 			MapMenuItems();
@@ -67,6 +51,23 @@ void OnNavigationViewLoaded(object sender, RoutedEventArgs e)
 
 		protected override void ConnectHandler(FrameworkElement platformView)
 		{
+			ShellItemNavigationView.PaneDisplayMode = NavigationViewPaneDisplayMode.Top;
+			ShellItemNavigationView.IsBackButtonVisible = NavigationViewBackButtonVisible.Collapsed;
+			ShellItemNavigationView.IsSettingsVisible = false;
+			ShellItemNavigationView.IsPaneToggleButtonVisible = false;
+			ShellItemNavigationView.MenuItemTemplate = (UI.Xaml.DataTemplate)WApp.Current.Resources["TabBarNavigationViewMenuItem"];
+			ShellItemNavigationView.MenuItemsSource = _mainLevelTabs;
+
+			platformView.SetApplicationResource("NavigationViewMinimalHeaderMargin", null);
+			platformView.SetApplicationResource("NavigationViewHeaderMargin", null);
+			platformView.SetApplicationResource("NavigationViewContentMargin", null);
+			platformView.SetApplicationResource("NavigationViewMinimalContentMargin", null);
+
+			if (platformView.IsLoaded)
+				OnNavigationViewLoaded(ShellItemNavigationView, new RoutedEventArgs());
+			else
+				platformView.Loaded += OnNavigationViewLoaded;
+
 			base.ConnectHandler(platformView);
 			ShellItemNavigationView.SelectionChanged += OnNavigationTabChanged;
 		}
@@ -74,10 +75,9 @@ protected override void ConnectHandler(FrameworkElement platformView)
 		protected override void DisconnectHandler(FrameworkElement platformView)
 		{
 			base.DisconnectHandler(platformView);
-			ShellItemNavigationView.SelectionChanged -= OnNavigationTabChanged;
 
-			if (_mauiNavigationView != null)
-				_mauiNavigationView.Loaded -= OnNavigationViewLoaded;
+			ShellItemNavigationView.SelectionChanged -= OnNavigationTabChanged;
+			platformView.Loaded -= OnNavigationViewLoaded;
 
 			if (_currentShellSection != null)
 				_currentShellSection.PropertyChanged -= OnCurrentShellSectionPropertyChanged;
@@ -442,28 +442,40 @@ void IAppearanceObserver.OnAppearanceChanged(ShellAppearance appearance)
 		{
 			if (appearance is IShellAppearanceElement a)
 			{
+				_shellAppearanceElement = a;
 				// This means the template hasn't been applied yet
-				if (ShellItemNavigationView.TopNavArea == null)
+				if (ShellItemNavigationView.TopNavArea is null)
 				{
 					ShellItemNavigationView.OnApplyTemplateFinished += OnApplyTemplateFinished;
-
-					void OnApplyTemplateFinished(object? sender, EventArgs e)
-					{
-						ShellItemNavigationView.OnApplyTemplateFinished -= OnApplyTemplateFinished;
-						ApplyAppearance();
-					}
-				}
-				else
-				{
-					ApplyAppearance();
 				}
 
-				void ApplyAppearance()
-				{
-					ShellItemNavigationView.UpdateTopNavAreaBackground(a.EffectiveTabBarBackgroundColor?.AsPaint());
-					ShellItemNavigationView.UpdateTopNavigationViewItemTextColor(a.EffectiveTabBarForegroundColor?.AsPaint());
-				}
+				UpdateAppearance(_shellAppearanceElement);
 			}
 		}
+
+		protected virtual void UpdateAppearance(IShellAppearanceElement appearance)
+		{
+			if (_shellAppearanceElement is null)
+				return;
+
+			var backgroundColor = _shellAppearanceElement.EffectiveTabBarBackgroundColor?.AsPaint();
+			var foregroundColor = _shellAppearanceElement.EffectiveTabBarForegroundColor?.AsPaint();
+			var unselectedColor = _shellAppearanceElement.EffectiveTabBarUnselectedColor?.AsPaint();
+			var titleColor = _shellAppearanceElement.EffectiveTabBarTitleColor?.AsPaint();
+
+			ShellItemNavigationView.UpdateTopNavAreaBackground(backgroundColor);
+			ShellItemNavigationView.UpdateTopNavigationViewItemUnselectedColor(unselectedColor);
+			ShellItemNavigationView.UpdateTopNavigationViewItemTextSelectedColor(titleColor ?? foregroundColor);
+			ShellItemNavigationView.UpdateTopNavigationViewItemTextColor(unselectedColor);
+			ShellItemNavigationView.UpdateTopNavigationViewItemSelectedColor(foregroundColor ?? titleColor);
+		}
+
+		void OnApplyTemplateFinished(object? sender, EventArgs e)
+		{
+			ShellItemNavigationView.OnApplyTemplateFinished -= OnApplyTemplateFinished;
+
+			if (_shellAppearanceElement is not null)
+				UpdateAppearance(_shellAppearanceElement);
+		}
 	}
 }
diff --git a/src/Controls/src/Core/Handlers/Shell/ShellSectionHandler.Windows.cs b/src/Controls/src/Core/Handlers/Shell/ShellSectionHandler.Windows.cs
index 84f57580dd4f..c39510302daa 100644
--- a/src/Controls/src/Core/Handlers/Shell/ShellSectionHandler.Windows.cs
+++ b/src/Controls/src/Core/Handlers/Shell/ShellSectionHandler.Windows.cs
@@ -94,9 +94,12 @@ void SyncNavigationStack(bool animated, NavigationRequestedEventArgs? e)
 			// Current Item might transition to null while visibility is adjusting on shell
 			// so we just ignore this and eventually when shell knows
 			// the next current item it will request to sync again
-			if (VirtualView.CurrentItem == null)
+			if (VirtualView.CurrentItem == null || MauiContext is null)
 				return;
 
+			// This is used to assign the ShellContentHandler to ShellContent
+			_ = VirtualView.CurrentItem.ToPlatform(MauiContext);
+
 			List<IView> pageStack = new List<IView>()
 			{
 				(VirtualView.CurrentItem as IShellContentController).GetOrCreateContent()
diff --git a/src/Controls/src/Core/Platform/Windows/TabbedPage/TabbedPageStyle.xaml b/src/Controls/src/Core/Platform/Windows/TabbedPage/TabbedPageStyle.xaml
index a7b8a6204412..1756541e112e 100644
--- a/src/Controls/src/Core/Platform/Windows/TabbedPage/TabbedPageStyle.xaml
+++ b/src/Controls/src/Core/Platform/Windows/TabbedPage/TabbedPageStyle.xaml
@@ -6,7 +6,7 @@
         <NavigationViewItem 
             x:Name="navViewItem"
             Content="{Binding Content}" 
-            Foreground="{Binding Foreground}" 
+            Foreground="{Binding TitleColor}" 
             Background="{Binding Background}" 
             IsSelected="{Binding IsSelected, Mode=TwoWay}"
             MenuItemsSource="{Binding MenuItemsSource}"
diff --git a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index 0e121b091421..d000525aa54d 100644
--- a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -31,6 +31,7 @@ static Microsoft.Maui.Controls.Region.operator !=(Microsoft.Maui.Controls.Region
 static Microsoft.Maui.Controls.Region.operator ==(Microsoft.Maui.Controls.Region left, Microsoft.Maui.Controls.Region right) -> bool
 static Microsoft.Maui.Controls.Shapes.Matrix.operator !=(Microsoft.Maui.Controls.Shapes.Matrix left, Microsoft.Maui.Controls.Shapes.Matrix right) -> bool
 static Microsoft.Maui.Controls.Shapes.Matrix.operator ==(Microsoft.Maui.Controls.Shapes.Matrix left, Microsoft.Maui.Controls.Shapes.Matrix right) -> bool
+virtual Microsoft.Maui.Controls.Handlers.ShellItemHandler.UpdateAppearance(Microsoft.Maui.Controls.IShellAppearanceElement! appearance) -> void
 ~Microsoft.Maui.Controls.Handlers.Compatibility.FrameRenderer.FrameRenderer(Microsoft.Maui.IPropertyMapper mapper) -> void
 ~Microsoft.Maui.Controls.Handlers.Compatibility.FrameRenderer.FrameRenderer(Microsoft.Maui.IPropertyMapper mapper, Microsoft.Maui.CommandMapper commandMapper) -> void
 override Microsoft.Maui.Controls.View.ChangeVisualState() -> void
diff --git a/src/Controls/tests/DeviceTests/Elements/Shell/ShellTabBarTests.Windows.cs b/src/Controls/tests/DeviceTests/Elements/Shell/ShellTabBarTests.Windows.cs
new file mode 100644
index 000000000000..4e2be8090aae
--- /dev/null
+++ b/src/Controls/tests/DeviceTests/Elements/Shell/ShellTabBarTests.Windows.cs
@@ -0,0 +1,145 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Controls.Handlers;
+using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Platform;
+using WNavigationViewItem = Microsoft.UI.Xaml.Controls.NavigationViewItem;
+using Xunit;
+using NavigationView = Microsoft.UI.Xaml.Controls.NavigationView;
+using WFrameworkElement = Microsoft.UI.Xaml.FrameworkElement;
+
+
+namespace Microsoft.Maui.DeviceTests
+{
+	[Category(TestCategory.Shell)]
+	public partial class ShellTests
+	{
+		[Fact(DisplayName = "ForegroundColor sets icon and title color sets title")]
+		public async Task ForegroundColorSetsIconAndTitleColorSetsTitle()
+		{
+			SetupBuilder();
+
+			var titleColor = Color.FromArgb("#FFFF0000");
+			var foregroundColor = Color.FromArgb("#FF00FF00");
+			await RunShellTabBarTests(shell =>
+			{
+				Shell.SetTabBarTitleColor(shell, titleColor);
+				Shell.SetTabBarForegroundColor(shell, foregroundColor);
+			},
+			async (shell) =>
+			{
+				await ValidateTabBarItemColor(shell.CurrentSection, titleColor, true);
+				await ValidateTabBarItemColor(shell.CurrentSection, foregroundColor, true);
+				await ValidateTabBarItemColor(shell.Items[0].Items[1], titleColor, false);
+				await ValidateTabBarItemColor(shell.Items[0].Items[1], foregroundColor, false);
+			});
+		}
+
+		[Theory(DisplayName = "Shell TabBar Title Color Initializes Correctly")]
+		[InlineData("#FFFF0000")]
+		[InlineData("#FF00FF00")]
+
+		public async Task ShellTabBarTitleColorInitializesCorrectly(string colorHex)
+		{
+			SetupBuilder();
+
+			var expectedColor = Color.FromArgb(colorHex);
+			await RunShellTabBarTests(shell => Shell.SetTabBarTitleColor(shell, expectedColor),
+				async (shell) =>
+				{
+					await ValidateTabBarItemColor(shell.CurrentSection, expectedColor, true);
+					await ValidateTabBarItemColor(shell.Items[0].Items[1], expectedColor, false);
+				});
+		}
+
+		[Theory(DisplayName = "Shell TabBar Foreground Initializes Correctly")]
+		[InlineData("#FFFF0000")]
+		[InlineData("#FF00FF00")]
+		public async Task ShellTabBarForegroundInitializesCorrectly(string colorHex)
+		{
+			var expectedColor = Color.FromArgb(colorHex);
+			await RunShellTabBarTests(shell => Shell.SetTabBarForegroundColor(shell, expectedColor),
+				async (shell) =>
+				{
+					await ValidateTabBarItemColor(shell.CurrentSection, expectedColor, true);
+					await ValidateTabBarItemColor(shell.Items[0].Items[1], expectedColor, false);
+				});
+		}
+
+		[Theory(DisplayName = "Shell TabBar UnselectedColor Initializes Correctly")]
+		[InlineData("#FF0000")]
+		[InlineData("#0000FF")]
+		public async Task ShellTabBarUnselectedColorInitializesCorrectly(string colorHex)
+		{
+			var expectedColor = Color.FromArgb(colorHex);
+			await RunShellTabBarTests(shell => Shell.SetTabBarUnselectedColor(shell, expectedColor),
+				async (shell) =>
+				{
+					await ValidateTabBarItemColor(shell.CurrentSection, expectedColor, false);
+					await ValidateTabBarItemColor(shell.Items[0].Items[1], expectedColor, true);
+				});
+		}
+
+		async Task RunShellTabBarTests(Action<Shell> setup, Func<Shell, Task> runTest)
+		{
+			SetupBuilder();
+
+			var selectedContent = new ShellContent()
+			{
+				Route = "Tab1",
+				Title = "Tab1",
+				Content = new ContentPage(),
+				Icon = "white.png"
+			};
+
+			var unselectedContent = new ShellContent()
+			{
+				Route = "Tab2",
+				Title = "Tab2",
+				Content = new ContentPage(),
+				Icon = "white.png"
+			};
+
+			var shell = await CreateShellAsync((shell) =>
+			{
+				shell.Items.Add(new TabBar()
+				{
+					Items =
+					{
+						selectedContent,
+						unselectedContent,
+					}
+				});
+			});
+
+			setup.Invoke(shell);
+			await CreateHandlerAndAddToWindow<ShellHandler>(shell, async (handler) =>
+			{
+				await runTest(shell);
+			});
+		}
+
+		List<WNavigationViewItem> GetTabBarItems(Shell shell)
+		{
+			var shellItemHandler = shell.CurrentItem.Handler as ShellItemHandler;
+			var navView = shellItemHandler.PlatformView as MauiNavigationView;
+
+			return navView.TopNavArea.GetChildren<WNavigationViewItem>().ToList();
+		}
+		async Task ValidateTabBarItemColor(ShellSection item, Color expectedColor, bool hasColor)
+		{
+			var items = GetTabBarItems(item.FindParentOfType<Shell>());
+			var platformItem =
+				items.FirstOrDefault(x => x.Content.ToString().Equals(item.Title, StringComparison.OrdinalIgnoreCase));
+
+			if (hasColor)
+				await AssertionExtensions.AssertContainsColor(platformItem, expectedColor, item.FindMauiContext());
+			else
+				await AssertionExtensions.AssertDoesNotContainColor(platformItem, expectedColor, item.FindMauiContext());
+		}
+	}
+}
diff --git a/src/Controls/tests/DeviceTests/Elements/Shell/ShellTabBarTests.cs b/src/Controls/tests/DeviceTests/Elements/Shell/ShellTabBarTests.cs
new file mode 100644
index 000000000000..40313409c373
--- /dev/null
+++ b/src/Controls/tests/DeviceTests/Elements/Shell/ShellTabBarTests.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+
+namespace Microsoft.Maui.DeviceTests
+{
+	[Category(TestCategory.Shell)]
+	public partial class ShellTests
+	{
+	}
+}
diff --git a/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.Windows.cs b/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.Windows.cs
index 2e033e8c6c3e..b1484c12928f 100644
--- a/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.Windows.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.Windows.cs
@@ -10,8 +10,10 @@
 using Microsoft.Maui.Graphics;
 using Microsoft.Maui.Platform;
 using Microsoft.UI.Xaml;
+using WNavigationViewItem = Microsoft.UI.Xaml.Controls.NavigationViewItem;
 using Xunit;
 using NavigationView = Microsoft.UI.Xaml.Controls.NavigationView;
+using WFrameworkElement = Microsoft.UI.Xaml.FrameworkElement;
 
 
 namespace Microsoft.Maui.DeviceTests
diff --git a/src/Core/src/Platform/Windows/NavigationViewExtensions.cs b/src/Core/src/Platform/Windows/NavigationViewExtensions.cs
index 4645f8226749..2c72c519215b 100644
--- a/src/Core/src/Platform/Windows/NavigationViewExtensions.cs
+++ b/src/Core/src/Platform/Windows/NavigationViewExtensions.cs
@@ -26,7 +26,7 @@ public static void UpdateTopNavigationViewItemTextColor(this MauiNavigationView
 		{
 			var brush = paint?.ToPlatform();
 
-			if (navigationView.TopNavArea != null)
+			if (navigationView.TopNavArea is not null)
 			{
 				if (brush is null)
 				{
@@ -50,7 +50,81 @@ public static void UpdateTopNavigationViewItemTextColor(this MauiNavigationView
 			{
 				foreach (var item in items)
 				{
-					item.Foreground = brush;
+					item.UnselectedTitleColor = brush;
+				}
+			}
+		}
+
+		public static void UpdateTopNavigationViewItemTextSelectedColor(this MauiNavigationView navigationView, Paint? paint)
+		{
+			var brush = paint?.ToPlatform();
+
+			if (navigationView.TopNavArea is not null)
+			{
+				if (brush is null)
+				{
+					navigationView.TopNavArea.Resources.Remove("TopNavigationViewItemForegroundSelected");
+					navigationView.TopNavArea.Resources.Remove("TopNavigationViewItemForegroundSelectedPointerOver");
+					navigationView.TopNavArea.Resources.Remove("TopNavigationViewItemForegroundSelectedPressed");
+					navigationView.TopNavArea.Resources.Remove("TopNavigationViewItemForegroundSelectedDisabled");
+				}
+				else
+				{
+					navigationView.TopNavArea.Resources["TopNavigationViewItemForegroundSelected"] = brush;
+					navigationView.TopNavArea.Resources["TopNavigationViewItemForegroundSelectedPointerOver"] = brush;
+					navigationView.TopNavArea.Resources["TopNavigationViewItemForegroundSelectedPressed"] = brush;
+					navigationView.TopNavArea.Resources["TopNavigationViewItemForegroundSelectedDisabled"] = brush;
+				}
+
+				navigationView.TopNavArea.RefreshThemeResources();
+			}
+
+			if (navigationView.MenuItemsSource is IList<NavigationViewItemViewModel> items)
+			{
+				foreach (var item in items)
+				{
+					item.SelectedTitleColor = brush;
+				}
+			}
+		}
+
+		public static void UpdateTopNavigationViewItemSelectedColor(this MauiNavigationView navigationView, Paint? paint)
+		{
+			var brush = paint?.ToPlatform();
+
+			if (navigationView.TopNavArea is not null)
+			{
+				if (brush is null)
+				{
+					navigationView.TopNavArea.Resources.Remove("NavigationViewSelectionIndicatorForeground");
+				}
+				else
+				{
+					// Use the TabBarForegroundColor to update the Indicator Brush
+					navigationView.TopNavArea.Resources["NavigationViewSelectionIndicatorForeground"] = brush;
+				}
+
+				navigationView.TopNavArea.RefreshThemeResources();
+			}
+
+			if (navigationView.MenuItemsSource is IList<NavigationViewItemViewModel> items)
+			{
+				foreach (var item in items)
+				{
+					item.SelectedForeground = brush;
+				}
+			}
+		}
+
+		public static void UpdateTopNavigationViewItemUnselectedColor(this MauiNavigationView navigationView, Paint? paint)
+		{
+			var brush = paint?.ToPlatform();
+
+			if (navigationView.MenuItemsSource is IList<NavigationViewItemViewModel> items)
+			{
+				foreach (var item in items)
+				{
+					item.UnselectedForeground = brush;
 				}
 			}
 		}
@@ -58,7 +132,7 @@ public static void UpdateTopNavigationViewItemTextColor(this MauiNavigationView
 		public static void UpdateTopNavigationViewItemBackgroundUnselectedColor(this MauiNavigationView navigationView, Paint? paint)
 		{
 			var brush = paint?.ToPlatform();
-			if (navigationView.TopNavArea != null)
+			if (navigationView.TopNavArea is not null)
 			{
 				if (brush is null)
 				{
@@ -88,7 +162,7 @@ public static void UpdateTopNavigationViewItemBackgroundUnselectedColor(this Mau
 		public static void UpdateTopNavigationViewItemBackgroundSelectedColor(this MauiNavigationView navigationView, Paint? paint)
 		{
 			var brush = paint?.ToPlatform();
-			if (navigationView.TopNavArea != null)
+			if (navigationView.TopNavArea is not null)
 			{
 				if (brush is null)
 				{
@@ -144,7 +218,7 @@ public static void UpdatePaneBackground(this MauiNavigationView navigationView,
 		public static void UpdateFlyoutVerticalScrollMode(this MauiNavigationView navigationView, ScrollMode scrollMode)
 		{
 			var scrollViewer = navigationView.MenuItemsScrollViewer;
-			if (scrollViewer != null)
+			if (scrollViewer is not null)
 			{
 				switch (scrollMode)
 				{
diff --git a/src/Core/src/Platform/Windows/NavigationViewItemViewModel.cs b/src/Core/src/Platform/Windows/NavigationViewItemViewModel.cs
index b9b1a7a3a543..4df79c59c471 100644
--- a/src/Core/src/Platform/Windows/NavigationViewItemViewModel.cs
+++ b/src/Core/src/Platform/Windows/NavigationViewItemViewModel.cs
@@ -3,6 +3,7 @@
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
+using Microsoft.UI.Xaml.Controls;
 using WBrush = Microsoft.UI.Xaml.Media.Brush;
 using WIconElement = Microsoft.UI.Xaml.Controls.IconElement;
 
@@ -79,10 +80,13 @@ internal class NavigationViewItemViewModel : INotifyPropertyChanged
 		public event PropertyChangedEventHandler? PropertyChanged;
 
 		object? _content;
-		WBrush? _foreground;
 		bool _isSelected;
 		WBrush? _selectedBackground;
 		WBrush? _unselectedBackground;
+		WBrush? _selectedForeground;
+		WBrush? _selectedTitleColor;
+		WBrush? _unselectedTitleColor;
+		WBrush? _unselectedForeground;
 		ObservableCollection<NavigationViewItemViewModel>? _menuItemsSource;
 		WIconElement? _icon;
 
@@ -100,8 +104,7 @@ public WIconElement? Icon
 
 		public WBrush? Foreground
 		{
-			get { return _foreground; }
-			set { this.SetProperty(ref _foreground, value, OnPropertyChanged); }
+			get => IsSelected ? SelectedForeground : UnselectedForeground;
 		}
 
 		public WBrush? Background
@@ -137,6 +140,68 @@ public WBrush? UnselectedBackground
 			}
 		}
 
+		public WBrush? TitleColor
+		{
+			get => IsSelected ? SelectedTitleColor : UnselectedTitleColor;
+		}
+
+		public WBrush? SelectedTitleColor
+		{
+			get => _selectedTitleColor;
+			set
+			{
+				_selectedTitleColor = value;
+				OnPropertyChanged(nameof(TitleColor));
+			}
+		}
+
+		public WBrush? UnselectedTitleColor
+		{
+			get => _unselectedTitleColor;
+			set
+			{
+				_unselectedTitleColor = value;
+				OnPropertyChanged(nameof(TitleColor));
+			}
+		}
+
+		public WBrush? SelectedForeground
+		{
+			get => _selectedForeground;
+			set
+			{
+				_selectedForeground = value;
+				UpdateForeground();
+			}
+		}
+
+		public WBrush? UnselectedForeground
+		{
+			get => _unselectedForeground;
+			set
+			{
+				_unselectedForeground = value;
+				UpdateForeground();
+			}
+		}
+
+		void UpdateForeground()
+		{
+			OnPropertyChanged(nameof(Foreground));
+
+			if (Icon is WIconElement bi)
+			{
+				if (Foreground is null)
+				{
+					bi.ClearValue(WIconElement.ForegroundProperty);
+				}
+				else
+				{
+					bi.Foreground = Foreground;
+				}
+			}
+		}
+
 		public bool IsSelected
 		{
 			get => _isSelected;
@@ -144,6 +209,7 @@ public bool IsSelected
 			{
 				_isSelected = value;
 				OnPropertyChanged(nameof(Background));
+				UpdateForeground();
 			}
 		}
 
diff --git a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index d65de1abcc17..31164b188d41 100644
--- a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -35,6 +35,9 @@ static Microsoft.Maui.Layouts.FlexBasis.operator !=(Microsoft.Maui.Layouts.FlexB
 static Microsoft.Maui.Layouts.FlexBasis.operator ==(Microsoft.Maui.Layouts.FlexBasis left, Microsoft.Maui.Layouts.FlexBasis right) -> bool
 static Microsoft.Maui.Layouts.LayoutExtensions.ArrangeContentUnbounded(this Microsoft.Maui.IContentView! contentView, Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
 static Microsoft.Maui.Handlers.SearchBarHandler.MapKeyboard(Microsoft.Maui.Handlers.ISearchBarHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
+static Microsoft.Maui.Platform.NavigationViewExtensions.UpdateTopNavigationViewItemSelectedColor(this Microsoft.Maui.Platform.MauiNavigationView! navigationView, Microsoft.Maui.Graphics.Paint? paint) -> void
+static Microsoft.Maui.Platform.NavigationViewExtensions.UpdateTopNavigationViewItemTextSelectedColor(this Microsoft.Maui.Platform.MauiNavigationView! navigationView, Microsoft.Maui.Graphics.Paint? paint) -> void
+static Microsoft.Maui.Platform.NavigationViewExtensions.UpdateTopNavigationViewItemUnselectedColor(this Microsoft.Maui.Platform.MauiNavigationView! navigationView, Microsoft.Maui.Graphics.Paint? paint) -> void
 static Microsoft.Maui.Platform.SearchBarExtensions.UpdateKeyboard(this Microsoft.UI.Xaml.Controls.AutoSuggestBox! platformControl, Microsoft.Maui.ISearchBar! searchBar) -> void
 Microsoft.Maui.IWebView.UserAgent.get -> string?
 Microsoft.Maui.IWebView.UserAgent.set -> void

From 5ebd6099950792a4de6476e36e6ac38a8829145b Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 20 Jun 2023 03:05:54 +0000
Subject: [PATCH 014/105] Update dependencies from
 https://github.com/dotnet/xharness build 20230612.1 (#15727)

Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit
 From Version 8.0.0-prerelease.23307.1 -> To Version 8.0.0-prerelease.23312.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---
 .config/dotnet-tools.json |  2 +-
 eng/Version.Details.xml   | 12 ++++++------
 eng/Versions.props        |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 682376d8a04e..bd75e4c80518 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -15,7 +15,7 @@
       ]
     },
     "microsoft.dotnet.xharness.cli": {
-      "version": "8.0.0-prerelease.23307.1",
+      "version": "8.0.0-prerelease.23312.1",
       "commands": [
         "xharness"
       ]
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 64ad1449b81b..4862f2ffa0ab 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -51,17 +51,17 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>3f4da9ced34942d83054e647f3b1d9d7dde281e8</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.23307.1">
+    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.23312.1">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>98cbe592ee7494c5813d0e5173bc7a160fbcce70</Sha>
+      <Sha>5dabb78620cf157a43de27e8d1b84786eb1baabc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="8.0.0-prerelease.23307.1">
+    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="8.0.0-prerelease.23312.1">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>98cbe592ee7494c5813d0e5173bc7a160fbcce70</Sha>
+      <Sha>5dabb78620cf157a43de27e8d1b84786eb1baabc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.23307.1">
+    <Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.23312.1">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>98cbe592ee7494c5813d0e5173bc7a160fbcce70</Sha>
+      <Sha>5dabb78620cf157a43de27e8d1b84786eb1baabc</Sha>
     </Dependency>
   </ProductDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 10a2423f9da8..48fd17fa6690 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -69,9 +69,9 @@
     <_HarfBuzzSharpVersion>2.8.2.2</_HarfBuzzSharpVersion>
     <_SkiaSharpNativeAssetsVersion>0.0.0-commit.193b587552cb0ed39372a049d7e6c692db98c267.483</_SkiaSharpNativeAssetsVersion>
     <MicrosoftTemplateEngineTasksVersion>7.0.100-preview.5.22226.1</MicrosoftTemplateEngineTasksVersion>
-    <MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.23307.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
-    <MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.23307.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
-    <MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.23307.1</MicrosoftDotNetXHarnessCLIVersion>
+    <MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.23312.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
+    <MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.23312.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
+    <MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.23312.1</MicrosoftDotNetXHarnessCLIVersion>
     <TizenUIExtensionsVersion>0.9.0</TizenUIExtensionsVersion>
     <SvgSkiaPackageVersion>0.5.13</SvgSkiaPackageVersion>
     <FizzlerPackageVersion>1.2.0</FizzlerPackageVersion>

From 3b08c20dc691c0d6314e47d4431ead56048e653a Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Mon, 19 Jun 2023 23:29:54 -0500
Subject: [PATCH 015/105] Remove HandlerImpl folder and put partial files
 together (#14339)

* Remove HandlerImpl folder and put partial files together

* Auto-format source code

* Auto-format source code

---------

Co-authored-by: GitHub Actions Autoformatter <autoformat@example.com>
---
 .../ActivityIndicator.cs                      |   2 +-
 .../Application/Application.Android.cs        |   0
 .../Application.Mapper.cs}                    |   0
 .../Application/Application.Standard.cs       |   0
 .../Application/Application.Tizen.cs          |   0
 .../Application/Application.Windows.cs        |   0
 .../src/Core/{ => Application}/Application.cs | 139 ++++-
 .../Application/Application.iOS.cs            |   0
 .../{ => BindableLayout}/BindableLayout.cs    |   0
 src/Controls/src/Core/{ => Border}/Border.cs  |   0
 .../src/Core/{ => BoxView}/BoxView.cs         |  51 +-
 src/Controls/src/Core/{ => Brush}/Brush.cs    |  81 +++
 .../Core/{ => Brush}/BrushTypeConverter.cs    |   0
 .../Button/Button.Android.cs                  |   0
 .../Button.cs => Button/Button.Mapper.cs}     |   0
 .../Button/Button.Standard.cs                 |   0
 .../{HandlerImpl => }/Button/Button.Tizen.cs  |   0
 .../Button/Button.Windows.cs                  |   0
 src/Controls/src/Core/{ => Button}/Button.cs  |  56 +-
 .../{HandlerImpl => }/Button/Button.iOS.cs    |   0
 .../src/Core/{ => Button}/ButtonElement.cs    |   0
 .../src/Core/{ => Button}/ButtonsMask.cs      |   0
 .../Core/{ => CarouselPage}/CarouselPage.cs   |   0
 .../CheckBox.Mapper.cs}                       |   0
 .../src/Core/{ => CheckBox}/CheckBox.cs       |   3 +-
 .../{ => CheckBox}/CheckedChangedEventArgs.cs |   0
 src/Controls/src/Core/ColorElement.cs         |   3 +-
 src/Controls/src/Core/ContentPage.cs          |  44 --
 .../ContentPage.cs}                           |  46 +-
 .../src/Core/{ => ContentView}/ContentView.cs |   6 +-
 .../DatePicker/DatePicker.Android.cs          |   0
 .../DatePicker.Mapper.cs}                     |   0
 .../DatePicker/DatePicker.Standard.cs         |   0
 .../DatePicker/DatePicker.Windows.cs          |   0
 .../src/Core/{ => DatePicker}/DatePicker.cs   |   3 +-
 .../DatePicker/DatePicker.iOS.cs              |   0
 .../Editor/Editor.Android.cs                  |   0
 .../Editor.cs => Editor/Editor.Mapper.cs}     |   0
 .../Editor/Editor.Standard.cs                 |   0
 .../{HandlerImpl => }/Editor/Editor.Tizen.cs  |   0
 .../Editor/Editor.Windows.cs                  |   0
 src/Controls/src/Core/{ => Editor}/Editor.cs  |  48 +-
 .../{HandlerImpl => }/Editor/Editor.iOS.cs    |   0
 .../Element/Element.Android.cs                |   0
 .../Element.cs => Element/Element.Mapper.cs}  |   2 +-
 .../Element/Element.Standard.cs               |   2 +-
 .../Element/Element.Tizen.cs                  |   0
 .../Element/Element.Windows.cs                |   0
 .../src/Core/{ => Element}/Element.cs         |  98 +++-
 .../{HandlerImpl => }/Element/Element.iOS.cs  |   0
 .../Core/{ => Element}/ElementEventArgs.cs    |   0
 .../Core/{ => Element}/Element_StyleSheets.cs |   0
 .../Entry/{Entry.Controls.cs => Entry.cs}     |   0
 .../{ => FlyoutPage}/FlyoutLayoutBehavior.cs  |   0
 .../FlyoutPage.Mapper.cs}                     |   2 +-
 .../src/Core/{ => FlyoutPage}/FlyoutPage.cs   |  37 +-
 src/Controls/src/Core/{ => Frame}/Frame.cs    |  24 +-
 .../GraphicsView.cs}                          |   0
 .../HandlerImpl/ActivityIndicator.Impl.cs     |   8 -
 .../Application/Application.Impl.cs           | 150 ------
 .../src/Core/HandlerImpl/BoxView.Impl.cs      |  53 --
 .../src/Core/HandlerImpl/Brush.Impl.cs        |  90 ----
 .../Core/HandlerImpl/Button/Button.Impl.cs    |  62 ---
 .../HandlerImpl/CheckBox/CheckBox.Impl.cs     |  11 -
 .../ContentView/ContentView.Impl.cs           |  10 -
 .../HandlerImpl/DatePicker/DatePicker.Impl.cs |   8 -
 .../Core/HandlerImpl/Editor/Editor.Impl.cs    |  56 --
 .../Core/HandlerImpl/Element/Element.Impl.cs  | 105 ----
 .../src/Core/HandlerImpl/Ellipse.Impl.cs      |  40 --
 .../HandlerImpl/FlyoutPage/FlyoutPage.Impl.cs |  43 --
 .../src/Core/HandlerImpl/Frame.Impl.cs        |  31 --
 .../ImageButton/ImageButton.Impl.cs           |  50 --
 .../Core/HandlerImpl/IndicatorView.Impl.cs    |  15 -
 .../src/Core/HandlerImpl/Label/Label.Impl.cs  |   9 -
 .../src/Core/HandlerImpl/Line.Impl.cs         |  31 --
 .../src/Core/HandlerImpl/MenuItem.Impl.cs     |  31 --
 .../NavigationPage/NavigationPage.Impl.cs     | 474 -----------------
 .../src/Core/HandlerImpl/Page.Impl.cs         | 103 ----
 .../src/Core/HandlerImpl/Path.Impl.cs         |  30 --
 .../Core/HandlerImpl/Picker/Picker.Impl.cs    |  36 --
 .../src/Core/HandlerImpl/Polygon.Impl.cs      |  36 --
 .../src/Core/HandlerImpl/Polyline.Impl.cs     |  34 --
 .../src/Core/HandlerImpl/ProgressBar.Impl.cs  |   8 -
 .../RadioButton/RadioButton.Impl.cs           |  42 --
 .../src/Core/HandlerImpl/Rectangle.Impl.cs    |  39 --
 .../RefreshView/RefreshView.Impl.cs           |  12 -
 .../Core/HandlerImpl/RoundRectangle.Impl.cs   | 111 ----
 .../HandlerImpl/ScrollView/ScrollView.Impl.cs |  99 ----
 .../HandlerImpl/SearchBar/SearchBar.Impl.cs   |  16 -
 .../src/Core/HandlerImpl/Shape/Shape.Impl.cs  |   6 -
 .../src/Core/HandlerImpl/Shell.Impl.cs        |  33 --
 .../src/Core/HandlerImpl/ShellSection.Impl.cs |  32 --
 .../src/Core/HandlerImpl/Slider.Impl.cs       |  19 -
 .../src/Core/HandlerImpl/Stepper.Impl.cs      |   8 -
 .../src/Core/HandlerImpl/SwipeItem.Impl.cs    |  28 -
 .../Core/HandlerImpl/SwipeItemView.Impl.cs    |  11 -
 .../src/Core/HandlerImpl/SwipeView.Impl.cs    | 186 -------
 .../src/Core/HandlerImpl/Switch.Impl.cs       |  39 --
 .../HandlerImpl/TabbedPage/TabbedPage.Impl.cs |  59 ---
 .../TemplatedView/TemplatedView.Impl.cs       |  42 --
 .../HandlerImpl/TimePicker/TimePicker.Impl.cs |   8 -
 .../src/Core/HandlerImpl/View/View.Impl.cs    |  58 --
 .../VisualElement/VisualElement.Impl.cs       | 494 ------------------
 .../Core/HandlerImpl/WebView/WebView.Impl.cs  |  47 --
 .../src/Core/{ => Image}/IImageController.cs  |   0
 .../src/Core/{ => Image}/IImageElement.cs     |   0
 src/Controls/src/Core/{ => Image}/Image.cs    |   7 +-
 .../Image.Impl.cs => Image/ImageSource.cs}    |   9 -
 .../src/Core/{ => ImageButton}/ImageButton.cs |  43 +-
 .../{ => IndicatorView}/IndicatorShape.cs     |   0
 .../IndicatorStackLayout.cs                   |   0
 .../Core/{ => IndicatorView}/IndicatorView.cs |   7 +-
 .../{HandlerImpl => }/Label/Label.Android.cs  |   0
 .../Label/Label.cs => Label/Label.Mapper.cs}  |   2 +-
 .../{HandlerImpl => }/Label/Label.Standard.cs |   2 +-
 .../{HandlerImpl => }/Label/Label.Tizen.cs    |   0
 .../{HandlerImpl => }/Label/Label.Windows.cs  |   0
 src/Controls/src/Core/{ => Label}/Label.cs    |   4 +-
 .../Core/{HandlerImpl => }/Label/Label.iOS.cs |   0
 .../Layout/Layout.Android.cs                  |   0
 src/Controls/src/Core/Layout/Layout.Mapper.cs |  22 +
 .../Layout/Layout.Standard.cs                 |   0
 .../{HandlerImpl => }/Layout/Layout.Tizen.cs  |   0
 .../Layout/Layout.Windows.cs                  |   0
 src/Controls/src/Core/Layout/Layout.cs        |  12 -
 .../{HandlerImpl => }/Layout/Layout.iOS.cs    |   0
 .../Layout.Impl.cs => Layout/LayoutOfT.cs}    |   0
 .../src/Core/{ => ListView}/IListProxy.cs     |   0
 .../{ => ListView}/IListViewController.cs     |   0
 .../src/Core/{ => ListView}/ListView.cs       |   0
 .../{ => ListView}/ListViewCachingStrategy.cs |   0
 .../{ => ListView}/ListViewSelectionMode.cs   |   0
 .../src/Core/{ => Menu}/BaseMenuItem.cs       |   0
 .../src/Core/{ => Menu}/FlyoutBase.cs         |   0
 src/Controls/src/Core/{ => Menu}/MenuBar.cs   |   0
 .../src/Core/{ => Menu}/MenuBarItem.cs        |   0
 .../src/Core/{ => Menu}/MenuBarTracker.cs     |   0
 .../{ContextFlyout.cs => Menu/MenuFlyout.cs}  |   2 +-
 .../src/Core/{ => Menu}/MenuFlyoutItem.cs     |   0
 .../Core/{ => Menu}/MenuFlyoutSeparator.cs    |   0
 .../src/Core/{ => Menu}/MenuFlyoutSubItem.cs  |   0
 src/Controls/src/Core/{ => Menu}/MenuItem.cs  |  22 +-
 .../src/Core/{ => Menu}/MenuItemTracker.cs    |   0
 .../NavigationPage/NavigationPage.Legacy.cs   |   2 +-
 .../NavigationPage.Mapper.cs}                 |   0
 .../{ => NavigationPage}/NavigationPage.cs    | 458 +++++++++++++++-
 .../NavigationPage/NavigationPage.iOS.cs      |   0
 .../NavigationPageToolbar.cs                  |   0
 .../src/Core/Page/NavigatedFromEventArgs.cs   |  15 +
 .../src/Core/Page/NavigatedToEventArgs.cs     |  15 +
 .../src/Core/Page/NavigatingFromEventArgs.cs  |  10 +
 src/Controls/src/Core/{ => Page}/Page.cs      |  69 ++-
 .../Picker/Picker.Android.cs                  |   0
 .../Picker.cs => Picker/Picker.Mapper.cs}     |   0
 .../Picker/Picker.Standard.cs                 |   0
 .../Picker/Picker.Windows.cs                  |   0
 src/Controls/src/Core/{ => Picker}/Picker.cs  |  29 +-
 .../{HandlerImpl => }/Picker/Picker.iOS.cs    |   0
 .../src/Core/{ => ProgressBar}/ProgressBar.cs |   2 +-
 .../RadioButton/RadioButton.Android.cs        |   0
 .../RadioButton.Mapper.cs}                    |   2 +-
 .../RadioButton/RadioButton.Tizen.cs          |   0
 .../RadioButton/RadioButton.Windows.cs        |   0
 .../src/Core/{ => RadioButton}/RadioButton.cs |  34 +-
 .../RadioButton/RadioButton.iOS.cs            |   0
 .../{ => RadioButton}/RadioButtonGroup.cs     |   0
 .../RadioButtonGroupController.cs             |   0
 .../RadioButtonGroupSelectionChanged.cs       |   0
 .../RefreshView/RefreshView.Android.cs        |   0
 .../RefreshView.Mapper.cs}                    |   0
 .../RefreshView/RefreshView.Standard.cs       |   0
 .../RefreshView/RefreshView.Windows.cs        |   0
 .../src/Core/{ => RefreshView}/RefreshView.cs |   6 +-
 .../RefreshView/RefreshView.iOS.cs            |   0
 .../ScrollView/ScrollView.Android.cs          |   0
 .../ScrollView.Mapper.cs}                     |   0
 .../ScrollView/ScrollView.Standard.cs         |   0
 .../ScrollView/ScrollView.Windows.cs          |   0
 .../src/Core/{ => ScrollView}/ScrollView.cs   |  89 +++-
 .../ScrollView/ScrollView.iOS.cs              |   0
 .../SearchBar/SearchBar.Android.cs            |   0
 .../SearchBar.Mapper.cs}                      |   0
 .../SearchBar/SearchBar.Standard.cs           |   0
 .../SearchBar/SearchBar.Tizen.cs              |   0
 .../SearchBar/SearchBar.Windows.cs            |   0
 .../src/Core/{ => SearchBar}/SearchBar.cs     |  11 +-
 .../SearchBar/SearchBar.iOS.cs                |   0
 .../{HandlerImpl => }/Shape/Shape.Android.cs  |   0
 .../Shape/Shape.cs => Shape/Shape.Mapper.cs}  |   0
 .../{HandlerImpl => }/Shape/Shape.Standard.cs |   0
 .../{HandlerImpl => }/Shape/Shape.Tizen.cs    |   0
 .../{HandlerImpl => }/Shape/Shape.Windows.cs  |   0
 .../Core/{HandlerImpl => }/Shape/Shape.iOS.cs |   0
 src/Controls/src/Core/Shapes/Ellipse.cs       |  35 +-
 src/Controls/src/Core/Shapes/Line.cs          |  27 +-
 src/Controls/src/Core/Shapes/Path.cs          |  25 +-
 src/Controls/src/Core/Shapes/Polygon.cs       |  32 +-
 src/Controls/src/Core/Shapes/Polyline.cs      |  30 +-
 src/Controls/src/Core/Shapes/Rectangle.cs     |  33 +-
 .../src/Core/Shapes/RoundRectangle.cs         | 109 +++-
 .../Core/{ => Shell}/FlyoutHeaderBehavior.cs  |   0
 src/Controls/src/Core/Shell/Shell.cs          |  24 +-
 src/Controls/src/Core/Shell/ShellSection.cs   |  27 +-
 src/Controls/src/Core/{ => Slider}/Slider.cs  |  14 +-
 .../src/Core/{ => Stepper}/Stepper.cs         |   0
 .../Core/{ => SwipeView}/SwipeEventArgs.cs    |   0
 .../src/Core/{ => SwipeView}/SwipeItem.cs     |  19 +-
 .../src/Core/{ => SwipeView}/SwipeItemView.cs |   0
 .../src/Core/{ => SwipeView}/SwipeItems.cs    |   0
 .../src/Core/{ => SwipeView}/SwipeView.cs     | 179 ++++++-
 .../Core/{ => SwipeView}/SwipedEventArgs.cs   |   0
 src/Controls/src/Core/{ => Switch}/Switch.cs  |  33 +-
 .../TabbedPage/TabbedPage.Android.cs          |   0
 .../TabbedPage.Mapper.cs}                     |   0
 .../TabbedPage/TabbedPage.Standard.cs         |   0
 .../TabbedPage/TabbedPage.Tizen.cs            |   0
 .../TabbedPage/TabbedPage.Windows.cs          |   0
 .../src/Core/{ => TabbedPage}/TabbedPage.cs   |  50 +-
 .../TabbedPage/TabbedPage.iOS.cs              |   0
 .../ChildCollectionChangedEventArgs.cs        |   0
 .../src/Core/{ => TableView}/TableIntent.cs   |   0
 .../src/Core/{ => TableView}/TableModel.cs    |   0
 .../src/Core/{ => TableView}/TableRoot.cs     |   0
 .../src/Core/{ => TableView}/TableSection.cs  |   0
 .../Core/{ => TableView}/TableSectionBase.cs  |   0
 .../src/Core/{ => TableView}/TableView.cs     |   0
 .../Core/{ => TemplatedView}/TemplatedView.cs |  41 +-
 .../TimePicker/TimePicker.Android.cs          |   0
 .../TimePicker.Mapper.cs}                     |   0
 .../TimePicker/TimePicker.Standard.cs         |   0
 .../TimePicker/TimePicker.Windows.cs          |   0
 .../src/Core/{ => TimePicker}/TimePicker.cs   |   4 +-
 .../TimePicker/TimePicker.iOS.cs              |   0
 .../Toolbar/Toolbar.Android.cs                |   0
 .../Toolbar.cs => Toolbar/Toolbar.Mapper.cs}  |   0
 .../Toolbar/Toolbar.Tizen.cs                  |   0
 .../Toolbar/Toolbar.Windows.cs                |   0
 .../src/Core/{ => Toolbar}/Toolbar.cs         |   0
 .../src/Core/{ => Toolbar}/ToolbarItem.cs     |   0
 .../{ => Toolbar}/ToolbarItemEventArgs.cs     |   0
 .../Core/{ => Toolbar}/ToolbarItemOrder.cs    |   0
 .../src/Core/{ => Toolbar}/ToolbarTracker.cs  |   0
 .../{HandlerImpl => }/View/View.Android.cs    |   0
 src/Controls/src/Core/{ => View}/View.cs      |  55 +-
 .../VisualElement/VisualElement.Android.cs    |   0
 .../VisualElement.Mapper.cs}                  |   2 +-
 .../VisualElement/VisualElement.Platform.cs   |   0
 .../VisualElement/VisualElement.Standard.cs   |   0
 .../VisualElement/VisualElement.Tizen.cs      |   0
 .../VisualElement/VisualElement.Windows.cs    |   0
 .../Core/{ => VisualElement}/VisualElement.cs | 489 ++++++++++++++++-
 .../VisualElement/VisualElement.iOS.cs        |   0
 .../VisualElementChangedEventArgs.cs          |   0
 .../VisualElement_StyleSheet.cs               |   0
 .../{ => WebView}/WebNavigatedEventArgs.cs    |   0
 .../{ => WebView}/WebNavigatingEventArgs.cs   |   0
 .../{ => WebView}/WebNavigationEventArgs.cs   |   0
 .../WebView/WebView.Android.cs                |   0
 .../WebView.cs => WebView/WebView.Mapper.cs}  |   0
 .../WebView/WebView.Standard.cs               |   0
 .../WebView/WebView.Windows.cs                |   0
 .../src/Core/{ => WebView}/WebView.cs         |  43 +-
 .../{HandlerImpl => }/WebView/WebView.iOS.cs  |   0
 .../src/Core/{ => WebView}/WebViewSource.cs   |   0
 .../WebViewSourceTypeConverter.cs             |   0
 .../Window/Window.Android.cs                  |   0
 .../Window.cs => Window/Window.Mapper.cs}     |   0
 .../{HandlerImpl => }/Window/Window.Tizen.cs  |   0
 .../Window/Window.Windows.cs                  |   0
 .../Window.Impl.cs => Window/Window.cs}       |   0
 .../{HandlerImpl => }/Window/Window.iOS.cs    |   0
 271 files changed, 2667 insertions(+), 3038 deletions(-)
 rename src/Controls/src/Core/{ => ActivityIndicator}/ActivityIndicator.cs (96%)
 rename src/Controls/src/Core/{HandlerImpl => }/Application/Application.Android.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl/Application/Application.cs => Application/Application.Mapper.cs} (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/Application/Application.Standard.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/Application/Application.Tizen.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/Application/Application.Windows.cs (100%)
 rename src/Controls/src/Core/{ => Application}/Application.cs (74%)
 rename src/Controls/src/Core/{HandlerImpl => }/Application/Application.iOS.cs (100%)
 rename src/Controls/src/Core/{ => BindableLayout}/BindableLayout.cs (100%)
 rename src/Controls/src/Core/{ => Border}/Border.cs (100%)
 rename src/Controls/src/Core/{ => BoxView}/BoxView.cs (59%)
 rename src/Controls/src/Core/{ => Brush}/Brush.cs (92%)
 rename src/Controls/src/Core/{ => Brush}/BrushTypeConverter.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/Button/Button.Android.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl/Button/Button.cs => Button/Button.Mapper.cs} (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/Button/Button.Standard.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/Button/Button.Tizen.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/Button/Button.Windows.cs (100%)
 rename src/Controls/src/Core/{ => Button}/Button.cs (93%)
 rename src/Controls/src/Core/{HandlerImpl => }/Button/Button.iOS.cs (100%)
 rename src/Controls/src/Core/{ => Button}/ButtonElement.cs (100%)
 rename src/Controls/src/Core/{ => Button}/ButtonsMask.cs (100%)
 rename src/Controls/src/Core/{ => CarouselPage}/CarouselPage.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl/CheckBox/CheckBox.cs => CheckBox/CheckBox.Mapper.cs} (100%)
 rename src/Controls/src/Core/{ => CheckBox}/CheckBox.cs (97%)
 rename src/Controls/src/Core/{ => CheckBox}/CheckedChangedEventArgs.cs (100%)
 delete mode 100644 src/Controls/src/Core/ContentPage.cs
 rename src/Controls/src/Core/{HandlerImpl/ContentPage.Impl.cs => ContentPage/ContentPage.cs} (55%)
 rename src/Controls/src/Core/{ => ContentView}/ContentView.cs (88%)
 rename src/Controls/src/Core/{HandlerImpl => }/DatePicker/DatePicker.Android.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl/DatePicker/DatePicker.cs => DatePicker/DatePicker.Mapper.cs} (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/DatePicker/DatePicker.Standard.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/DatePicker/DatePicker.Windows.cs (100%)
 rename src/Controls/src/Core/{ => DatePicker}/DatePicker.cs (98%)
 rename src/Controls/src/Core/{HandlerImpl => }/DatePicker/DatePicker.iOS.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/Editor/Editor.Android.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl/Editor/Editor.cs => Editor/Editor.Mapper.cs} (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/Editor/Editor.Standard.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/Editor/Editor.Tizen.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/Editor/Editor.Windows.cs (100%)
 rename src/Controls/src/Core/{ => Editor}/Editor.cs (86%)
 rename src/Controls/src/Core/{HandlerImpl => }/Editor/Editor.iOS.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/Element/Element.Android.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl/Element/Element.cs => Element/Element.Mapper.cs} (79%)
 rename src/Controls/src/Core/{HandlerImpl => }/Element/Element.Standard.cs (84%)
 rename src/Controls/src/Core/{HandlerImpl => }/Element/Element.Tizen.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/Element/Element.Windows.cs (100%)
 rename src/Controls/src/Core/{ => Element}/Element.cs (89%)
 rename src/Controls/src/Core/{HandlerImpl => }/Element/Element.iOS.cs (100%)
 rename src/Controls/src/Core/{ => Element}/ElementEventArgs.cs (100%)
 rename src/Controls/src/Core/{ => Element}/Element_StyleSheets.cs (100%)
 rename src/Controls/src/Core/Entry/{Entry.Controls.cs => Entry.cs} (100%)
 rename src/Controls/src/Core/{ => FlyoutPage}/FlyoutLayoutBehavior.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl/FlyoutPage/FlyoutPage.cs => FlyoutPage/FlyoutPage.Mapper.cs} (76%)
 rename src/Controls/src/Core/{ => FlyoutPage}/FlyoutPage.cs (92%)
 rename src/Controls/src/Core/{ => Frame}/Frame.cs (87%)
 rename src/Controls/src/Core/{HandlerImpl/GraphicsView.Impl.cs => GraphicsView/GraphicsView.cs} (100%)
 delete mode 100644 src/Controls/src/Core/HandlerImpl/ActivityIndicator.Impl.cs
 delete mode 100644 src/Controls/src/Core/HandlerImpl/Application/Application.Impl.cs
 delete mode 100644 src/Controls/src/Core/HandlerImpl/BoxView.Impl.cs
 delete mode 100644 src/Controls/src/Core/HandlerImpl/Brush.Impl.cs
 delete mode 100644 src/Controls/src/Core/HandlerImpl/Button/Button.Impl.cs
 delete mode 100644 src/Controls/src/Core/HandlerImpl/CheckBox/CheckBox.Impl.cs
 delete mode 100644 src/Controls/src/Core/HandlerImpl/ContentView/ContentView.Impl.cs
 delete mode 100644 src/Controls/src/Core/HandlerImpl/DatePicker/DatePicker.Impl.cs
 delete mode 100644 src/Controls/src/Core/HandlerImpl/Editor/Editor.Impl.cs
 delete mode 100644 src/Controls/src/Core/HandlerImpl/Element/Element.Impl.cs
 delete mode 100644 src/Controls/src/Core/HandlerImpl/Ellipse.Impl.cs
 delete mode 100644 src/Controls/src/Core/HandlerImpl/FlyoutPage/FlyoutPage.Impl.cs
 delete mode 100644 src/Controls/src/Core/HandlerImpl/Frame.Impl.cs
 delete mode 100644 src/Controls/src/Core/HandlerImpl/ImageButton/ImageButton.Impl.cs
 delete mode 100644 src/Controls/src/Core/HandlerImpl/IndicatorView.Impl.cs
 delete mode 100644 src/Controls/src/Core/HandlerImpl/Label/Label.Impl.cs
 delete mode 100644 src/Controls/src/Core/HandlerImpl/Line.Impl.cs
 delete mode 100644 src/Controls/src/Core/HandlerImpl/MenuItem.Impl.cs
 delete mode 100644 src/Controls/src/Core/HandlerImpl/NavigationPage/NavigationPage.Impl.cs
 delete mode 100644 src/Controls/src/Core/HandlerImpl/Page.Impl.cs
 delete mode 100644 src/Controls/src/Core/HandlerImpl/Path.Impl.cs
 delete mode 100644 src/Controls/src/Core/HandlerImpl/Picker/Picker.Impl.cs
 delete mode 100644 src/Controls/src/Core/HandlerImpl/Polygon.Impl.cs
 delete mode 100644 src/Controls/src/Core/HandlerImpl/Polyline.Impl.cs
 delete mode 100644 src/Controls/src/Core/HandlerImpl/ProgressBar.Impl.cs
 delete mode 100644 src/Controls/src/Core/HandlerImpl/RadioButton/RadioButton.Impl.cs
 delete mode 100644 src/Controls/src/Core/HandlerImpl/Rectangle.Impl.cs
 delete mode 100644 src/Controls/src/Core/HandlerImpl/RefreshView/RefreshView.Impl.cs
 delete mode 100644 src/Controls/src/Core/HandlerImpl/RoundRectangle.Impl.cs
 delete mode 100644 src/Controls/src/Core/HandlerImpl/ScrollView/ScrollView.Impl.cs
 delete mode 100644 src/Controls/src/Core/HandlerImpl/SearchBar/SearchBar.Impl.cs
 delete mode 100644 src/Controls/src/Core/HandlerImpl/Shape/Shape.Impl.cs
 delete mode 100644 src/Controls/src/Core/HandlerImpl/Shell.Impl.cs
 delete mode 100644 src/Controls/src/Core/HandlerImpl/ShellSection.Impl.cs
 delete mode 100644 src/Controls/src/Core/HandlerImpl/Slider.Impl.cs
 delete mode 100644 src/Controls/src/Core/HandlerImpl/Stepper.Impl.cs
 delete mode 100644 src/Controls/src/Core/HandlerImpl/SwipeItem.Impl.cs
 delete mode 100644 src/Controls/src/Core/HandlerImpl/SwipeItemView.Impl.cs
 delete mode 100644 src/Controls/src/Core/HandlerImpl/SwipeView.Impl.cs
 delete mode 100644 src/Controls/src/Core/HandlerImpl/Switch.Impl.cs
 delete mode 100644 src/Controls/src/Core/HandlerImpl/TabbedPage/TabbedPage.Impl.cs
 delete mode 100644 src/Controls/src/Core/HandlerImpl/TemplatedView/TemplatedView.Impl.cs
 delete mode 100644 src/Controls/src/Core/HandlerImpl/TimePicker/TimePicker.Impl.cs
 delete mode 100644 src/Controls/src/Core/HandlerImpl/View/View.Impl.cs
 delete mode 100644 src/Controls/src/Core/HandlerImpl/VisualElement/VisualElement.Impl.cs
 delete mode 100644 src/Controls/src/Core/HandlerImpl/WebView/WebView.Impl.cs
 rename src/Controls/src/Core/{ => Image}/IImageController.cs (100%)
 rename src/Controls/src/Core/{ => Image}/IImageElement.cs (100%)
 rename src/Controls/src/Core/{ => Image}/Image.cs (95%)
 rename src/Controls/src/Core/{HandlerImpl/Image.Impl.cs => Image/ImageSource.cs} (79%)
 rename src/Controls/src/Core/{ => ImageButton}/ImageButton.cs (90%)
 rename src/Controls/src/Core/{ => IndicatorView}/IndicatorShape.cs (100%)
 rename src/Controls/src/Core/{ => IndicatorView}/IndicatorStackLayout.cs (100%)
 rename src/Controls/src/Core/{ => IndicatorView}/IndicatorView.cs (94%)
 rename src/Controls/src/Core/{HandlerImpl => }/Label/Label.Android.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl/Label/Label.cs => Label/Label.Mapper.cs} (90%)
 rename src/Controls/src/Core/{HandlerImpl => }/Label/Label.Standard.cs (86%)
 rename src/Controls/src/Core/{HandlerImpl => }/Label/Label.Tizen.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/Label/Label.Windows.cs (100%)
 rename src/Controls/src/Core/{ => Label}/Label.cs (99%)
 rename src/Controls/src/Core/{HandlerImpl => }/Label/Label.iOS.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/Layout/Layout.Android.cs (100%)
 create mode 100644 src/Controls/src/Core/Layout/Layout.Mapper.cs
 rename src/Controls/src/Core/{HandlerImpl => }/Layout/Layout.Standard.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/Layout/Layout.Tizen.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/Layout/Layout.Windows.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/Layout/Layout.iOS.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl/Layout.Impl.cs => Layout/LayoutOfT.cs} (100%)
 rename src/Controls/src/Core/{ => ListView}/IListProxy.cs (100%)
 rename src/Controls/src/Core/{ => ListView}/IListViewController.cs (100%)
 rename src/Controls/src/Core/{ => ListView}/ListView.cs (100%)
 rename src/Controls/src/Core/{ => ListView}/ListViewCachingStrategy.cs (100%)
 rename src/Controls/src/Core/{ => ListView}/ListViewSelectionMode.cs (100%)
 rename src/Controls/src/Core/{ => Menu}/BaseMenuItem.cs (100%)
 rename src/Controls/src/Core/{ => Menu}/FlyoutBase.cs (100%)
 rename src/Controls/src/Core/{ => Menu}/MenuBar.cs (100%)
 rename src/Controls/src/Core/{ => Menu}/MenuBarItem.cs (100%)
 rename src/Controls/src/Core/{ => Menu}/MenuBarTracker.cs (100%)
 rename src/Controls/src/Core/{ContextFlyout.cs => Menu/MenuFlyout.cs} (96%)
 rename src/Controls/src/Core/{ => Menu}/MenuFlyoutItem.cs (100%)
 rename src/Controls/src/Core/{ => Menu}/MenuFlyoutSeparator.cs (100%)
 rename src/Controls/src/Core/{ => Menu}/MenuFlyoutSubItem.cs (100%)
 rename src/Controls/src/Core/{ => Menu}/MenuItem.cs (92%)
 rename src/Controls/src/Core/{ => Menu}/MenuItemTracker.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/NavigationPage/NavigationPage.Legacy.cs (98%)
 rename src/Controls/src/Core/{HandlerImpl/NavigationPage/NavigationPage.cs => NavigationPage/NavigationPage.Mapper.cs} (100%)
 rename src/Controls/src/Core/{ => NavigationPage}/NavigationPage.cs (53%)
 rename src/Controls/src/Core/{HandlerImpl => }/NavigationPage/NavigationPage.iOS.cs (100%)
 rename src/Controls/src/Core/{ => NavigationPage}/NavigationPageToolbar.cs (100%)
 create mode 100644 src/Controls/src/Core/Page/NavigatedFromEventArgs.cs
 create mode 100644 src/Controls/src/Core/Page/NavigatedToEventArgs.cs
 create mode 100644 src/Controls/src/Core/Page/NavigatingFromEventArgs.cs
 rename src/Controls/src/Core/{ => Page}/Page.cs (92%)
 rename src/Controls/src/Core/{HandlerImpl => }/Picker/Picker.Android.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl/Picker/Picker.cs => Picker/Picker.Mapper.cs} (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/Picker/Picker.Standard.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/Picker/Picker.Windows.cs (100%)
 rename src/Controls/src/Core/{ => Picker}/Picker.cs (95%)
 rename src/Controls/src/Core/{HandlerImpl => }/Picker/Picker.iOS.cs (100%)
 rename src/Controls/src/Core/{ => ProgressBar}/ProgressBar.cs (99%)
 rename src/Controls/src/Core/{HandlerImpl => }/RadioButton/RadioButton.Android.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl/RadioButton/RadioButton.cs => RadioButton/RadioButton.Mapper.cs} (82%)
 rename src/Controls/src/Core/{HandlerImpl => }/RadioButton/RadioButton.Tizen.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/RadioButton/RadioButton.Windows.cs (100%)
 rename src/Controls/src/Core/{ => RadioButton}/RadioButton.cs (96%)
 rename src/Controls/src/Core/{HandlerImpl => }/RadioButton/RadioButton.iOS.cs (100%)
 rename src/Controls/src/Core/{ => RadioButton}/RadioButtonGroup.cs (100%)
 rename src/Controls/src/Core/{ => RadioButton}/RadioButtonGroupController.cs (100%)
 rename src/Controls/src/Core/{ => RadioButton}/RadioButtonGroupSelectionChanged.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/RefreshView/RefreshView.Android.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl/RefreshView/RefreshView.cs => RefreshView/RefreshView.Mapper.cs} (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/RefreshView/RefreshView.Standard.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/RefreshView/RefreshView.Windows.cs (100%)
 rename src/Controls/src/Core/{ => RefreshView}/RefreshView.cs (97%)
 rename src/Controls/src/Core/{HandlerImpl => }/RefreshView/RefreshView.iOS.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/ScrollView/ScrollView.Android.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl/ScrollView/ScrollView.cs => ScrollView/ScrollView.Mapper.cs} (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/ScrollView/ScrollView.Standard.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/ScrollView/ScrollView.Windows.cs (100%)
 rename src/Controls/src/Core/{ => ScrollView}/ScrollView.cs (87%)
 rename src/Controls/src/Core/{HandlerImpl => }/ScrollView/ScrollView.iOS.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/SearchBar/SearchBar.Android.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl/SearchBar/SearchBar.cs => SearchBar/SearchBar.Mapper.cs} (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/SearchBar/SearchBar.Standard.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/SearchBar/SearchBar.Tizen.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/SearchBar/SearchBar.Windows.cs (100%)
 rename src/Controls/src/Core/{ => SearchBar}/SearchBar.cs (97%)
 rename src/Controls/src/Core/{HandlerImpl => }/SearchBar/SearchBar.iOS.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/Shape/Shape.Android.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl/Shape/Shape.cs => Shape/Shape.Mapper.cs} (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/Shape/Shape.Standard.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/Shape/Shape.Tizen.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/Shape/Shape.Windows.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/Shape/Shape.iOS.cs (100%)
 rename src/Controls/src/Core/{ => Shell}/FlyoutHeaderBehavior.cs (100%)
 rename src/Controls/src/Core/{ => Slider}/Slider.cs (96%)
 rename src/Controls/src/Core/{ => Stepper}/Stepper.cs (100%)
 rename src/Controls/src/Core/{ => SwipeView}/SwipeEventArgs.cs (100%)
 rename src/Controls/src/Core/{ => SwipeView}/SwipeItem.cs (70%)
 rename src/Controls/src/Core/{ => SwipeView}/SwipeItemView.cs (100%)
 rename src/Controls/src/Core/{ => SwipeView}/SwipeItems.cs (100%)
 rename src/Controls/src/Core/{ => SwipeView}/SwipeView.cs (61%)
 rename src/Controls/src/Core/{ => SwipeView}/SwipedEventArgs.cs (100%)
 rename src/Controls/src/Core/{ => Switch}/Switch.cs (85%)
 rename src/Controls/src/Core/{HandlerImpl => }/TabbedPage/TabbedPage.Android.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl/TabbedPage/TabbedPage.cs => TabbedPage/TabbedPage.Mapper.cs} (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/TabbedPage/TabbedPage.Standard.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/TabbedPage/TabbedPage.Tizen.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/TabbedPage/TabbedPage.Windows.cs (100%)
 rename src/Controls/src/Core/{ => TabbedPage}/TabbedPage.cs (71%)
 rename src/Controls/src/Core/{HandlerImpl => }/TabbedPage/TabbedPage.iOS.cs (100%)
 rename src/Controls/src/Core/{ => TableView}/ChildCollectionChangedEventArgs.cs (100%)
 rename src/Controls/src/Core/{ => TableView}/TableIntent.cs (100%)
 rename src/Controls/src/Core/{ => TableView}/TableModel.cs (100%)
 rename src/Controls/src/Core/{ => TableView}/TableRoot.cs (100%)
 rename src/Controls/src/Core/{ => TableView}/TableSection.cs (100%)
 rename src/Controls/src/Core/{ => TableView}/TableSectionBase.cs (100%)
 rename src/Controls/src/Core/{ => TableView}/TableView.cs (100%)
 rename src/Controls/src/Core/{ => TemplatedView}/TemplatedView.cs (79%)
 rename src/Controls/src/Core/{HandlerImpl => }/TimePicker/TimePicker.Android.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl/TimePicker/TimePicker.cs => TimePicker/TimePicker.Mapper.cs} (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/TimePicker/TimePicker.Standard.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/TimePicker/TimePicker.Windows.cs (100%)
 rename src/Controls/src/Core/{ => TimePicker}/TimePicker.cs (98%)
 rename src/Controls/src/Core/{HandlerImpl => }/TimePicker/TimePicker.iOS.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/Toolbar/Toolbar.Android.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl/Toolbar/Toolbar.cs => Toolbar/Toolbar.Mapper.cs} (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/Toolbar/Toolbar.Tizen.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/Toolbar/Toolbar.Windows.cs (100%)
 rename src/Controls/src/Core/{ => Toolbar}/Toolbar.cs (100%)
 rename src/Controls/src/Core/{ => Toolbar}/ToolbarItem.cs (100%)
 rename src/Controls/src/Core/{ => Toolbar}/ToolbarItemEventArgs.cs (100%)
 rename src/Controls/src/Core/{ => Toolbar}/ToolbarItemOrder.cs (100%)
 rename src/Controls/src/Core/{ => Toolbar}/ToolbarTracker.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/View/View.Android.cs (100%)
 rename src/Controls/src/Core/{ => View}/View.cs (84%)
 rename src/Controls/src/Core/{HandlerImpl => }/VisualElement/VisualElement.Android.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl/VisualElement/VisualElement.cs => VisualElement/VisualElement.Mapper.cs} (95%)
 rename src/Controls/src/Core/{HandlerImpl => }/VisualElement/VisualElement.Platform.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/VisualElement/VisualElement.Standard.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/VisualElement/VisualElement.Tizen.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/VisualElement/VisualElement.Windows.cs (100%)
 rename src/Controls/src/Core/{ => VisualElement}/VisualElement.cs (81%)
 rename src/Controls/src/Core/{HandlerImpl => }/VisualElement/VisualElement.iOS.cs (100%)
 rename src/Controls/src/Core/{ => VisualElement}/VisualElementChangedEventArgs.cs (100%)
 rename src/Controls/src/Core/{ => VisualElement}/VisualElement_StyleSheet.cs (100%)
 rename src/Controls/src/Core/{ => WebView}/WebNavigatedEventArgs.cs (100%)
 rename src/Controls/src/Core/{ => WebView}/WebNavigatingEventArgs.cs (100%)
 rename src/Controls/src/Core/{ => WebView}/WebNavigationEventArgs.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/WebView/WebView.Android.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl/WebView/WebView.cs => WebView/WebView.Mapper.cs} (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/WebView/WebView.Standard.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/WebView/WebView.Windows.cs (100%)
 rename src/Controls/src/Core/{ => WebView}/WebView.cs (90%)
 rename src/Controls/src/Core/{HandlerImpl => }/WebView/WebView.iOS.cs (100%)
 rename src/Controls/src/Core/{ => WebView}/WebViewSource.cs (100%)
 rename src/Controls/src/Core/{ => WebView}/WebViewSourceTypeConverter.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/Window/Window.Android.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl/Window/Window.cs => Window/Window.Mapper.cs} (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/Window/Window.Tizen.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/Window/Window.Windows.cs (100%)
 rename src/Controls/src/Core/{HandlerImpl/Window/Window.Impl.cs => Window/Window.cs} (100%)
 rename src/Controls/src/Core/{HandlerImpl => }/Window/Window.iOS.cs (100%)

diff --git a/src/Controls/src/Core/ActivityIndicator.cs b/src/Controls/src/Core/ActivityIndicator/ActivityIndicator.cs
similarity index 96%
rename from src/Controls/src/Core/ActivityIndicator.cs
rename to src/Controls/src/Core/ActivityIndicator/ActivityIndicator.cs
index 8652244bf664..5e9dc3d6bc43 100644
--- a/src/Controls/src/Core/ActivityIndicator.cs
+++ b/src/Controls/src/Core/ActivityIndicator/ActivityIndicator.cs
@@ -5,7 +5,7 @@
 namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/ActivityIndicator.xml" path="Type[@FullName='Microsoft.Maui.Controls.ActivityIndicator']/Docs/*" />
-	public partial class ActivityIndicator : View, IColorElement, IElementConfiguration<ActivityIndicator>
+	public partial class ActivityIndicator : View, IColorElement, IElementConfiguration<ActivityIndicator>, IActivityIndicator
 	{
 		/// <summary>Bindable property for <see cref="IsRunning"/>.</summary>
 		public static readonly BindableProperty IsRunningProperty = BindableProperty.Create("IsRunning", typeof(bool), typeof(ActivityIndicator), default(bool));
diff --git a/src/Controls/src/Core/HandlerImpl/Application/Application.Android.cs b/src/Controls/src/Core/Application/Application.Android.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Application/Application.Android.cs
rename to src/Controls/src/Core/Application/Application.Android.cs
diff --git a/src/Controls/src/Core/HandlerImpl/Application/Application.cs b/src/Controls/src/Core/Application/Application.Mapper.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Application/Application.cs
rename to src/Controls/src/Core/Application/Application.Mapper.cs
diff --git a/src/Controls/src/Core/HandlerImpl/Application/Application.Standard.cs b/src/Controls/src/Core/Application/Application.Standard.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Application/Application.Standard.cs
rename to src/Controls/src/Core/Application/Application.Standard.cs
diff --git a/src/Controls/src/Core/HandlerImpl/Application/Application.Tizen.cs b/src/Controls/src/Core/Application/Application.Tizen.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Application/Application.Tizen.cs
rename to src/Controls/src/Core/Application/Application.Tizen.cs
diff --git a/src/Controls/src/Core/HandlerImpl/Application/Application.Windows.cs b/src/Controls/src/Core/Application/Application.Windows.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Application/Application.Windows.cs
rename to src/Controls/src/Core/Application/Application.Windows.cs
diff --git a/src/Controls/src/Core/Application.cs b/src/Controls/src/Core/Application/Application.cs
similarity index 74%
rename from src/Controls/src/Core/Application.cs
rename to src/Controls/src/Core/Application/Application.cs
index 14348cb52519..6a0541e234bf 100644
--- a/src/Controls/src/Core/Application.cs
+++ b/src/Controls/src/Core/Application/Application.cs
@@ -15,7 +15,7 @@
 namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/Application.xml" path="Type[@FullName='Microsoft.Maui.Controls.Application']/Docs/*" />
-	public partial class Application : Element, IResourcesProvider, IApplicationController, IElementConfiguration<Application>, IVisualTreeElement
+	public partial class Application : Element, IResourcesProvider, IApplicationController, IElementConfiguration<Application>, IVisualTreeElement, IApplication
 	{
 		readonly WeakEventManager _weakEventManager = new WeakEventManager();
 		readonly Lazy<PlatformConfigurationRegistry<Application>> _platformConfigurationRegistry;
@@ -391,5 +391,142 @@ protected internal virtual void CleanUp()
 		}
 
 		IReadOnlyList<Maui.IVisualTreeElement> IVisualTreeElement.GetVisualChildren() => this.Windows;
+
+		internal const string MauiWindowIdKey = "__MAUI_WINDOW_ID__";
+
+		readonly List<Window> _windows = new();
+		readonly Dictionary<string, WeakReference<Window>> _requestedWindows = new(StringComparer.Ordinal);
+		ILogger<Application>? _logger;
+
+		ILogger<Application>? Logger =>
+			_logger ??= Handler?.MauiContext?.CreateLogger<Application>();
+
+		IReadOnlyList<IWindow> IApplication.Windows => _windows;
+
+		public IReadOnlyList<Window> Windows => _windows;
+
+		IWindow IApplication.CreateWindow(IActivationState? activationState)
+		{
+			Window? window = null;
+
+			// try get the window that is pending
+			if (activationState?.State?.TryGetValue(MauiWindowIdKey, out var requestedWindowId) ?? false)
+			{
+				if (requestedWindowId != null && _requestedWindows.TryGetValue(requestedWindowId, out var r))
+				{
+					if (r.TryGetTarget(out var w))
+					{
+						window = w;
+					}
+					_requestedWindows.Remove(requestedWindowId);
+				}
+			}
+
+			// create a new one if there is no pending windows
+			if (window == null)
+			{
+				window = CreateWindow(activationState);
+
+				if (_singleWindowMainPage != null && window.Page != null && window.Page != _singleWindowMainPage)
+					throw new InvalidOperationException($"Both {nameof(MainPage)} was set and {nameof(Application.CreateWindow)} was overridden to provide a page.");
+			}
+
+			// make sure it is added to the windows list
+			if (!_windows.Contains(window))
+				AddWindow(window);
+
+			return window;
+		}
+
+		void IApplication.OpenWindow(IWindow window)
+		{
+			if (window is Window cwindow)
+				OpenWindow(cwindow);
+		}
+
+		void IApplication.CloseWindow(IWindow window)
+		{
+			Handler?.Invoke(nameof(IApplication.CloseWindow), window);
+		}
+
+		internal void RemoveWindow(Window window)
+		{
+			// Do not attempt to close the "MainPage" window
+			if (_singleWindowMainPage != null && window.Page == _singleWindowMainPage)
+				return;
+
+			// Window was closed, stop tracking it
+			if (window is null)
+				return;
+
+			if (window is NavigableElement ne)
+				ne.NavigationProxy.Inner = null;
+
+			if (window is Element windowElement)
+			{
+				RemoveLogicalChildInternal(windowElement);
+			}
+
+			_windows.Remove(window);
+		}
+
+		public virtual void OpenWindow(Window window)
+		{
+			var id = Guid.NewGuid().ToString("n");
+			_requestedWindows.Add(id, new WeakReference<Window>(window));
+
+			var state = new PersistedState
+			{
+				[MauiWindowIdKey] = id
+			};
+
+			Handler?.Invoke(nameof(IApplication.OpenWindow), new OpenWindowRequest(State: state));
+		}
+
+		public virtual void CloseWindow(Window window)
+		{
+			Handler?.Invoke(nameof(IApplication.CloseWindow), window);
+		}
+
+		void IApplication.ThemeChanged()
+		{
+			PlatformAppTheme = AppInfo.RequestedTheme;
+		}
+
+		protected virtual Window CreateWindow(IActivationState? activationState)
+		{
+			if (Windows.Count > 1)
+				throw new NotImplementedException($"Either set {nameof(MainPage)} or override {nameof(Application.CreateWindow)}.");
+
+			if (Windows.Count > 0)
+				return Windows[0];
+
+			if (_singleWindowMainPage != null)
+				return new Window(_singleWindowMainPage);
+
+			throw new NotImplementedException($"Either set {nameof(MainPage)} or override {nameof(Application.CreateWindow)}.");
+		}
+
+		void AddWindow(Window window)
+		{
+			_windows.Add(window);
+
+			if (window is Element windowElement)
+			{
+				AddLogicalChildInternal(windowElement);
+			}
+
+			if (window is NavigableElement ne)
+				ne.NavigationProxy.Inner = NavigationProxy;
+
+			// Once the window has been attached to the application. 
+			// The window will finish propagating events like `Appearing`.
+			//
+			// I could fire this from 'OnParentSet` inside Window but
+			// I'd rather wait until Application is done wiring itself
+			// up to the window before triggering any down stream life cycle
+			// events.
+			window.FinishedAddingWindowToApplication(this);
+		}
 	}
 }
diff --git a/src/Controls/src/Core/HandlerImpl/Application/Application.iOS.cs b/src/Controls/src/Core/Application/Application.iOS.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Application/Application.iOS.cs
rename to src/Controls/src/Core/Application/Application.iOS.cs
diff --git a/src/Controls/src/Core/BindableLayout.cs b/src/Controls/src/Core/BindableLayout/BindableLayout.cs
similarity index 100%
rename from src/Controls/src/Core/BindableLayout.cs
rename to src/Controls/src/Core/BindableLayout/BindableLayout.cs
diff --git a/src/Controls/src/Core/Border.cs b/src/Controls/src/Core/Border/Border.cs
similarity index 100%
rename from src/Controls/src/Core/Border.cs
rename to src/Controls/src/Core/Border/Border.cs
diff --git a/src/Controls/src/Core/BoxView.cs b/src/Controls/src/Core/BoxView/BoxView.cs
similarity index 59%
rename from src/Controls/src/Core/BoxView.cs
rename to src/Controls/src/Core/BoxView/BoxView.cs
index 09bc2e2fa5e9..21cdce7f8ea1 100644
--- a/src/Controls/src/Core/BoxView.cs
+++ b/src/Controls/src/Core/BoxView/BoxView.cs
@@ -1,12 +1,13 @@
 #nullable disable
 using System;
 using System.ComponentModel;
+using System.Runtime.CompilerServices;
 using Microsoft.Maui.Graphics;
 
 namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/BoxView.xml" path="Type[@FullName='Microsoft.Maui.Controls.BoxView']/Docs/*" />
-	public partial class BoxView : View, IColorElement, ICornerElement, IElementConfiguration<BoxView>
+	public partial class BoxView : View, IColorElement, ICornerElement, IElementConfiguration<BoxView>, IShapeView, IShape
 	{
 		/// <summary>Bindable property for <see cref="Color"/>.</summary>
 		public static readonly BindableProperty ColorProperty = ColorElement.ColorProperty;
@@ -46,5 +47,53 @@ protected override SizeRequest OnMeasure(double widthConstraint, double heightCo
 		{
 			return new SizeRequest(new Size(40, 40));
 		}
+
+#nullable enable
+		// Todo these shuold be moved to a mapper
+		protected override void OnPropertyChanged([CallerMemberName] string? propertyName = null)
+		{
+			base.OnPropertyChanged(propertyName);
+
+			if (propertyName == BackgroundColorProperty.PropertyName ||
+				propertyName == ColorProperty.PropertyName ||
+				propertyName == CornerRadiusProperty.PropertyName)
+				Handler?.UpdateValue(nameof(IShapeView.Shape));
+		}
+
+		IShape? IShapeView.Shape => this;
+
+		PathAspect IShapeView.Aspect => PathAspect.None;
+
+		Paint? IShapeView.Fill => Color?.AsPaint() ?? ((IView)this).Background;
+
+		Paint? IStroke.Stroke => null;
+
+		double IStroke.StrokeThickness => 0;
+
+		LineCap IStroke.StrokeLineCap => LineCap.Butt;
+
+		LineJoin IStroke.StrokeLineJoin => LineJoin.Miter;
+
+		float[]? IStroke.StrokeDashPattern => null;
+
+		float IStroke.StrokeDashOffset => 0f;
+
+		float IStroke.StrokeMiterLimit => 0;
+
+		PathF IShape.PathForBounds(Rect bounds)
+		{
+			var path = new PathF();
+
+			path.AppendRoundedRectangle(
+				bounds,
+				(float)CornerRadius.TopLeft,
+				(float)CornerRadius.TopRight,
+				(float)CornerRadius.BottomLeft,
+				(float)CornerRadius.BottomRight);
+
+			return path;
+		}
+#nullable disable
+
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/src/Core/Brush.cs b/src/Controls/src/Core/Brush/Brush.cs
similarity index 92%
rename from src/Controls/src/Core/Brush.cs
rename to src/Controls/src/Core/Brush/Brush.cs
index d4fc16021c19..8d8cee876d40 100644
--- a/src/Controls/src/Core/Brush.cs
+++ b/src/Controls/src/Core/Brush/Brush.cs
@@ -1,5 +1,6 @@
 #nullable disable
 using Microsoft.Maui.Graphics;
+using GraphicsGradientStop = Microsoft.Maui.Graphics.PaintGradientStop;
 
 namespace Microsoft.Maui.Controls
 {
@@ -7,6 +8,86 @@ namespace Microsoft.Maui.Controls
 	[System.ComponentModel.TypeConverter(typeof(BrushTypeConverter))]
 	public abstract partial class Brush : Element
 	{
+		public static implicit operator Brush(Paint paint)
+		{
+			if (paint is SolidPaint solidPaint)
+				return new SolidColorBrush { Color = solidPaint.Color };
+
+			if (paint is GradientPaint gradientPaint)
+			{
+				var gradientStopCollection = gradientPaint.GradientStops;
+
+				GradientStopCollection gradientStops = new GradientStopCollection();
+
+				for (int i = 0; i < gradientStopCollection.Length; i++)
+				{
+					var gs = gradientStopCollection[i];
+					gradientStops.Insert(i, new GradientStop(gs.Color, gs.Offset));
+				}
+
+				if (gradientPaint is LinearGradientPaint linearGradientPaint)
+				{
+					var startPoint = linearGradientPaint.StartPoint;
+					var endPoint = linearGradientPaint.EndPoint;
+
+					return new LinearGradientBrush { GradientStops = gradientStops, StartPoint = startPoint, EndPoint = endPoint };
+				}
+
+				if (gradientPaint is RadialGradientPaint radialGradientPaint)
+				{
+					var center = radialGradientPaint.Center;
+					var radius = radialGradientPaint.Radius;
+
+					return new RadialGradientBrush { GradientStops = gradientStops, Center = center, Radius = radius };
+				}
+			}
+
+			if (paint is ImageSourcePaint imageSourcePaint && imageSourcePaint.ImageSource is ImageSource imageSource)
+				return new ImageBrush { ImageSource = imageSource };
+
+			return null;
+		}
+
+		public static implicit operator Paint(Brush brush)
+		{
+			if (brush is SolidColorBrush solidColorBrush)
+				return new SolidPaint { Color = solidColorBrush.Color };
+
+			if (brush is GradientBrush gradientBrush)
+			{
+				var gradientStopCollection = gradientBrush.GradientStops;
+
+				GraphicsGradientStop[] gradientStops = new GraphicsGradientStop[gradientStopCollection.Count];
+
+				for (int i = 0; i < gradientStopCollection.Count; i++)
+				{
+					var gs = gradientStopCollection[i];
+					gradientStops[i] = new GraphicsGradientStop(gs.Offset, gs.Color);
+				}
+
+				if (gradientBrush is LinearGradientBrush linearGradientBrush)
+				{
+					var startPoint = linearGradientBrush.StartPoint;
+					var endPoint = linearGradientBrush.EndPoint;
+
+					return new LinearGradientPaint { GradientStops = gradientStops, StartPoint = startPoint, EndPoint = endPoint };
+				}
+
+				if (gradientBrush is RadialGradientBrush radialGradientBrush)
+				{
+					var center = radialGradientBrush.Center;
+					var radius = radialGradientBrush.Radius;
+
+					return new RadialGradientPaint { GradientStops = gradientStops, Center = center, Radius = radius };
+				}
+			}
+
+			if (brush is ImageBrush imageBrush)
+				return new ImageSourcePaint { ImageSource = imageBrush.ImageSource };
+
+			return null;
+		}
+
 		static ImmutableBrush defaultBrush;
 		/// <include file="../../docs/Microsoft.Maui.Controls/Brush.xml" path="//Member[@MemberName='Default']/Docs/*" />
 		public static Brush Default => defaultBrush ??= new(null);
diff --git a/src/Controls/src/Core/BrushTypeConverter.cs b/src/Controls/src/Core/Brush/BrushTypeConverter.cs
similarity index 100%
rename from src/Controls/src/Core/BrushTypeConverter.cs
rename to src/Controls/src/Core/Brush/BrushTypeConverter.cs
diff --git a/src/Controls/src/Core/HandlerImpl/Button/Button.Android.cs b/src/Controls/src/Core/Button/Button.Android.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Button/Button.Android.cs
rename to src/Controls/src/Core/Button/Button.Android.cs
diff --git a/src/Controls/src/Core/HandlerImpl/Button/Button.cs b/src/Controls/src/Core/Button/Button.Mapper.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Button/Button.cs
rename to src/Controls/src/Core/Button/Button.Mapper.cs
diff --git a/src/Controls/src/Core/HandlerImpl/Button/Button.Standard.cs b/src/Controls/src/Core/Button/Button.Standard.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Button/Button.Standard.cs
rename to src/Controls/src/Core/Button/Button.Standard.cs
diff --git a/src/Controls/src/Core/HandlerImpl/Button/Button.Tizen.cs b/src/Controls/src/Core/Button/Button.Tizen.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Button/Button.Tizen.cs
rename to src/Controls/src/Core/Button/Button.Tizen.cs
diff --git a/src/Controls/src/Core/HandlerImpl/Button/Button.Windows.cs b/src/Controls/src/Core/Button/Button.Windows.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Button/Button.Windows.cs
rename to src/Controls/src/Core/Button/Button.Windows.cs
diff --git a/src/Controls/src/Core/Button.cs b/src/Controls/src/Core/Button/Button.cs
similarity index 93%
rename from src/Controls/src/Core/Button.cs
rename to src/Controls/src/Core/Button/Button.cs
index 27ed73b79592..995c94b45a6f 100644
--- a/src/Controls/src/Core/Button.cs
+++ b/src/Controls/src/Core/Button/Button.cs
@@ -3,6 +3,7 @@
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Globalization;
+using System.Runtime.CompilerServices;
 using System.Windows.Input;
 using Microsoft.Maui.Controls.Internals;
 using Microsoft.Maui.Graphics;
@@ -12,7 +13,7 @@ namespace Microsoft.Maui.Controls
 	/// <summary>
 	/// A button <see cref="View" /> that reacts to touch events.
 	/// </summary>
-	public partial class Button : View, IFontElement, ITextElement, IBorderElement, IButtonController, IElementConfiguration<Button>, IPaddingElement, IImageController, IViewController, IButtonElement, ICommandElement, IImageElement
+	public partial class Button : View, IFontElement, ITextElement, IBorderElement, IButtonController, IElementConfiguration<Button>, IPaddingElement, IImageController, IViewController, IButtonElement, ICommandElement, IImageElement, IButton, ITextButton, IImageButton
 	{
 		const double DefaultSpacing = 10;
 
@@ -464,6 +465,59 @@ void ICommandElement.CanExecuteChanged(object sender, EventArgs e) =>
 		protected override bool IsEnabledCore =>
 			base.IsEnabledCore && CommandElement.GetCanExecute(this);
 
+		bool _wasImageLoading;
+
+		protected override void OnPropertyChanged([CallerMemberName] string propertyName = null)
+		{
+			base.OnPropertyChanged(propertyName);
+
+			if (propertyName == BorderColorProperty.PropertyName)
+				Handler?.UpdateValue(nameof(IButtonStroke.StrokeColor));
+			else if (propertyName == BorderWidthProperty.PropertyName)
+				Handler?.UpdateValue(nameof(IButtonStroke.StrokeThickness));
+			else if (propertyName == ImageSourceProperty.PropertyName)
+				Handler?.UpdateValue(nameof(IImage.Source));
+		}
+
+		void IButton.Clicked()
+		{
+			(this as IButtonController).SendClicked();
+		}
+
+		void IButton.Pressed()
+		{
+			(this as IButtonController).SendPressed();
+		}
+
+		void IButton.Released()
+		{
+			(this as IButtonController).SendReleased();
+		}
+
+		void IImageSourcePart.UpdateIsLoading(bool isLoading)
+		{
+			if (!isLoading && _wasImageLoading)
+				Handler?.UpdateValue(nameof(ContentLayout));
+
+			_wasImageLoading = isLoading;
+		}
+
+		Font ITextStyle.Font => this.ToFont();
+
+		Aspect IImage.Aspect => Aspect.Fill;
+
+		bool IImage.IsOpaque => true;
+
+		IImageSource IImageSourcePart.Source => ImageSource;
+
+		bool IImageSourcePart.IsAnimationPlaying => false;
+
+		double IButtonStroke.StrokeThickness => (double)GetValue(BorderWidthProperty);
+
+		Color IButtonStroke.StrokeColor => (Color)GetValue(BorderColorProperty);
+
+		int IButtonStroke.CornerRadius => (int)GetValue(CornerRadiusProperty);
+
 		/// <summary>
 		/// Represents the layout of the button content whenever an image is shown.
 		/// </summary>
diff --git a/src/Controls/src/Core/HandlerImpl/Button/Button.iOS.cs b/src/Controls/src/Core/Button/Button.iOS.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Button/Button.iOS.cs
rename to src/Controls/src/Core/Button/Button.iOS.cs
diff --git a/src/Controls/src/Core/ButtonElement.cs b/src/Controls/src/Core/Button/ButtonElement.cs
similarity index 100%
rename from src/Controls/src/Core/ButtonElement.cs
rename to src/Controls/src/Core/Button/ButtonElement.cs
diff --git a/src/Controls/src/Core/ButtonsMask.cs b/src/Controls/src/Core/Button/ButtonsMask.cs
similarity index 100%
rename from src/Controls/src/Core/ButtonsMask.cs
rename to src/Controls/src/Core/Button/ButtonsMask.cs
diff --git a/src/Controls/src/Core/CarouselPage.cs b/src/Controls/src/Core/CarouselPage/CarouselPage.cs
similarity index 100%
rename from src/Controls/src/Core/CarouselPage.cs
rename to src/Controls/src/Core/CarouselPage/CarouselPage.cs
diff --git a/src/Controls/src/Core/HandlerImpl/CheckBox/CheckBox.cs b/src/Controls/src/Core/CheckBox/CheckBox.Mapper.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/CheckBox/CheckBox.cs
rename to src/Controls/src/Core/CheckBox/CheckBox.Mapper.cs
diff --git a/src/Controls/src/Core/CheckBox.cs b/src/Controls/src/Core/CheckBox/CheckBox.cs
similarity index 97%
rename from src/Controls/src/Core/CheckBox.cs
rename to src/Controls/src/Core/CheckBox/CheckBox.cs
index c94256e6c3ba..02fa42baf107 100644
--- a/src/Controls/src/Core/CheckBox.cs
+++ b/src/Controls/src/Core/CheckBox/CheckBox.cs
@@ -5,7 +5,7 @@
 namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/CheckBox.xml" path="Type[@FullName='Microsoft.Maui.Controls.CheckBox']/Docs/*" />
-	public partial class CheckBox : View, IElementConfiguration<CheckBox>, IBorderElement, IColorElement
+	public partial class CheckBox : View, IElementConfiguration<CheckBox>, IBorderElement, IColorElement, ICheckBox
 	{
 		readonly Lazy<PlatformConfigurationRegistry<CheckBox>> _platformConfigurationRegistry;
 		/// <include file="../../docs/Microsoft.Maui.Controls/CheckBox.xml" path="//Member[@MemberName='IsCheckedVisualState']/Docs/*" />
@@ -72,5 +72,6 @@ void IBorderElement.OnBorderColorPropertyChanged(Color oldValue, Color newValue)
 		bool IBorderElement.IsBackgroundSet() => IsSet(BackgroundProperty);
 		bool IBorderElement.IsBorderColorSet() => false;
 		bool IBorderElement.IsBorderWidthSet() => false;
+		public Paint Foreground => Color?.AsPaint();
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/src/Core/CheckedChangedEventArgs.cs b/src/Controls/src/Core/CheckBox/CheckedChangedEventArgs.cs
similarity index 100%
rename from src/Controls/src/Core/CheckedChangedEventArgs.cs
rename to src/Controls/src/Core/CheckBox/CheckedChangedEventArgs.cs
diff --git a/src/Controls/src/Core/ColorElement.cs b/src/Controls/src/Core/ColorElement.cs
index 51f050e1d6a9..8d1117eba039 100644
--- a/src/Controls/src/Core/ColorElement.cs
+++ b/src/Controls/src/Core/ColorElement.cs
@@ -1,5 +1,4 @@
-#nullable disable
-using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Graphics;
 
 namespace Microsoft.Maui.Controls
 {
diff --git a/src/Controls/src/Core/ContentPage.cs b/src/Controls/src/Core/ContentPage.cs
deleted file mode 100644
index af0a13d1fcd6..000000000000
--- a/src/Controls/src/Core/ContentPage.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-#nullable disable
-namespace Microsoft.Maui.Controls
-{
-	/// <include file="../../docs/Microsoft.Maui.Controls/ContentPage.xml" path="Type[@FullName='Microsoft.Maui.Controls.ContentPage']/Docs/*" />
-	[ContentProperty("Content")]
-	public partial class ContentPage : TemplatedPage
-	{
-		/// <summary>Bindable property for <see cref="Content"/>.</summary>
-		public static readonly BindableProperty ContentProperty = BindableProperty.Create(nameof(Content), typeof(View), typeof(ContentPage), null, propertyChanged: TemplateUtilities.OnContentChanged);
-
-		/// <include file="../../docs/Microsoft.Maui.Controls/ContentPage.xml" path="//Member[@MemberName='Content']/Docs/*" />
-		public View Content
-		{
-			get { return (View)GetValue(ContentProperty); }
-			set { SetValue(ContentProperty, value); }
-		}
-
-		protected override void OnBindingContextChanged()
-		{
-			base.OnBindingContextChanged();
-
-			View content = Content;
-			ControlTemplate controlTemplate = ControlTemplate;
-			if (content != null && controlTemplate != null)
-			{
-				SetInheritedBindingContext(content, BindingContext);
-			}
-		}
-
-		internal override void OnControlTemplateChanged(ControlTemplate oldValue, ControlTemplate newValue)
-		{
-			if (oldValue == null)
-				return;
-
-			base.OnControlTemplateChanged(oldValue, newValue);
-			View content = Content;
-			ControlTemplate controlTemplate = ControlTemplate;
-			if (content != null && controlTemplate != null)
-			{
-				SetInheritedBindingContext(content, BindingContext);
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/Controls/src/Core/HandlerImpl/ContentPage.Impl.cs b/src/Controls/src/Core/ContentPage/ContentPage.cs
similarity index 55%
rename from src/Controls/src/Core/HandlerImpl/ContentPage.Impl.cs
rename to src/Controls/src/Core/ContentPage/ContentPage.cs
index 86c7c9981160..7ce00866f664 100644
--- a/src/Controls/src/Core/HandlerImpl/ContentPage.Impl.cs
+++ b/src/Controls/src/Core/ContentPage/ContentPage.cs
@@ -1,13 +1,51 @@
-#nullable disable
+#nullable disable
+
 using Microsoft.Maui.Graphics;
 using Microsoft.Maui.HotReload;
 using Microsoft.Maui.Layouts;
 
 namespace Microsoft.Maui.Controls
 {
-	/// <include file="../../../docs/Microsoft.Maui.Controls/ContentPage.xml" path="Type[@FullName='Microsoft.Maui.Controls.ContentPage']/Docs/*" />
-	public partial class ContentPage : IContentView, HotReload.IHotReloadableView
+	/// <include file="../../docs/Microsoft.Maui.Controls/ContentPage.xml" path="Type[@FullName='Microsoft.Maui.Controls.ContentPage']/Docs/*" />
+	[ContentProperty("Content")]
+	public partial class ContentPage : TemplatedPage, IContentView, HotReload.IHotReloadableView
 	{
+		/// <summary>Bindable property for <see cref="Content"/>.</summary>
+		public static readonly BindableProperty ContentProperty = BindableProperty.Create(nameof(Content), typeof(View), typeof(ContentPage), null, propertyChanged: TemplateUtilities.OnContentChanged);
+
+		/// <include file="../../docs/Microsoft.Maui.Controls/ContentPage.xml" path="//Member[@MemberName='Content']/Docs/*" />
+		public View Content
+		{
+			get { return (View)GetValue(ContentProperty); }
+			set { SetValue(ContentProperty, value); }
+		}
+
+		protected override void OnBindingContextChanged()
+		{
+			base.OnBindingContextChanged();
+
+			View content = Content;
+			ControlTemplate controlTemplate = ControlTemplate;
+			if (content != null && controlTemplate != null)
+			{
+				SetInheritedBindingContext(content, BindingContext);
+			}
+		}
+
+		internal override void OnControlTemplateChanged(ControlTemplate oldValue, ControlTemplate newValue)
+		{
+			if (oldValue == null)
+				return;
+
+			base.OnControlTemplateChanged(oldValue, newValue);
+			View content = Content;
+			ControlTemplate controlTemplate = ControlTemplate;
+			if (content != null && controlTemplate != null)
+			{
+				SetInheritedBindingContext(content, BindingContext);
+			}
+		}
+
 		object IContentView.Content => Content;
 		IView IContentView.PresentedContent => ((this as IControlTemplated).TemplateRoot as IView) ?? Content;
 
@@ -72,4 +110,4 @@ void HotReload.IHotReloadableView.Reload()
 		}
 		#endregion
 	}
-}
+}
\ No newline at end of file
diff --git a/src/Controls/src/Core/ContentView.cs b/src/Controls/src/Core/ContentView/ContentView.cs
similarity index 88%
rename from src/Controls/src/Core/ContentView.cs
rename to src/Controls/src/Core/ContentView/ContentView.cs
index 18a9ae86881f..b447cabdc1f4 100644
--- a/src/Controls/src/Core/ContentView.cs
+++ b/src/Controls/src/Core/ContentView/ContentView.cs
@@ -6,7 +6,7 @@ namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/ContentView.xml" path="Type[@FullName='Microsoft.Maui.Controls.ContentView']/Docs/*" />
 	[ContentProperty("Content")]
-	public partial class ContentView : TemplatedView
+	public partial class ContentView : TemplatedView, IContentView
 	{
 		/// <summary>Bindable property for <see cref="Content"/>.</summary>
 		public static readonly BindableProperty ContentProperty = BindableProperty.Create(nameof(Content), typeof(View), typeof(ContentView), null, propertyChanged: TemplateUtilities.OnContentChanged);
@@ -46,5 +46,9 @@ internal override void OnControlTemplateChanged(ControlTemplate oldValue, Contro
 				SetInheritedBindingContext(content, BindingContext);
 			}
 		}
+
+		object IContentView.Content => Content;
+
+		IView IContentView.PresentedContent => ((this as IControlTemplated).TemplateRoot as IView) ?? Content;
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/src/Core/HandlerImpl/DatePicker/DatePicker.Android.cs b/src/Controls/src/Core/DatePicker/DatePicker.Android.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/DatePicker/DatePicker.Android.cs
rename to src/Controls/src/Core/DatePicker/DatePicker.Android.cs
diff --git a/src/Controls/src/Core/HandlerImpl/DatePicker/DatePicker.cs b/src/Controls/src/Core/DatePicker/DatePicker.Mapper.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/DatePicker/DatePicker.cs
rename to src/Controls/src/Core/DatePicker/DatePicker.Mapper.cs
diff --git a/src/Controls/src/Core/HandlerImpl/DatePicker/DatePicker.Standard.cs b/src/Controls/src/Core/DatePicker/DatePicker.Standard.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/DatePicker/DatePicker.Standard.cs
rename to src/Controls/src/Core/DatePicker/DatePicker.Standard.cs
diff --git a/src/Controls/src/Core/HandlerImpl/DatePicker/DatePicker.Windows.cs b/src/Controls/src/Core/DatePicker/DatePicker.Windows.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/DatePicker/DatePicker.Windows.cs
rename to src/Controls/src/Core/DatePicker/DatePicker.Windows.cs
diff --git a/src/Controls/src/Core/DatePicker.cs b/src/Controls/src/Core/DatePicker/DatePicker.cs
similarity index 98%
rename from src/Controls/src/Core/DatePicker.cs
rename to src/Controls/src/Core/DatePicker/DatePicker.cs
index fbb814d1009e..7c94e105d018 100644
--- a/src/Controls/src/Core/DatePicker.cs
+++ b/src/Controls/src/Core/DatePicker/DatePicker.cs
@@ -6,7 +6,7 @@
 namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/DatePicker.xml" path="Type[@FullName='Microsoft.Maui.Controls.DatePicker']/Docs/*" />
-	public partial class DatePicker : View, IFontElement, ITextElement, IElementConfiguration<DatePicker>
+	public partial class DatePicker : View, IFontElement, ITextElement, IElementConfiguration<DatePicker>, IDatePicker
 	{
 		/// <summary>Bindable property for <see cref="Format"/>.</summary>
 		public static readonly BindableProperty FormatProperty = BindableProperty.Create(nameof(Format), typeof(string), typeof(DatePicker), "d");
@@ -226,5 +226,6 @@ void ITextElement.OnCharacterSpacingPropertyChanged(double oldValue, double newV
 			InvalidateMeasure();
 		}
 
+		Font ITextStyle.Font => this.ToFont();
 	}
 }
diff --git a/src/Controls/src/Core/HandlerImpl/DatePicker/DatePicker.iOS.cs b/src/Controls/src/Core/DatePicker/DatePicker.iOS.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/DatePicker/DatePicker.iOS.cs
rename to src/Controls/src/Core/DatePicker/DatePicker.iOS.cs
diff --git a/src/Controls/src/Core/HandlerImpl/Editor/Editor.Android.cs b/src/Controls/src/Core/Editor/Editor.Android.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Editor/Editor.Android.cs
rename to src/Controls/src/Core/Editor/Editor.Android.cs
diff --git a/src/Controls/src/Core/HandlerImpl/Editor/Editor.cs b/src/Controls/src/Core/Editor/Editor.Mapper.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Editor/Editor.cs
rename to src/Controls/src/Core/Editor/Editor.Mapper.cs
diff --git a/src/Controls/src/Core/HandlerImpl/Editor/Editor.Standard.cs b/src/Controls/src/Core/Editor/Editor.Standard.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Editor/Editor.Standard.cs
rename to src/Controls/src/Core/Editor/Editor.Standard.cs
diff --git a/src/Controls/src/Core/HandlerImpl/Editor/Editor.Tizen.cs b/src/Controls/src/Core/Editor/Editor.Tizen.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Editor/Editor.Tizen.cs
rename to src/Controls/src/Core/Editor/Editor.Tizen.cs
diff --git a/src/Controls/src/Core/HandlerImpl/Editor/Editor.Windows.cs b/src/Controls/src/Core/Editor/Editor.Windows.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Editor/Editor.Windows.cs
rename to src/Controls/src/Core/Editor/Editor.Windows.cs
diff --git a/src/Controls/src/Core/Editor.cs b/src/Controls/src/Core/Editor/Editor.cs
similarity index 86%
rename from src/Controls/src/Core/Editor.cs
rename to src/Controls/src/Core/Editor/Editor.cs
index f4b6c6644712..b41ea89bcba3 100644
--- a/src/Controls/src/Core/Editor.cs
+++ b/src/Controls/src/Core/Editor/Editor.cs
@@ -2,11 +2,12 @@
 using System;
 using System.ComponentModel;
 using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Graphics;
 
 namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/Editor.xml" path="Type[@FullName='Microsoft.Maui.Controls.Editor']/Docs/*" />
-	public partial class Editor : InputView, IEditorController, IFontElement, ITextAlignmentElement, IElementConfiguration<Editor>
+	public partial class Editor : InputView, IEditorController, IFontElement, ITextAlignmentElement, IElementConfiguration<Editor>, IEditor
 	{
 		/// <include file="../../docs/Microsoft.Maui.Controls/Editor.xml" path="//Member[@MemberName='TextProperty']/Docs/*" />
 		public new static readonly BindableProperty TextProperty = InputView.TextProperty;
@@ -150,6 +151,9 @@ void UpdateAutoSizeOption()
 		}
 
 		public event EventHandler Completed;
+		double _previousWidthConstraint;
+		double _previousHeightConstraint;
+		Rect _previousBounds;
 
 		/// <include file="../../docs/Microsoft.Maui.Controls/Editor.xml" path="//Member[@MemberName='.ctor']/Docs/*" />
 		public Editor()
@@ -181,5 +185,47 @@ protected override void OnTextChanged(string oldValue, string newValue)
 		public void OnHorizontalTextAlignmentPropertyChanged(TextAlignment oldValue, TextAlignment newValue)
 		{
 		}
+
+		Font ITextStyle.Font => this.ToFont();
+
+		void IEditor.Completed()
+		{
+			(this as IEditorController).SendCompleted();
+		}
+
+		protected override Size ArrangeOverride(Rect bounds)
+		{
+			_previousBounds = bounds;
+			return base.ArrangeOverride(bounds);
+		}
+
+		protected override Size MeasureOverride(double widthConstraint, double heightConstraint)
+		{
+			if (AutoSize == EditorAutoSizeOption.Disabled &&
+				Width > 0 &&
+				Height > 0)
+			{
+				if (TheSame(_previousHeightConstraint, heightConstraint) &&
+					TheSame(_previousWidthConstraint, widthConstraint))
+				{
+					return new Size(Width, Height);
+				}
+				else if (TheSame(_previousHeightConstraint, _previousBounds.Height) &&
+					TheSame(_previousWidthConstraint, _previousBounds.Width))
+				{
+					return new Size(Width, Height);
+				}
+			}
+
+			_previousWidthConstraint = widthConstraint;
+			_previousHeightConstraint = heightConstraint;
+			return base.MeasureOverride(widthConstraint, heightConstraint);
+
+			bool TheSame(double width, double otherWidth)
+			{
+				return width == otherWidth ||
+					(width - otherWidth) < double.Epsilon;
+			}
+		}
 	}
 }
diff --git a/src/Controls/src/Core/HandlerImpl/Editor/Editor.iOS.cs b/src/Controls/src/Core/Editor/Editor.iOS.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Editor/Editor.iOS.cs
rename to src/Controls/src/Core/Editor/Editor.iOS.cs
diff --git a/src/Controls/src/Core/HandlerImpl/Element/Element.Android.cs b/src/Controls/src/Core/Element/Element.Android.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Element/Element.Android.cs
rename to src/Controls/src/Core/Element/Element.Android.cs
diff --git a/src/Controls/src/Core/HandlerImpl/Element/Element.cs b/src/Controls/src/Core/Element/Element.Mapper.cs
similarity index 79%
rename from src/Controls/src/Core/HandlerImpl/Element/Element.cs
rename to src/Controls/src/Core/Element/Element.Mapper.cs
index c220da6b67bc..3472ad5c2d09 100644
--- a/src/Controls/src/Core/HandlerImpl/Element/Element.cs
+++ b/src/Controls/src/Core/Element/Element.Mapper.cs
@@ -5,7 +5,7 @@
 
 namespace Microsoft.Maui.Controls
 {
-	/// <include file="../../../../docs/Microsoft.Maui.Controls/Element.xml" path="Type[@FullName='Microsoft.Maui.Controls.Element']/Docs/*" />
+	/// <include file="../../../docs/Microsoft.Maui.Controls/Element.xml" path="Type[@FullName='Microsoft.Maui.Controls.Element']/Docs/*" />
 	public partial class Element
 	{
 		public static IPropertyMapper<Maui.IElement, IElementHandler> ControlsElementMapper = new PropertyMapper<IElement, IElementHandler>(ViewHandler.ViewMapper)
diff --git a/src/Controls/src/Core/HandlerImpl/Element/Element.Standard.cs b/src/Controls/src/Core/Element/Element.Standard.cs
similarity index 84%
rename from src/Controls/src/Core/HandlerImpl/Element/Element.Standard.cs
rename to src/Controls/src/Core/Element/Element.Standard.cs
index 6e452716ea2a..52ad4e4a13fe 100644
--- a/src/Controls/src/Core/HandlerImpl/Element/Element.Standard.cs
+++ b/src/Controls/src/Core/Element/Element.Standard.cs
@@ -5,7 +5,7 @@
 
 namespace Microsoft.Maui.Controls
 {
-	/// <include file="../../../../docs/Microsoft.Maui.Controls/Element.xml" path="Type[@FullName='Microsoft.Maui.Controls.Element']/Docs/*" />
+	/// <include file="../../../docs/Microsoft.Maui.Controls/Element.xml" path="Type[@FullName='Microsoft.Maui.Controls.Element']/Docs/*" />
 	public partial class Element
 	{
 		public static void MapAutomationPropertiesIsInAccessibleTree(IElementHandler handler, Element element)
diff --git a/src/Controls/src/Core/HandlerImpl/Element/Element.Tizen.cs b/src/Controls/src/Core/Element/Element.Tizen.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Element/Element.Tizen.cs
rename to src/Controls/src/Core/Element/Element.Tizen.cs
diff --git a/src/Controls/src/Core/HandlerImpl/Element/Element.Windows.cs b/src/Controls/src/Core/Element/Element.Windows.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Element/Element.Windows.cs
rename to src/Controls/src/Core/Element/Element.Windows.cs
diff --git a/src/Controls/src/Core/Element.cs b/src/Controls/src/Core/Element/Element.cs
similarity index 89%
rename from src/Controls/src/Core/Element.cs
rename to src/Controls/src/Core/Element/Element.cs
index d6d633de21b0..fea1bd729e7d 100644
--- a/src/Controls/src/Core/Element.cs
+++ b/src/Controls/src/Core/Element/Element.cs
@@ -5,13 +5,15 @@
 using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using Microsoft.Maui.Controls.Hosting;
 using Microsoft.Maui.Controls.Internals;
 
 namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/Element.xml" path="Type[@FullName='Microsoft.Maui.Controls.Element']/Docs/*" />
-	public abstract partial class Element : BindableObject, IElementDefinition, INameScope, IElementController, IVisualTreeElement
+	public abstract partial class Element : BindableObject, IElementDefinition, INameScope, IElementController, IVisualTreeElement, Maui.IElement, IEffectControlProvider, IToolTipElement, IContextFlyoutElement, IControlsElement
 	{
 		internal static readonly ReadOnlyCollection<Element> EmptyChildren = new ReadOnlyCollection<Element>(Array.Empty<Element>());
 
@@ -767,6 +769,100 @@ private protected virtual void OnParentChangingCore(Element oldParent, Element n
 			OnParentChanging(args);
 		}
 
+		IElementHandler _handler;
+		EffectsFactory _effectsFactory;
+
+		Maui.IElement Maui.IElement.Parent => Parent;
+		EffectsFactory EffectsFactory => _effectsFactory ??= Handler.MauiContext.Services.GetRequiredService<EffectsFactory>();
+
+		public IElementHandler Handler
+		{
+			get => _handler;
+			set => SetHandler(value);
+		}
+
+		public event EventHandler<HandlerChangingEventArgs> HandlerChanging;
+		public event EventHandler HandlerChanged;
+
+		protected virtual void OnHandlerChanging(HandlerChangingEventArgs args) { }
+
+		protected virtual void OnHandlerChanged() { }
+
+		private protected virtual void OnHandlerChangedCore()
+		{
+			EffectControlProvider = (Handler != null) ? this : null;
+			HandlerChanged?.Invoke(this, EventArgs.Empty);
+
+			OnHandlerChanged();
+		}
+
+		private protected virtual void OnHandlerChangingCore(HandlerChangingEventArgs args)
+		{
+			HandlerChanging?.Invoke(this, args);
+			OnHandlerChanging(args);
+		}
+
+		IElementHandler _previousHandler;
+		void SetHandler(IElementHandler newHandler)
+		{
+			if (newHandler == _handler)
+				return;
+
+			try
+			{
+				// If a handler is getting changed before the end of this method
+				// Something is wired up incorrectly
+				if (_previousHandler != null)
+					throw new InvalidOperationException("Handler is already being set elsewhere");
+
+				_previousHandler = _handler;
+
+				OnHandlerChangingCore(new HandlerChangingEventArgs(_previousHandler, newHandler));
+
+				_handler = newHandler;
+
+				// Only call disconnect if the previous handler is still connected to this virtual view.
+				// If a handler is being reused for a different VirtualView then the virtual
+				// view would have already rolled 
+				if (_previousHandler?.VirtualView == this)
+					_previousHandler?.DisconnectHandler();
+
+				if (_handler?.VirtualView != this)
+					_handler?.SetVirtualView(this);
+
+				OnHandlerChangedCore();
+			}
+			finally
+			{
+				_previousHandler = null;
+			}
+		}
+
+		void IEffectControlProvider.RegisterEffect(Effect effect)
+		{
+			if (effect is RoutingEffect re && re.Inner != null)
+			{
+				re.Element = this;
+				re.Inner.Element = this;
+				return;
+			}
+
+			var platformEffect = EffectsFactory.CreateEffect(effect);
+
+			if (platformEffect != null)
+			{
+				platformEffect.Element = this;
+				effect.PlatformEffect = platformEffect;
+			}
+			else
+			{
+				effect.Element = this;
+			}
+		}
+
+		ToolTip IToolTipElement.ToolTip => ToolTipProperties.GetToolTip(this);
+		IFlyout IContextFlyoutElement.ContextFlyout => FlyoutBase.GetContextFlyout(this);
+
 		class TemporaryWrapper : IList<Element>
 		{
 			IReadOnlyList<Element> _inner;
diff --git a/src/Controls/src/Core/HandlerImpl/Element/Element.iOS.cs b/src/Controls/src/Core/Element/Element.iOS.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Element/Element.iOS.cs
rename to src/Controls/src/Core/Element/Element.iOS.cs
diff --git a/src/Controls/src/Core/ElementEventArgs.cs b/src/Controls/src/Core/Element/ElementEventArgs.cs
similarity index 100%
rename from src/Controls/src/Core/ElementEventArgs.cs
rename to src/Controls/src/Core/Element/ElementEventArgs.cs
diff --git a/src/Controls/src/Core/Element_StyleSheets.cs b/src/Controls/src/Core/Element/Element_StyleSheets.cs
similarity index 100%
rename from src/Controls/src/Core/Element_StyleSheets.cs
rename to src/Controls/src/Core/Element/Element_StyleSheets.cs
diff --git a/src/Controls/src/Core/Entry/Entry.Controls.cs b/src/Controls/src/Core/Entry/Entry.cs
similarity index 100%
rename from src/Controls/src/Core/Entry/Entry.Controls.cs
rename to src/Controls/src/Core/Entry/Entry.cs
diff --git a/src/Controls/src/Core/FlyoutLayoutBehavior.cs b/src/Controls/src/Core/FlyoutPage/FlyoutLayoutBehavior.cs
similarity index 100%
rename from src/Controls/src/Core/FlyoutLayoutBehavior.cs
rename to src/Controls/src/Core/FlyoutPage/FlyoutLayoutBehavior.cs
diff --git a/src/Controls/src/Core/HandlerImpl/FlyoutPage/FlyoutPage.cs b/src/Controls/src/Core/FlyoutPage/FlyoutPage.Mapper.cs
similarity index 76%
rename from src/Controls/src/Core/HandlerImpl/FlyoutPage/FlyoutPage.cs
rename to src/Controls/src/Core/FlyoutPage/FlyoutPage.Mapper.cs
index 7fb3ecf07639..312d10568048 100644
--- a/src/Controls/src/Core/HandlerImpl/FlyoutPage/FlyoutPage.cs
+++ b/src/Controls/src/Core/FlyoutPage/FlyoutPage.Mapper.cs
@@ -1,6 +1,6 @@
 namespace Microsoft.Maui.Controls
 {
-	/// <include file="../../../../docs/Microsoft.Maui.Controls/FlyoutPage.xml" path="Type[@FullName='Microsoft.Maui.Controls.FlyoutPage']/Docs/*" />
+	/// <include file="../../../docs/Microsoft.Maui.Controls/FlyoutPage.xml" path="Type[@FullName='Microsoft.Maui.Controls.FlyoutPage']/Docs/*" />
 	public partial class FlyoutPage
 	{
 		public static IPropertyMapper<IFlyoutView, FlyoutViewHandler> ControlsFlyoutPageMapper = new PropertyMapper<IFlyoutView, FlyoutViewHandler>(FlyoutViewHandler.Mapper)
diff --git a/src/Controls/src/Core/FlyoutPage.cs b/src/Controls/src/Core/FlyoutPage/FlyoutPage.cs
similarity index 92%
rename from src/Controls/src/Core/FlyoutPage.cs
rename to src/Controls/src/Core/FlyoutPage/FlyoutPage.cs
index 421f30191a2c..eff2d373501b 100644
--- a/src/Controls/src/Core/FlyoutPage.cs
+++ b/src/Controls/src/Core/FlyoutPage/FlyoutPage.cs
@@ -11,7 +11,7 @@ namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/FlyoutPage.xml" path="Type[@FullName='Microsoft.Maui.Controls.FlyoutPage']/Docs/*" />
 	[ContentProperty(nameof(Detail))]
-	public partial class FlyoutPage : Page, IFlyoutPageController, IElementConfiguration<FlyoutPage>
+	public partial class FlyoutPage : Page, IFlyoutPageController, IElementConfiguration<FlyoutPage>, IFlyoutView
 	{
 		/// <summary>Bindable property for <see cref="IsGestureEnabled"/>.</summary>
 		public static readonly BindableProperty IsGestureEnabledProperty = BindableProperty.Create(nameof(IsGestureEnabled), typeof(bool), typeof(FlyoutPage), true);
@@ -334,5 +334,40 @@ void OnMainDisplayInfoChanged(object sender, DisplayInfoChangedEventArgs e)
 		{
 			Handler?.UpdateValue(nameof(FlyoutBehavior));
 		}
+
+		IView IFlyoutView.Flyout => this.Flyout;
+		IView IFlyoutView.Detail => this.Detail;
+
+		Maui.FlyoutBehavior IFlyoutView.FlyoutBehavior
+		{
+			get
+			{
+				if (((IFlyoutPageController)this).ShouldShowSplitMode)
+					return Maui.FlyoutBehavior.Locked;
+
+				return Maui.FlyoutBehavior.Flyout;
+			}
+		}
+
+#if ANDROID
+
+		const double DefaultFlyoutSize = 320;
+		const double DefaultSmallFlyoutSize = 240;
+
+		double IFlyoutView.FlyoutWidth
+		{
+			get
+			{
+				if (DeviceInfo.Idiom == DeviceIdiom.Phone)
+					return -1;
+
+				var scaledScreenSize = DeviceDisplay.MainDisplayInfo.GetScaledScreenSize();
+				double w = scaledScreenSize.Width;
+				return w < DefaultSmallFlyoutSize ? w : (w < DefaultFlyoutSize ? DefaultSmallFlyoutSize : DefaultFlyoutSize);
+			}
+		}
+#else
+		double IFlyoutView.FlyoutWidth => -1;
+#endif
 	}
 }
diff --git a/src/Controls/src/Core/Frame.cs b/src/Controls/src/Core/Frame/Frame.cs
similarity index 87%
rename from src/Controls/src/Core/Frame.cs
rename to src/Controls/src/Core/Frame/Frame.cs
index 576f752a3d43..6648be56e869 100644
--- a/src/Controls/src/Core/Frame.cs
+++ b/src/Controls/src/Core/Frame/Frame.cs
@@ -7,7 +7,7 @@ namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/Frame.xml" path="Type[@FullName='Microsoft.Maui.Controls.Frame']/Docs/*" />
 	[ContentProperty(nameof(Content))]
-	public partial class Frame : ContentView, IElementConfiguration<Frame>, IPaddingElement, IBorderElement, IContentView
+	public partial class Frame : ContentView, IElementConfiguration<Frame>, IPaddingElement, IBorderElement, IView, IContentView
 	{
 		/// <summary>Bindable property for <see cref="BorderColor"/>.</summary>
 		public static readonly BindableProperty BorderColorProperty = BorderElement.BorderColorProperty;
@@ -83,6 +83,28 @@ void IBorderElement.OnBorderColorPropertyChanged(Color oldValue, Color newValue)
 
 		bool IBorderElement.IsBorderWidthSet() => false;
 
+		IShadow IView.Shadow
+		{
+			get
+			{
+				if (!HasShadow)
+					return null;
+
+				if (base.Shadow != null)
+					return base.Shadow;
+
+#if IOS
+				// The way the shadow is applied in .NET MAUI on iOS is the same way it was applied in Forms
+				// so on iOS we just return the shadow that was hard coded into the renderer
+				// On Android it sets the elevation on the CardView and on WinUI Forms just ignored HasShadow
+				if(HasShadow)
+					return new Shadow() { Radius = 5, Opacity = 0.8f, Offset = new Point(0, 0), Brush = Brush.Black };
+#endif
+
+				return null;
+			}
+		}
+
 		// TODO fix iOS/WinUI to work the same as Android
 		// once this has been fixed on iOS/WinUI we should centralize 
 		// this code and Border into LayoutExtensions
diff --git a/src/Controls/src/Core/HandlerImpl/GraphicsView.Impl.cs b/src/Controls/src/Core/GraphicsView/GraphicsView.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/GraphicsView.Impl.cs
rename to src/Controls/src/Core/GraphicsView/GraphicsView.cs
diff --git a/src/Controls/src/Core/HandlerImpl/ActivityIndicator.Impl.cs b/src/Controls/src/Core/HandlerImpl/ActivityIndicator.Impl.cs
deleted file mode 100644
index ca53ecf4105b..000000000000
--- a/src/Controls/src/Core/HandlerImpl/ActivityIndicator.Impl.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace Microsoft.Maui.Controls
-{
-	/// <include file="../../../docs/Microsoft.Maui.Controls/ActivityIndicator.xml" path="Type[@FullName='Microsoft.Maui.Controls.ActivityIndicator']/Docs/*" />
-	public partial class ActivityIndicator : IActivityIndicator
-	{
-
-	}
-}
\ No newline at end of file
diff --git a/src/Controls/src/Core/HandlerImpl/Application/Application.Impl.cs b/src/Controls/src/Core/HandlerImpl/Application/Application.Impl.cs
deleted file mode 100644
index 30b82d078ea1..000000000000
--- a/src/Controls/src/Core/HandlerImpl/Application/Application.Impl.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-using Microsoft.Extensions.Logging;
-using Microsoft.Maui.ApplicationModel;
-using Microsoft.Maui.Devices;
-using Microsoft.Maui.Handlers;
-
-namespace Microsoft.Maui.Controls
-{
-	public partial class Application : IApplication
-	{
-		internal const string MauiWindowIdKey = "__MAUI_WINDOW_ID__";
-
-		readonly List<Window> _windows = new();
-		readonly Dictionary<string, WeakReference<Window>> _requestedWindows = new(StringComparer.Ordinal);
-		ILogger<Application>? _logger;
-
-		ILogger<Application>? Logger =>
-			_logger ??= Handler?.MauiContext?.CreateLogger<Application>();
-
-		IReadOnlyList<IWindow> IApplication.Windows => _windows;
-
-		public IReadOnlyList<Window> Windows => _windows;
-
-		IWindow IApplication.CreateWindow(IActivationState? activationState)
-		{
-			Window? window = null;
-
-			// try get the window that is pending
-			if (activationState?.State?.TryGetValue(MauiWindowIdKey, out var requestedWindowId) ?? false)
-			{
-				if (requestedWindowId != null && _requestedWindows.TryGetValue(requestedWindowId, out var r))
-				{
-					if (r.TryGetTarget(out var w))
-					{
-						window = w;
-					}
-					_requestedWindows.Remove(requestedWindowId);
-				}
-			}
-
-			// create a new one if there is no pending windows
-			if (window == null)
-			{
-				window = CreateWindow(activationState);
-
-				if (_singleWindowMainPage != null && window.Page != null && window.Page != _singleWindowMainPage)
-					throw new InvalidOperationException($"Both {nameof(MainPage)} was set and {nameof(Application.CreateWindow)} was overridden to provide a page.");
-			}
-
-			// make sure it is added to the windows list
-			if (!_windows.Contains(window))
-				AddWindow(window);
-
-			return window;
-		}
-
-		void IApplication.OpenWindow(IWindow window)
-		{
-			if (window is Window cwindow)
-				OpenWindow(cwindow);
-		}
-
-		void IApplication.CloseWindow(IWindow window)
-		{
-			Handler?.Invoke(nameof(IApplication.CloseWindow), window);
-		}
-
-		internal void RemoveWindow(Window window)
-		{
-			// Do not attempt to close the "MainPage" window
-			if (_singleWindowMainPage != null && window.Page == _singleWindowMainPage)
-				return;
-
-			// Window was closed, stop tracking it
-			if (window is null)
-				return;
-
-			if (window is NavigableElement ne)
-				ne.NavigationProxy.Inner = null;
-
-			if (window is Element windowElement)
-			{
-				RemoveLogicalChildInternal(windowElement);
-			}
-
-			_windows.Remove(window);
-		}
-
-		public virtual void OpenWindow(Window window)
-		{
-			var id = Guid.NewGuid().ToString("n");
-			_requestedWindows.Add(id, new WeakReference<Window>(window));
-
-			var state = new PersistedState
-			{
-				[MauiWindowIdKey] = id
-			};
-
-			Handler?.Invoke(nameof(IApplication.OpenWindow), new OpenWindowRequest(State: state));
-		}
-
-		public virtual void CloseWindow(Window window)
-		{
-			Handler?.Invoke(nameof(IApplication.CloseWindow), window);
-		}
-
-		void IApplication.ThemeChanged()
-		{
-			PlatformAppTheme = AppInfo.RequestedTheme;
-		}
-
-		protected virtual Window CreateWindow(IActivationState? activationState)
-		{
-			if (Windows.Count > 1)
-				throw new NotImplementedException($"Either set {nameof(MainPage)} or override {nameof(Application.CreateWindow)}.");
-
-			if (Windows.Count > 0)
-				return Windows[0];
-
-			if (_singleWindowMainPage != null)
-				return new Window(_singleWindowMainPage);
-
-			throw new NotImplementedException($"Either set {nameof(MainPage)} or override {nameof(Application.CreateWindow)}.");
-		}
-
-		void AddWindow(Window window)
-		{
-			_windows.Add(window);
-
-			if (window is Element windowElement)
-			{
-				AddLogicalChildInternal(windowElement);
-			}
-
-			if (window is NavigableElement ne)
-				ne.NavigationProxy.Inner = NavigationProxy;
-
-			// Once the window has been attached to the application. 
-			// The window will finish propagating events like `Appearing`.
-			//
-			// I could fire this from 'OnParentSet` inside Window but
-			// I'd rather wait until Application is done wiring itself
-			// up to the window before triggering any down stream life cycle
-			// events.
-			window.FinishedAddingWindowToApplication(this);
-		}
-	}
-}
diff --git a/src/Controls/src/Core/HandlerImpl/BoxView.Impl.cs b/src/Controls/src/Core/HandlerImpl/BoxView.Impl.cs
deleted file mode 100644
index 9542925c9be2..000000000000
--- a/src/Controls/src/Core/HandlerImpl/BoxView.Impl.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System.Runtime.CompilerServices;
-using Microsoft.Maui.Graphics;
-
-namespace Microsoft.Maui.Controls
-{
-	/// <include file="../../../docs/Microsoft.Maui.Controls/BoxView.xml" path="Type[@FullName='Microsoft.Maui.Controls.BoxView']/Docs/*" />
-	public partial class BoxView : IShapeView, IShape
-	{
-		protected override void OnPropertyChanged([CallerMemberName] string? propertyName = null)
-		{
-			base.OnPropertyChanged(propertyName);
-
-			if (propertyName == BackgroundColorProperty.PropertyName ||
-				propertyName == ColorProperty.PropertyName ||
-				propertyName == CornerRadiusProperty.PropertyName)
-				Handler?.UpdateValue(nameof(IShapeView.Shape));
-		}
-
-		IShape? IShapeView.Shape => this;
-
-		PathAspect IShapeView.Aspect => PathAspect.None;
-
-		Paint? IShapeView.Fill => Color?.AsPaint() ?? ((IView)this).Background;
-
-		Paint? IStroke.Stroke => null;
-
-		double IStroke.StrokeThickness => 0;
-
-		LineCap IStroke.StrokeLineCap => LineCap.Butt;
-
-		LineJoin IStroke.StrokeLineJoin => LineJoin.Miter;
-
-		float[]? IStroke.StrokeDashPattern => null;
-
-		float IStroke.StrokeDashOffset => 0f;
-
-		float IStroke.StrokeMiterLimit => 0;
-
-		PathF IShape.PathForBounds(Rect bounds)
-		{
-			var path = new PathF();
-
-			path.AppendRoundedRectangle(
-				bounds,
-				(float)CornerRadius.TopLeft,
-				(float)CornerRadius.TopRight,
-				(float)CornerRadius.BottomLeft,
-				(float)CornerRadius.BottomRight);
-
-			return path;
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/Controls/src/Core/HandlerImpl/Brush.Impl.cs b/src/Controls/src/Core/HandlerImpl/Brush.Impl.cs
deleted file mode 100644
index d89bb3e5ee26..000000000000
--- a/src/Controls/src/Core/HandlerImpl/Brush.Impl.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-#nullable disable
-using Microsoft.Maui.Graphics;
-using GraphicsGradientStop = Microsoft.Maui.Graphics.PaintGradientStop;
-
-namespace Microsoft.Maui.Controls
-{
-	/// <include file="../../../docs/Microsoft.Maui.Controls/Brush.xml" path="Type[@FullName='Microsoft.Maui.Controls.Brush']/Docs/*" />
-	public partial class Brush
-	{
-		public static implicit operator Brush(Paint paint)
-		{
-			if (paint is SolidPaint solidPaint)
-				return new SolidColorBrush { Color = solidPaint.Color };
-
-			if (paint is GradientPaint gradientPaint)
-			{
-				var gradientStopCollection = gradientPaint.GradientStops;
-
-				GradientStopCollection gradientStops = new GradientStopCollection();
-
-				for (int i = 0; i < gradientStopCollection.Length; i++)
-				{
-					var gs = gradientStopCollection[i];
-					gradientStops.Insert(i, new GradientStop(gs.Color, gs.Offset));
-				}
-
-				if (gradientPaint is LinearGradientPaint linearGradientPaint)
-				{
-					var startPoint = linearGradientPaint.StartPoint;
-					var endPoint = linearGradientPaint.EndPoint;
-
-					return new LinearGradientBrush { GradientStops = gradientStops, StartPoint = startPoint, EndPoint = endPoint };
-				}
-
-				if (gradientPaint is RadialGradientPaint radialGradientPaint)
-				{
-					var center = radialGradientPaint.Center;
-					var radius = radialGradientPaint.Radius;
-
-					return new RadialGradientBrush { GradientStops = gradientStops, Center = center, Radius = radius };
-				}
-			}
-
-			if (paint is ImageSourcePaint imageSourcePaint && imageSourcePaint.ImageSource is ImageSource imageSource)
-				return new ImageBrush { ImageSource = imageSource };
-
-			return null;
-		}
-
-		public static implicit operator Paint(Brush brush)
-		{
-			if (brush is SolidColorBrush solidColorBrush)
-				return new SolidPaint { Color = solidColorBrush.Color };
-
-			if (brush is GradientBrush gradientBrush)
-			{
-				var gradientStopCollection = gradientBrush.GradientStops;
-
-				GraphicsGradientStop[] gradientStops = new GraphicsGradientStop[gradientStopCollection.Count];
-
-				for (int i = 0; i < gradientStopCollection.Count; i++)
-				{
-					var gs = gradientStopCollection[i];
-					gradientStops[i] = new GraphicsGradientStop(gs.Offset, gs.Color);
-				}
-
-				if (gradientBrush is LinearGradientBrush linearGradientBrush)
-				{
-					var startPoint = linearGradientBrush.StartPoint;
-					var endPoint = linearGradientBrush.EndPoint;
-
-					return new LinearGradientPaint { GradientStops = gradientStops, StartPoint = startPoint, EndPoint = endPoint };
-				}
-
-				if (gradientBrush is RadialGradientBrush radialGradientBrush)
-				{
-					var center = radialGradientBrush.Center;
-					var radius = radialGradientBrush.Radius;
-
-					return new RadialGradientPaint { GradientStops = gradientStops, Center = center, Radius = radius };
-				}
-			}
-
-			if (brush is ImageBrush imageBrush)
-				return new ImageSourcePaint { ImageSource = imageBrush.ImageSource };
-
-			return null;
-		}
-	}
-}
diff --git a/src/Controls/src/Core/HandlerImpl/Button/Button.Impl.cs b/src/Controls/src/Core/HandlerImpl/Button/Button.Impl.cs
deleted file mode 100644
index 7b354b818c66..000000000000
--- a/src/Controls/src/Core/HandlerImpl/Button/Button.Impl.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-#nullable disable
-using System.Runtime.CompilerServices;
-using Microsoft.Maui.Graphics;
-
-namespace Microsoft.Maui.Controls
-{
-	public partial class Button : IButton, ITextButton, IImageButton
-	{
-		bool _wasImageLoading;
-
-		protected override void OnPropertyChanged([CallerMemberName] string propertyName = null)
-		{
-			base.OnPropertyChanged(propertyName);
-
-			if (propertyName == BorderColorProperty.PropertyName)
-				Handler?.UpdateValue(nameof(IButtonStroke.StrokeColor));
-			else if (propertyName == BorderWidthProperty.PropertyName)
-				Handler?.UpdateValue(nameof(IButtonStroke.StrokeThickness));
-			else if (propertyName == ImageSourceProperty.PropertyName)
-				Handler?.UpdateValue(nameof(IImage.Source));
-		}
-
-		void IButton.Clicked()
-		{
-			(this as IButtonController).SendClicked();
-		}
-
-		void IButton.Pressed()
-		{
-			(this as IButtonController).SendPressed();
-		}
-
-		void IButton.Released()
-		{
-			(this as IButtonController).SendReleased();
-		}
-
-		void IImageSourcePart.UpdateIsLoading(bool isLoading)
-		{
-			if (!isLoading && _wasImageLoading)
-				Handler?.UpdateValue(nameof(ContentLayout));
-
-			_wasImageLoading = isLoading;
-		}
-
-		Font ITextStyle.Font => this.ToFont();
-
-		Aspect IImage.Aspect => Aspect.Fill;
-
-		bool IImage.IsOpaque => true;
-
-		IImageSource IImageSourcePart.Source => ImageSource;
-
-		bool IImageSourcePart.IsAnimationPlaying => false;
-
-		double IButtonStroke.StrokeThickness => (double)GetValue(BorderWidthProperty);
-
-		Color IButtonStroke.StrokeColor => (Color)GetValue(BorderColorProperty);
-
-		int IButtonStroke.CornerRadius => (int)GetValue(CornerRadiusProperty);
-	}
-}
\ No newline at end of file
diff --git a/src/Controls/src/Core/HandlerImpl/CheckBox/CheckBox.Impl.cs b/src/Controls/src/Core/HandlerImpl/CheckBox/CheckBox.Impl.cs
deleted file mode 100644
index ca8d2825af30..000000000000
--- a/src/Controls/src/Core/HandlerImpl/CheckBox/CheckBox.Impl.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-#nullable disable
-using Microsoft.Maui.Graphics;
-
-namespace Microsoft.Maui.Controls
-{
-	/// <include file="../../../../docs/Microsoft.Maui.Controls/CheckBox.xml" path="Type[@FullName='Microsoft.Maui.Controls.CheckBox']/Docs/*" />
-	public partial class CheckBox : ICheckBox
-	{
-		public Paint Foreground => Color?.AsPaint();
-	}
-}
\ No newline at end of file
diff --git a/src/Controls/src/Core/HandlerImpl/ContentView/ContentView.Impl.cs b/src/Controls/src/Core/HandlerImpl/ContentView/ContentView.Impl.cs
deleted file mode 100644
index f8814e2d4ce4..000000000000
--- a/src/Controls/src/Core/HandlerImpl/ContentView/ContentView.Impl.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-#nullable disable
-namespace Microsoft.Maui.Controls
-{
-	public partial class ContentView : IContentView
-	{
-		object IContentView.Content => Content;
-
-		IView IContentView.PresentedContent => ((this as IControlTemplated).TemplateRoot as IView) ?? Content;
-	}
-}
diff --git a/src/Controls/src/Core/HandlerImpl/DatePicker/DatePicker.Impl.cs b/src/Controls/src/Core/HandlerImpl/DatePicker/DatePicker.Impl.cs
deleted file mode 100644
index 657499f74bb9..000000000000
--- a/src/Controls/src/Core/HandlerImpl/DatePicker/DatePicker.Impl.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-#nullable disable
-namespace Microsoft.Maui.Controls
-{
-	public partial class DatePicker : IDatePicker
-	{
-		Font ITextStyle.Font => this.ToFont();
-	}
-}
\ No newline at end of file
diff --git a/src/Controls/src/Core/HandlerImpl/Editor/Editor.Impl.cs b/src/Controls/src/Core/HandlerImpl/Editor/Editor.Impl.cs
deleted file mode 100644
index 016be2deec22..000000000000
--- a/src/Controls/src/Core/HandlerImpl/Editor/Editor.Impl.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-#nullable disable
-using System;
-using Microsoft.Maui.Graphics;
-
-namespace Microsoft.Maui.Controls
-{
-	/// <include file="../../../../docs/Microsoft.Maui.Controls/Editor.xml" path="Type[@FullName='Microsoft.Maui.Controls.Editor']/Docs/*" />
-	public partial class Editor : IEditor
-	{
-		double _previousWidthConstraint;
-		double _previousHeightConstraint;
-		Rect _previousBounds;
-
-		Font ITextStyle.Font => this.ToFont();
-
-		void IEditor.Completed()
-		{
-			(this as IEditorController).SendCompleted();
-		}
-
-		protected override Size ArrangeOverride(Rect bounds)
-		{
-			_previousBounds = bounds;
-			return base.ArrangeOverride(bounds);
-		}
-
-		protected override Size MeasureOverride(double widthConstraint, double heightConstraint)
-		{
-			if (AutoSize == EditorAutoSizeOption.Disabled &&
-				Width > 0 &&
-				Height > 0)
-			{
-				if (TheSame(_previousHeightConstraint, heightConstraint) &&
-					TheSame(_previousWidthConstraint, widthConstraint))
-				{
-					return new Size(Width, Height);
-				}
-				else if (TheSame(_previousHeightConstraint, _previousBounds.Height) &&
-					TheSame(_previousWidthConstraint, _previousBounds.Width))
-				{
-					return new Size(Width, Height);
-				}
-			}
-
-			_previousWidthConstraint = widthConstraint;
-			_previousHeightConstraint = heightConstraint;
-			return base.MeasureOverride(widthConstraint, heightConstraint);
-
-			bool TheSame(double width, double otherWidth)
-			{
-				return width == otherWidth ||
-					(width - otherWidth) < double.Epsilon;
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/Controls/src/Core/HandlerImpl/Element/Element.Impl.cs b/src/Controls/src/Core/HandlerImpl/Element/Element.Impl.cs
deleted file mode 100644
index e320d2671523..000000000000
--- a/src/Controls/src/Core/HandlerImpl/Element/Element.Impl.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-#nullable disable
-using System;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Maui.Controls.Hosting;
-
-namespace Microsoft.Maui.Controls
-{
-	/// <include file="../../../../docs/Microsoft.Maui.Controls/Element.xml" path="Type[@FullName='Microsoft.Maui.Controls.Element']/Docs/*" />
-	public partial class Element : Maui.IElement, IEffectControlProvider, IToolTipElement, IContextFlyoutElement, IControlsElement
-	{
-		IElementHandler _handler;
-		EffectsFactory _effectsFactory;
-
-		Maui.IElement Maui.IElement.Parent => Parent;
-		EffectsFactory EffectsFactory => _effectsFactory ??= Handler.MauiContext.Services.GetRequiredService<EffectsFactory>();
-
-		public IElementHandler Handler
-		{
-			get => _handler;
-			set => SetHandler(value);
-		}
-
-		public event EventHandler<HandlerChangingEventArgs> HandlerChanging;
-		public event EventHandler HandlerChanged;
-
-		protected virtual void OnHandlerChanging(HandlerChangingEventArgs args) { }
-
-		protected virtual void OnHandlerChanged() { }
-
-		private protected virtual void OnHandlerChangedCore()
-		{
-			EffectControlProvider = (Handler != null) ? this : null;
-			HandlerChanged?.Invoke(this, EventArgs.Empty);
-
-			OnHandlerChanged();
-		}
-
-		private protected virtual void OnHandlerChangingCore(HandlerChangingEventArgs args)
-		{
-			HandlerChanging?.Invoke(this, args);
-			OnHandlerChanging(args);
-		}
-
-		IElementHandler _previousHandler;
-		void SetHandler(IElementHandler newHandler)
-		{
-			if (newHandler == _handler)
-				return;
-
-			try
-			{
-				// If a handler is getting changed before the end of this method
-				// Something is wired up incorrectly
-				if (_previousHandler != null)
-					throw new InvalidOperationException("Handler is already being set elsewhere");
-
-				_previousHandler = _handler;
-
-				OnHandlerChangingCore(new HandlerChangingEventArgs(_previousHandler, newHandler));
-
-				_handler = newHandler;
-
-				// Only call disconnect if the previous handler is still connected to this virtual view.
-				// If a handler is being reused for a different VirtualView then the virtual
-				// view would have already rolled 
-				if (_previousHandler?.VirtualView == this)
-					_previousHandler?.DisconnectHandler();
-
-				if (_handler?.VirtualView != this)
-					_handler?.SetVirtualView(this);
-
-				OnHandlerChangedCore();
-			}
-			finally
-			{
-				_previousHandler = null;
-			}
-		}
-
-		void IEffectControlProvider.RegisterEffect(Effect effect)
-		{
-			if (effect is RoutingEffect re && re.Inner != null)
-			{
-				re.Element = this;
-				re.Inner.Element = this;
-				return;
-			}
-
-			var platformEffect = EffectsFactory.CreateEffect(effect);
-
-			if (platformEffect != null)
-			{
-				platformEffect.Element = this;
-				effect.PlatformEffect = platformEffect;
-			}
-			else
-			{
-				effect.Element = this;
-			}
-		}
-
-		ToolTip IToolTipElement.ToolTip => ToolTipProperties.GetToolTip(this);
-		IFlyout IContextFlyoutElement.ContextFlyout => FlyoutBase.GetContextFlyout(this);
-	}
-}
diff --git a/src/Controls/src/Core/HandlerImpl/Ellipse.Impl.cs b/src/Controls/src/Core/HandlerImpl/Ellipse.Impl.cs
deleted file mode 100644
index d53deb20b23b..000000000000
--- a/src/Controls/src/Core/HandlerImpl/Ellipse.Impl.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-#nullable disable
-using System.Runtime.CompilerServices;
-using Microsoft.Maui.Graphics;
-
-namespace Microsoft.Maui.Controls.Shapes
-{
-	/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/Ellipse.xml" path="Type[@FullName='Microsoft.Maui.Controls.Shapes.Ellipse']/Docs/*" />
-	public partial class Ellipse : IShape
-	{
-		protected override void OnPropertyChanged([CallerMemberName] string propertyName = null)
-		{
-			base.OnPropertyChanged(propertyName);
-
-			if (propertyName == XProperty.PropertyName ||
-				propertyName == YProperty.PropertyName ||
-				propertyName == WidthProperty.PropertyName ||
-				propertyName == HeightProperty.PropertyName)
-			{
-				Handler?.UpdateValue(nameof(IShapeView.Shape));
-			}
-		}
-
-		public override PathF GetPath()
-		{
-			var width = WidthForPathComputation;
-			var height = HeightForPathComputation;
-
-			var path = new PathF();
-
-			float x = (float)StrokeThickness / 2;
-			float y = (float)StrokeThickness / 2;
-			float w = (float)(width - StrokeThickness);
-			float h = (float)(height - StrokeThickness);
-
-			path.AppendEllipse(x, y, w, h);
-
-			return path;
-		}
-	}
-}
diff --git a/src/Controls/src/Core/HandlerImpl/FlyoutPage/FlyoutPage.Impl.cs b/src/Controls/src/Core/HandlerImpl/FlyoutPage/FlyoutPage.Impl.cs
deleted file mode 100644
index 70908627cb89..000000000000
--- a/src/Controls/src/Core/HandlerImpl/FlyoutPage/FlyoutPage.Impl.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using Microsoft.Maui.Devices;
-
-namespace Microsoft.Maui.Controls
-{
-	/// <include file="../../../../docs/Microsoft.Maui.Controls/FlyoutPage.xml" path="Type[@FullName='Microsoft.Maui.Controls.FlyoutPage']/Docs/*" />
-	public partial class FlyoutPage : IFlyoutView
-	{
-		IView IFlyoutView.Flyout => this.Flyout;
-		IView IFlyoutView.Detail => this.Detail;
-
-		Maui.FlyoutBehavior IFlyoutView.FlyoutBehavior
-		{
-			get
-			{
-				if (((IFlyoutPageController)this).ShouldShowSplitMode)
-					return Maui.FlyoutBehavior.Locked;
-
-				return Maui.FlyoutBehavior.Flyout;
-			}
-		}
-
-#if ANDROID
-
-		const double DefaultFlyoutSize = 320;
-		const double DefaultSmallFlyoutSize = 240;
-
-		double IFlyoutView.FlyoutWidth
-		{
-			get
-			{
-				if (DeviceInfo.Idiom == DeviceIdiom.Phone)
-					return -1;
-
-				var scaledScreenSize = DeviceDisplay.MainDisplayInfo.GetScaledScreenSize();
-				double w = scaledScreenSize.Width;
-				return w < DefaultSmallFlyoutSize ? w : (w < DefaultFlyoutSize ? DefaultSmallFlyoutSize : DefaultFlyoutSize);
-			}
-		}
-#else
-		double IFlyoutView.FlyoutWidth => -1;
-#endif
-	}
-}
diff --git a/src/Controls/src/Core/HandlerImpl/Frame.Impl.cs b/src/Controls/src/Core/HandlerImpl/Frame.Impl.cs
deleted file mode 100644
index d8656e39af0e..000000000000
--- a/src/Controls/src/Core/HandlerImpl/Frame.Impl.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-#nullable disable
-using Microsoft.Maui.Graphics;
-
-namespace Microsoft.Maui.Controls
-{
-	/// <include file="../../../docs/Microsoft.Maui.Controls/Frame.xml" path="Type[@FullName='Microsoft.Maui.Controls.Frame']/Docs/*" />
-	public partial class Frame : IView
-	{
-		IShadow IView.Shadow
-		{
-			get
-			{
-				if (!HasShadow)
-					return null;
-
-				if (base.Shadow != null)
-					return base.Shadow;
-
-#if IOS
-				// The way the shadow is applied in .NET MAUI on iOS is the same way it was applied in Forms
-				// so on iOS we just return the shadow that was hard coded into the renderer
-				// On Android it sets the elevation on the CardView and on WinUI Forms just ignored HasShadow
-				if(HasShadow)
-					return new Shadow() { Radius = 5, Opacity = 0.8f, Offset = new Point(0, 0), Brush = Brush.Black };
-#endif
-
-				return null;
-			}
-		}
-	}
-}
diff --git a/src/Controls/src/Core/HandlerImpl/ImageButton/ImageButton.Impl.cs b/src/Controls/src/Core/HandlerImpl/ImageButton/ImageButton.Impl.cs
deleted file mode 100644
index 7fe74f76a733..000000000000
--- a/src/Controls/src/Core/HandlerImpl/ImageButton/ImageButton.Impl.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-#nullable disable
-using System.Runtime.CompilerServices;
-using Microsoft.Maui.Graphics;
-
-namespace Microsoft.Maui.Controls
-{
-	/// <include file="../../../../docs/Microsoft.Maui.Controls/ImageButton.xml" path="Type[@FullName='Microsoft.Maui.Controls.ImageButton']/Docs/*" />
-	public partial class ImageButton : IImageButton
-	{
-		protected override void OnPropertyChanged([CallerMemberName] string propertyName = null)
-		{
-			base.OnPropertyChanged(propertyName);
-
-			if (propertyName == BorderWidthProperty.PropertyName)
-				Handler?.UpdateValue(nameof(IImageButton.StrokeThickness));
-			else if (propertyName == BorderColorProperty.PropertyName)
-				Handler?.UpdateValue(nameof(IImageButton.StrokeColor));
-		}
-
-		void IImageSourcePart.UpdateIsLoading(bool isLoading)
-		{
-			((IImageController)this)?.SetIsLoading(isLoading);
-		}
-
-		bool IImageSourcePart.IsAnimationPlaying => false;
-
-		IImageSource IImageSourcePart.Source => Source;
-
-		void IButton.Clicked()
-		{
-			(this as IButtonController).SendClicked();
-		}
-
-		void IButton.Pressed()
-		{
-			(this as IButtonController).SendPressed();
-		}
-
-		void IButton.Released()
-		{
-			(this as IButtonController).SendReleased();
-		}
-
-		double IButtonStroke.StrokeThickness => (double)GetValue(BorderWidthProperty);
-
-		Color IButtonStroke.StrokeColor => (Color)GetValue(BorderColorProperty);
-
-		int IButtonStroke.CornerRadius => (int)GetValue(CornerRadiusProperty);
-	}
-}
diff --git a/src/Controls/src/Core/HandlerImpl/IndicatorView.Impl.cs b/src/Controls/src/Core/HandlerImpl/IndicatorView.Impl.cs
deleted file mode 100644
index 3a8eb271aeff..000000000000
--- a/src/Controls/src/Core/HandlerImpl/IndicatorView.Impl.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-#nullable disable
-using System.Runtime.CompilerServices;
-using Microsoft.Maui.Graphics;
-
-namespace Microsoft.Maui.Controls
-{
-	/// <include file="../../../docs/Microsoft.Maui.Controls/IndicatorView.xml" path="Type[@FullName='Microsoft.Maui.Controls.IndicatorView']/Docs/*" />
-	public partial class IndicatorView : ITemplatedIndicatorView
-	{
-		Paint IIndicatorView.IndicatorColor => IndicatorColor?.AsPaint();
-		Paint IIndicatorView.SelectedIndicatorColor => SelectedIndicatorColor?.AsPaint();
-		IShape IIndicatorView.IndicatorsShape => IndicatorsShape == IndicatorShape.Square ? new Shapes.Rectangle() : new Shapes.Ellipse();
-		Maui.ILayout ITemplatedIndicatorView.IndicatorsLayoutOverride => (IndicatorTemplate != null) ? IndicatorLayout as Maui.ILayout : null;
-	}
-}
diff --git a/src/Controls/src/Core/HandlerImpl/Label/Label.Impl.cs b/src/Controls/src/Core/HandlerImpl/Label/Label.Impl.cs
deleted file mode 100644
index df6038454d2e..000000000000
--- a/src/Controls/src/Core/HandlerImpl/Label/Label.Impl.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-#nullable disable
-namespace Microsoft.Maui.Controls
-{
-	/// <include file="../../../../docs/Microsoft.Maui.Controls/Label.xml" path="Type[@FullName='Microsoft.Maui.Controls.Label']/Docs/*" />
-	public partial class Label : ILabel
-	{
-		Font ITextStyle.Font => this.ToFont();
-	}
-}
\ No newline at end of file
diff --git a/src/Controls/src/Core/HandlerImpl/Line.Impl.cs b/src/Controls/src/Core/HandlerImpl/Line.Impl.cs
deleted file mode 100644
index 2dfd95662e36..000000000000
--- a/src/Controls/src/Core/HandlerImpl/Line.Impl.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-#nullable disable
-using System.Runtime.CompilerServices;
-using Microsoft.Maui.Graphics;
-
-namespace Microsoft.Maui.Controls.Shapes
-{
-	/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/Line.xml" path="Type[@FullName='Microsoft.Maui.Controls.Shapes.Line']/Docs/*" />
-	public partial class Line : IShape
-	{
-		protected override void OnPropertyChanged([CallerMemberName] string propertyName = null)
-		{
-			base.OnPropertyChanged(propertyName);
-
-			if (propertyName == X1Property.PropertyName ||
-				propertyName == Y1Property.PropertyName ||
-				propertyName == X2Property.PropertyName ||
-				propertyName == Y2Property.PropertyName)
-				Handler?.UpdateValue(nameof(IShapeView.Shape));
-		}
-
-		public override PathF GetPath()
-		{
-			var path = new PathF();
-
-			path.MoveTo((float)X1, (float)Y1);
-			path.LineTo((float)X2, (float)Y2);
-
-			return path;
-		}
-	}
-}
diff --git a/src/Controls/src/Core/HandlerImpl/MenuItem.Impl.cs b/src/Controls/src/Core/HandlerImpl/MenuItem.Impl.cs
deleted file mode 100644
index 66bee5d45591..000000000000
--- a/src/Controls/src/Core/HandlerImpl/MenuItem.Impl.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-#nullable disable
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Microsoft.Maui.Graphics;
-
-namespace Microsoft.Maui.Controls
-{
-	/// <include file="../../../docs/Microsoft.Maui.Controls/MenuItem.xml" path="Type[@FullName='Microsoft.Maui.Controls.MenuItem']/Docs/*" />
-	public partial class MenuItem : IMenuElement
-	{
-		IImageSource IImageSourcePart.Source => this.IconImageSource;
-
-		bool IImageSourcePart.IsAnimationPlaying => false;
-
-		Color ITextStyle.TextColor => null;
-
-		Font ITextStyle.Font => Font.Default;
-
-		double ITextStyle.CharacterSpacing => 0;
-
-		void IMenuElement.Clicked()
-		{
-			((IMenuItemController)this).Activate();
-		}
-
-		void IImageSourcePart.UpdateIsLoading(bool isLoading)
-		{
-		}
-	}
-}
diff --git a/src/Controls/src/Core/HandlerImpl/NavigationPage/NavigationPage.Impl.cs b/src/Controls/src/Core/HandlerImpl/NavigationPage/NavigationPage.Impl.cs
deleted file mode 100644
index d1b869f8b7e8..000000000000
--- a/src/Controls/src/Core/HandlerImpl/NavigationPage/NavigationPage.Impl.cs
+++ /dev/null
@@ -1,474 +0,0 @@
-#nullable disable
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
-using Microsoft.Maui.Controls.Internals;
-using Microsoft.Maui.Graphics;
-using Microsoft.Maui.Layouts;
-
-namespace Microsoft.Maui.Controls
-{
-	/// <include file="../../../../docs/Microsoft.Maui.Controls/NavigationPage.xml" path="Type[@FullName='Microsoft.Maui.Controls.NavigationPage']/Docs/*" />
-	public partial class NavigationPage : IStackNavigationView, IToolbarElement
-	{
-		// If the user is making overlapping navigation requests this is used to fire once all navigation 
-		// events have been processed
-		TaskCompletionSource<object> _allPendingNavigationCompletionSource;
-
-		// This is used to process the currently active navigation request
-		TaskCompletionSource<object> _currentNavigationCompletionSource;
-
-		int _waitingCount = 0;
-		NavigationPageToolbar _toolbar;
-		readonly SemaphoreSlim SemaphoreSlim = new SemaphoreSlim(1, 1);
-
-		partial void Init()
-		{
-			(this as IControlsVisualElement).WindowChanged += OnWindowChanged;
-		}
-
-		Thickness IView.Margin => Thickness.Zero;
-
-		protected override void LayoutChildren(double x, double y, double width, double height)
-		{
-			// We don't want forcelayout to call the legacy
-			// Page.LayoutChildren code
-		}
-
-		void IStackNavigation.RequestNavigation(NavigationRequest eventArgs)
-		{
-			Handler?.Invoke(nameof(IStackNavigation.RequestNavigation), eventArgs);
-		}
-
-		// If a native navigation occurs then this syncs up the NavigationStack
-		// with the new native Navigation Stack
-		void IStackNavigation.NavigationFinished(IReadOnlyList<IView> newStack)
-		{
-			// If the user is performing multiple overlapping navigations then we don't want to sync the native stack to our xplat stack
-			// We wait until we get to the end of the queue and then we sync up.
-			// Otherwise intermediate results will wipe out the navigationstack
-			if (_waitingCount <= 1)
-			{
-				SyncToNavigationStack(newStack);
-				CurrentPage = (Page)newStack[newStack.Count - 1];
-				RootPage = (Page)newStack[0];
-			}
-
-			var completionSource = _currentNavigationCompletionSource;
-			CurrentNavigationTask = null;
-			_currentNavigationCompletionSource = null;
-			completionSource?.SetResult(null);
-		}
-
-		void SyncToNavigationStack(IReadOnlyList<IView> newStack)
-		{
-			for (int i = 0; i < newStack.Count; i++)
-			{
-				var element = (Element)newStack[i];
-
-				if (InternalChildren.Count < i)
-					InternalChildren.Add(element);
-				else if (InternalChildren[i] != element)
-				{
-					int index = InternalChildren.IndexOf(element);
-					if (index >= 0)
-					{
-						InternalChildren.Move(index, i);
-					}
-					else
-					{
-						InternalChildren.Insert(i, element);
-					}
-				}
-			}
-
-			while (InternalChildren.Count > newStack.Count)
-			{
-				InternalChildren.RemoveAt(InternalChildren.Count - 1);
-			}
-		}
-
-		IView Content => this.CurrentPage;
-
-		IReadOnlyList<IView> NavigationStack => this.Navigation.NavigationStack;
-
-
-		static void OnCurrentPageChanged(BindableObject bindable, object oldValue, object newValue)
-		{
-			if (oldValue is Page oldPage)
-				oldPage.SendDisappearing();
-
-			if (newValue is Page newPage && ((NavigationPage)bindable).HasAppeared)
-				newPage.SendAppearing();
-		}
-
-		internal IToolbar FindMyToolbar()
-		{
-			if (this.Toolbar != null)
-				return Toolbar;
-
-			if (this.Window is null)
-				return null;
-
-			var rootPage = this.FindParentWith(x => (x is IWindow te || Window.Navigation.ModalStack.Contains(x)), true);
-			if (this.FindParentWith(x => (x is IToolbarElement te && te.Toolbar != null), false) is IToolbarElement te)
-			{
-				// This means I'm inside a Modal Page so we shouldn't return the Toolbar from the window
-				if (rootPage is not IWindow && te is IWindow)
-					return null;
-
-				return te.Toolbar;
-			}
-
-			return null;
-		}
-
-		void OnWindowChanged(object sender, EventArgs e)
-		{
-			// If this NavigationPage is removed from the window
-			// Then we just invalidate the toolbar that this NavigationPage created
-			if (this.Window is null)
-			{
-				if (_toolbar is not null)
-				{
-					if (_toolbar.Parent is Window w &&
-						w.Toolbar == _toolbar)
-					{
-						w.Toolbar = null;
-					}
-
-					_toolbar.Disconnect();
-					_toolbar = null;
-				}
-
-				return;
-			}
-
-			// Update the Container level Toolbar with my Toolbar information
-			if (FindMyToolbar() is not NavigationPageToolbar)
-			{
-				// If the root is a FlyoutPage then we set the toolbar on the flyout page
-				var flyoutPage = this.FindParentOfType<FlyoutPage>();
-
-				if (flyoutPage != null && flyoutPage.Parent is IWindow)
-				{
-					_toolbar = new NavigationPageToolbar(flyoutPage, flyoutPage);
-					flyoutPage.Toolbar = _toolbar;
-				}
-				// Is the root a modal page?
-				else
-				{
-					// Is the root the window or is this part of a modal stack
-					var rootPage = this.FindParentWith(x => (x is IWindow te || Window.Navigation.ModalStack.Contains(x)), true);
-
-					if (rootPage is Window w)
-					{
-						_toolbar = new NavigationPageToolbar(w, w.Page);
-						w.Toolbar = _toolbar;
-					}
-					else if (rootPage is Page p)
-					{
-						_toolbar = new NavigationPageToolbar(p, p);
-						p.Toolbar = _toolbar;
-					}
-				}
-			}
-		}
-
-		async Task SendHandlerUpdateAsync(
-			bool animated,
-			Action processStackChanges,
-			Action firePostNavigatingEvents,
-			Action fireNavigatedEvents)
-		{
-			if (!_setForMaui || this.IsShimmed())
-			{
-				return;
-			}
-
-			processStackChanges?.Invoke();
-
-			if (Handler == null)
-			{
-				return;
-			}
-
-			try
-			{
-				Interlocked.Increment(ref _waitingCount);
-
-				// Wait for pending navigation tasks to finish
-				await SemaphoreSlim.WaitAsync();
-
-				// If our handler was removed while waiting then don't do anything
-				if (Handler != null)
-				{
-					var currentNavRequestTaskSource = new TaskCompletionSource<object>();
-					_allPendingNavigationCompletionSource ??= new TaskCompletionSource<object>();
-
-					if (CurrentNavigationTask == null)
-					{
-						CurrentNavigationTask = _allPendingNavigationCompletionSource.Task;
-					}
-					else if (CurrentNavigationTask != _allPendingNavigationCompletionSource.Task)
-					{
-						throw new InvalidOperationException("Pending Navigations still processing");
-					}
-
-					_currentNavigationCompletionSource = currentNavRequestTaskSource;
-
-					// We create a new list to send to the handler because the structure backing 
-					// The Navigation stack isn't immutable
-					var immutableNavigationStack = new List<IView>(NavigationStack);
-					firePostNavigatingEvents?.Invoke();
-
-					// Create the request for the handler
-					var request = new NavigationRequest(immutableNavigationStack, animated);
-					((IStackNavigation)this).RequestNavigation(request);
-
-					// Wait for the handler to finish processing the navigation
-					// This task completes once the handler calls INavigationView.Finished
-					await currentNavRequestTaskSource.Task;
-				}
-			}
-			finally
-			{
-				if (Interlocked.Decrement(ref _waitingCount) == 0)
-				{
-					_allPendingNavigationCompletionSource.SetResult(new object());
-					_allPendingNavigationCompletionSource = null;
-				}
-
-				SemaphoreSlim.Release();
-			}
-
-			// Send navigated event to currently visible pages and associated navigation event
-			fireNavigatedEvents?.Invoke();
-		}
-
-		private protected override void OnHandlerChangedCore()
-		{
-			base.OnHandlerChangedCore();
-
-			if (Navigation is MauiNavigationImpl && InternalChildren.Count > 0)
-			{
-				var navStack = Navigation.NavigationStack;
-				var visiblePage = Navigation.NavigationStack[NavigationStack.Count - 1];
-				RootPage = navStack[0];
-				CurrentPage = visiblePage;
-
-				SendHandlerUpdateAsync(false, null,
-				() =>
-				{
-					FireAppearing(CurrentPage);
-				},
-				() =>
-				{
-					SendNavigated(null);
-				})
-				.FireAndForget(Handler);
-			}
-
-			// If the handler is disconnected and we're still waiting for updates from the handler
-			// Just complete any waits
-			if (Handler == null && _waitingCount > 0)
-			{
-				((IStackNavigation)this).NavigationFinished(this.NavigationStack);
-			}
-		}
-
-		// Once we get all platforms over to the new APIs
-		// we can just delete all the code inside NavigationPage.cs that fires "requested" events
-		class MauiNavigationImpl : NavigationProxy
-		{
-			readonly Lazy<ReadOnlyCastingList<Page, Element>> _castingList;
-
-			public MauiNavigationImpl(NavigationPage owner)
-			{
-				Owner = owner;
-				_castingList = new Lazy<ReadOnlyCastingList<Page, Element>>(() => new ReadOnlyCastingList<Page, Element>(Owner.InternalChildren));
-			}
-
-			NavigationPage Owner { get; }
-
-			protected override IReadOnlyList<Page> GetNavigationStack()
-			{
-				return _castingList.Value;
-			}
-
-			protected override void OnInsertPageBefore(Page page, Page before)
-			{
-				if (page == null)
-					throw new ArgumentNullException($"{nameof(page)} cannot be null.");
-
-				if (before == null)
-					throw new ArgumentNullException($"{nameof(before)} cannot be null.");
-
-				if (!Owner.InternalChildren.Contains(before))
-					throw new ArgumentException($"{nameof(before)} must be a child of the NavigationPage", nameof(before));
-
-				if (Owner.InternalChildren.Contains(page))
-					throw new ArgumentException("Cannot insert page which is already in the navigation stack");
-
-
-				Owner.SendHandlerUpdateAsync(false,
-					() =>
-					{
-						int index = Owner.InternalChildren.IndexOf(before);
-						Owner.InternalChildren.Insert(index, page);
-
-						if (index == 0)
-							Owner.RootPage = page;
-					},
-					() =>
-					{
-					},
-					() =>
-					{
-						//// If no other pending operations happen
-						//// Then update the toolbar to match
-						//// the current navigation stack
-						//if (Owner._waitingCount == 0)
-						//	Owner.UpdateToolbar();
-
-					}).FireAndForget();
-			}
-
-			protected async override Task<Page> OnPopAsync(bool animated)
-			{
-				if (Owner.InternalChildren.Count == 1)
-				{
-					return null;
-				}
-
-				var currentPage = NavigationStack[NavigationStack.Count - 1];
-				var newCurrentPage = NavigationStack[NavigationStack.Count - 2];
-
-				await Owner.SendHandlerUpdateAsync(animated,
-					() =>
-					{
-						Owner.RemoveFromInnerChildren(currentPage);
-						Owner.CurrentPage = newCurrentPage;
-					},
-					() =>
-					{
-						Owner.SendNavigating(currentPage);
-						Owner.FireDisappearing(currentPage);
-						Owner.FireAppearing(newCurrentPage);
-					},
-					() =>
-					{
-						Owner.SendNavigated(currentPage);
-						Owner?.Popped?.Invoke(Owner, new NavigationEventArgs(currentPage));
-					});
-
-				return currentPage;
-			}
-
-			protected override Task OnPopToRootAsync(bool animated)
-			{
-				if (NavigationStack.Count == 1)
-					return Task.CompletedTask;
-
-				Page previousPage = Owner.CurrentPage;
-				Page newPage = Owner.RootPage;
-				List<Page> pagesToRemove = new List<Page>();
-
-				return Owner.SendHandlerUpdateAsync(animated,
-					() =>
-					{
-						var lastIndex = NavigationStack.Count - 1;
-						while (lastIndex > 0)
-						{
-							var page = (Page)NavigationStack[lastIndex];
-							Owner.RemoveFromInnerChildren(page);
-							lastIndex = NavigationStack.Count - 1;
-							pagesToRemove.Insert(0, page);
-						}
-						Owner.CurrentPage = newPage;
-					},
-					() =>
-					{
-						Owner.SendNavigating(previousPage);
-						Owner.FireDisappearing(previousPage);
-						Owner.FireAppearing(newPage);
-					},
-					() =>
-					{
-						Owner.SendNavigated(previousPage);
-						Owner?.PoppedToRoot?.Invoke(Owner, new PoppedToRootEventArgs(newPage, pagesToRemove));
-					});
-			}
-
-			protected override Task OnPushAsync(Page root, bool animated)
-			{
-				if (Owner.InternalChildren.Contains(root))
-					return Task.CompletedTask;
-
-				var previousPage = Owner.CurrentPage;
-
-				return Owner.SendHandlerUpdateAsync(animated,
-					() =>
-					{
-						Owner.PushPage(root);
-					},
-					() =>
-					{
-						Owner.SendNavigating(previousPage);
-						Owner.FireDisappearing(previousPage);
-						Owner.FireAppearing(root);
-					},
-					() =>
-					{
-						Owner.SendNavigated(previousPage);
-						Owner?.Pushed?.Invoke(Owner, new NavigationEventArgs(root));
-					});
-			}
-
-			protected override void OnRemovePage(Page page)
-			{
-				if (page == null)
-					throw new ArgumentNullException($"{nameof(page)} cannot be null.");
-
-				if (page == Owner.CurrentPage && Owner.CurrentPage == Owner.RootPage)
-					throw new InvalidOperationException("Cannot remove root page when it is also the currently displayed page.");
-
-				if (page == Owner.CurrentPage)
-				{
-					Application.Current?.FindMauiContext()?.CreateLogger<NavigationPage>()?.LogWarning("RemovePage called for CurrentPage object. This can result in undesired behavior, consider calling PopAsync instead.");
-					PopAsync();
-					return;
-				}
-
-				if (!Owner.InternalChildren.Contains(page))
-					throw new ArgumentException("Page to remove must be contained on this Navigation Page");
-
-				Owner.SendHandlerUpdateAsync(false,
-					() =>
-					{
-						Owner.RemoveFromInnerChildren(page);
-
-						if (Owner.RootPage == page)
-							Owner.RootPage = (Page)Owner.InternalChildren[0];
-					},
-					() =>
-					{
-					},
-					() =>
-					{
-						//// If no other pending operations happen
-						//// Then update the toolbar to match
-						//// the current navigation stack
-						//if (Owner._waitingCount == 0)
-						//	Owner.UpdateToolbar();
-
-					}).FireAndForget();
-			}
-		}
-	}
-}
diff --git a/src/Controls/src/Core/HandlerImpl/Page.Impl.cs b/src/Controls/src/Core/HandlerImpl/Page.Impl.cs
deleted file mode 100644
index e0a5bd15a2ce..000000000000
--- a/src/Controls/src/Core/HandlerImpl/Page.Impl.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-#nullable disable
-using System;
-using Microsoft.Maui.Controls.Internals;
-using Microsoft.Maui.Graphics;
-
-namespace Microsoft.Maui.Controls
-{
-	/// <include file="../../../docs/Microsoft.Maui.Controls/Page.xml" path="Type[@FullName='Microsoft.Maui.Controls.Page']/Docs/*" />
-	public partial class Page : IView, ITitledElement, IToolbarElement
-	{
-		internal bool HasNavigatedTo { get; private set; }
-
-		Paint IView.Background
-		{
-			get
-			{
-				if (!Brush.IsNullOrEmpty(Background))
-					return Background;
-				if (!ImageSource.IsNullOrEmpty(BackgroundImageSource))
-					return new ImageSourcePaint(BackgroundImageSource);
-				if (BackgroundColor.IsNotDefault())
-					return new SolidColorBrush(BackgroundColor);
-
-				return null;
-			}
-		}
-
-		Toolbar _toolbar;
-		IToolbar IToolbarElement.Toolbar
-		{
-			get => _toolbar;
-		}
-
-		internal Toolbar Toolbar
-		{
-			get => _toolbar;
-			set
-			{
-				_toolbar = value;
-				Handler?.UpdateValue(nameof(IToolbarElement.Toolbar));
-			}
-		}
-
-		internal void SendNavigatedTo(NavigatedToEventArgs args)
-		{
-			HasNavigatedTo = true;
-			NavigatedTo?.Invoke(this, args);
-			OnNavigatedTo(args);
-			(this as IPageContainer<Page>)?.CurrentPage?.SendNavigatedTo(args);
-		}
-
-		internal void SendNavigatingFrom(NavigatingFromEventArgs args)
-		{
-			NavigatingFrom?.Invoke(this, args);
-			OnNavigatingFrom(args);
-			(this as IPageContainer<Page>)?.CurrentPage?.SendNavigatingFrom(args);
-		}
-
-		internal void SendNavigatedFrom(NavigatedFromEventArgs args)
-		{
-			HasNavigatedTo = false;
-			NavigatedFrom?.Invoke(this, args);
-			OnNavigatedFrom(args);
-			(this as IPageContainer<Page>)?.CurrentPage?.SendNavigatedFrom(args);
-		}
-
-		public event EventHandler<NavigatedToEventArgs> NavigatedTo;
-		public event EventHandler<NavigatingFromEventArgs> NavigatingFrom;
-		public event EventHandler<NavigatedFromEventArgs> NavigatedFrom;
-
-		protected virtual void OnNavigatedTo(NavigatedToEventArgs args) { }
-		protected virtual void OnNavigatingFrom(NavigatingFromEventArgs args) { }
-		protected virtual void OnNavigatedFrom(NavigatedFromEventArgs args) { }
-
-		public virtual Window GetParentWindow()
-			=> this.FindParentOfType<Window>();
-	}
-
-	public sealed class NavigatingFromEventArgs : EventArgs
-	{
-
-	}
-
-	public sealed class NavigatedToEventArgs : EventArgs
-	{
-		internal NavigatedToEventArgs(Page previousPage)
-		{
-			PreviousPage = previousPage;
-		}
-
-		internal Page PreviousPage { get; }
-	}
-
-	public sealed class NavigatedFromEventArgs : EventArgs
-	{
-		internal NavigatedFromEventArgs(Page destinationPage)
-		{
-			DestinationPage = destinationPage;
-		}
-
-		internal Page DestinationPage { get; }
-	}
-}
diff --git a/src/Controls/src/Core/HandlerImpl/Path.Impl.cs b/src/Controls/src/Core/HandlerImpl/Path.Impl.cs
deleted file mode 100644
index ac9a8b975c05..000000000000
--- a/src/Controls/src/Core/HandlerImpl/Path.Impl.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-#nullable disable
-using System.Runtime.CompilerServices;
-using Microsoft.Maui.Graphics;
-
-namespace Microsoft.Maui.Controls.Shapes
-{
-	/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/Path.xml" path="Type[@FullName='Microsoft.Maui.Controls.Shapes.Path']/Docs/*" />
-	public partial class Path : IShape
-	{
-		protected override void OnPropertyChanged([CallerMemberName] string propertyName = null)
-		{
-			base.OnPropertyChanged(propertyName);
-
-			if (propertyName == DataProperty.PropertyName)
-			{
-				Handler?.UpdateValue(nameof(IShapeView.Shape));
-			}
-		}
-
-		public override PathF GetPath()
-		{
-			var path = new PathF();
-
-			if (Data != null)
-				Data.AppendPath(path);
-
-			return path;
-		}
-	}
-}
diff --git a/src/Controls/src/Core/HandlerImpl/Picker/Picker.Impl.cs b/src/Controls/src/Core/HandlerImpl/Picker/Picker.Impl.cs
deleted file mode 100644
index f76b65de0f38..000000000000
--- a/src/Controls/src/Core/HandlerImpl/Picker/Picker.Impl.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-#nullable disable
-using System.Collections.Generic;
-
-namespace Microsoft.Maui.Controls
-{
-	public partial class Picker : IPicker
-	{
-		Font ITextStyle.Font => this.ToFont();
-
-		IList<string> IPicker.Items => Items;
-
-		int IItemDelegate<string>.GetCount() => Items?.Count ?? ItemsSource?.Count ?? 0;
-
-		string IItemDelegate<string>.GetItem(int index)
-		{
-			if (index < 0)
-				return string.Empty;
-			if (index < Items?.Count)
-				return GetItem(index);
-			if (index < ItemsSource?.Count)
-				return GetDisplayMember(ItemsSource[index]);
-			return string.Empty;
-		}
-
-		string GetItem(int index)
-		{
-			if (index < Items?.Count)
-			{
-				var item = Items[index];
-				return item ?? string.Empty;
-			}
-
-			return string.Empty;
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/Controls/src/Core/HandlerImpl/Polygon.Impl.cs b/src/Controls/src/Core/HandlerImpl/Polygon.Impl.cs
deleted file mode 100644
index ab1fa147ce42..000000000000
--- a/src/Controls/src/Core/HandlerImpl/Polygon.Impl.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-#nullable disable
-using System.Runtime.CompilerServices;
-using Microsoft.Maui.Graphics;
-
-namespace Microsoft.Maui.Controls.Shapes
-{
-	/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/Polygon.xml" path="Type[@FullName='Microsoft.Maui.Controls.Shapes.Polygon']/Docs/*" />
-	public partial class Polygon : IShape
-	{
-		protected override void OnPropertyChanged([CallerMemberName] string propertyName = null)
-		{
-			base.OnPropertyChanged(propertyName);
-
-			if (propertyName == PointsProperty.PropertyName ||
-				propertyName == FillRuleProperty.PropertyName)
-				Handler?.UpdateValue(nameof(IShapeView.Shape));
-		}
-
-		public override PathF GetPath()
-		{
-			var path = new PathF();
-
-			if (Points?.Count > 0)
-			{
-				path.MoveTo((float)Points[0].X, (float)Points[0].Y);
-
-				for (int index = 1; index < Points.Count; index++)
-					path.LineTo((float)Points[index].X, (float)Points[index].Y);
-
-				path.Close();
-			}
-
-			return path;
-		}
-	}
-}
diff --git a/src/Controls/src/Core/HandlerImpl/Polyline.Impl.cs b/src/Controls/src/Core/HandlerImpl/Polyline.Impl.cs
deleted file mode 100644
index 84eda2972165..000000000000
--- a/src/Controls/src/Core/HandlerImpl/Polyline.Impl.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-#nullable disable
-using System.Runtime.CompilerServices;
-using Microsoft.Maui.Graphics;
-
-namespace Microsoft.Maui.Controls.Shapes
-{
-	/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/Polyline.xml" path="Type[@FullName='Microsoft.Maui.Controls.Shapes.Polyline']/Docs/*" />
-	public partial class Polyline : IShape
-	{
-		protected override void OnPropertyChanged([CallerMemberName] string propertyName = null)
-		{
-			base.OnPropertyChanged(propertyName);
-
-			if (propertyName == PointsProperty.PropertyName ||
-				propertyName == FillRuleProperty.PropertyName)
-				Handler?.UpdateValue(nameof(IShapeView.Shape));
-		}
-
-		public override PathF GetPath()
-		{
-			var path = new PathF();
-
-			if (Points?.Count > 0)
-			{
-				path.MoveTo((float)Points[0].X, (float)Points[0].Y);
-
-				for (int index = 1; index < Points.Count; index++)
-					path.LineTo((float)Points[index].X, (float)Points[index].Y);
-			}
-
-			return path;
-		}
-	}
-}
diff --git a/src/Controls/src/Core/HandlerImpl/ProgressBar.Impl.cs b/src/Controls/src/Core/HandlerImpl/ProgressBar.Impl.cs
deleted file mode 100644
index 1937754bd21f..000000000000
--- a/src/Controls/src/Core/HandlerImpl/ProgressBar.Impl.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace Microsoft.Maui.Controls
-{
-	/// <include file="../../../docs/Microsoft.Maui.Controls/ProgressBar.xml" path="Type[@FullName='Microsoft.Maui.Controls.ProgressBar']/Docs/*" />
-	public partial class ProgressBar : IProgress
-	{
-
-	}
-}
\ No newline at end of file
diff --git a/src/Controls/src/Core/HandlerImpl/RadioButton/RadioButton.Impl.cs b/src/Controls/src/Core/HandlerImpl/RadioButton/RadioButton.Impl.cs
deleted file mode 100644
index 279814bb8dfd..000000000000
--- a/src/Controls/src/Core/HandlerImpl/RadioButton/RadioButton.Impl.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-#nullable disable
-using Microsoft.Maui.Graphics;
-using Microsoft.Maui.Layouts;
-
-namespace Microsoft.Maui.Controls
-{
-	/// <include file="../../../../docs/Microsoft.Maui.Controls/RadioButton.xml" path="Type[@FullName='Microsoft.Maui.Controls.RadioButton']/Docs/*" />
-	public partial class RadioButton : IRadioButton
-	{
-		Font ITextStyle.Font => this.ToFont();
-
-#if ANDROID
-		object IContentView.Content => ContentAsString();
-#endif
-
-		IView IContentView.PresentedContent => ((this as IControlTemplated).TemplateRoot as IView) ?? (Content as IView);
-
-		double IButtonStroke.StrokeThickness => (double)GetValue(BorderWidthProperty);
-
-		Color IButtonStroke.StrokeColor => (Color)GetValue(BorderColorProperty);
-
-		int IButtonStroke.CornerRadius => (int)GetValue(CornerRadiusProperty);
-
-		private protected override Semantics UpdateSemantics()
-		{
-			var semantics = base.UpdateSemantics();
-
-			if (ControlTemplate != null)
-			{
-				string contentAsString = ContentAsString();
-
-				if (!string.IsNullOrWhiteSpace(contentAsString) && string.IsNullOrWhiteSpace(semantics?.Description))
-				{
-					semantics ??= new Semantics();
-					semantics.Description = contentAsString;
-				}
-			}
-
-			return semantics;
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/Controls/src/Core/HandlerImpl/Rectangle.Impl.cs b/src/Controls/src/Core/HandlerImpl/Rectangle.Impl.cs
deleted file mode 100644
index a670e247936e..000000000000
--- a/src/Controls/src/Core/HandlerImpl/Rectangle.Impl.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-#nullable disable
-using System;
-using System.Runtime.CompilerServices;
-using Microsoft.Maui.Graphics;
-
-namespace Microsoft.Maui.Controls.Shapes
-{
-	/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/Rectangle.xml" path="Type[@FullName='Microsoft.Maui.Controls.Shapes.Rectangle']/Docs/*" />
-	public partial class Rectangle : IShape
-	{
-		protected override void OnPropertyChanged([CallerMemberName] string propertyName = null)
-		{
-			base.OnPropertyChanged(propertyName);
-
-			if (propertyName == RadiusXProperty.PropertyName ||
-				propertyName == RadiusYProperty.PropertyName)
-				Handler?.UpdateValue(nameof(IShapeView.Shape));
-		}
-
-		public override PathF GetPath()
-		{
-			var width = WidthForPathComputation;
-			var height = HeightForPathComputation;
-
-			var path = new PathF();
-
-			float x = (float)StrokeThickness / 2;
-			float y = (float)StrokeThickness / 2;
-			float w = (float)(width - StrokeThickness);
-			float h = (float)(height - StrokeThickness);
-			float cornerRadius = (float)Math.Max(RadiusX, RadiusY);
-
-			// TODO: Create specific Path taking into account RadiusX and RadiusY
-			path.AppendRoundedRectangle(x, y, w, h, cornerRadius);
-
-			return path;
-		}
-	}
-}
diff --git a/src/Controls/src/Core/HandlerImpl/RefreshView/RefreshView.Impl.cs b/src/Controls/src/Core/HandlerImpl/RefreshView/RefreshView.Impl.cs
deleted file mode 100644
index 80137b317791..000000000000
--- a/src/Controls/src/Core/HandlerImpl/RefreshView/RefreshView.Impl.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-#nullable disable
-using Microsoft.Maui.Graphics;
-
-namespace Microsoft.Maui.Controls
-{
-	public partial class RefreshView : IRefreshView
-	{
-		Paint IRefreshView.RefreshColor => RefreshColor?.AsPaint();
-
-		IView IRefreshView.Content => base.Content;
-	}
-}
\ No newline at end of file
diff --git a/src/Controls/src/Core/HandlerImpl/RoundRectangle.Impl.cs b/src/Controls/src/Core/HandlerImpl/RoundRectangle.Impl.cs
deleted file mode 100644
index 487cbc69d191..000000000000
--- a/src/Controls/src/Core/HandlerImpl/RoundRectangle.Impl.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-#nullable disable
-using System;
-using System.Runtime.CompilerServices;
-using Microsoft.Maui.Graphics;
-
-namespace Microsoft.Maui.Controls.Shapes
-{
-	public partial class RoundRectangle : IRoundRectangle
-	{
-		double _fallbackWidth;
-		double _fallbackHeight;
-
-		internal override double WidthForPathComputation
-		{
-			get
-			{
-				var width = Width;
-
-				return width == -1 ? _fallbackWidth : width;
-			}
-		}
-
-		internal override double HeightForPathComputation
-		{
-			get
-			{
-				var height = Height;
-
-				return height == -1 ? _fallbackHeight : height;
-			}
-		}
-
-		protected override void OnPropertyChanged([CallerMemberName] string propertyName = null)
-		{
-			base.OnPropertyChanged(propertyName);
-
-			if (propertyName == CornerRadiusProperty.PropertyName)
-				Handler?.UpdateValue(nameof(IShapeView.Shape));
-		}
-
-		public override PathF GetPath()
-		{
-			var width = WidthForPathComputation;
-			var height = HeightForPathComputation;
-
-			var path = new PathF();
-
-			float x = (float)StrokeThickness / 2;
-			float y = (float)StrokeThickness / 2;
-
-			float w = (float)(width - StrokeThickness);
-			float h = (float)(height - StrokeThickness);
-
-			float topLeftCornerRadius = (float)CornerRadius.TopLeft;
-			float topRightCornerRadius = (float)CornerRadius.TopRight;
-			float bottomLeftCornerRadius = (float)CornerRadius.BottomLeft;
-			float bottomRightCornerRadius = (float)CornerRadius.BottomRight;
-
-			path.AppendRoundedRectangle(x, y, w, h, topLeftCornerRadius, topRightCornerRadius, bottomLeftCornerRadius, bottomRightCornerRadius);
-
-			return path;
-		}
-
-		PathF IShape.PathForBounds(Graphics.Rect viewBounds)
-		{
-			_fallbackHeight = viewBounds.Height;
-			_fallbackWidth = viewBounds.Width;
-
-			var path = GetPath();
-
-			TransformPathForBounds(path, viewBounds);
-
-			return path;
-		}
-
-		internal PathF GetInnerPath(float strokeWidth)
-		{
-			var width = WidthForPathComputation;
-			var height = HeightForPathComputation;
-
-			var path = new PathF();
-
-			float x = (float)StrokeThickness / 2;
-			float y = (float)StrokeThickness / 2;
-
-			float w = (float)(width - StrokeThickness);
-			float h = (float)(height - StrokeThickness);
-
-			float topLeftCornerRadius = (float)Math.Max(0, CornerRadius.TopLeft - strokeWidth);
-			float topRightCornerRadius = (float)Math.Max(0, CornerRadius.TopRight - strokeWidth);
-			float bottomLeftCornerRadius = (float)Math.Max(0, CornerRadius.BottomLeft - strokeWidth);
-			float bottomRightCornerRadius = (float)Math.Max(0, CornerRadius.BottomRight - strokeWidth);
-
-			path.AppendRoundedRectangle(x, y, w, h, topLeftCornerRadius, topRightCornerRadius, bottomLeftCornerRadius, bottomRightCornerRadius);
-
-			return path;
-		}
-
-		PathF IRoundRectangle.InnerPathForBounds(Rect viewBounds, float strokeWidth)
-		{
-			_fallbackHeight = viewBounds.Height;
-			_fallbackWidth = viewBounds.Width;
-
-			var path = GetInnerPath(strokeWidth);
-
-			TransformPathForBounds(path, viewBounds);
-
-			return path;
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/Controls/src/Core/HandlerImpl/ScrollView/ScrollView.Impl.cs b/src/Controls/src/Core/HandlerImpl/ScrollView/ScrollView.Impl.cs
deleted file mode 100644
index 5ef14aab1ac9..000000000000
--- a/src/Controls/src/Core/HandlerImpl/ScrollView/ScrollView.Impl.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-#nullable disable
-using System;
-using Microsoft.Maui.Controls.Internals;
-using Microsoft.Maui.Graphics;
-using Microsoft.Maui.Layouts;
-using static Microsoft.Maui.Layouts.LayoutManager;
-
-namespace Microsoft.Maui.Controls
-{
-	public partial class ScrollView : IScrollView, IContentView
-	{
-		object IContentView.Content => Content;
-		IView IContentView.PresentedContent => Content;
-
-		double IScrollView.HorizontalOffset
-		{
-			get => ScrollX;
-			set
-			{
-				if (ScrollX != value)
-				{
-					SetScrolledPosition(value, ScrollY);
-				}
-			}
-		}
-
-		double IScrollView.VerticalOffset
-		{
-			get => ScrollY;
-			set
-			{
-				if (ScrollY != value)
-				{
-					SetScrolledPosition(ScrollX, value);
-				}
-			}
-		}
-
-		void IScrollView.RequestScrollTo(double horizontalOffset, double verticalOffset, bool instant)
-		{
-			var request = new ScrollToRequest(horizontalOffset, verticalOffset, instant);
-			Handler?.Invoke(nameof(IScrollView.RequestScrollTo), request);
-		}
-
-		void IScrollView.ScrollFinished() => SendScrollFinished();
-
-		protected override Size MeasureOverride(double widthConstraint, double heightConstraint)
-		{
-			DesiredSize = this.ComputeDesiredSize(widthConstraint, heightConstraint);
-			return DesiredSize;
-		}
-
-		Size IContentView.CrossPlatformMeasure(double widthConstraint, double heightConstraint)
-		{
-			if ((this as IContentView)?.PresentedContent is not IView content)
-			{
-				ContentSize = Size.Zero;
-				return ContentSize;
-			}
-
-			switch (Orientation)
-			{
-				case ScrollOrientation.Horizontal:
-					widthConstraint = double.PositiveInfinity;
-					break;
-				case ScrollOrientation.Neither:
-				case ScrollOrientation.Both:
-					heightConstraint = double.PositiveInfinity;
-					widthConstraint = double.PositiveInfinity;
-					break;
-				case ScrollOrientation.Vertical:
-				default:
-					heightConstraint = double.PositiveInfinity;
-					break;
-			}
-
-			content.Measure(widthConstraint, heightConstraint);
-			return content.DesiredSize;
-		}
-
-		protected override Size ArrangeOverride(Rect bounds)
-		{
-			Frame = this.ComputeFrame(bounds);
-			Handler?.PlatformArrange(Frame);
-
-			return Frame.Size;
-		}
-
-		Size IContentView.CrossPlatformArrange(Rect bounds)
-		{
-			if (this is IScrollView scrollView)
-			{
-				return scrollView.ArrangeContentUnbounded(bounds);
-			}
-
-			return bounds.Size;
-		}
-	}
-}
diff --git a/src/Controls/src/Core/HandlerImpl/SearchBar/SearchBar.Impl.cs b/src/Controls/src/Core/HandlerImpl/SearchBar/SearchBar.Impl.cs
deleted file mode 100644
index 28affbec4d4e..000000000000
--- a/src/Controls/src/Core/HandlerImpl/SearchBar/SearchBar.Impl.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-#nullable disable
-namespace Microsoft.Maui.Controls
-{
-	/// <include file="../../../../docs/Microsoft.Maui.Controls/SearchBar.xml" path="Type[@FullName='Microsoft.Maui.Controls.SearchBar']/Docs/*" />
-	public partial class SearchBar : ISearchBar
-	{
-		Font ITextStyle.Font => this.ToFont();
-
-		bool ITextInput.IsTextPredictionEnabled => true;
-
-		void ISearchBar.SearchButtonPressed()
-		{
-			(this as ISearchBarController).OnSearchButtonPressed();
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/Controls/src/Core/HandlerImpl/Shape/Shape.Impl.cs b/src/Controls/src/Core/HandlerImpl/Shape/Shape.Impl.cs
deleted file mode 100644
index 56a994c73bfc..000000000000
--- a/src/Controls/src/Core/HandlerImpl/Shape/Shape.Impl.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Microsoft.Maui.Controls.Shapes
-{
-	public partial class Shape
-	{
-	}
-}
diff --git a/src/Controls/src/Core/HandlerImpl/Shell.Impl.cs b/src/Controls/src/Core/HandlerImpl/Shell.Impl.cs
deleted file mode 100644
index 602e0ee00529..000000000000
--- a/src/Controls/src/Core/HandlerImpl/Shell.Impl.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-#nullable disable
-using System;
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-using System.Text;
-
-namespace Microsoft.Maui.Controls
-{
-	public partial class Shell : IFlyoutView
-	{
-		IView IFlyoutView.Flyout => this.FlyoutContentView;
-		IView IFlyoutView.Detail => null;
-
-		bool IFlyoutView.IsPresented { get => FlyoutIsPresented; set => FlyoutIsPresented = value; }
-
-		bool IFlyoutView.IsGestureEnabled => false;
-
-		FlyoutBehavior IFlyoutView.FlyoutBehavior
-		{
-			get
-			{
-				return GetEffectiveFlyoutBehavior();
-			}
-		}
-
-		protected override void OnPropertyChanged([CallerMemberName] string propertyName = null)
-		{
-			base.OnPropertyChanged(propertyName);
-			if (propertyName == Shell.FlyoutIsPresentedProperty.PropertyName)
-				Handler?.UpdateValue(nameof(IFlyoutView.IsPresented));
-		}
-	}
-}
diff --git a/src/Controls/src/Core/HandlerImpl/ShellSection.Impl.cs b/src/Controls/src/Core/HandlerImpl/ShellSection.Impl.cs
deleted file mode 100644
index 3e565cf6801e..000000000000
--- a/src/Controls/src/Core/HandlerImpl/ShellSection.Impl.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Microsoft.Maui.Controls
-{
-	public partial class ShellSection : IStackNavigation
-	{
-		// This code only runs for shell bits that are running through a proper
-		// ShellHandler
-		TaskCompletionSource<object>? _handlerBasedNavigationCompletionSource;
-		internal Task? PendingNavigationTask => _handlerBasedNavigationCompletionSource?.Task;
-
-		void IStackNavigation.RequestNavigation(NavigationRequest eventArgs)
-		{
-			if (_handlerBasedNavigationCompletionSource != null)
-				throw new InvalidOperationException("Pending Navigations still processing");
-
-			_handlerBasedNavigationCompletionSource = new TaskCompletionSource<object>();
-			Handler.Invoke(nameof(IStackNavigation.RequestNavigation), eventArgs);
-		}
-
-		void IStackNavigation.NavigationFinished(IReadOnlyList<IView> newStack)
-		{
-			_ = _handlerBasedNavigationCompletionSource ?? throw new InvalidOperationException("Mismatched Navigation finished");
-			var source = _handlerBasedNavigationCompletionSource;
-			_handlerBasedNavigationCompletionSource = null;
-			source?.SetResult(true);
-		}
-	}
-}
diff --git a/src/Controls/src/Core/HandlerImpl/Slider.Impl.cs b/src/Controls/src/Core/HandlerImpl/Slider.Impl.cs
deleted file mode 100644
index d25001b8236d..000000000000
--- a/src/Controls/src/Core/HandlerImpl/Slider.Impl.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-#nullable disable
-namespace Microsoft.Maui.Controls
-{
-	/// <include file="../../../docs/Microsoft.Maui.Controls/Slider.xml" path="Type[@FullName='Microsoft.Maui.Controls.Slider']/Docs/*" />
-	public partial class Slider : ISlider
-	{
-		IImageSource ISlider.ThumbImageSource => ThumbImageSource;
-
-		void ISlider.DragCompleted()
-		{
-			(this as ISliderController).SendDragCompleted();
-		}
-
-		void ISlider.DragStarted()
-		{
-			(this as ISliderController).SendDragStarted();
-		}
-	}
-}
diff --git a/src/Controls/src/Core/HandlerImpl/Stepper.Impl.cs b/src/Controls/src/Core/HandlerImpl/Stepper.Impl.cs
deleted file mode 100644
index 0650e5e77d41..000000000000
--- a/src/Controls/src/Core/HandlerImpl/Stepper.Impl.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace Microsoft.Maui.Controls
-{
-	/// <include file="../../../docs/Microsoft.Maui.Controls/Stepper.xml" path="Type[@FullName='Microsoft.Maui.Controls.Stepper']/Docs/*" />
-	public partial class Stepper : IStepper
-	{
-
-	}
-}
\ No newline at end of file
diff --git a/src/Controls/src/Core/HandlerImpl/SwipeItem.Impl.cs b/src/Controls/src/Core/HandlerImpl/SwipeItem.Impl.cs
deleted file mode 100644
index 6d8b8d63704f..000000000000
--- a/src/Controls/src/Core/HandlerImpl/SwipeItem.Impl.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-#nullable disable
-using System;
-using System.ComponentModel;
-using Microsoft.Maui.Graphics;
-
-namespace Microsoft.Maui.Controls
-{
-	/// <include file="../../../docs/Microsoft.Maui.Controls/SwipeItem.xml" path="Type[@FullName='Microsoft.Maui.Controls.SwipeItem']/Docs/*" />
-	public partial class SwipeItem : MenuItem, Maui.ISwipeItemMenuItem
-	{
-		Paint ISwipeItemMenuItem.Background => new SolidPaint(BackgroundColor);
-
-		Visibility ISwipeItemMenuItem.Visibility => this.IsVisible ? Visibility.Visible : Visibility.Collapsed;
-
-		void Maui.ISwipeItem.OnInvoked()
-		{
-			if (Command != null && Command.CanExecute(CommandParameter))
-				Command.Execute(CommandParameter);
-
-			OnClicked();
-			Invoked?.Invoke(this, EventArgs.Empty);
-		}
-
-		void IImageSourcePart.UpdateIsLoading(bool isLoading)
-		{
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/Controls/src/Core/HandlerImpl/SwipeItemView.Impl.cs b/src/Controls/src/Core/HandlerImpl/SwipeItemView.Impl.cs
deleted file mode 100644
index aec8bf2c103d..000000000000
--- a/src/Controls/src/Core/HandlerImpl/SwipeItemView.Impl.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-using System.ComponentModel;
-using Microsoft.Maui.Graphics;
-
-namespace Microsoft.Maui.Controls
-{
-	/// <include file="../../../docs/Microsoft.Maui.Controls/SwipeItemView.xml" path="Type[@FullName='Microsoft.Maui.Controls.SwipeItemView']/Docs/*" />
-	public partial class SwipeItemView : Controls.ISwipeItem, Maui.ISwipeItemView
-	{
-	}
-}
\ No newline at end of file
diff --git a/src/Controls/src/Core/HandlerImpl/SwipeView.Impl.cs b/src/Controls/src/Core/HandlerImpl/SwipeView.Impl.cs
deleted file mode 100644
index 84aff682971c..000000000000
--- a/src/Controls/src/Core/HandlerImpl/SwipeView.Impl.cs
+++ /dev/null
@@ -1,186 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Microsoft.Maui.Controls
-{
-	/// <include file="../../../docs/Microsoft.Maui.Controls/SwipeView.xml" path="Type[@FullName='Microsoft.Maui.Controls.SwipeView']/Docs/*" />
-	public partial class SwipeView : ISwipeView
-	{
-		bool _isOpen;
-		double _previousScrollX;
-		double _previousScrollY;
-		View? _scrollParent;
-		const float SwipeMinimumDelta = 10f;
-
-		ISwipeItems ISwipeView.LeftItems => new HandlerSwipeItems(LeftItems);
-
-		ISwipeItems ISwipeView.RightItems => new HandlerSwipeItems(RightItems);
-
-		ISwipeItems ISwipeView.TopItems => new HandlerSwipeItems(TopItems);
-
-		ISwipeItems ISwipeView.BottomItems => new HandlerSwipeItems(BottomItems);
-
-		bool ISwipeView.IsOpen
-		{
-			get => _isOpen;
-			set
-			{
-				_isOpen = value;
-				Handler?.UpdateValue(nameof(ISwipeView.IsOpen));
-			}
-		}
-
-#if IOS
-		SwipeTransitionMode ISwipeView.SwipeTransitionMode =>
-			Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific.SwipeView.GetSwipeTransitionMode(this);
-#elif ANDROID
-		SwipeTransitionMode ISwipeView.SwipeTransitionMode =>
-			Microsoft.Maui.Controls.PlatformConfiguration.AndroidSpecific.SwipeView.GetSwipeTransitionMode(this);
-#else
-		SwipeTransitionMode ISwipeView.SwipeTransitionMode => SwipeTransitionMode.Reveal;
-#endif
-
-
-		protected override void OnChildAdded(Element child)
-		{
-			base.OnChildAdded(child);
-			child.PropertyChanged += OnPropertyChanged;
-		}
-
-		protected override void OnChildRemoved(Element child, int oldLogicalIndex)
-		{
-			base.OnChildRemoved(child, oldLogicalIndex);
-			child.PropertyChanged -= OnPropertyChanged;
-		}
-
-		void OnPropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
-		{
-			if (e.PropertyName == IsEnabledProperty.PropertyName)
-				Handler?.UpdateValue(nameof(IsEnabled));
-			else if (e.PropertyName == MarginProperty.PropertyName)
-				UpdateMargin();
-		}
-
-		private protected override void OnParentChangedCore()
-		{
-			if (_scrollParent != null)
-			{
-				if (_scrollParent is ScrollView scrollView)
-				{
-					scrollView.Scrolled -= OnParentScrolled;
-				}
-
-				if (_scrollParent is ListView listView)
-				{
-					listView.Scrolled -= OnParentScrolled;
-					return;
-				}
-
-				if (_scrollParent is Microsoft.Maui.Controls.CollectionView collectionView)
-				{
-					collectionView.Scrolled -= OnParentScrolled;
-				}
-
-				_scrollParent = null;
-			}
-
-			base.OnParentChangedCore();
-
-			if (_scrollParent == null)
-			{
-				_scrollParent = this.FindParentOfType<ScrollView>();
-
-				if (_scrollParent is ScrollView scrollView)
-				{
-					scrollView.Scrolled += OnParentScrolled;
-					return;
-				}
-
-				_scrollParent = this.FindParentOfType<ListView>();
-
-				if (_scrollParent is ListView listView)
-				{
-					listView.Scrolled += OnParentScrolled;
-					return;
-				}
-
-				_scrollParent = this.FindParentOfType<Microsoft.Maui.Controls.CollectionView>();
-
-				if (_scrollParent is Microsoft.Maui.Controls.CollectionView collectionView)
-				{
-					collectionView.Scrolled += OnParentScrolled;
-				}
-			}
-		}
-
-		void UpdateMargin()
-		{
-			if (this is not ISwipeView swipeView)
-				return;
-
-			if (swipeView.IsOpen)
-				swipeView.RequestClose(new SwipeViewCloseRequest(false));
-		}
-
-		void OnParentScrolled(object? sender, ScrolledEventArgs e)
-		{
-			var horizontalDelta = e.ScrollX - _previousScrollX;
-			var verticalDelta = e.ScrollY - _previousScrollY;
-
-			if (horizontalDelta > SwipeMinimumDelta || verticalDelta > SwipeMinimumDelta)
-				((ISwipeView)this).RequestClose(new SwipeViewCloseRequest(true));
-
-			_previousScrollX = e.ScrollX;
-			_previousScrollY = e.ScrollY;
-		}
-
-		void OnParentScrolled(object? sender, ItemsViewScrolledEventArgs e)
-		{
-			if (e.HorizontalDelta > SwipeMinimumDelta || e.VerticalDelta > SwipeMinimumDelta)
-				((ISwipeView)this).RequestClose(new SwipeViewCloseRequest(true));
-		}
-
-		void ISwipeView.SwipeStarted(SwipeViewSwipeStarted swipeStarted)
-		{
-			var swipeStartedEventArgs = new SwipeStartedEventArgs(swipeStarted.SwipeDirection);
-			((ISwipeViewController)this).SendSwipeStarted(swipeStartedEventArgs);
-		}
-
-		void ISwipeView.SwipeChanging(SwipeViewSwipeChanging swipeChanging)
-		{
-			var swipeChangingEventArgs = new SwipeChangingEventArgs(swipeChanging.SwipeDirection, swipeChanging.Offset);
-			((ISwipeViewController)this).SendSwipeChanging(swipeChangingEventArgs);
-		}
-
-		void ISwipeView.SwipeEnded(SwipeViewSwipeEnded swipeEnded)
-		{
-			var swipeEndedEventArgs = new SwipeEndedEventArgs(swipeEnded.SwipeDirection, swipeEnded.IsOpen);
-			((ISwipeViewController)this).SendSwipeEnded(swipeEndedEventArgs);
-		}
-
-		void ISwipeView.RequestOpen(SwipeViewOpenRequest swipeOpenRequest)
-		{
-			Handler?.Invoke(nameof(ISwipeView.RequestOpen), swipeOpenRequest);
-		}
-
-		void ISwipeView.RequestClose(SwipeViewCloseRequest swipeCloseRequest)
-		{
-			Handler?.Invoke(nameof(ISwipeView.RequestClose), swipeCloseRequest);
-		}
-
-		class HandlerSwipeItems : List<Maui.ISwipeItem>, ISwipeItems
-		{
-			readonly SwipeItems _swipeItems;
-
-			public HandlerSwipeItems(SwipeItems swipeItems) : base(swipeItems)
-			{
-				_swipeItems = swipeItems;
-			}
-
-			public SwipeMode Mode => _swipeItems.Mode;
-
-			public SwipeBehaviorOnInvoked SwipeBehaviorOnInvoked => _swipeItems.SwipeBehaviorOnInvoked;
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/Controls/src/Core/HandlerImpl/Switch.Impl.cs b/src/Controls/src/Core/HandlerImpl/Switch.Impl.cs
deleted file mode 100644
index ed6bfdfbedff..000000000000
--- a/src/Controls/src/Core/HandlerImpl/Switch.Impl.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-#nullable disable
-using System.Runtime.CompilerServices;
-using Microsoft.Maui.Graphics;
-
-namespace Microsoft.Maui.Controls
-{
-	/// <include file="../../../docs/Microsoft.Maui.Controls/Switch.xml" path="Type[@FullName='Microsoft.Maui.Controls.Switch']/Docs/*" />
-	public partial class Switch : ISwitch
-	{
-		protected override void OnPropertyChanged([CallerMemberName] string propertyName = null)
-		{
-			base.OnPropertyChanged(propertyName);
-
-			if (propertyName == IsToggledProperty.PropertyName)
-				Handler?.UpdateValue(nameof(ISwitch.IsOn));
-		}
-
-		Color ISwitch.TrackColor
-		{
-			get
-			{
-#if WINDOWS
-				return OnColor;
-#else
-				if (IsToggled)
-					return OnColor;
-
-				return null;
-#endif
-			}
-		}
-
-		bool ISwitch.IsOn
-		{
-			get => IsToggled;
-			set => IsToggled = value;
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/Controls/src/Core/HandlerImpl/TabbedPage/TabbedPage.Impl.cs b/src/Controls/src/Core/HandlerImpl/TabbedPage/TabbedPage.Impl.cs
deleted file mode 100644
index f30a0188717f..000000000000
--- a/src/Controls/src/Core/HandlerImpl/TabbedPage/TabbedPage.Impl.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-#nullable disable
-using System;
-using Microsoft.Maui.Graphics;
-using Microsoft.Maui.Layouts;
-
-namespace Microsoft.Maui.Controls
-{
-	/// <include file="../../../../docs/Microsoft.Maui.Controls/TabbedPage.xml" path="Type[@FullName='Microsoft.Maui.Controls.TabbedPage']/Docs/*" />
-	public partial class TabbedPage : ITabbedView
-	{
-		protected override void LayoutChildren(double x, double y, double width, double height)
-		{
-			// We don't want forcelayout to call the legacy
-			// Page.LayoutChildren code
-		}
-
-		partial void OnHandlerChangingPartial(HandlerChangingEventArgs args);
-		private protected override void OnHandlerChangingCore(HandlerChangingEventArgs args)
-		{
-			base.OnHandlerChangingCore(args);
-
-			if (args.NewHandler == null)
-			{
-				PagesChanged -= OnPagesChanged;
-				WireUnwireChanges(false);
-			}
-			else if (args.OldHandler == null)
-			{
-				PagesChanged += OnPagesChanged;
-				WireUnwireChanges(true);
-			}
-
-			OnHandlerChangingPartial(args);
-			void OnPagesChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
-			{
-				WireUnwireChanges(false);
-				Handler?.UpdateValue(TabbedPage.ItemsSourceProperty.PropertyName);
-				WireUnwireChanges(true);
-			}
-
-			void WireUnwireChanges(bool wire)
-			{
-				foreach (var page in Children)
-				{
-					if (wire)
-						page.PropertyChanged += OnPagePropertyChanged;
-					else
-						page.PropertyChanged -= OnPagePropertyChanged;
-				}
-			}
-
-			void OnPagePropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
-			{
-				if (e.PropertyName == Page.TitleProperty.PropertyName)
-					Handler?.UpdateValue(TabbedPage.ItemsSourceProperty.PropertyName);
-			}
-		}
-	}
-}
diff --git a/src/Controls/src/Core/HandlerImpl/TemplatedView/TemplatedView.Impl.cs b/src/Controls/src/Core/HandlerImpl/TemplatedView/TemplatedView.Impl.cs
deleted file mode 100644
index 8d4b44623c4b..000000000000
--- a/src/Controls/src/Core/HandlerImpl/TemplatedView/TemplatedView.Impl.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using Microsoft.Maui.Graphics;
-using Microsoft.Maui.Layouts;
-
-namespace Microsoft.Maui.Controls
-{
-	public partial class TemplatedView : IContentView
-	{
-		object? IContentView.Content => null;
-
-		IView? IContentView.PresentedContent =>
-			(this as IControlTemplated).TemplateRoot as IView;
-
-		partial void OnApplyTemplateImpl()
-		{
-			Handler?.UpdateValue(nameof(IContentView.Content));
-		}
-
-		protected override Size MeasureOverride(double widthConstraint, double heightConstraint)
-		{
-			DesiredSize = this.ComputeDesiredSize(widthConstraint, heightConstraint);
-			return DesiredSize;
-		}
-
-		Size IContentView.CrossPlatformMeasure(double widthConstraint, double heightConstraint)
-		{
-			return this.MeasureContent(widthConstraint, heightConstraint);
-		}
-
-		protected override Size ArrangeOverride(Rect bounds)
-		{
-			Frame = this.ComputeFrame(bounds);
-			Handler?.PlatformArrange(Frame);
-			return Frame.Size;
-		}
-
-		Size IContentView.CrossPlatformArrange(Rect bounds)
-		{
-			this.ArrangeContent(bounds);
-			return bounds.Size;
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/Controls/src/Core/HandlerImpl/TimePicker/TimePicker.Impl.cs b/src/Controls/src/Core/HandlerImpl/TimePicker/TimePicker.Impl.cs
deleted file mode 100644
index a3a496a81fc9..000000000000
--- a/src/Controls/src/Core/HandlerImpl/TimePicker/TimePicker.Impl.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-#nullable disable
-namespace Microsoft.Maui.Controls
-{
-	public partial class TimePicker : ITimePicker
-	{
-		Font ITextStyle.Font => this.ToFont();
-	}
-}
\ No newline at end of file
diff --git a/src/Controls/src/Core/HandlerImpl/View/View.Impl.cs b/src/Controls/src/Core/HandlerImpl/View/View.Impl.cs
deleted file mode 100644
index 327c56b36810..000000000000
--- a/src/Controls/src/Core/HandlerImpl/View/View.Impl.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using Microsoft.Maui.Controls.Platform;
-using Microsoft.Maui.HotReload;
-
-namespace Microsoft.Maui.Controls
-{
-	/// <include file="../../../../docs/Microsoft.Maui.Controls/View.xml" path="Type[@FullName='Microsoft.Maui.Controls.View']/Docs/*" />
-	public partial class View : IView, IPropertyMapperView, IHotReloadableView, IControlsView
-	{
-		Thickness IView.Margin => Margin;
-		partial void HandlerChangedPartial();
-		GestureManager _gestureManager;
-
-		private protected override void OnHandlerChangedCore()
-		{
-			base.OnHandlerChangedCore();
-
-			HandlerChangedPartial();
-		}
-
-		protected PropertyMapper propertyMapper;
-
-		internal protected PropertyMapper<T> GetRendererOverrides<T>() where T : IView =>
-			(PropertyMapper<T>)(propertyMapper as PropertyMapper<T> ?? (propertyMapper = new PropertyMapper<T>()));
-
-		PropertyMapper IPropertyMapperView.GetPropertyMapperOverrides() => propertyMapper;
-
-		Primitives.LayoutAlignment IView.HorizontalLayoutAlignment => HorizontalOptions.ToCore();
-		Primitives.LayoutAlignment IView.VerticalLayoutAlignment => VerticalOptions.ToCore();
-
-		#region HotReload
-
-		IView IReplaceableView.ReplacedView =>
-			MauiHotReloadHelper.GetReplacedView(this) ?? this;
-
-		IReloadHandler IHotReloadableView.ReloadHandler { get; set; }
-
-		void IHotReloadableView.TransferState(IView newView)
-		{
-			//TODO: LEt you hot reload the the ViewModel
-			if (newView is View v)
-				v.BindingContext = BindingContext;
-		}
-
-		void IHotReloadableView.Reload()
-		{
-			Dispatcher.Dispatch(() =>
-			{
-				this.CheckHandlers();
-				//Handler = null;
-				var reloadHandler = ((IHotReloadableView)this).ReloadHandler;
-				reloadHandler?.Reload();
-				//TODO: if reload handler is null, Do a manual reload?
-			});
-		}
-
-		#endregion
-	}
-}
\ No newline at end of file
diff --git a/src/Controls/src/Core/HandlerImpl/VisualElement/VisualElement.Impl.cs b/src/Controls/src/Core/HandlerImpl/VisualElement/VisualElement.Impl.cs
deleted file mode 100644
index 625d942651fe..000000000000
--- a/src/Controls/src/Core/HandlerImpl/VisualElement/VisualElement.Impl.cs
+++ /dev/null
@@ -1,494 +0,0 @@
-using System;
-using System.ComponentModel;
-using Microsoft.Maui.Graphics;
-using Microsoft.Maui.Layouts;
-
-namespace Microsoft.Maui.Controls
-{
-	/// <include file="../../../../docs/Microsoft.Maui.Controls/VisualElement.xml" path="Type[@FullName='Microsoft.Maui.Controls.VisualElement']/Docs/*" />
-	public partial class VisualElement : IView, IControlsVisualElement
-	{
-		Semantics? _semantics;
-		bool _isLoadedFired;
-		EventHandler? _loaded;
-		EventHandler? _unloaded;
-		bool _watchingPlatformLoaded;
-		Rect _frame = new Rect(0, 0, -1, -1);
-		event EventHandler? _windowChanged;
-		event EventHandler? _platformContainerViewChanged;
-
-		public Rect Frame
-		{
-			get => _frame;
-			set
-			{
-				if (_frame == value)
-					return;
-
-				UpdateBoundsComponents(value);
-			}
-		}
-
-		new public IViewHandler? Handler
-		{
-			get => (IViewHandler?)base.Handler;
-			set => base.Handler = value;
-		}
-
-		private protected override void OnHandlerChangedCore()
-		{
-			base.OnHandlerChangedCore();
-
-			IsPlatformEnabled = Handler != null;
-			UpdatePlatformUnloadedLoadedWiring(Window);
-		}
-
-		Paint? IView.Background
-		{
-			get
-			{
-				if (!Brush.IsNullOrEmpty(Background))
-					return Background;
-				if (BackgroundColor.IsNotDefault())
-					return new SolidColorBrush(BackgroundColor);
-
-				return null;
-			}
-		}
-
-		IShape IView.Clip => Clip;
-
-		IShadow IView.Shadow => Shadow;
-
-		/// <summary>Bindable property for <see cref="Shadow"/>.</summary>
-		public static readonly BindableProperty ShadowProperty =
- 			BindableProperty.Create(nameof(Shadow), typeof(Shadow), typeof(VisualElement), defaultValue: null,
-				propertyChanging: (bindable, oldvalue, newvalue) =>
-				{
-					if (oldvalue != null)
-						(bindable as VisualElement)?.StopNotifyingShadowChanges();
-				},
-				propertyChanged: (bindable, oldvalue, newvalue) =>
-				{
-					if (newvalue != null)
-						(bindable as VisualElement)?.NotifyShadowChanges();
-				});
-
-		public Shadow Shadow
-		{
-			get { return (Shadow)GetValue(ShadowProperty); }
-			set { SetValue(ShadowProperty, value); }
-		}
-
-		/// <summary>Bindable property for <see cref="ZIndex"/>.</summary>
-		public static readonly BindableProperty ZIndexProperty =
-			BindableProperty.Create(nameof(ZIndex), typeof(int), typeof(VisualElement), default(int),
-				propertyChanged: ZIndexPropertyChanged);
-
-		static void ZIndexPropertyChanged(BindableObject bindable, object oldValue, object newValue)
-		{
-			if (bindable is IView view)
-			{
-				view.Handler?.Invoke(nameof(IView.ZIndex));
-			}
-		}
-
-		public int ZIndex
-		{
-			get { return (int)GetValue(ZIndexProperty); }
-			set { SetValue(ZIndexProperty, value); }
-		}
-
-		public Size DesiredSize { get; protected set; }
-
-		public void Arrange(Rect bounds)
-		{
-			Layout(bounds);
-		}
-
-		Size IView.Arrange(Rect bounds)
-		{
-			return ArrangeOverride(bounds);
-		}
-
-		// ArrangeOverride provides a way to allow subclasses (e.g., ScrollView) to override Arrange even though
-		// the interface has to be explicitly implemented to avoid conflict with the old Arrange method
-		protected virtual Size ArrangeOverride(Rect bounds)
-		{
-			Frame = this.ComputeFrame(bounds);
-			Handler?.PlatformArrange(Frame);
-			return Frame.Size;
-		}
-
-		/// <include file="../../../../docs/Microsoft.Maui.Controls/VisualElement.xml" path="//Member[@MemberName='Layout']/Docs/*" />
-		public void Layout(Rect bounds)
-		{
-			Bounds = bounds;
-		}
-
-		void IView.InvalidateMeasure()
-		{
-			InvalidateMeasureOverride();
-		}
-
-		// InvalidateMeasureOverride provides a way to allow subclasses (e.g., Layout) to override InvalidateMeasure even though
-		// the interface has to be explicitly implemented to avoid conflict with the VisualElement.InvalidateMeasure method
-		protected virtual void InvalidateMeasureOverride() => Handler?.Invoke(nameof(IView.InvalidateMeasure));
-
-		void IView.InvalidateArrange()
-		{
-		}
-
-		Size IView.Measure(double widthConstraint, double heightConstraint)
-		{
-			return MeasureOverride(widthConstraint, heightConstraint);
-		}
-
-		// MeasureOverride provides a way to allow subclasses (e.g., Layout) to override Measure even though
-		// the interface has to be explicitly implemented to avoid conflict with the old Measure method
-		protected virtual Size MeasureOverride(double widthConstraint, double heightConstraint)
-		{
-			DesiredSize = this.ComputeDesiredSize(widthConstraint, heightConstraint);
-			return DesiredSize;
-		}
-
-		bool IView.IsFocused
-		{
-			get => (bool)GetValue(IsFocusedProperty);
-			set => SetValueCore(IsFocusedPropertyKey, value);
-		}
-
-		FlowDirection IView.FlowDirection => FlowDirection;
-
-		Primitives.LayoutAlignment IView.HorizontalLayoutAlignment => default;
-		Primitives.LayoutAlignment IView.VerticalLayoutAlignment => default;
-
-		Visibility IView.Visibility => IsVisible.ToVisibility();
-
-		Semantics? IView.Semantics => UpdateSemantics();
-
-		private protected virtual Semantics? UpdateSemantics()
-		{
-			if (!this.IsSet(SemanticProperties.HintProperty) &&
-				!this.IsSet(SemanticProperties.DescriptionProperty) &&
-				!this.IsSet(SemanticProperties.HeadingLevelProperty))
-			{
-				_semantics = null;
-				return _semantics;
-			}
-
-			_semantics ??= new Semantics();
-			_semantics.Description = SemanticProperties.GetDescription(this);
-			_semantics.HeadingLevel = SemanticProperties.GetHeadingLevel(this);
-			_semantics.Hint = SemanticProperties.GetHint(this);
-			return _semantics;
-		}
-
-		static double EnsurePositive(double value)
-		{
-			if (value < 0)
-			{
-				return 0;
-			}
-
-			return value;
-		}
-
-		double IView.Width
-		{
-			get
-			{
-				if (!IsSet(WidthRequestProperty))
-				{
-					return Primitives.Dimension.Unset;
-				}
-
-				// Access once up front to avoid multiple GetValue calls
-				var value = WidthRequest;
-
-				if (value == -1)
-				{
-					return Primitives.Dimension.Unset;
-				}
-
-				value = EnsurePositive(value);
-				return value;
-			}
-		}
-
-		double IView.Height
-		{
-			get
-			{
-				if (!IsSet(HeightRequestProperty))
-				{
-					return Primitives.Dimension.Unset;
-				}
-
-				// Access once up front to avoid multiple GetValue calls
-				var value = HeightRequest;
-
-				if (value == -1)
-				{
-					return Primitives.Dimension.Unset;
-				}
-
-				value = EnsurePositive(value);
-				return value;
-			}
-		}
-
-		double IView.MinimumWidth
-		{
-			get
-			{
-				if (!IsSet(MinimumWidthRequestProperty))
-				{
-					return Primitives.Dimension.Unset;
-				}
-
-				// Access once up front to avoid multiple GetValue calls
-				var value = MinimumWidthRequest;
-				value = EnsurePositive(value);
-				return value;
-			}
-		}
-
-		double IView.MinimumHeight
-		{
-			get
-			{
-				if (!IsSet(MinimumHeightRequestProperty))
-				{
-					return Primitives.Dimension.Unset;
-				}
-
-				// Access once up front to avoid multiple GetValue calls
-				var value = MinimumHeightRequest;
-				value = EnsurePositive(value);
-				return value;
-			}
-		}
-
-		double IView.MaximumWidth
-		{
-			get
-			{
-				// Access once up front to avoid multiple GetValue calls
-				var value = MaximumWidthRequest;
-				value = EnsurePositive(value);
-				return value;
-			}
-		}
-
-		double IView.MaximumHeight
-		{
-			get
-			{
-				// Access once up front to avoid multiple GetValue calls
-				var value = MaximumHeightRequest;
-				value = EnsurePositive(value);
-				return value;
-			}
-		}
-
-		Thickness IView.Margin => Thickness.Zero;
-
-		IElementHandler? Maui.IElement.Handler
-		{
-			get => base.Handler;
-			set
-			{
-				if (value != null && value is not IViewHandler)
-					throw new InvalidOperationException("Handler must be of type IViewHandler");
-
-				base.Handler = value;
-			}
-		}
-
-		void NotifyShadowChanges()
-		{
-			var shadow = Shadow;
-
-			if (shadow is not null)
-			{
-				SetInheritedBindingContext(shadow, BindingContext);
-				_shadowChanged ??= (sender, e) => OnPropertyChanged(nameof(Shadow));
-				_shadowProxy ??= new();
-				_shadowProxy.Subscribe(shadow, _shadowChanged);
-			}
-		}
-
-		void StopNotifyingShadowChanges()
-		{
-			var shadow = Shadow;
-
-			if (shadow is not null)
-			{
-				SetInheritedBindingContext(shadow, null);
-				_shadowProxy?.Unsubscribe();
-			}
-		}
-
-		void OnShadowChanged(object? sender, PropertyChangedEventArgs e)
-		{
-			OnPropertyChanged(nameof(Shadow));
-		}
-
-		void PropagateBindingContextToBrush()
-		{
-			if (Background != null)
-				SetInheritedBindingContext(Background, BindingContext);
-		}
-
-		void PropagateBindingContextToShadow()
-		{
-			if (Shadow != null)
-				SetInheritedBindingContext(Shadow, BindingContext);
-		}
-
-		/// <summary>
-		/// Indicates if a VisualElement is connected to the main object tree.
-		/// </summary>
-		public bool IsLoaded
-		{
-			get
-			{
-#if PLATFORM
-				bool isLoaded = (Handler as IPlatformViewHandler)?.PlatformView?.IsLoaded() == true;
-#else
-				bool isLoaded = Window != null;
-#endif
-
-				return isLoaded;
-			}
-		}
-
-		/// <summary>
-		/// Occurs when a VisualElement has been constructed and added to the object tree.
-		/// This event may occur before the VisualElement has been measured so should not be relied on for size information.  
-		/// </summary>
-		public event EventHandler? Loaded
-		{
-			add
-			{
-				_loaded += value;
-				UpdatePlatformUnloadedLoadedWiring(Window);
-				if (_isLoadedFired)
-					_loaded?.Invoke(this, EventArgs.Empty);
-
-			}
-			remove
-			{
-				_loaded -= value;
-				UpdatePlatformUnloadedLoadedWiring(Window);
-			}
-		}
-
-		/// <summary>
-		/// Occurs when this VisualElement is no longer connected to the main object tree.
-		/// </summary>
-		public event EventHandler? Unloaded
-		{
-			add
-			{
-				_unloaded += value;
-				UpdatePlatformUnloadedLoadedWiring(Window);
-			}
-			remove
-			{
-				_unloaded -= value;
-				UpdatePlatformUnloadedLoadedWiring(Window);
-			}
-		}
-
-		event EventHandler? IControlsVisualElement.WindowChanged
-		{
-			add => _windowChanged += value;
-			remove => _windowChanged -= value;
-		}
-
-		event EventHandler? IControlsVisualElement.PlatformContainerViewChanged
-		{
-			add => _platformContainerViewChanged += value;
-			remove => _platformContainerViewChanged -= value;
-		}
-
-		void OnLoadedCore()
-		{
-			if (_isLoadedFired)
-				return;
-
-			_isLoadedFired = true;
-			_loaded?.Invoke(this, EventArgs.Empty);
-		}
-
-		void OnUnloadedCore()
-		{
-			if (!_isLoadedFired)
-				return;
-
-			_isLoadedFired = false;
-			_unloaded?.Invoke(this, EventArgs.Empty);
-		}
-
-		static void OnWindowChanged(BindableObject bindable, object? oldValue, object? newValue)
-		{
-			if (bindable is not VisualElement visualElement)
-				return;
-
-			if (visualElement._watchingPlatformLoaded && oldValue is Window oldWindow)
-				oldWindow.HandlerChanged -= visualElement.OnWindowHandlerChanged;
-
-			visualElement.UpdatePlatformUnloadedLoadedWiring(newValue as Window);
-			visualElement.InvalidateStateTriggers(newValue != null);
-			visualElement._windowChanged?.Invoke(visualElement, EventArgs.Empty);
-		}
-
-		void OnWindowHandlerChanged(object? sender, EventArgs e)
-		{
-			UpdatePlatformUnloadedLoadedWiring(Window);
-		}
-
-		// We only want to wire up to platform loaded events
-		// if the user is watching for them. Otherwise
-		// this will get wired up for every single VE that's on 
-		// the screen
-		void UpdatePlatformUnloadedLoadedWiring(Window? window)
-		{
-			// If I'm not attached to a window and I haven't started watching any platform events
-			// then it's not useful to wire anything up. We will just wait until
-			// This VE gets connected to the xplat Window before wiring up any events
-			if (!_watchingPlatformLoaded && window == null)
-				return;
-
-			if (_unloaded == null && _loaded == null)
-			{
-				if (window is not null)
-					window.HandlerChanged -= OnWindowHandlerChanged;
-
-#if PLATFORM
-				_loadedUnloadedToken?.Dispose();
-				_loadedUnloadedToken = null;
-#endif
-
-				_watchingPlatformLoaded = false;
-				return;
-			}
-
-			if (!_watchingPlatformLoaded)
-			{
-				if (window is not null)
-					window.HandlerChanged += OnWindowHandlerChanged;
-
-				_watchingPlatformLoaded = true;
-			}
-
-			HandlePlatformUnloadedLoaded();
-		}
-
-		partial void HandlePlatformUnloadedLoaded();
-
-		internal IView? ParentView => ((this as IView)?.Parent as IView);
-	}
-}
\ No newline at end of file
diff --git a/src/Controls/src/Core/HandlerImpl/WebView/WebView.Impl.cs b/src/Controls/src/Core/HandlerImpl/WebView/WebView.Impl.cs
deleted file mode 100644
index c80d36a92a43..000000000000
--- a/src/Controls/src/Core/HandlerImpl/WebView/WebView.Impl.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-#nullable disable
-namespace Microsoft.Maui.Controls
-{
-	public partial class WebView : IWebView
-	{
-		bool _canGoBack;
-		bool _canGoForward;
-
-		IWebViewSource IWebView.Source => Source;
-
-		bool IWebView.CanGoBack
-		{
-			get => _canGoBack;
-			set
-			{
-				_canGoBack = value;
-				((IWebViewController)this).CanGoBack = _canGoBack;
-				Handler?.UpdateValue(nameof(IWebView.CanGoBack));
-			}
-		}
-
-		bool IWebView.CanGoForward
-		{
-			get => _canGoForward;
-			set
-			{
-				_canGoForward = value;
-				((IWebViewController)this).CanGoForward = _canGoForward;
-				Handler?.UpdateValue(nameof(IWebView.CanGoForward));
-			}
-		}
-
-		bool IWebView.Navigating(WebNavigationEvent evnt, string url)
-		{
-			var args = new WebNavigatingEventArgs(evnt, new UrlWebViewSource { Url = url }, url);
-			(this as IWebViewController)?.SendNavigating(args);
-
-			return args.Cancel;
-		}
-
-		void IWebView.Navigated(WebNavigationEvent evnt, string url, WebNavigationResult result)
-		{
-			var args = new WebNavigatedEventArgs(evnt, new UrlWebViewSource { Url = url }, url, result);
-			(this as IWebViewController)?.SendNavigated(args);
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/Controls/src/Core/IImageController.cs b/src/Controls/src/Core/Image/IImageController.cs
similarity index 100%
rename from src/Controls/src/Core/IImageController.cs
rename to src/Controls/src/Core/Image/IImageController.cs
diff --git a/src/Controls/src/Core/IImageElement.cs b/src/Controls/src/Core/Image/IImageElement.cs
similarity index 100%
rename from src/Controls/src/Core/IImageElement.cs
rename to src/Controls/src/Core/Image/IImageElement.cs
diff --git a/src/Controls/src/Core/Image.cs b/src/Controls/src/Core/Image/Image.cs
similarity index 95%
rename from src/Controls/src/Core/Image.cs
rename to src/Controls/src/Core/Image/Image.cs
index 961262af7163..2b91eabfdbc4 100644
--- a/src/Controls/src/Core/Image.cs
+++ b/src/Controls/src/Core/Image/Image.cs
@@ -5,7 +5,7 @@
 namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/Image.xml" path="Type[@FullName='Microsoft.Maui.Controls.Image']/Docs/*" />
-	public partial class Image : View, IImageController, IElementConfiguration<Image>, IViewController, IImageElement
+	public partial class Image : View, IImageController, IElementConfiguration<Image>, IViewController, IImageElement, IImage
 	{
 		/// <summary>Bindable property for <see cref="Source"/>.</summary>
 		public static readonly BindableProperty SourceProperty = ImageElement.SourceProperty;
@@ -97,5 +97,10 @@ void IImageElement.OnImageSourceSourceChanged(object sender, EventArgs e) =>
 
 		void IImageElement.RaiseImageSourcePropertyChanged() =>
 			OnPropertyChanged(nameof(Source));
+
+		IImageSource IImageSourcePart.Source => Source;
+
+		void IImageSourcePart.UpdateIsLoading(bool isLoading) =>
+			IsLoading = isLoading;
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/src/Core/HandlerImpl/Image.Impl.cs b/src/Controls/src/Core/Image/ImageSource.cs
similarity index 79%
rename from src/Controls/src/Core/HandlerImpl/Image.Impl.cs
rename to src/Controls/src/Core/Image/ImageSource.cs
index d4ea25000d28..8cb6166520e9 100644
--- a/src/Controls/src/Core/HandlerImpl/Image.Impl.cs
+++ b/src/Controls/src/Core/Image/ImageSource.cs
@@ -1,15 +1,6 @@
 #nullable disable
 namespace Microsoft.Maui.Controls
 {
-	/// <include file="../../../docs/Microsoft.Maui.Controls/Image.xml" path="Type[@FullName='Microsoft.Maui.Controls.Image']/Docs/*" />
-	public partial class Image : IImage
-	{
-		IImageSource IImageSourcePart.Source => Source;
-
-		void IImageSourcePart.UpdateIsLoading(bool isLoading) =>
-			IsLoading = isLoading;
-	}
-
 	/// <include file="../../../docs/Microsoft.Maui.Controls/ImageSource.xml" path="Type[@FullName='Microsoft.Maui.Controls.ImageSource']/Docs/*" />
 	public partial class ImageSource : IImageSource
 	{
diff --git a/src/Controls/src/Core/ImageButton.cs b/src/Controls/src/Core/ImageButton/ImageButton.cs
similarity index 90%
rename from src/Controls/src/Core/ImageButton.cs
rename to src/Controls/src/Core/ImageButton/ImageButton.cs
index 65a542778abb..bc16e6e35752 100644
--- a/src/Controls/src/Core/ImageButton.cs
+++ b/src/Controls/src/Core/ImageButton/ImageButton.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Windows.Input;
 using Microsoft.Maui.Controls.Internals;
 using Microsoft.Maui.Graphics;
@@ -10,7 +11,7 @@
 namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/ImageButton.xml" path="Type[@FullName='Microsoft.Maui.Controls.ImageButton']/Docs/*" />
-	public partial class ImageButton : View, IImageController, IElementConfiguration<ImageButton>, IBorderElement, IButtonController, IViewController, IPaddingElement, IButtonElement, ICommandElement, IImageElement
+	public partial class ImageButton : View, IImageController, IElementConfiguration<ImageButton>, IBorderElement, IButtonController, IViewController, IPaddingElement, IButtonElement, ICommandElement, IImageElement, IImageButton
 	{
 		const int DefaultCornerRadius = -1;
 
@@ -241,5 +242,45 @@ bool IImageElement.IsAnimationPlaying
 
 		void ICommandElement.CanExecuteChanged(object sender, EventArgs e) =>
 			RefreshIsEnabledProperty();
+
+		protected override void OnPropertyChanged([CallerMemberName] string propertyName = null)
+		{
+			base.OnPropertyChanged(propertyName);
+
+			if (propertyName == BorderWidthProperty.PropertyName)
+				Handler?.UpdateValue(nameof(IImageButton.StrokeThickness));
+			else if (propertyName == BorderColorProperty.PropertyName)
+				Handler?.UpdateValue(nameof(IImageButton.StrokeColor));
+		}
+
+		void IImageSourcePart.UpdateIsLoading(bool isLoading)
+		{
+			((IImageController)this)?.SetIsLoading(isLoading);
+		}
+
+		bool IImageSourcePart.IsAnimationPlaying => false;
+
+		IImageSource IImageSourcePart.Source => Source;
+
+		void IButton.Clicked()
+		{
+			(this as IButtonController).SendClicked();
+		}
+
+		void IButton.Pressed()
+		{
+			(this as IButtonController).SendPressed();
+		}
+
+		void IButton.Released()
+		{
+			(this as IButtonController).SendReleased();
+		}
+
+		double IButtonStroke.StrokeThickness => (double)GetValue(BorderWidthProperty);
+
+		Color IButtonStroke.StrokeColor => (Color)GetValue(BorderColorProperty);
+
+		int IButtonStroke.CornerRadius => (int)GetValue(CornerRadiusProperty);
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/src/Core/IndicatorShape.cs b/src/Controls/src/Core/IndicatorView/IndicatorShape.cs
similarity index 100%
rename from src/Controls/src/Core/IndicatorShape.cs
rename to src/Controls/src/Core/IndicatorView/IndicatorShape.cs
diff --git a/src/Controls/src/Core/IndicatorStackLayout.cs b/src/Controls/src/Core/IndicatorView/IndicatorStackLayout.cs
similarity index 100%
rename from src/Controls/src/Core/IndicatorStackLayout.cs
rename to src/Controls/src/Core/IndicatorView/IndicatorStackLayout.cs
diff --git a/src/Controls/src/Core/IndicatorView.cs b/src/Controls/src/Core/IndicatorView/IndicatorView.cs
similarity index 94%
rename from src/Controls/src/Core/IndicatorView.cs
rename to src/Controls/src/Core/IndicatorView/IndicatorView.cs
index 2451b129e98f..897d26e36eb5 100644
--- a/src/Controls/src/Core/IndicatorView.cs
+++ b/src/Controls/src/Core/IndicatorView/IndicatorView.cs
@@ -10,7 +10,7 @@ namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/IndicatorView.xml" path="Type[@FullName='Microsoft.Maui.Controls.IndicatorView']/Docs/*" />
 	[ContentProperty(nameof(IndicatorLayout))]
-	public partial class IndicatorView : TemplatedView
+	public partial class IndicatorView : TemplatedView, ITemplatedIndicatorView
 	{
 		const int DefaultPadding = 4;
 
@@ -187,5 +187,10 @@ void OnCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
 			}
 			Count = count;
 		}
+
+		Paint IIndicatorView.IndicatorColor => IndicatorColor?.AsPaint();
+		Paint IIndicatorView.SelectedIndicatorColor => SelectedIndicatorColor?.AsPaint();
+		IShape IIndicatorView.IndicatorsShape => IndicatorsShape == IndicatorShape.Square ? new Shapes.Rectangle() : new Shapes.Ellipse();
+		Maui.ILayout ITemplatedIndicatorView.IndicatorsLayoutOverride => (IndicatorTemplate != null) ? IndicatorLayout as Maui.ILayout : null;
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/src/Core/HandlerImpl/Label/Label.Android.cs b/src/Controls/src/Core/Label/Label.Android.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Label/Label.Android.cs
rename to src/Controls/src/Core/Label/Label.Android.cs
diff --git a/src/Controls/src/Core/HandlerImpl/Label/Label.cs b/src/Controls/src/Core/Label/Label.Mapper.cs
similarity index 90%
rename from src/Controls/src/Core/HandlerImpl/Label/Label.cs
rename to src/Controls/src/Core/Label/Label.Mapper.cs
index 5b6bb3429825..8295b7fb1486 100644
--- a/src/Controls/src/Core/HandlerImpl/Label/Label.cs
+++ b/src/Controls/src/Core/Label/Label.Mapper.cs
@@ -3,7 +3,7 @@
 
 namespace Microsoft.Maui.Controls
 {
-	/// <include file="../../../../docs/Microsoft.Maui.Controls/Label.xml" path="Type[@FullName='Microsoft.Maui.Controls.Label']/Docs/*" />
+	/// <include file="../../../docs/Microsoft.Maui.Controls/Label.xml" path="Type[@FullName='Microsoft.Maui.Controls.Label']/Docs/*" />
 	public partial class Label
 	{
 		public static IPropertyMapper<ILabel, LabelHandler> ControlsLabelMapper = new PropertyMapper<Label, LabelHandler>(LabelHandler.Mapper)
diff --git a/src/Controls/src/Core/HandlerImpl/Label/Label.Standard.cs b/src/Controls/src/Core/Label/Label.Standard.cs
similarity index 86%
rename from src/Controls/src/Core/HandlerImpl/Label/Label.Standard.cs
rename to src/Controls/src/Core/Label/Label.Standard.cs
index 804c3ff5a507..16c5a3278dc3 100644
--- a/src/Controls/src/Core/HandlerImpl/Label/Label.Standard.cs
+++ b/src/Controls/src/Core/Label/Label.Standard.cs
@@ -3,7 +3,7 @@
 
 namespace Microsoft.Maui.Controls
 {
-	/// <include file="../../../../docs/Microsoft.Maui.Controls/Label.xml" path="Type[@FullName='Microsoft.Maui.Controls.Label']/Docs/*" />
+	/// <include file="../../../docs/Microsoft.Maui.Controls/Label.xml" path="Type[@FullName='Microsoft.Maui.Controls.Label']/Docs/*" />
 	public partial class Label
 	{
 		public static void MapTextType(ILabelHandler handler, Label label) { }
diff --git a/src/Controls/src/Core/HandlerImpl/Label/Label.Tizen.cs b/src/Controls/src/Core/Label/Label.Tizen.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Label/Label.Tizen.cs
rename to src/Controls/src/Core/Label/Label.Tizen.cs
diff --git a/src/Controls/src/Core/HandlerImpl/Label/Label.Windows.cs b/src/Controls/src/Core/Label/Label.Windows.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Label/Label.Windows.cs
rename to src/Controls/src/Core/Label/Label.Windows.cs
diff --git a/src/Controls/src/Core/Label.cs b/src/Controls/src/Core/Label/Label.cs
similarity index 99%
rename from src/Controls/src/Core/Label.cs
rename to src/Controls/src/Core/Label/Label.cs
index 871abc74d13b..8dbf3e288ad3 100644
--- a/src/Controls/src/Core/Label.cs
+++ b/src/Controls/src/Core/Label/Label.cs
@@ -12,7 +12,7 @@ namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/Label.xml" path="Type[@FullName='Microsoft.Maui.Controls.Label']/Docs/*" />
 	[ContentProperty(nameof(Text))]
-	public partial class Label : View, IFontElement, ITextElement, ITextAlignmentElement, ILineHeightElement, IElementConfiguration<Label>, IDecorableTextElement, IPaddingElement
+	public partial class Label : View, IFontElement, ITextElement, ITextAlignmentElement, ILineHeightElement, IElementConfiguration<Label>, IDecorableTextElement, IPaddingElement, ILabel
 	{
 		/// <summary>Bindable property for <see cref="HorizontalTextAlignment"/>.</summary>
 		public static readonly BindableProperty HorizontalTextAlignmentProperty = TextAlignmentElement.HorizontalTextAlignmentProperty;
@@ -420,5 +420,7 @@ void IPaddingElement.OnPaddingPropertyChanged(Thickness oldValue, Thickness newV
 		{
 			InvalidateMeasureInternal(InvalidationTrigger.MeasureChanged);
 		}
+
+		Font ITextStyle.Font => this.ToFont();
 	}
 }
diff --git a/src/Controls/src/Core/HandlerImpl/Label/Label.iOS.cs b/src/Controls/src/Core/Label/Label.iOS.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Label/Label.iOS.cs
rename to src/Controls/src/Core/Label/Label.iOS.cs
diff --git a/src/Controls/src/Core/HandlerImpl/Layout/Layout.Android.cs b/src/Controls/src/Core/Layout/Layout.Android.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Layout/Layout.Android.cs
rename to src/Controls/src/Core/Layout/Layout.Android.cs
diff --git a/src/Controls/src/Core/Layout/Layout.Mapper.cs b/src/Controls/src/Core/Layout/Layout.Mapper.cs
new file mode 100644
index 000000000000..ab7fdf8142f2
--- /dev/null
+++ b/src/Controls/src/Core/Layout/Layout.Mapper.cs
@@ -0,0 +1,22 @@
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Microsoft.Maui.Controls
+{
+	public abstract partial class Layout
+	{
+		internal static new void RemapForControls()
+		{
+			ViewHandler.ViewMapper = ControlsLayoutMapper;
+		}
+
+		public static IPropertyMapper<IView, IViewHandler> ControlsLayoutMapper = new PropertyMapper<IView, IViewHandler>(ControlsVisualElementMapper)
+		{
+			[nameof(CascadeInputTransparent)] = MapInputTransparent,
+			[nameof(IView.InputTransparent)] = MapInputTransparent,
+		};
+	}
+}
diff --git a/src/Controls/src/Core/HandlerImpl/Layout/Layout.Standard.cs b/src/Controls/src/Core/Layout/Layout.Standard.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Layout/Layout.Standard.cs
rename to src/Controls/src/Core/Layout/Layout.Standard.cs
diff --git a/src/Controls/src/Core/HandlerImpl/Layout/Layout.Tizen.cs b/src/Controls/src/Core/Layout/Layout.Tizen.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Layout/Layout.Tizen.cs
rename to src/Controls/src/Core/Layout/Layout.Tizen.cs
diff --git a/src/Controls/src/Core/HandlerImpl/Layout/Layout.Windows.cs b/src/Controls/src/Core/Layout/Layout.Windows.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Layout/Layout.Windows.cs
rename to src/Controls/src/Core/Layout/Layout.Windows.cs
diff --git a/src/Controls/src/Core/Layout/Layout.cs b/src/Controls/src/Core/Layout/Layout.cs
index b010a77a565d..94a29eccb50d 100644
--- a/src/Controls/src/Core/Layout/Layout.cs
+++ b/src/Controls/src/Core/Layout/Layout.cs
@@ -286,12 +286,6 @@ public Graphics.Size CrossPlatformArrange(Graphics.Rect bounds)
 			return LayoutManager.ArrangeChildren(bounds);
 		}
 
-		internal static new void RemapForControls()
-		{
-			ViewHandler.ViewMapper = ControlsLayoutMapper;
-		}
-
-		/// <summary>Bindable property for <see cref="CascadeInputTransparent"/>.</summary>
 		public static readonly BindableProperty CascadeInputTransparentProperty =
 			BindableProperty.Create(nameof(CascadeInputTransparent), typeof(bool), typeof(Layout), true);
 
@@ -301,12 +295,6 @@ public bool CascadeInputTransparent
 			set => SetValue(CascadeInputTransparentProperty, value);
 		}
 
-		public static IPropertyMapper<IView, IViewHandler> ControlsLayoutMapper = new PropertyMapper<IView, IViewHandler>(ControlsVisualElementMapper)
-		{
-			[nameof(CascadeInputTransparent)] = MapInputTransparent,
-			[nameof(IView.InputTransparent)] = MapInputTransparent,
-		};
-
 		void UpdateDescendantInputTransparent()
 		{
 			if (!InputTransparent || !CascadeInputTransparent)
diff --git a/src/Controls/src/Core/HandlerImpl/Layout/Layout.iOS.cs b/src/Controls/src/Core/Layout/Layout.iOS.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Layout/Layout.iOS.cs
rename to src/Controls/src/Core/Layout/Layout.iOS.cs
diff --git a/src/Controls/src/Core/HandlerImpl/Layout.Impl.cs b/src/Controls/src/Core/Layout/LayoutOfT.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Layout.Impl.cs
rename to src/Controls/src/Core/Layout/LayoutOfT.cs
diff --git a/src/Controls/src/Core/IListProxy.cs b/src/Controls/src/Core/ListView/IListProxy.cs
similarity index 100%
rename from src/Controls/src/Core/IListProxy.cs
rename to src/Controls/src/Core/ListView/IListProxy.cs
diff --git a/src/Controls/src/Core/IListViewController.cs b/src/Controls/src/Core/ListView/IListViewController.cs
similarity index 100%
rename from src/Controls/src/Core/IListViewController.cs
rename to src/Controls/src/Core/ListView/IListViewController.cs
diff --git a/src/Controls/src/Core/ListView.cs b/src/Controls/src/Core/ListView/ListView.cs
similarity index 100%
rename from src/Controls/src/Core/ListView.cs
rename to src/Controls/src/Core/ListView/ListView.cs
diff --git a/src/Controls/src/Core/ListViewCachingStrategy.cs b/src/Controls/src/Core/ListView/ListViewCachingStrategy.cs
similarity index 100%
rename from src/Controls/src/Core/ListViewCachingStrategy.cs
rename to src/Controls/src/Core/ListView/ListViewCachingStrategy.cs
diff --git a/src/Controls/src/Core/ListViewSelectionMode.cs b/src/Controls/src/Core/ListView/ListViewSelectionMode.cs
similarity index 100%
rename from src/Controls/src/Core/ListViewSelectionMode.cs
rename to src/Controls/src/Core/ListView/ListViewSelectionMode.cs
diff --git a/src/Controls/src/Core/BaseMenuItem.cs b/src/Controls/src/Core/Menu/BaseMenuItem.cs
similarity index 100%
rename from src/Controls/src/Core/BaseMenuItem.cs
rename to src/Controls/src/Core/Menu/BaseMenuItem.cs
diff --git a/src/Controls/src/Core/FlyoutBase.cs b/src/Controls/src/Core/Menu/FlyoutBase.cs
similarity index 100%
rename from src/Controls/src/Core/FlyoutBase.cs
rename to src/Controls/src/Core/Menu/FlyoutBase.cs
diff --git a/src/Controls/src/Core/MenuBar.cs b/src/Controls/src/Core/Menu/MenuBar.cs
similarity index 100%
rename from src/Controls/src/Core/MenuBar.cs
rename to src/Controls/src/Core/Menu/MenuBar.cs
diff --git a/src/Controls/src/Core/MenuBarItem.cs b/src/Controls/src/Core/Menu/MenuBarItem.cs
similarity index 100%
rename from src/Controls/src/Core/MenuBarItem.cs
rename to src/Controls/src/Core/Menu/MenuBarItem.cs
diff --git a/src/Controls/src/Core/MenuBarTracker.cs b/src/Controls/src/Core/Menu/MenuBarTracker.cs
similarity index 100%
rename from src/Controls/src/Core/MenuBarTracker.cs
rename to src/Controls/src/Core/Menu/MenuBarTracker.cs
diff --git a/src/Controls/src/Core/ContextFlyout.cs b/src/Controls/src/Core/Menu/MenuFlyout.cs
similarity index 96%
rename from src/Controls/src/Core/ContextFlyout.cs
rename to src/Controls/src/Core/Menu/MenuFlyout.cs
index 0f0dd6f4cedb..94d4788b3f49 100644
--- a/src/Controls/src/Core/ContextFlyout.cs
+++ b/src/Controls/src/Core/Menu/MenuFlyout.cs
@@ -7,7 +7,7 @@
 namespace Microsoft.Maui.Controls
 {
 
-	public partial class MenuFlyout : FlyoutBase, IMenuFlyout // Same pattern as MenuBarItem
+	public class MenuFlyout : FlyoutBase, IMenuFlyout // Same pattern as MenuBarItem
 	{
 		readonly List<IMenuElement> _menus = new List<IMenuElement>();
 
diff --git a/src/Controls/src/Core/MenuFlyoutItem.cs b/src/Controls/src/Core/Menu/MenuFlyoutItem.cs
similarity index 100%
rename from src/Controls/src/Core/MenuFlyoutItem.cs
rename to src/Controls/src/Core/Menu/MenuFlyoutItem.cs
diff --git a/src/Controls/src/Core/MenuFlyoutSeparator.cs b/src/Controls/src/Core/Menu/MenuFlyoutSeparator.cs
similarity index 100%
rename from src/Controls/src/Core/MenuFlyoutSeparator.cs
rename to src/Controls/src/Core/Menu/MenuFlyoutSeparator.cs
diff --git a/src/Controls/src/Core/MenuFlyoutSubItem.cs b/src/Controls/src/Core/Menu/MenuFlyoutSubItem.cs
similarity index 100%
rename from src/Controls/src/Core/MenuFlyoutSubItem.cs
rename to src/Controls/src/Core/Menu/MenuFlyoutSubItem.cs
diff --git a/src/Controls/src/Core/MenuItem.cs b/src/Controls/src/Core/Menu/MenuItem.cs
similarity index 92%
rename from src/Controls/src/Core/MenuItem.cs
rename to src/Controls/src/Core/Menu/MenuItem.cs
index a10bc69d0796..83b24b4489a2 100644
--- a/src/Controls/src/Core/MenuItem.cs
+++ b/src/Controls/src/Core/Menu/MenuItem.cs
@@ -5,11 +5,12 @@
 using System.Windows.Input;
 using Microsoft.Maui.Controls.Internals;
 using Microsoft.Maui.Controls.StyleSheets;
+using Microsoft.Maui.Graphics;
 
 namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/MenuItem.xml" path="Type[@FullName='Microsoft.Maui.Controls.MenuItem']/Docs/*" />
-	public partial class MenuItem : BaseMenuItem, IMenuItemController, IStyleSelectable, ICommandElement
+	public partial class MenuItem : BaseMenuItem, IMenuItemController, IStyleSelectable, ICommandElement, IMenuElement
 	{
 		/// <summary>Bindable property for <see cref="Accelerator"/>.</summary>
 		public static readonly BindableProperty AcceleratorProperty = BindableProperty.CreateAttached(nameof(Accelerator), typeof(Accelerator), typeof(MenuItem), null);
@@ -143,5 +144,24 @@ static object CoerceIsEnabledProperty(BindableObject bindable, object value)
 
 			return false;
 		}
+
+		IImageSource IImageSourcePart.Source => this.IconImageSource;
+
+		bool IImageSourcePart.IsAnimationPlaying => false;
+
+		Color ITextStyle.TextColor => null;
+
+		Font ITextStyle.Font => Font.Default;
+
+		double ITextStyle.CharacterSpacing => 0;
+
+		void IMenuElement.Clicked()
+		{
+			((IMenuItemController)this).Activate();
+		}
+
+		void IImageSourcePart.UpdateIsLoading(bool isLoading)
+		{
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/src/Core/MenuItemTracker.cs b/src/Controls/src/Core/Menu/MenuItemTracker.cs
similarity index 100%
rename from src/Controls/src/Core/MenuItemTracker.cs
rename to src/Controls/src/Core/Menu/MenuItemTracker.cs
diff --git a/src/Controls/src/Core/HandlerImpl/NavigationPage/NavigationPage.Legacy.cs b/src/Controls/src/Core/NavigationPage/NavigationPage.Legacy.cs
similarity index 98%
rename from src/Controls/src/Core/HandlerImpl/NavigationPage/NavigationPage.Legacy.cs
rename to src/Controls/src/Core/NavigationPage/NavigationPage.Legacy.cs
index 8bdfe2f2dfdb..1e9629e0068c 100644
--- a/src/Controls/src/Core/HandlerImpl/NavigationPage/NavigationPage.Legacy.cs
+++ b/src/Controls/src/Core/NavigationPage/NavigationPage.Legacy.cs
@@ -11,7 +11,7 @@
 namespace Microsoft.Maui.Controls
 {
 	// This contains the messaging required to communicate with legacy renderers
-	/// <include file="../../../../docs/Microsoft.Maui.Controls/NavigationPage.xml" path="Type[@FullName='Microsoft.Maui.Controls.NavigationPage']/Docs/*" />
+	/// <include file="../../../docs/Microsoft.Maui.Controls/NavigationPage.xml" path="Type[@FullName='Microsoft.Maui.Controls.NavigationPage']/Docs/*" />
 	public partial class NavigationPage : INavigationPageController
 	{
 		async Task<Page> PopAsyncInner(
diff --git a/src/Controls/src/Core/HandlerImpl/NavigationPage/NavigationPage.cs b/src/Controls/src/Core/NavigationPage/NavigationPage.Mapper.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/NavigationPage/NavigationPage.cs
rename to src/Controls/src/Core/NavigationPage/NavigationPage.Mapper.cs
diff --git a/src/Controls/src/Core/NavigationPage.cs b/src/Controls/src/Core/NavigationPage/NavigationPage.cs
similarity index 53%
rename from src/Controls/src/Core/NavigationPage.cs
rename to src/Controls/src/Core/NavigationPage/NavigationPage.cs
index b64ba08552dc..ac45c2f92671 100644
--- a/src/Controls/src/Core/NavigationPage.cs
+++ b/src/Controls/src/Core/NavigationPage/NavigationPage.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Microsoft.Maui.Controls.Internals;
@@ -11,7 +12,7 @@
 namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/NavigationPage.xml" path="Type[@FullName='Microsoft.Maui.Controls.NavigationPage']/Docs/*" />
-	public partial class NavigationPage : Page, IPageContainer<Page>, IBarElement, IElementConfiguration<NavigationPage>
+	public partial class NavigationPage : Page, IPageContainer<Page>, IBarElement, IElementConfiguration<NavigationPage>, IStackNavigationView, IToolbarElement
 	{
 		/// <summary>Bindable property for attached property <c>BackButtonTitle</c>.</summary>
 		public static readonly BindableProperty BackButtonTitleProperty = BindableProperty.CreateAttached("BackButtonTitle", typeof(string), typeof(Page), null);
@@ -424,5 +425,460 @@ void SafePop()
 		{
 			return _platformConfigurationRegistry.Value.On<T>();
 		}
+
+		// If the user is making overlapping navigation requests this is used to fire once all navigation 
+		// events have been processed
+		TaskCompletionSource<object> _allPendingNavigationCompletionSource;
+
+		// This is used to process the currently active navigation request
+		TaskCompletionSource<object> _currentNavigationCompletionSource;
+
+		int _waitingCount = 0;
+		NavigationPageToolbar _toolbar;
+		readonly SemaphoreSlim SemaphoreSlim = new SemaphoreSlim(1, 1);
+
+		partial void Init()
+		{
+			(this as IControlsVisualElement).WindowChanged += OnWindowChanged;
+		}
+
+		Thickness IView.Margin => Thickness.Zero;
+
+		protected override void LayoutChildren(double x, double y, double width, double height)
+		{
+			// We don't want forcelayout to call the legacy
+			// Page.LayoutChildren code
+		}
+
+		void IStackNavigation.RequestNavigation(NavigationRequest eventArgs)
+		{
+			Handler?.Invoke(nameof(IStackNavigation.RequestNavigation), eventArgs);
+		}
+
+		// If a native navigation occurs then this syncs up the NavigationStack
+		// with the new native Navigation Stack
+		void IStackNavigation.NavigationFinished(IReadOnlyList<IView> newStack)
+		{
+			// If the user is performing multiple overlapping navigations then we don't want to sync the native stack to our xplat stack
+			// We wait until we get to the end of the queue and then we sync up.
+			// Otherwise intermediate results will wipe out the navigationstack
+			if (_waitingCount <= 1)
+			{
+				SyncToNavigationStack(newStack);
+				CurrentPage = (Page)newStack[newStack.Count - 1];
+				RootPage = (Page)newStack[0];
+			}
+
+			var completionSource = _currentNavigationCompletionSource;
+			CurrentNavigationTask = null;
+			_currentNavigationCompletionSource = null;
+			completionSource?.SetResult(null);
+		}
+
+		void SyncToNavigationStack(IReadOnlyList<IView> newStack)
+		{
+			for (int i = 0; i < newStack.Count; i++)
+			{
+				var element = (Element)newStack[i];
+
+				if (InternalChildren.Count < i)
+					InternalChildren.Add(element);
+				else if (InternalChildren[i] != element)
+				{
+					int index = InternalChildren.IndexOf(element);
+					if (index >= 0)
+					{
+						InternalChildren.Move(index, i);
+					}
+					else
+					{
+						InternalChildren.Insert(i, element);
+					}
+				}
+			}
+
+			while (InternalChildren.Count > newStack.Count)
+			{
+				InternalChildren.RemoveAt(InternalChildren.Count - 1);
+			}
+		}
+
+		IView Content => this.CurrentPage;
+
+		IReadOnlyList<IView> NavigationStack => this.Navigation.NavigationStack;
+
+
+		static void OnCurrentPageChanged(BindableObject bindable, object oldValue, object newValue)
+		{
+			if (oldValue is Page oldPage)
+				oldPage.SendDisappearing();
+
+			if (newValue is Page newPage && ((NavigationPage)bindable).HasAppeared)
+				newPage.SendAppearing();
+		}
+
+		internal IToolbar FindMyToolbar()
+		{
+			if (this.Toolbar != null)
+				return Toolbar;
+
+			if (this.Window is null)
+				return null;
+
+			var rootPage = this.FindParentWith(x => (x is IWindow te || Window.Navigation.ModalStack.Contains(x)), true);
+			if (this.FindParentWith(x => (x is IToolbarElement te && te.Toolbar != null), false) is IToolbarElement te)
+			{
+				// This means I'm inside a Modal Page so we shouldn't return the Toolbar from the window
+				if (rootPage is not IWindow && te is IWindow)
+					return null;
+
+				return te.Toolbar;
+			}
+
+			return null;
+		}
+
+		void OnWindowChanged(object sender, EventArgs e)
+		{
+			// If this NavigationPage is removed from the window
+			// Then we just invalidate the toolbar that this NavigationPage created
+			if (this.Window is null)
+			{
+				if (_toolbar is not null)
+				{
+					if (_toolbar.Parent is Window w &&
+						w.Toolbar == _toolbar)
+					{
+						w.Toolbar = null;
+					}
+
+					_toolbar.Disconnect();
+					_toolbar = null;
+				}
+
+				return;
+			}
+
+			// Update the Container level Toolbar with my Toolbar information
+			if (FindMyToolbar() is not NavigationPageToolbar)
+			{
+				// If the root is a FlyoutPage then we set the toolbar on the flyout page
+				var flyoutPage = this.FindParentOfType<FlyoutPage>();
+
+				if (flyoutPage != null && flyoutPage.Parent is IWindow)
+				{
+					_toolbar = new NavigationPageToolbar(flyoutPage, flyoutPage);
+					flyoutPage.Toolbar = _toolbar;
+				}
+				// Is the root a modal page?
+				else
+				{
+					// Is the root the window or is this part of a modal stack
+					var rootPage = this.FindParentWith(x => (x is IWindow te || Window.Navigation.ModalStack.Contains(x)), true);
+
+					if (rootPage is Window w)
+					{
+						_toolbar = new NavigationPageToolbar(w, w.Page);
+						w.Toolbar = _toolbar;
+					}
+					else if (rootPage is Page p)
+					{
+						_toolbar = new NavigationPageToolbar(p, p);
+						p.Toolbar = _toolbar;
+					}
+				}
+			}
+		}
+
+		async Task SendHandlerUpdateAsync(
+			bool animated,
+			Action processStackChanges,
+			Action firePostNavigatingEvents,
+			Action fireNavigatedEvents)
+		{
+			if (!_setForMaui || this.IsShimmed())
+			{
+				return;
+			}
+
+			processStackChanges?.Invoke();
+
+			if (Handler == null)
+			{
+				return;
+			}
+
+			try
+			{
+				Interlocked.Increment(ref _waitingCount);
+
+				// Wait for pending navigation tasks to finish
+				await SemaphoreSlim.WaitAsync();
+
+				// If our handler was removed while waiting then don't do anything
+				if (Handler != null)
+				{
+					var currentNavRequestTaskSource = new TaskCompletionSource<object>();
+					_allPendingNavigationCompletionSource ??= new TaskCompletionSource<object>();
+
+					if (CurrentNavigationTask == null)
+					{
+						CurrentNavigationTask = _allPendingNavigationCompletionSource.Task;
+					}
+					else if (CurrentNavigationTask != _allPendingNavigationCompletionSource.Task)
+					{
+						throw new InvalidOperationException("Pending Navigations still processing");
+					}
+
+					_currentNavigationCompletionSource = currentNavRequestTaskSource;
+
+					// We create a new list to send to the handler because the structure backing 
+					// The Navigation stack isn't immutable
+					var immutableNavigationStack = new List<IView>(NavigationStack);
+					firePostNavigatingEvents?.Invoke();
+
+					// Create the request for the handler
+					var request = new NavigationRequest(immutableNavigationStack, animated);
+					((IStackNavigation)this).RequestNavigation(request);
+
+					// Wait for the handler to finish processing the navigation
+					// This task completes once the handler calls INavigationView.Finished
+					await currentNavRequestTaskSource.Task;
+				}
+			}
+			finally
+			{
+				if (Interlocked.Decrement(ref _waitingCount) == 0)
+				{
+					_allPendingNavigationCompletionSource.SetResult(new object());
+					_allPendingNavigationCompletionSource = null;
+				}
+
+				SemaphoreSlim.Release();
+			}
+
+			// Send navigated event to currently visible pages and associated navigation event
+			fireNavigatedEvents?.Invoke();
+		}
+
+		private protected override void OnHandlerChangedCore()
+		{
+			base.OnHandlerChangedCore();
+
+			if (Navigation is MauiNavigationImpl && InternalChildren.Count > 0)
+			{
+				var navStack = Navigation.NavigationStack;
+				var visiblePage = Navigation.NavigationStack[NavigationStack.Count - 1];
+				RootPage = navStack[0];
+				CurrentPage = visiblePage;
+
+				SendHandlerUpdateAsync(false, null,
+				() =>
+				{
+					FireAppearing(CurrentPage);
+				},
+				() =>
+				{
+					SendNavigated(null);
+				})
+				.FireAndForget(Handler);
+			}
+
+			// If the handler is disconnected and we're still waiting for updates from the handler
+			// Just complete any waits
+			if (Handler == null && _waitingCount > 0)
+			{
+				((IStackNavigation)this).NavigationFinished(this.NavigationStack);
+			}
+		}
+
+		// Once we get all platforms over to the new APIs
+		// we can just delete all the code inside NavigationPage.cs that fires "requested" events
+		class MauiNavigationImpl : NavigationProxy
+		{
+			readonly Lazy<ReadOnlyCastingList<Page, Element>> _castingList;
+
+			public MauiNavigationImpl(NavigationPage owner)
+			{
+				Owner = owner;
+				_castingList = new Lazy<ReadOnlyCastingList<Page, Element>>(() => new ReadOnlyCastingList<Page, Element>(Owner.InternalChildren));
+			}
+
+			NavigationPage Owner { get; }
+
+			protected override IReadOnlyList<Page> GetNavigationStack()
+			{
+				return _castingList.Value;
+			}
+
+			protected override void OnInsertPageBefore(Page page, Page before)
+			{
+				if (page == null)
+					throw new ArgumentNullException($"{nameof(page)} cannot be null.");
+
+				if (before == null)
+					throw new ArgumentNullException($"{nameof(before)} cannot be null.");
+
+				if (!Owner.InternalChildren.Contains(before))
+					throw new ArgumentException($"{nameof(before)} must be a child of the NavigationPage", nameof(before));
+
+				if (Owner.InternalChildren.Contains(page))
+					throw new ArgumentException("Cannot insert page which is already in the navigation stack");
+
+
+				Owner.SendHandlerUpdateAsync(false,
+					() =>
+					{
+						int index = Owner.InternalChildren.IndexOf(before);
+						Owner.InternalChildren.Insert(index, page);
+
+						if (index == 0)
+							Owner.RootPage = page;
+					},
+					() =>
+					{
+					},
+					() =>
+					{
+						//// If no other pending operations happen
+						//// Then update the toolbar to match
+						//// the current navigation stack
+						//if (Owner._waitingCount == 0)
+						//	Owner.UpdateToolbar();
+
+					}).FireAndForget();
+			}
+
+			protected async override Task<Page> OnPopAsync(bool animated)
+			{
+				if (Owner.InternalChildren.Count == 1)
+				{
+					return null;
+				}
+
+				var currentPage = NavigationStack[NavigationStack.Count - 1];
+				var newCurrentPage = NavigationStack[NavigationStack.Count - 2];
+
+				await Owner.SendHandlerUpdateAsync(animated,
+					() =>
+					{
+						Owner.RemoveFromInnerChildren(currentPage);
+						Owner.CurrentPage = newCurrentPage;
+					},
+					() =>
+					{
+						Owner.SendNavigating(currentPage);
+						Owner.FireDisappearing(currentPage);
+						Owner.FireAppearing(newCurrentPage);
+					},
+					() =>
+					{
+						Owner.SendNavigated(currentPage);
+						Owner?.Popped?.Invoke(Owner, new NavigationEventArgs(currentPage));
+					});
+
+				return currentPage;
+			}
+
+			protected override Task OnPopToRootAsync(bool animated)
+			{
+				if (NavigationStack.Count == 1)
+					return Task.CompletedTask;
+
+				Page previousPage = Owner.CurrentPage;
+				Page newPage = Owner.RootPage;
+				List<Page> pagesToRemove = new List<Page>();
+
+				return Owner.SendHandlerUpdateAsync(animated,
+					() =>
+					{
+						var lastIndex = NavigationStack.Count - 1;
+						while (lastIndex > 0)
+						{
+							var page = (Page)NavigationStack[lastIndex];
+							Owner.RemoveFromInnerChildren(page);
+							lastIndex = NavigationStack.Count - 1;
+							pagesToRemove.Insert(0, page);
+						}
+						Owner.CurrentPage = newPage;
+					},
+					() =>
+					{
+						Owner.SendNavigating(previousPage);
+						Owner.FireDisappearing(previousPage);
+						Owner.FireAppearing(newPage);
+					},
+					() =>
+					{
+						Owner.SendNavigated(previousPage);
+						Owner?.PoppedToRoot?.Invoke(Owner, new PoppedToRootEventArgs(newPage, pagesToRemove));
+					});
+			}
+
+			protected override Task OnPushAsync(Page root, bool animated)
+			{
+				if (Owner.InternalChildren.Contains(root))
+					return Task.CompletedTask;
+
+				var previousPage = Owner.CurrentPage;
+
+				return Owner.SendHandlerUpdateAsync(animated,
+					() =>
+					{
+						Owner.PushPage(root);
+					},
+					() =>
+					{
+						Owner.SendNavigating(previousPage);
+						Owner.FireDisappearing(previousPage);
+						Owner.FireAppearing(root);
+					},
+					() =>
+					{
+						Owner.SendNavigated(previousPage);
+						Owner?.Pushed?.Invoke(Owner, new NavigationEventArgs(root));
+					});
+			}
+
+			protected override void OnRemovePage(Page page)
+			{
+				if (page == null)
+					throw new ArgumentNullException($"{nameof(page)} cannot be null.");
+
+				if (page == Owner.CurrentPage && Owner.CurrentPage == Owner.RootPage)
+					throw new InvalidOperationException("Cannot remove root page when it is also the currently displayed page.");
+
+				if (page == Owner.CurrentPage)
+				{
+					Application.Current?.FindMauiContext()?.CreateLogger<NavigationPage>()?.LogWarning("RemovePage called for CurrentPage object. This can result in undesired behavior, consider calling PopAsync instead.");
+					PopAsync();
+					return;
+				}
+
+				if (!Owner.InternalChildren.Contains(page))
+					throw new ArgumentException("Page to remove must be contained on this Navigation Page");
+
+				Owner.SendHandlerUpdateAsync(false,
+					() =>
+					{
+						Owner.RemoveFromInnerChildren(page);
+
+						if (Owner.RootPage == page)
+							Owner.RootPage = (Page)Owner.InternalChildren[0];
+					},
+					() =>
+					{
+					},
+					() =>
+					{
+						//// If no other pending operations happen
+						//// Then update the toolbar to match
+						//// the current navigation stack
+						//if (Owner._waitingCount == 0)
+						//	Owner.UpdateToolbar();
+
+					}).FireAndForget();
+			}
+		}
 	}
 }
diff --git a/src/Controls/src/Core/HandlerImpl/NavigationPage/NavigationPage.iOS.cs b/src/Controls/src/Core/NavigationPage/NavigationPage.iOS.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/NavigationPage/NavigationPage.iOS.cs
rename to src/Controls/src/Core/NavigationPage/NavigationPage.iOS.cs
diff --git a/src/Controls/src/Core/NavigationPageToolbar.cs b/src/Controls/src/Core/NavigationPage/NavigationPageToolbar.cs
similarity index 100%
rename from src/Controls/src/Core/NavigationPageToolbar.cs
rename to src/Controls/src/Core/NavigationPage/NavigationPageToolbar.cs
diff --git a/src/Controls/src/Core/Page/NavigatedFromEventArgs.cs b/src/Controls/src/Core/Page/NavigatedFromEventArgs.cs
new file mode 100644
index 000000000000..832175c16d84
--- /dev/null
+++ b/src/Controls/src/Core/Page/NavigatedFromEventArgs.cs
@@ -0,0 +1,15 @@
+#nullable disable
+using System;
+
+namespace Microsoft.Maui.Controls
+{
+	public sealed class NavigatedFromEventArgs : EventArgs
+	{
+		internal NavigatedFromEventArgs(Page destinationPage)
+		{
+			DestinationPage = destinationPage;
+		}
+
+		internal Page DestinationPage { get; }
+	}
+}
diff --git a/src/Controls/src/Core/Page/NavigatedToEventArgs.cs b/src/Controls/src/Core/Page/NavigatedToEventArgs.cs
new file mode 100644
index 000000000000..ec336aa1e60f
--- /dev/null
+++ b/src/Controls/src/Core/Page/NavigatedToEventArgs.cs
@@ -0,0 +1,15 @@
+#nullable disable
+using System;
+
+namespace Microsoft.Maui.Controls
+{
+	public sealed class NavigatedToEventArgs : EventArgs
+	{
+		internal NavigatedToEventArgs(Page previousPage)
+		{
+			PreviousPage = previousPage;
+		}
+
+		internal Page PreviousPage { get; }
+	}
+}
diff --git a/src/Controls/src/Core/Page/NavigatingFromEventArgs.cs b/src/Controls/src/Core/Page/NavigatingFromEventArgs.cs
new file mode 100644
index 000000000000..bd568dd419a9
--- /dev/null
+++ b/src/Controls/src/Core/Page/NavigatingFromEventArgs.cs
@@ -0,0 +1,10 @@
+#nullable disable
+using System;
+
+namespace Microsoft.Maui.Controls
+{
+	public sealed class NavigatingFromEventArgs : EventArgs
+	{
+
+	}
+}
diff --git a/src/Controls/src/Core/Page.cs b/src/Controls/src/Core/Page/Page.cs
similarity index 92%
rename from src/Controls/src/Core/Page.cs
rename to src/Controls/src/Core/Page/Page.cs
index b7d7934dc700..219e553cb095 100644
--- a/src/Controls/src/Core/Page.cs
+++ b/src/Controls/src/Core/Page/Page.cs
@@ -14,7 +14,7 @@
 namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/Page.xml" path="Type[@FullName='Microsoft.Maui.Controls.Page']/Docs/*" />
-	public partial class Page : VisualElement, ILayout, IPageController, IElementConfiguration<Page>, IPaddingElement, ISafeAreaView
+	public partial class Page : VisualElement, ILayout, IPageController, IElementConfiguration<Page>, IPaddingElement, ISafeAreaView, IView, ITitledElement, IToolbarElement
 	{
 		/// <include file="../../docs/Microsoft.Maui.Controls/Page.xml" path="//Member[@MemberName='BusySetSignalName']/Docs/*" />
 		public const string BusySetSignalName = "Microsoft.Maui.Controls.BusySet";
@@ -631,5 +631,72 @@ internal void SetTitleView(View oldTitleView, View newTitleView)
 
 			_titleView = newTitleView;
 		}
+
+		internal bool HasNavigatedTo { get; private set; }
+
+		Paint IView.Background
+		{
+			get
+			{
+				if (!Brush.IsNullOrEmpty(Background))
+					return Background;
+				if (!ImageSource.IsNullOrEmpty(BackgroundImageSource))
+					return new ImageSourcePaint(BackgroundImageSource);
+				if (BackgroundColor.IsNotDefault())
+					return new SolidColorBrush(BackgroundColor);
+
+				return null;
+			}
+		}
+
+		Toolbar _toolbar;
+		IToolbar IToolbarElement.Toolbar
+		{
+			get => _toolbar;
+		}
+
+		internal Toolbar Toolbar
+		{
+			get => _toolbar;
+			set
+			{
+				_toolbar = value;
+				Handler?.UpdateValue(nameof(IToolbarElement.Toolbar));
+			}
+		}
+
+		internal void SendNavigatedTo(NavigatedToEventArgs args)
+		{
+			HasNavigatedTo = true;
+			NavigatedTo?.Invoke(this, args);
+			OnNavigatedTo(args);
+			(this as IPageContainer<Page>)?.CurrentPage?.SendNavigatedTo(args);
+		}
+
+		internal void SendNavigatingFrom(NavigatingFromEventArgs args)
+		{
+			NavigatingFrom?.Invoke(this, args);
+			OnNavigatingFrom(args);
+			(this as IPageContainer<Page>)?.CurrentPage?.SendNavigatingFrom(args);
+		}
+
+		internal void SendNavigatedFrom(NavigatedFromEventArgs args)
+		{
+			HasNavigatedTo = false;
+			NavigatedFrom?.Invoke(this, args);
+			OnNavigatedFrom(args);
+			(this as IPageContainer<Page>)?.CurrentPage?.SendNavigatedFrom(args);
+		}
+
+		public event EventHandler<NavigatedToEventArgs> NavigatedTo;
+		public event EventHandler<NavigatingFromEventArgs> NavigatingFrom;
+		public event EventHandler<NavigatedFromEventArgs> NavigatedFrom;
+
+		protected virtual void OnNavigatedTo(NavigatedToEventArgs args) { }
+		protected virtual void OnNavigatingFrom(NavigatingFromEventArgs args) { }
+		protected virtual void OnNavigatedFrom(NavigatedFromEventArgs args) { }
+
+		public virtual Window GetParentWindow()
+			=> this.FindParentOfType<Window>();
 	}
 }
diff --git a/src/Controls/src/Core/HandlerImpl/Picker/Picker.Android.cs b/src/Controls/src/Core/Picker/Picker.Android.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Picker/Picker.Android.cs
rename to src/Controls/src/Core/Picker/Picker.Android.cs
diff --git a/src/Controls/src/Core/HandlerImpl/Picker/Picker.cs b/src/Controls/src/Core/Picker/Picker.Mapper.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Picker/Picker.cs
rename to src/Controls/src/Core/Picker/Picker.Mapper.cs
diff --git a/src/Controls/src/Core/HandlerImpl/Picker/Picker.Standard.cs b/src/Controls/src/Core/Picker/Picker.Standard.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Picker/Picker.Standard.cs
rename to src/Controls/src/Core/Picker/Picker.Standard.cs
diff --git a/src/Controls/src/Core/HandlerImpl/Picker/Picker.Windows.cs b/src/Controls/src/Core/Picker/Picker.Windows.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Picker/Picker.Windows.cs
rename to src/Controls/src/Core/Picker/Picker.Windows.cs
diff --git a/src/Controls/src/Core/Picker.cs b/src/Controls/src/Core/Picker/Picker.cs
similarity index 95%
rename from src/Controls/src/Core/Picker.cs
rename to src/Controls/src/Core/Picker/Picker.cs
index cc436868d9cb..d3b6374ee11f 100644
--- a/src/Controls/src/Core/Picker.cs
+++ b/src/Controls/src/Core/Picker/Picker.cs
@@ -12,7 +12,7 @@
 namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/Picker.xml" path="Type[@FullName='Microsoft.Maui.Controls.Picker']/Docs/*" />
-	public partial class Picker : View, IFontElement, ITextElement, ITextAlignmentElement, IElementConfiguration<Picker>
+	public partial class Picker : View, IFontElement, ITextElement, ITextAlignmentElement, IElementConfiguration<Picker>, IPicker
 	{
 		/// <summary>Bindable property for <see cref="TextColor"/>.</summary>
 		public static readonly BindableProperty TextColorProperty = TextElement.TextColorProperty;
@@ -384,5 +384,32 @@ void ITextAlignmentElement.OnHorizontalTextAlignmentPropertyChanged(TextAlignmen
 
 		}
 
+		Font ITextStyle.Font => this.ToFont();
+
+		IList<string> IPicker.Items => Items;
+
+		int IItemDelegate<string>.GetCount() => Items?.Count ?? ItemsSource?.Count ?? 0;
+
+		string IItemDelegate<string>.GetItem(int index)
+		{
+			if (index < 0)
+				return string.Empty;
+			if (index < Items?.Count)
+				return GetItem(index);
+			if (index < ItemsSource?.Count)
+				return GetDisplayMember(ItemsSource[index]);
+			return string.Empty;
+		}
+
+		string GetItem(int index)
+		{
+			if (index < Items?.Count)
+			{
+				var item = Items[index];
+				return item ?? string.Empty;
+			}
+
+			return string.Empty;
+		}
 	}
 }
diff --git a/src/Controls/src/Core/HandlerImpl/Picker/Picker.iOS.cs b/src/Controls/src/Core/Picker/Picker.iOS.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Picker/Picker.iOS.cs
rename to src/Controls/src/Core/Picker/Picker.iOS.cs
diff --git a/src/Controls/src/Core/ProgressBar.cs b/src/Controls/src/Core/ProgressBar/ProgressBar.cs
similarity index 99%
rename from src/Controls/src/Core/ProgressBar.cs
rename to src/Controls/src/Core/ProgressBar/ProgressBar.cs
index 0024dffc03c2..9a568bf6e36f 100644
--- a/src/Controls/src/Core/ProgressBar.cs
+++ b/src/Controls/src/Core/ProgressBar/ProgressBar.cs
@@ -8,7 +8,7 @@
 namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/ProgressBar.xml" path="Type[@FullName='Microsoft.Maui.Controls.ProgressBar']/Docs/*" />
-	public partial class ProgressBar : View, IElementConfiguration<ProgressBar>
+	public partial class ProgressBar : View, IElementConfiguration<ProgressBar>, IProgress
 	{
 		/// <summary>Bindable property for <see cref="ProgressColor"/>.</summary>
 		public static readonly BindableProperty ProgressColorProperty = BindableProperty.Create(nameof(ProgressColor), typeof(Color), typeof(ProgressBar), null);
diff --git a/src/Controls/src/Core/HandlerImpl/RadioButton/RadioButton.Android.cs b/src/Controls/src/Core/RadioButton/RadioButton.Android.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/RadioButton/RadioButton.Android.cs
rename to src/Controls/src/Core/RadioButton/RadioButton.Android.cs
diff --git a/src/Controls/src/Core/HandlerImpl/RadioButton/RadioButton.cs b/src/Controls/src/Core/RadioButton/RadioButton.Mapper.cs
similarity index 82%
rename from src/Controls/src/Core/HandlerImpl/RadioButton/RadioButton.cs
rename to src/Controls/src/Core/RadioButton/RadioButton.Mapper.cs
index cb6c7d7023ee..1a28b7e86d44 100644
--- a/src/Controls/src/Core/HandlerImpl/RadioButton/RadioButton.cs
+++ b/src/Controls/src/Core/RadioButton/RadioButton.Mapper.cs
@@ -3,7 +3,7 @@
 
 namespace Microsoft.Maui.Controls
 {
-	/// <include file="../../../../docs/Microsoft.Maui.Controls/RadioButton.xml" path="Type[@FullName='Microsoft.Maui.Controls.RadioButton']/Docs/*" />
+	/// <include file="../../../docs/Microsoft.Maui.Controls/RadioButton.xml" path="Type[@FullName='Microsoft.Maui.Controls.RadioButton']/Docs/*" />
 	public partial class RadioButton
 	{
 		IMauiContext MauiContext => Handler?.MauiContext ?? throw new InvalidOperationException("MauiContext not set");
diff --git a/src/Controls/src/Core/HandlerImpl/RadioButton/RadioButton.Tizen.cs b/src/Controls/src/Core/RadioButton/RadioButton.Tizen.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/RadioButton/RadioButton.Tizen.cs
rename to src/Controls/src/Core/RadioButton/RadioButton.Tizen.cs
diff --git a/src/Controls/src/Core/HandlerImpl/RadioButton/RadioButton.Windows.cs b/src/Controls/src/Core/RadioButton/RadioButton.Windows.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/RadioButton/RadioButton.Windows.cs
rename to src/Controls/src/Core/RadioButton/RadioButton.Windows.cs
diff --git a/src/Controls/src/Core/RadioButton.cs b/src/Controls/src/Core/RadioButton/RadioButton.cs
similarity index 96%
rename from src/Controls/src/Core/RadioButton.cs
rename to src/Controls/src/Core/RadioButton/RadioButton.cs
index 2fc92e68ffe8..63518b2e20a7 100644
--- a/src/Controls/src/Core/RadioButton.cs
+++ b/src/Controls/src/Core/RadioButton/RadioButton.cs
@@ -10,7 +10,7 @@
 namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/RadioButton.xml" path="Type[@FullName='Microsoft.Maui.Controls.RadioButton']/Docs/*" />
-	public partial class RadioButton : TemplatedView, IElementConfiguration<RadioButton>, ITextElement, IFontElement, IBorderElement
+	public partial class RadioButton : TemplatedView, IElementConfiguration<RadioButton>, ITextElement, IFontElement, IBorderElement, IRadioButton
 	{
 		/// <include file="../../docs/Microsoft.Maui.Controls/RadioButton.xml" path="//Member[@MemberName='CheckedVisualState']/Docs/*" />
 		public const string CheckedVisualState = "Checked";
@@ -659,6 +659,38 @@ public string ContentAsString()
 			return content?.ToString();
 		}
 
+		Font ITextStyle.Font => this.ToFont();
+
+#if ANDROID
+		object IContentView.Content => ContentAsString();
+#endif
+
+		IView IContentView.PresentedContent => ((this as IControlTemplated).TemplateRoot as IView) ?? (Content as IView);
+
+		double IButtonStroke.StrokeThickness => (double)GetValue(BorderWidthProperty);
+
+		Color IButtonStroke.StrokeColor => (Color)GetValue(BorderColorProperty);
+
+		int IButtonStroke.CornerRadius => (int)GetValue(CornerRadiusProperty);
+
+		private protected override Semantics UpdateSemantics()
+		{
+			var semantics = base.UpdateSemantics();
+
+			if (ControlTemplate != null)
+			{
+				string contentAsString = ContentAsString();
+
+				if (!string.IsNullOrWhiteSpace(contentAsString) && string.IsNullOrWhiteSpace(semantics?.Description))
+				{
+					semantics ??= new Semantics();
+					semantics.Description = contentAsString;
+				}
+			}
+
+			return semantics;
+		}
+
 		class CornerRadiusToShape : IValueConverter
 		{
 			public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
diff --git a/src/Controls/src/Core/HandlerImpl/RadioButton/RadioButton.iOS.cs b/src/Controls/src/Core/RadioButton/RadioButton.iOS.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/RadioButton/RadioButton.iOS.cs
rename to src/Controls/src/Core/RadioButton/RadioButton.iOS.cs
diff --git a/src/Controls/src/Core/RadioButtonGroup.cs b/src/Controls/src/Core/RadioButton/RadioButtonGroup.cs
similarity index 100%
rename from src/Controls/src/Core/RadioButtonGroup.cs
rename to src/Controls/src/Core/RadioButton/RadioButtonGroup.cs
diff --git a/src/Controls/src/Core/RadioButtonGroupController.cs b/src/Controls/src/Core/RadioButton/RadioButtonGroupController.cs
similarity index 100%
rename from src/Controls/src/Core/RadioButtonGroupController.cs
rename to src/Controls/src/Core/RadioButton/RadioButtonGroupController.cs
diff --git a/src/Controls/src/Core/RadioButtonGroupSelectionChanged.cs b/src/Controls/src/Core/RadioButton/RadioButtonGroupSelectionChanged.cs
similarity index 100%
rename from src/Controls/src/Core/RadioButtonGroupSelectionChanged.cs
rename to src/Controls/src/Core/RadioButton/RadioButtonGroupSelectionChanged.cs
diff --git a/src/Controls/src/Core/HandlerImpl/RefreshView/RefreshView.Android.cs b/src/Controls/src/Core/RefreshView/RefreshView.Android.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/RefreshView/RefreshView.Android.cs
rename to src/Controls/src/Core/RefreshView/RefreshView.Android.cs
diff --git a/src/Controls/src/Core/HandlerImpl/RefreshView/RefreshView.cs b/src/Controls/src/Core/RefreshView/RefreshView.Mapper.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/RefreshView/RefreshView.cs
rename to src/Controls/src/Core/RefreshView/RefreshView.Mapper.cs
diff --git a/src/Controls/src/Core/HandlerImpl/RefreshView/RefreshView.Standard.cs b/src/Controls/src/Core/RefreshView/RefreshView.Standard.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/RefreshView/RefreshView.Standard.cs
rename to src/Controls/src/Core/RefreshView/RefreshView.Standard.cs
diff --git a/src/Controls/src/Core/HandlerImpl/RefreshView/RefreshView.Windows.cs b/src/Controls/src/Core/RefreshView/RefreshView.Windows.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/RefreshView/RefreshView.Windows.cs
rename to src/Controls/src/Core/RefreshView/RefreshView.Windows.cs
diff --git a/src/Controls/src/Core/RefreshView.cs b/src/Controls/src/Core/RefreshView/RefreshView.cs
similarity index 97%
rename from src/Controls/src/Core/RefreshView.cs
rename to src/Controls/src/Core/RefreshView/RefreshView.cs
index 1f985f70e7da..3f695c1998e1 100644
--- a/src/Controls/src/Core/RefreshView.cs
+++ b/src/Controls/src/Core/RefreshView/RefreshView.cs
@@ -8,7 +8,7 @@ namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/RefreshView.xml" path="Type[@FullName='Microsoft.Maui.Controls.RefreshView']/Docs/*" />
 	[ContentProperty(nameof(Content))]
-	public partial class RefreshView : ContentView, IElementConfiguration<RefreshView>
+	public partial class RefreshView : ContentView, IElementConfiguration<RefreshView>, IRefreshView
 	{
 		readonly Lazy<PlatformConfigurationRegistry<RefreshView>> _platformConfigurationRegistry;
 		public event EventHandler Refreshing;
@@ -146,5 +146,9 @@ protected override void OnPropertyChanged([CallerMemberName] string propertyName
 				IsRefreshing = false;
 			}
 		}
+
+		Paint IRefreshView.RefreshColor => RefreshColor?.AsPaint();
+
+		IView IRefreshView.Content => base.Content;
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/src/Core/HandlerImpl/RefreshView/RefreshView.iOS.cs b/src/Controls/src/Core/RefreshView/RefreshView.iOS.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/RefreshView/RefreshView.iOS.cs
rename to src/Controls/src/Core/RefreshView/RefreshView.iOS.cs
diff --git a/src/Controls/src/Core/HandlerImpl/ScrollView/ScrollView.Android.cs b/src/Controls/src/Core/ScrollView/ScrollView.Android.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/ScrollView/ScrollView.Android.cs
rename to src/Controls/src/Core/ScrollView/ScrollView.Android.cs
diff --git a/src/Controls/src/Core/HandlerImpl/ScrollView/ScrollView.cs b/src/Controls/src/Core/ScrollView/ScrollView.Mapper.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/ScrollView/ScrollView.cs
rename to src/Controls/src/Core/ScrollView/ScrollView.Mapper.cs
diff --git a/src/Controls/src/Core/HandlerImpl/ScrollView/ScrollView.Standard.cs b/src/Controls/src/Core/ScrollView/ScrollView.Standard.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/ScrollView/ScrollView.Standard.cs
rename to src/Controls/src/Core/ScrollView/ScrollView.Standard.cs
diff --git a/src/Controls/src/Core/HandlerImpl/ScrollView/ScrollView.Windows.cs b/src/Controls/src/Core/ScrollView/ScrollView.Windows.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/ScrollView/ScrollView.Windows.cs
rename to src/Controls/src/Core/ScrollView/ScrollView.Windows.cs
diff --git a/src/Controls/src/Core/ScrollView.cs b/src/Controls/src/Core/ScrollView/ScrollView.cs
similarity index 87%
rename from src/Controls/src/Core/ScrollView.cs
rename to src/Controls/src/Core/ScrollView/ScrollView.cs
index d0453ae5a217..5f5139b39c03 100644
--- a/src/Controls/src/Core/ScrollView.cs
+++ b/src/Controls/src/Core/ScrollView/ScrollView.cs
@@ -10,7 +10,7 @@ namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/ScrollView.xml" path="Type[@FullName='Microsoft.Maui.Controls.ScrollView']/Docs/*" />
 	[ContentProperty(nameof(Content))]
-	public partial class ScrollView : Compatibility.Layout, IScrollViewController, IElementConfiguration<ScrollView>, IFlowDirectionController
+	public partial class ScrollView : Compatibility.Layout, IScrollViewController, IElementConfiguration<ScrollView>, IFlowDirectionController, IScrollView, IContentView
 	{
 		#region IScrollViewController
 
@@ -387,5 +387,92 @@ ScrollToRequestedEventArgs ConvertRequestMode(ScrollToRequestedEventArgs args)
 
 			return args;
 		}
+
+		object IContentView.Content => Content;
+		IView IContentView.PresentedContent => Content;
+
+		double IScrollView.HorizontalOffset
+		{
+			get => ScrollX;
+			set
+			{
+				if (ScrollX != value)
+				{
+					SetScrolledPosition(value, ScrollY);
+				}
+			}
+		}
+
+		double IScrollView.VerticalOffset
+		{
+			get => ScrollY;
+			set
+			{
+				if (ScrollY != value)
+				{
+					SetScrolledPosition(ScrollX, value);
+				}
+			}
+		}
+
+		void IScrollView.RequestScrollTo(double horizontalOffset, double verticalOffset, bool instant)
+		{
+			var request = new ScrollToRequest(horizontalOffset, verticalOffset, instant);
+			Handler?.Invoke(nameof(IScrollView.RequestScrollTo), request);
+		}
+
+		void IScrollView.ScrollFinished() => SendScrollFinished();
+
+		protected override Size MeasureOverride(double widthConstraint, double heightConstraint)
+		{
+			DesiredSize = this.ComputeDesiredSize(widthConstraint, heightConstraint);
+			return DesiredSize;
+		}
+
+		Size IContentView.CrossPlatformMeasure(double widthConstraint, double heightConstraint)
+		{
+			if ((this as IContentView)?.PresentedContent is not IView content)
+			{
+				ContentSize = Size.Zero;
+				return ContentSize;
+			}
+
+			switch (Orientation)
+			{
+				case ScrollOrientation.Horizontal:
+					widthConstraint = double.PositiveInfinity;
+					break;
+				case ScrollOrientation.Neither:
+				case ScrollOrientation.Both:
+					heightConstraint = double.PositiveInfinity;
+					widthConstraint = double.PositiveInfinity;
+					break;
+				case ScrollOrientation.Vertical:
+				default:
+					heightConstraint = double.PositiveInfinity;
+					break;
+			}
+
+			content.Measure(widthConstraint, heightConstraint);
+			return content.DesiredSize;
+		}
+
+		protected override Size ArrangeOverride(Rect bounds)
+		{
+			Frame = this.ComputeFrame(bounds);
+			Handler?.PlatformArrange(Frame);
+
+			return Frame.Size;
+		}
+
+		Size IContentView.CrossPlatformArrange(Rect bounds)
+		{
+			if (this is IScrollView scrollView)
+			{
+				return scrollView.ArrangeContentUnbounded(bounds);
+			}
+
+			return bounds.Size;
+		}
 	}
 }
diff --git a/src/Controls/src/Core/HandlerImpl/ScrollView/ScrollView.iOS.cs b/src/Controls/src/Core/ScrollView/ScrollView.iOS.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/ScrollView/ScrollView.iOS.cs
rename to src/Controls/src/Core/ScrollView/ScrollView.iOS.cs
diff --git a/src/Controls/src/Core/HandlerImpl/SearchBar/SearchBar.Android.cs b/src/Controls/src/Core/SearchBar/SearchBar.Android.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/SearchBar/SearchBar.Android.cs
rename to src/Controls/src/Core/SearchBar/SearchBar.Android.cs
diff --git a/src/Controls/src/Core/HandlerImpl/SearchBar/SearchBar.cs b/src/Controls/src/Core/SearchBar/SearchBar.Mapper.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/SearchBar/SearchBar.cs
rename to src/Controls/src/Core/SearchBar/SearchBar.Mapper.cs
diff --git a/src/Controls/src/Core/HandlerImpl/SearchBar/SearchBar.Standard.cs b/src/Controls/src/Core/SearchBar/SearchBar.Standard.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/SearchBar/SearchBar.Standard.cs
rename to src/Controls/src/Core/SearchBar/SearchBar.Standard.cs
diff --git a/src/Controls/src/Core/HandlerImpl/SearchBar/SearchBar.Tizen.cs b/src/Controls/src/Core/SearchBar/SearchBar.Tizen.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/SearchBar/SearchBar.Tizen.cs
rename to src/Controls/src/Core/SearchBar/SearchBar.Tizen.cs
diff --git a/src/Controls/src/Core/HandlerImpl/SearchBar/SearchBar.Windows.cs b/src/Controls/src/Core/SearchBar/SearchBar.Windows.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/SearchBar/SearchBar.Windows.cs
rename to src/Controls/src/Core/SearchBar/SearchBar.Windows.cs
diff --git a/src/Controls/src/Core/SearchBar.cs b/src/Controls/src/Core/SearchBar/SearchBar.cs
similarity index 97%
rename from src/Controls/src/Core/SearchBar.cs
rename to src/Controls/src/Core/SearchBar/SearchBar.cs
index 8dadadffe66a..b7e0e4239751 100644
--- a/src/Controls/src/Core/SearchBar.cs
+++ b/src/Controls/src/Core/SearchBar/SearchBar.cs
@@ -8,7 +8,7 @@
 namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/SearchBar.xml" path="Type[@FullName='Microsoft.Maui.Controls.SearchBar']/Docs/*" />
-	public partial class SearchBar : InputView, IFontElement, ITextAlignmentElement, ISearchBarController, IElementConfiguration<SearchBar>, ICommandElement
+	public partial class SearchBar : InputView, IFontElement, ITextAlignmentElement, ISearchBarController, IElementConfiguration<SearchBar>, ICommandElement, ISearchBar
 	{
 		/// <summary>Bindable property for <see cref="SearchCommand"/>.</summary>
 		public static readonly BindableProperty SearchCommandProperty = BindableProperty.Create(
@@ -209,5 +209,14 @@ public IPlatformElementConfiguration<T, SearchBar> On<T>() where T : IConfigPlat
 		void ITextAlignmentElement.OnHorizontalTextAlignmentPropertyChanged(TextAlignment oldValue, TextAlignment newValue)
 		{
 		}
+
+		Font ITextStyle.Font => this.ToFont();
+
+		bool ITextInput.IsTextPredictionEnabled => true;
+
+		void ISearchBar.SearchButtonPressed()
+		{
+			(this as ISearchBarController).OnSearchButtonPressed();
+		}
 	}
 }
diff --git a/src/Controls/src/Core/HandlerImpl/SearchBar/SearchBar.iOS.cs b/src/Controls/src/Core/SearchBar/SearchBar.iOS.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/SearchBar/SearchBar.iOS.cs
rename to src/Controls/src/Core/SearchBar/SearchBar.iOS.cs
diff --git a/src/Controls/src/Core/HandlerImpl/Shape/Shape.Android.cs b/src/Controls/src/Core/Shape/Shape.Android.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Shape/Shape.Android.cs
rename to src/Controls/src/Core/Shape/Shape.Android.cs
diff --git a/src/Controls/src/Core/HandlerImpl/Shape/Shape.cs b/src/Controls/src/Core/Shape/Shape.Mapper.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Shape/Shape.cs
rename to src/Controls/src/Core/Shape/Shape.Mapper.cs
diff --git a/src/Controls/src/Core/HandlerImpl/Shape/Shape.Standard.cs b/src/Controls/src/Core/Shape/Shape.Standard.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Shape/Shape.Standard.cs
rename to src/Controls/src/Core/Shape/Shape.Standard.cs
diff --git a/src/Controls/src/Core/HandlerImpl/Shape/Shape.Tizen.cs b/src/Controls/src/Core/Shape/Shape.Tizen.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Shape/Shape.Tizen.cs
rename to src/Controls/src/Core/Shape/Shape.Tizen.cs
diff --git a/src/Controls/src/Core/HandlerImpl/Shape/Shape.Windows.cs b/src/Controls/src/Core/Shape/Shape.Windows.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Shape/Shape.Windows.cs
rename to src/Controls/src/Core/Shape/Shape.Windows.cs
diff --git a/src/Controls/src/Core/HandlerImpl/Shape/Shape.iOS.cs b/src/Controls/src/Core/Shape/Shape.iOS.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Shape/Shape.iOS.cs
rename to src/Controls/src/Core/Shape/Shape.iOS.cs
diff --git a/src/Controls/src/Core/Shapes/Ellipse.cs b/src/Controls/src/Core/Shapes/Ellipse.cs
index 1baa27868043..33971536b9a7 100644
--- a/src/Controls/src/Core/Shapes/Ellipse.cs
+++ b/src/Controls/src/Core/Shapes/Ellipse.cs
@@ -1,14 +1,47 @@
+#nullable disable
+using System.Runtime.CompilerServices;
 using Microsoft.Maui.Graphics;
 
 namespace Microsoft.Maui.Controls.Shapes
 {
 	/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/Ellipse.xml" path="Type[@FullName='Microsoft.Maui.Controls.Shapes.Ellipse']/Docs/*" />
-	public sealed partial class Ellipse : Shape
+	public sealed partial class Ellipse : Shape, IShape
 	{
 		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/Ellipse.xml" path="//Member[@MemberName='.ctor']/Docs/*" />
 		public Ellipse() : base()
 		{
 			Aspect = Stretch.Fill;
 		}
+
+		// TODO this should move to a remapped mapper
+		protected override void OnPropertyChanged([CallerMemberName] string propertyName = null)
+		{
+			base.OnPropertyChanged(propertyName);
+
+			if (propertyName == XProperty.PropertyName ||
+				propertyName == YProperty.PropertyName ||
+				propertyName == WidthProperty.PropertyName ||
+				propertyName == HeightProperty.PropertyName)
+			{
+				Handler?.UpdateValue(nameof(IShapeView.Shape));
+			}
+		}
+
+		public override PathF GetPath()
+		{
+			var width = WidthForPathComputation;
+			var height = HeightForPathComputation;
+
+			var path = new PathF();
+
+			float x = (float)StrokeThickness / 2;
+			float y = (float)StrokeThickness / 2;
+			float w = (float)(width - StrokeThickness);
+			float h = (float)(height - StrokeThickness);
+
+			path.AppendEllipse(x, y, w, h);
+
+			return path;
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/src/Core/Shapes/Line.cs b/src/Controls/src/Core/Shapes/Line.cs
index 8cb67c4f6de9..14a45f366edb 100644
--- a/src/Controls/src/Core/Shapes/Line.cs
+++ b/src/Controls/src/Core/Shapes/Line.cs
@@ -1,8 +1,11 @@
 #nullable disable
+using System.Runtime.CompilerServices;
+using Microsoft.Maui.Graphics;
+
 namespace Microsoft.Maui.Controls.Shapes
 {
 	/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/Line.xml" path="Type[@FullName='Microsoft.Maui.Controls.Shapes.Line']/Docs/*" />
-	public sealed partial class Line : Shape
+	public sealed partial class Line : Shape, IShape
 	{
 		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/Line.xml" path="//Member[@MemberName='.ctor'][1]/Docs/*" />
 		public Line() : base()
@@ -60,5 +63,27 @@ public double Y2
 			set { SetValue(Y2Property, value); }
 			get { return (double)GetValue(Y2Property); }
 		}
+
+		// TODO this should move to a remapped mapper
+		protected override void OnPropertyChanged([CallerMemberName] string propertyName = null)
+		{
+			base.OnPropertyChanged(propertyName);
+
+			if (propertyName == X1Property.PropertyName ||
+				propertyName == Y1Property.PropertyName ||
+				propertyName == X2Property.PropertyName ||
+				propertyName == Y2Property.PropertyName)
+				Handler?.UpdateValue(nameof(IShapeView.Shape));
+		}
+
+		public override PathF GetPath()
+		{
+			var path = new PathF();
+
+			path.MoveTo((float)X1, (float)Y1);
+			path.LineTo((float)X2, (float)Y2);
+
+			return path;
+		}
 	}
 }
diff --git a/src/Controls/src/Core/Shapes/Path.cs b/src/Controls/src/Core/Shapes/Path.cs
index 917e37c4ff8e..3ca2c5b34c1d 100644
--- a/src/Controls/src/Core/Shapes/Path.cs
+++ b/src/Controls/src/Core/Shapes/Path.cs
@@ -1,11 +1,13 @@
 #nullable disable
 using System;
 using System.ComponentModel;
+using System.Runtime.CompilerServices;
+using Microsoft.Maui.Graphics;
 
 namespace Microsoft.Maui.Controls.Shapes
 {
 	/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/Path.xml" path="Type[@FullName='Microsoft.Maui.Controls.Shapes.Path']/Docs/*" />
-	public sealed partial class Path : Shape
+	public sealed partial class Path : Shape, IShape
 	{
 		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/Path.xml" path="//Member[@MemberName='.ctor'][1]/Docs/*" />
 		public Path() : base()
@@ -91,5 +93,26 @@ void OnTransformPropertyChanged(object sender, PropertyChangedEventArgs args)
 				OnPropertyChanged(nameof(RenderTransform));
 			}
 		}
+
+		// TODO this should move to a remapped mapper
+		protected override void OnPropertyChanged([CallerMemberName] string propertyName = null)
+		{
+			base.OnPropertyChanged(propertyName);
+
+			if (propertyName == DataProperty.PropertyName)
+			{
+				Handler?.UpdateValue(nameof(IShapeView.Shape));
+			}
+		}
+
+		public override PathF GetPath()
+		{
+			var path = new PathF();
+
+			if (Data != null)
+				Data.AppendPath(path);
+
+			return path;
+		}
 	}
 }
diff --git a/src/Controls/src/Core/Shapes/Polygon.cs b/src/Controls/src/Core/Shapes/Polygon.cs
index 1c233d4fac1f..4c799ca10804 100644
--- a/src/Controls/src/Core/Shapes/Polygon.cs
+++ b/src/Controls/src/Core/Shapes/Polygon.cs
@@ -1,8 +1,11 @@
 #nullable disable
+using System.Runtime.CompilerServices;
+using Microsoft.Maui.Graphics;
+
 namespace Microsoft.Maui.Controls.Shapes
 {
 	/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/Polygon.xml" path="Type[@FullName='Microsoft.Maui.Controls.Shapes.Polygon']/Docs/*" />
-	public sealed partial class Polygon : Shape
+	public sealed partial class Polygon : Shape, IShape
 	{
 		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/Polygon.xml" path="//Member[@MemberName='.ctor'][1]/Docs/*" />
 		public Polygon() : base()
@@ -36,5 +39,32 @@ public FillRule FillRule
 			get { return (FillRule)GetValue(FillRuleProperty); }
 
 		}
+
+		// TODO this should move to a remapped mapper
+		protected override void OnPropertyChanged([CallerMemberName] string propertyName = null)
+		{
+			base.OnPropertyChanged(propertyName);
+
+			if (propertyName == PointsProperty.PropertyName ||
+				propertyName == FillRuleProperty.PropertyName)
+				Handler?.UpdateValue(nameof(IShapeView.Shape));
+		}
+
+		public override PathF GetPath()
+		{
+			var path = new PathF();
+
+			if (Points?.Count > 0)
+			{
+				path.MoveTo((float)Points[0].X, (float)Points[0].Y);
+
+				for (int index = 1; index < Points.Count; index++)
+					path.LineTo((float)Points[index].X, (float)Points[index].Y);
+
+				path.Close();
+			}
+
+			return path;
+		}
 	}
 }
diff --git a/src/Controls/src/Core/Shapes/Polyline.cs b/src/Controls/src/Core/Shapes/Polyline.cs
index e1daa9360cbf..bd96dad612df 100644
--- a/src/Controls/src/Core/Shapes/Polyline.cs
+++ b/src/Controls/src/Core/Shapes/Polyline.cs
@@ -1,8 +1,11 @@
 #nullable disable
+using System.Runtime.CompilerServices;
+using Microsoft.Maui.Graphics;
+
 namespace Microsoft.Maui.Controls.Shapes
 {
 	/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/Polyline.xml" path="Type[@FullName='Microsoft.Maui.Controls.Shapes.Polyline']/Docs/*" />
-	public sealed partial class Polyline : Shape
+	public sealed partial class Polyline : Shape, IShape
 	{
 		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/Polyline.xml" path="//Member[@MemberName='.ctor'][1]/Docs/*" />
 		public Polyline() : base()
@@ -35,5 +38,30 @@ public FillRule FillRule
 			set { SetValue(FillRuleProperty, value); }
 			get { return (FillRule)GetValue(FillRuleProperty); }
 		}
+
+		// TODO this should move to a remapped mapper
+		protected override void OnPropertyChanged([CallerMemberName] string propertyName = null)
+		{
+			base.OnPropertyChanged(propertyName);
+
+			if (propertyName == PointsProperty.PropertyName ||
+				propertyName == FillRuleProperty.PropertyName)
+				Handler?.UpdateValue(nameof(IShapeView.Shape));
+		}
+
+		public override PathF GetPath()
+		{
+			var path = new PathF();
+
+			if (Points?.Count > 0)
+			{
+				path.MoveTo((float)Points[0].X, (float)Points[0].Y);
+
+				for (int index = 1; index < Points.Count; index++)
+					path.LineTo((float)Points[index].X, (float)Points[index].Y);
+			}
+
+			return path;
+		}
 	}
 }
diff --git a/src/Controls/src/Core/Shapes/Rectangle.cs b/src/Controls/src/Core/Shapes/Rectangle.cs
index 254a41591d58..478e729b5531 100644
--- a/src/Controls/src/Core/Shapes/Rectangle.cs
+++ b/src/Controls/src/Core/Shapes/Rectangle.cs
@@ -1,10 +1,12 @@
 #nullable disable
+using System;
+using System.Runtime.CompilerServices;
 using Microsoft.Maui.Graphics;
 
 namespace Microsoft.Maui.Controls.Shapes
 {
 	/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/Rectangle.xml" path="Type[@FullName='Microsoft.Maui.Controls.Shapes.Rectangle']/Docs/*" />
-	public sealed partial class Rectangle : Shape
+	public sealed partial class Rectangle : Shape, IShape
 	{
 		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/Rectangle.xml" path="//Member[@MemberName='.ctor']/Docs/*" />
 		public Rectangle() : base()
@@ -33,5 +35,34 @@ public double RadiusY
 			set { SetValue(RadiusYProperty, value); }
 			get { return (double)GetValue(RadiusYProperty); }
 		}
+
+		// TODO this should move to a remapped mapper
+		protected override void OnPropertyChanged([CallerMemberName] string propertyName = null)
+		{
+			base.OnPropertyChanged(propertyName);
+
+			if (propertyName == RadiusXProperty.PropertyName ||
+				propertyName == RadiusYProperty.PropertyName)
+				Handler?.UpdateValue(nameof(IShapeView.Shape));
+		}
+
+		public override PathF GetPath()
+		{
+			var width = WidthForPathComputation;
+			var height = HeightForPathComputation;
+
+			var path = new PathF();
+
+			float x = (float)StrokeThickness / 2;
+			float y = (float)StrokeThickness / 2;
+			float w = (float)(width - StrokeThickness);
+			float h = (float)(height - StrokeThickness);
+			float cornerRadius = (float)Math.Max(RadiusX, RadiusY);
+
+			// TODO: Create specific Path taking into account RadiusX and RadiusY
+			path.AppendRoundedRectangle(x, y, w, h, cornerRadius);
+
+			return path;
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/src/Core/Shapes/RoundRectangle.cs b/src/Controls/src/Core/Shapes/RoundRectangle.cs
index 0b85978b3668..ce0f969327b4 100644
--- a/src/Controls/src/Core/Shapes/RoundRectangle.cs
+++ b/src/Controls/src/Core/Shapes/RoundRectangle.cs
@@ -1,7 +1,11 @@
-#nullable disable
+#nullable disable
+using System;
+using System.Runtime.CompilerServices;
+using Microsoft.Maui.Graphics;
+
 namespace Microsoft.Maui.Controls.Shapes
 {
-	public sealed partial class RoundRectangle : Shape
+	public sealed partial class RoundRectangle : Shape, IShape, IRoundRectangle
 	{
 		public RoundRectangle() : base()
 		{
@@ -17,5 +21,106 @@ public CornerRadius CornerRadius
 			set { SetValue(CornerRadiusProperty, value); }
 			get { return (CornerRadius)GetValue(CornerRadiusProperty); }
 		}
+		double _fallbackWidth;
+		double _fallbackHeight;
+
+		internal override double WidthForPathComputation
+		{
+			get
+			{
+				var width = Width;
+
+				return width == -1 ? _fallbackWidth : width;
+			}
+		}
+
+		internal override double HeightForPathComputation
+		{
+			get
+			{
+				var height = Height;
+
+				return height == -1 ? _fallbackHeight : height;
+			}
+		}
+
+		// TODO this should move to a remapped mapper
+		protected override void OnPropertyChanged([CallerMemberName] string propertyName = null)
+		{
+			base.OnPropertyChanged(propertyName);
+
+			if (propertyName == CornerRadiusProperty.PropertyName)
+				Handler?.UpdateValue(nameof(IShapeView.Shape));
+		}
+
+		public override PathF GetPath()
+		{
+			var width = WidthForPathComputation;
+			var height = HeightForPathComputation;
+
+			var path = new PathF();
+
+			float x = (float)StrokeThickness / 2;
+			float y = (float)StrokeThickness / 2;
+
+			float w = (float)(width - StrokeThickness);
+			float h = (float)(height - StrokeThickness);
+
+			float topLeftCornerRadius = (float)CornerRadius.TopLeft;
+			float topRightCornerRadius = (float)CornerRadius.TopRight;
+			float bottomLeftCornerRadius = (float)CornerRadius.BottomLeft;
+			float bottomRightCornerRadius = (float)CornerRadius.BottomRight;
+
+			path.AppendRoundedRectangle(x, y, w, h, topLeftCornerRadius, topRightCornerRadius, bottomLeftCornerRadius, bottomRightCornerRadius);
+
+			return path;
+		}
+
+		PathF IShape.PathForBounds(Graphics.Rect viewBounds)
+		{
+			_fallbackHeight = viewBounds.Height;
+			_fallbackWidth = viewBounds.Width;
+
+			var path = GetPath();
+
+			TransformPathForBounds(path, viewBounds);
+
+			return path;
+		}
+
+		internal PathF GetInnerPath(float strokeWidth)
+		{
+			var width = WidthForPathComputation;
+			var height = HeightForPathComputation;
+
+			var path = new PathF();
+
+			float x = (float)StrokeThickness / 2;
+			float y = (float)StrokeThickness / 2;
+
+			float w = (float)(width - StrokeThickness);
+			float h = (float)(height - StrokeThickness);
+
+			float topLeftCornerRadius = (float)Math.Max(0, CornerRadius.TopLeft - strokeWidth);
+			float topRightCornerRadius = (float)Math.Max(0, CornerRadius.TopRight - strokeWidth);
+			float bottomLeftCornerRadius = (float)Math.Max(0, CornerRadius.BottomLeft - strokeWidth);
+			float bottomRightCornerRadius = (float)Math.Max(0, CornerRadius.BottomRight - strokeWidth);
+
+			path.AppendRoundedRectangle(x, y, w, h, topLeftCornerRadius, topRightCornerRadius, bottomLeftCornerRadius, bottomRightCornerRadius);
+
+			return path;
+		}
+
+		PathF IRoundRectangle.InnerPathForBounds(Rect viewBounds, float strokeWidth)
+		{
+			_fallbackHeight = viewBounds.Height;
+			_fallbackWidth = viewBounds.Width;
+
+			var path = GetInnerPath(strokeWidth);
+
+			TransformPathForBounds(path, viewBounds);
+
+			return path;
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/src/Core/FlyoutHeaderBehavior.cs b/src/Controls/src/Core/Shell/FlyoutHeaderBehavior.cs
similarity index 100%
rename from src/Controls/src/Core/FlyoutHeaderBehavior.cs
rename to src/Controls/src/Core/Shell/FlyoutHeaderBehavior.cs
diff --git a/src/Controls/src/Core/Shell/Shell.cs b/src/Controls/src/Core/Shell/Shell.cs
index 436b77b239d2..179de869928a 100644
--- a/src/Controls/src/Core/Shell/Shell.cs
+++ b/src/Controls/src/Core/Shell/Shell.cs
@@ -21,7 +21,7 @@ namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../../docs/Microsoft.Maui.Controls/Shell.xml" path="Type[@FullName='Microsoft.Maui.Controls.Shell']/Docs/*" />
 	[ContentProperty(nameof(Items))]
-	public partial class Shell : Page, IShellController, IPropertyPropagationController, IPageContainer<Page>
+	public partial class Shell : Page, IShellController, IPropertyPropagationController, IPageContainer<Page>, IFlyoutView
 	{
 		/// <include file="../../../docs/Microsoft.Maui.Controls/Shell.xml" path="//Member[@MemberName='CurrentPage']/Docs/*" />
 		public Page CurrentPage => GetVisiblePage() as Page;
@@ -1581,6 +1581,28 @@ protected override void LayoutChildren(double x, double y, double width, double
 			// we don't want this behavior with shell
 		}
 
+		IView IFlyoutView.Flyout => this.FlyoutContentView;
+		IView IFlyoutView.Detail => null;
+
+		bool IFlyoutView.IsPresented { get => FlyoutIsPresented; set => FlyoutIsPresented = value; }
+
+		bool IFlyoutView.IsGestureEnabled => false;
+
+		FlyoutBehavior IFlyoutView.FlyoutBehavior
+		{
+			get
+			{
+				return GetEffectiveFlyoutBehavior();
+			}
+		}
+
+		protected override void OnPropertyChanged([CallerMemberName] string propertyName = null)
+		{
+			base.OnPropertyChanged(propertyName);
+			if (propertyName == Shell.FlyoutIsPresentedProperty.PropertyName)
+				Handler?.UpdateValue(nameof(IFlyoutView.IsPresented));
+		}
+
 		#region Shell Flyout Content
 
 
diff --git a/src/Controls/src/Core/Shell/ShellSection.cs b/src/Controls/src/Core/Shell/ShellSection.cs
index c3bdb92d3279..8201e545891a 100644
--- a/src/Controls/src/Core/Shell/ShellSection.cs
+++ b/src/Controls/src/Core/Shell/ShellSection.cs
@@ -20,7 +20,7 @@ public class Tab : ShellSection
 	/// <include file="../../../docs/Microsoft.Maui.Controls/ShellSection.xml" path="Type[@FullName='Microsoft.Maui.Controls.ShellSection']/Docs/*" />
 	[ContentProperty(nameof(Items))]
 	[EditorBrowsable(EditorBrowsableState.Never)]
-	public partial class ShellSection : ShellGroupItem, IShellSectionController, IPropertyPropagationController, IVisualTreeElement
+	public partial class ShellSection : ShellGroupItem, IShellSectionController, IPropertyPropagationController, IVisualTreeElement, IStackNavigation
 	{
 		#region PropertyKeys
 
@@ -1216,5 +1216,30 @@ ShellNavigationState GetUpdatedStatus(IReadOnlyList<Page> stack)
 		}
 
 		IReadOnlyList<Maui.IVisualTreeElement> IVisualTreeElement.GetVisualChildren() => AllChildren.ToList();
+
+#nullable enable
+		// This code only runs for shell bits that are running through a proper
+		// ShellHandler
+		TaskCompletionSource<object>? _handlerBasedNavigationCompletionSource;
+		internal Task? PendingNavigationTask => _handlerBasedNavigationCompletionSource?.Task;
+
+		void IStackNavigation.RequestNavigation(NavigationRequest eventArgs)
+		{
+			if (_handlerBasedNavigationCompletionSource != null)
+				throw new InvalidOperationException("Pending Navigations still processing");
+
+			_handlerBasedNavigationCompletionSource = new TaskCompletionSource<object>();
+			Handler.Invoke(nameof(IStackNavigation.RequestNavigation), eventArgs);
+		}
+
+		void IStackNavigation.NavigationFinished(IReadOnlyList<IView> newStack)
+		{
+			_ = _handlerBasedNavigationCompletionSource ?? throw new InvalidOperationException("Mismatched Navigation finished");
+			var source = _handlerBasedNavigationCompletionSource;
+			_handlerBasedNavigationCompletionSource = null;
+			source?.SetResult(true);
+		}
+#nullable disable
+
 	}
 }
diff --git a/src/Controls/src/Core/Slider.cs b/src/Controls/src/Core/Slider/Slider.cs
similarity index 96%
rename from src/Controls/src/Core/Slider.cs
rename to src/Controls/src/Core/Slider/Slider.cs
index 8d45e67eefa9..4d496897ad98 100644
--- a/src/Controls/src/Core/Slider.cs
+++ b/src/Controls/src/Core/Slider/Slider.cs
@@ -6,7 +6,7 @@
 namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/Slider.xml" path="Type[@FullName='Microsoft.Maui.Controls.Slider']/Docs/*" />
-	public partial class Slider : View, ISliderController, IElementConfiguration<Slider>
+	public partial class Slider : View, ISliderController, IElementConfiguration<Slider>, ISlider
 	{
 		/// <summary>Bindable property for <see cref="Minimum"/>.</summary>
 		public static readonly BindableProperty MinimumProperty = BindableProperty.Create(nameof(Minimum), typeof(double), typeof(Slider), 0d, coerceValue: (bindable, value) =>
@@ -170,5 +170,17 @@ public IPlatformElementConfiguration<T, Slider> On<T>() where T : IConfigPlatfor
 		{
 			return _platformConfigurationRegistry.Value.On<T>();
 		}
+
+		IImageSource ISlider.ThumbImageSource => ThumbImageSource;
+
+		void ISlider.DragCompleted()
+		{
+			(this as ISliderController).SendDragCompleted();
+		}
+
+		void ISlider.DragStarted()
+		{
+			(this as ISliderController).SendDragStarted();
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/src/Core/Stepper.cs b/src/Controls/src/Core/Stepper/Stepper.cs
similarity index 100%
rename from src/Controls/src/Core/Stepper.cs
rename to src/Controls/src/Core/Stepper/Stepper.cs
diff --git a/src/Controls/src/Core/SwipeEventArgs.cs b/src/Controls/src/Core/SwipeView/SwipeEventArgs.cs
similarity index 100%
rename from src/Controls/src/Core/SwipeEventArgs.cs
rename to src/Controls/src/Core/SwipeView/SwipeEventArgs.cs
diff --git a/src/Controls/src/Core/SwipeItem.cs b/src/Controls/src/Core/SwipeView/SwipeItem.cs
similarity index 70%
rename from src/Controls/src/Core/SwipeItem.cs
rename to src/Controls/src/Core/SwipeView/SwipeItem.cs
index e723d9ac9326..dbb6fa7a0116 100644
--- a/src/Controls/src/Core/SwipeItem.cs
+++ b/src/Controls/src/Core/SwipeView/SwipeItem.cs
@@ -6,7 +6,7 @@
 namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/SwipeItem.xml" path="Type[@FullName='Microsoft.Maui.Controls.SwipeItem']/Docs/*" />
-	public partial class SwipeItem : MenuItem, Controls.ISwipeItem
+	public partial class SwipeItem : MenuItem, Controls.ISwipeItem, Maui.ISwipeItemMenuItem
 	{
 		/// <summary>Bindable property for <see cref="BackgroundColor"/>.</summary>
 		public static readonly BindableProperty BackgroundColorProperty = BindableProperty.Create(nameof(BackgroundColor), typeof(Color), typeof(SwipeItem), null);
@@ -29,5 +29,22 @@ public bool IsVisible
 		}
 
 		public event EventHandler<EventArgs> Invoked;
+
+		Paint ISwipeItemMenuItem.Background => new SolidPaint(BackgroundColor);
+
+		Visibility ISwipeItemMenuItem.Visibility => this.IsVisible ? Visibility.Visible : Visibility.Collapsed;
+
+		void Maui.ISwipeItem.OnInvoked()
+		{
+			if (Command != null && Command.CanExecute(CommandParameter))
+				Command.Execute(CommandParameter);
+
+			OnClicked();
+			Invoked?.Invoke(this, EventArgs.Empty);
+		}
+
+		void IImageSourcePart.UpdateIsLoading(bool isLoading)
+		{
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/src/Core/SwipeItemView.cs b/src/Controls/src/Core/SwipeView/SwipeItemView.cs
similarity index 100%
rename from src/Controls/src/Core/SwipeItemView.cs
rename to src/Controls/src/Core/SwipeView/SwipeItemView.cs
diff --git a/src/Controls/src/Core/SwipeItems.cs b/src/Controls/src/Core/SwipeView/SwipeItems.cs
similarity index 100%
rename from src/Controls/src/Core/SwipeItems.cs
rename to src/Controls/src/Core/SwipeView/SwipeItems.cs
diff --git a/src/Controls/src/Core/SwipeView.cs b/src/Controls/src/Core/SwipeView/SwipeView.cs
similarity index 61%
rename from src/Controls/src/Core/SwipeView.cs
rename to src/Controls/src/Core/SwipeView/SwipeView.cs
index 9fd66d6feb2b..a51d1315796b 100644
--- a/src/Controls/src/Core/SwipeView.cs
+++ b/src/Controls/src/Core/SwipeView/SwipeView.cs
@@ -7,7 +7,7 @@ namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/SwipeView.xml" path="Type[@FullName='Microsoft.Maui.Controls.SwipeView']/Docs/*" />
 	[ContentProperty(nameof(Content))]
-	public partial class SwipeView : ContentView, IElementConfiguration<SwipeView>, ISwipeViewController
+	public partial class SwipeView : ContentView, IElementConfiguration<SwipeView>, ISwipeViewController, ISwipeView
 	{
 		readonly Lazy<PlatformConfigurationRegistry<SwipeView>> _platformConfigurationRegistry;
 
@@ -210,5 +210,182 @@ void UpdateSwipeItemsParent(SwipeItems swipeItems)
 					swipeItem.Parent = swipeItems;
 			}
 		}
+
+#nullable enable
+		bool _isOpen;
+		double _previousScrollX;
+		double _previousScrollY;
+		View? _scrollParent;
+		const float SwipeMinimumDelta = 10f;
+
+		ISwipeItems ISwipeView.LeftItems => new HandlerSwipeItems(LeftItems);
+
+		ISwipeItems ISwipeView.RightItems => new HandlerSwipeItems(RightItems);
+
+		ISwipeItems ISwipeView.TopItems => new HandlerSwipeItems(TopItems);
+
+		ISwipeItems ISwipeView.BottomItems => new HandlerSwipeItems(BottomItems);
+
+		bool ISwipeView.IsOpen
+		{
+			get => _isOpen;
+			set
+			{
+				_isOpen = value;
+				Handler?.UpdateValue(nameof(ISwipeView.IsOpen));
+			}
+		}
+
+#if IOS
+		SwipeTransitionMode ISwipeView.SwipeTransitionMode =>
+			Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific.SwipeView.GetSwipeTransitionMode(this);
+#elif ANDROID
+		SwipeTransitionMode ISwipeView.SwipeTransitionMode =>
+			Microsoft.Maui.Controls.PlatformConfiguration.AndroidSpecific.SwipeView.GetSwipeTransitionMode(this);
+#else
+		SwipeTransitionMode ISwipeView.SwipeTransitionMode => SwipeTransitionMode.Reveal;
+#endif
+
+		protected override void OnChildAdded(Element child)
+		{
+			base.OnChildAdded(child);
+			child.PropertyChanged += OnPropertyChanged;
+		}
+
+		protected override void OnChildRemoved(Element child, int oldLogicalIndex)
+		{
+			base.OnChildRemoved(child, oldLogicalIndex);
+			child.PropertyChanged -= OnPropertyChanged;
+		}
+
+		void OnPropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
+		{
+			if (e.PropertyName == IsEnabledProperty.PropertyName)
+				Handler?.UpdateValue(nameof(IsEnabled));
+			else if (e.PropertyName == MarginProperty.PropertyName)
+				UpdateMargin();
+		}
+
+		private protected override void OnParentChangedCore()
+		{
+			if (_scrollParent != null)
+			{
+				if (_scrollParent is ScrollView scrollView)
+				{
+					scrollView.Scrolled -= OnParentScrolled;
+				}
+
+				if (_scrollParent is ListView listView)
+				{
+					listView.Scrolled -= OnParentScrolled;
+					return;
+				}
+
+				if (_scrollParent is Microsoft.Maui.Controls.CollectionView collectionView)
+				{
+					collectionView.Scrolled -= OnParentScrolled;
+				}
+
+				_scrollParent = null;
+			}
+
+			base.OnParentChangedCore();
+
+			if (_scrollParent == null)
+			{
+				_scrollParent = this.FindParentOfType<ScrollView>();
+
+				if (_scrollParent is ScrollView scrollView)
+				{
+					scrollView.Scrolled += OnParentScrolled;
+					return;
+				}
+
+				_scrollParent = this.FindParentOfType<ListView>();
+
+				if (_scrollParent is ListView listView)
+				{
+					listView.Scrolled += OnParentScrolled;
+					return;
+				}
+
+				_scrollParent = this.FindParentOfType<Microsoft.Maui.Controls.CollectionView>();
+
+				if (_scrollParent is Microsoft.Maui.Controls.CollectionView collectionView)
+				{
+					collectionView.Scrolled += OnParentScrolled;
+				}
+			}
+		}
+
+		void UpdateMargin()
+		{
+			if (this is not ISwipeView swipeView)
+				return;
+
+			if (swipeView.IsOpen)
+				swipeView.RequestClose(new SwipeViewCloseRequest(false));
+		}
+
+		void OnParentScrolled(object? sender, ScrolledEventArgs e)
+		{
+			var horizontalDelta = e.ScrollX - _previousScrollX;
+			var verticalDelta = e.ScrollY - _previousScrollY;
+
+			if (horizontalDelta > SwipeMinimumDelta || verticalDelta > SwipeMinimumDelta)
+				((ISwipeView)this).RequestClose(new SwipeViewCloseRequest(true));
+
+			_previousScrollX = e.ScrollX;
+			_previousScrollY = e.ScrollY;
+		}
+
+		void OnParentScrolled(object? sender, ItemsViewScrolledEventArgs e)
+		{
+			if (e.HorizontalDelta > SwipeMinimumDelta || e.VerticalDelta > SwipeMinimumDelta)
+				((ISwipeView)this).RequestClose(new SwipeViewCloseRequest(true));
+		}
+
+		void ISwipeView.SwipeStarted(SwipeViewSwipeStarted swipeStarted)
+		{
+			var swipeStartedEventArgs = new SwipeStartedEventArgs(swipeStarted.SwipeDirection);
+			((ISwipeViewController)this).SendSwipeStarted(swipeStartedEventArgs);
+		}
+
+		void ISwipeView.SwipeChanging(SwipeViewSwipeChanging swipeChanging)
+		{
+			var swipeChangingEventArgs = new SwipeChangingEventArgs(swipeChanging.SwipeDirection, swipeChanging.Offset);
+			((ISwipeViewController)this).SendSwipeChanging(swipeChangingEventArgs);
+		}
+
+		void ISwipeView.SwipeEnded(SwipeViewSwipeEnded swipeEnded)
+		{
+			var swipeEndedEventArgs = new SwipeEndedEventArgs(swipeEnded.SwipeDirection, swipeEnded.IsOpen);
+			((ISwipeViewController)this).SendSwipeEnded(swipeEndedEventArgs);
+		}
+
+		void ISwipeView.RequestOpen(SwipeViewOpenRequest swipeOpenRequest)
+		{
+			Handler?.Invoke(nameof(ISwipeView.RequestOpen), swipeOpenRequest);
+		}
+
+		void ISwipeView.RequestClose(SwipeViewCloseRequest swipeCloseRequest)
+		{
+			Handler?.Invoke(nameof(ISwipeView.RequestClose), swipeCloseRequest);
+		}
+
+		class HandlerSwipeItems : List<Maui.ISwipeItem>, ISwipeItems
+		{
+			readonly SwipeItems _swipeItems;
+
+			public HandlerSwipeItems(SwipeItems swipeItems) : base(swipeItems)
+			{
+				_swipeItems = swipeItems;
+			}
+
+			public SwipeMode Mode => _swipeItems.Mode;
+
+			public SwipeBehaviorOnInvoked SwipeBehaviorOnInvoked => _swipeItems.SwipeBehaviorOnInvoked;
+		}
+#nullable disable
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/src/Core/SwipedEventArgs.cs b/src/Controls/src/Core/SwipeView/SwipedEventArgs.cs
similarity index 100%
rename from src/Controls/src/Core/SwipedEventArgs.cs
rename to src/Controls/src/Core/SwipeView/SwipedEventArgs.cs
diff --git a/src/Controls/src/Core/Switch.cs b/src/Controls/src/Core/Switch/Switch.cs
similarity index 85%
rename from src/Controls/src/Core/Switch.cs
rename to src/Controls/src/Core/Switch/Switch.cs
index 763ec4a559be..7a6abd0bef52 100644
--- a/src/Controls/src/Core/Switch.cs
+++ b/src/Controls/src/Core/Switch/Switch.cs
@@ -1,11 +1,12 @@
 #nullable disable
 using System;
+using System.Runtime.CompilerServices;
 using Microsoft.Maui.Graphics;
 
 namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/Switch.xml" path="Type[@FullName='Microsoft.Maui.Controls.Switch']/Docs/*" />
-	public partial class Switch : View, IElementConfiguration<Switch>
+	public partial class Switch : View, IElementConfiguration<Switch>, ISwitch
 	{
 		/// <include file="../../docs/Microsoft.Maui.Controls/Switch.xml" path="//Member[@MemberName='SwitchOnVisualState']/Docs/*" />
 		public const string SwitchOnVisualState = "On";
@@ -76,5 +77,35 @@ public IPlatformElementConfiguration<T, Switch> On<T>() where T : IConfigPlatfor
 		{
 			return _platformConfigurationRegistry.Value.On<T>();
 		}
+
+		// TODO This should get moved to a remapped mapper
+		protected override void OnPropertyChanged([CallerMemberName] string propertyName = null)
+		{
+			base.OnPropertyChanged(propertyName);
+
+			if (propertyName == IsToggledProperty.PropertyName)
+				Handler?.UpdateValue(nameof(ISwitch.IsOn));
+		}
+
+		Color ISwitch.TrackColor
+		{
+			get
+			{
+#if WINDOWS
+				return OnColor;
+#else
+				if (IsToggled)
+					return OnColor;
+
+				return null;
+#endif
+			}
+		}
+
+		bool ISwitch.IsOn
+		{
+			get => IsToggled;
+			set => IsToggled = value;
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/src/Core/HandlerImpl/TabbedPage/TabbedPage.Android.cs b/src/Controls/src/Core/TabbedPage/TabbedPage.Android.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/TabbedPage/TabbedPage.Android.cs
rename to src/Controls/src/Core/TabbedPage/TabbedPage.Android.cs
diff --git a/src/Controls/src/Core/HandlerImpl/TabbedPage/TabbedPage.cs b/src/Controls/src/Core/TabbedPage/TabbedPage.Mapper.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/TabbedPage/TabbedPage.cs
rename to src/Controls/src/Core/TabbedPage/TabbedPage.Mapper.cs
diff --git a/src/Controls/src/Core/HandlerImpl/TabbedPage/TabbedPage.Standard.cs b/src/Controls/src/Core/TabbedPage/TabbedPage.Standard.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/TabbedPage/TabbedPage.Standard.cs
rename to src/Controls/src/Core/TabbedPage/TabbedPage.Standard.cs
diff --git a/src/Controls/src/Core/HandlerImpl/TabbedPage/TabbedPage.Tizen.cs b/src/Controls/src/Core/TabbedPage/TabbedPage.Tizen.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/TabbedPage/TabbedPage.Tizen.cs
rename to src/Controls/src/Core/TabbedPage/TabbedPage.Tizen.cs
diff --git a/src/Controls/src/Core/HandlerImpl/TabbedPage/TabbedPage.Windows.cs b/src/Controls/src/Core/TabbedPage/TabbedPage.Windows.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/TabbedPage/TabbedPage.Windows.cs
rename to src/Controls/src/Core/TabbedPage/TabbedPage.Windows.cs
diff --git a/src/Controls/src/Core/TabbedPage.cs b/src/Controls/src/Core/TabbedPage/TabbedPage.cs
similarity index 71%
rename from src/Controls/src/Core/TabbedPage.cs
rename to src/Controls/src/Core/TabbedPage/TabbedPage.cs
index 676acb584e08..563ec1482e15 100644
--- a/src/Controls/src/Core/TabbedPage.cs
+++ b/src/Controls/src/Core/TabbedPage/TabbedPage.cs
@@ -6,7 +6,7 @@ namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/TabbedPage.xml" path="Type[@FullName='Microsoft.Maui.Controls.TabbedPage']/Docs/*" />
 	[ContentProperty(nameof(Children))]
-	public partial class TabbedPage : MultiPage<Page>, IBarElement, IElementConfiguration<TabbedPage>
+	public partial class TabbedPage : MultiPage<Page>, IBarElement, IElementConfiguration<TabbedPage>, ITabbedView
 	{
 		/// <summary>Bindable property for <see cref="BarBackgroundColor"/>.</summary>
 		public static readonly BindableProperty BarBackgroundColorProperty = BarElement.BarBackgroundColorProperty;
@@ -79,5 +79,53 @@ public TabbedPage()
 		{
 			return _platformConfigurationRegistry.Value.On<T>();
 		}
+
+		protected override void LayoutChildren(double x, double y, double width, double height)
+		{
+			// We don't want forcelayout to call the legacy
+			// Page.LayoutChildren code
+		}
+
+		partial void OnHandlerChangingPartial(HandlerChangingEventArgs args);
+		private protected override void OnHandlerChangingCore(HandlerChangingEventArgs args)
+		{
+			base.OnHandlerChangingCore(args);
+
+			if (args.NewHandler == null)
+			{
+				PagesChanged -= OnPagesChanged;
+				WireUnwireChanges(false);
+			}
+			else if (args.OldHandler == null)
+			{
+				PagesChanged += OnPagesChanged;
+				WireUnwireChanges(true);
+			}
+
+			OnHandlerChangingPartial(args);
+			void OnPagesChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
+			{
+				WireUnwireChanges(false);
+				Handler?.UpdateValue(TabbedPage.ItemsSourceProperty.PropertyName);
+				WireUnwireChanges(true);
+			}
+
+			void WireUnwireChanges(bool wire)
+			{
+				foreach (var page in Children)
+				{
+					if (wire)
+						page.PropertyChanged += OnPagePropertyChanged;
+					else
+						page.PropertyChanged -= OnPagePropertyChanged;
+				}
+			}
+
+			void OnPagePropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+			{
+				if (e.PropertyName == Page.TitleProperty.PropertyName)
+					Handler?.UpdateValue(TabbedPage.ItemsSourceProperty.PropertyName);
+			}
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/src/Core/HandlerImpl/TabbedPage/TabbedPage.iOS.cs b/src/Controls/src/Core/TabbedPage/TabbedPage.iOS.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/TabbedPage/TabbedPage.iOS.cs
rename to src/Controls/src/Core/TabbedPage/TabbedPage.iOS.cs
diff --git a/src/Controls/src/Core/ChildCollectionChangedEventArgs.cs b/src/Controls/src/Core/TableView/ChildCollectionChangedEventArgs.cs
similarity index 100%
rename from src/Controls/src/Core/ChildCollectionChangedEventArgs.cs
rename to src/Controls/src/Core/TableView/ChildCollectionChangedEventArgs.cs
diff --git a/src/Controls/src/Core/TableIntent.cs b/src/Controls/src/Core/TableView/TableIntent.cs
similarity index 100%
rename from src/Controls/src/Core/TableIntent.cs
rename to src/Controls/src/Core/TableView/TableIntent.cs
diff --git a/src/Controls/src/Core/TableModel.cs b/src/Controls/src/Core/TableView/TableModel.cs
similarity index 100%
rename from src/Controls/src/Core/TableModel.cs
rename to src/Controls/src/Core/TableView/TableModel.cs
diff --git a/src/Controls/src/Core/TableRoot.cs b/src/Controls/src/Core/TableView/TableRoot.cs
similarity index 100%
rename from src/Controls/src/Core/TableRoot.cs
rename to src/Controls/src/Core/TableView/TableRoot.cs
diff --git a/src/Controls/src/Core/TableSection.cs b/src/Controls/src/Core/TableView/TableSection.cs
similarity index 100%
rename from src/Controls/src/Core/TableSection.cs
rename to src/Controls/src/Core/TableView/TableSection.cs
diff --git a/src/Controls/src/Core/TableSectionBase.cs b/src/Controls/src/Core/TableView/TableSectionBase.cs
similarity index 100%
rename from src/Controls/src/Core/TableSectionBase.cs
rename to src/Controls/src/Core/TableView/TableSectionBase.cs
diff --git a/src/Controls/src/Core/TableView.cs b/src/Controls/src/Core/TableView/TableView.cs
similarity index 100%
rename from src/Controls/src/Core/TableView.cs
rename to src/Controls/src/Core/TableView/TableView.cs
diff --git a/src/Controls/src/Core/TemplatedView.cs b/src/Controls/src/Core/TemplatedView/TemplatedView.cs
similarity index 79%
rename from src/Controls/src/Core/TemplatedView.cs
rename to src/Controls/src/Core/TemplatedView/TemplatedView.cs
index 789e7286d180..4f27524bc68c 100644
--- a/src/Controls/src/Core/TemplatedView.cs
+++ b/src/Controls/src/Core/TemplatedView/TemplatedView.cs
@@ -1,13 +1,13 @@
 #nullable disable
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Layouts;
 
 namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/TemplatedView.xml" path="Type[@FullName='Microsoft.Maui.Controls.TemplatedView']/Docs/*" />
-	public partial class TemplatedView : Compatibility.Layout, IControlTemplated
+	public partial class TemplatedView : Compatibility.Layout, IControlTemplated, IContentView
 	{
 		/// <summary>Bindable property for <see cref="ControlTemplate"/>.</summary>
 		public static readonly BindableProperty ControlTemplateProperty = BindableProperty.Create(nameof(ControlTemplate), typeof(ControlTemplate), typeof(TemplatedView), null,
@@ -106,5 +106,42 @@ public virtual ControlTemplate ResolveControlTemplate()
 		{
 			return ControlTemplate;
 		}
+
+#nullable enable
+		object? IContentView.Content => null;
+
+		IView? IContentView.PresentedContent =>
+			(this as IControlTemplated).TemplateRoot as IView;
+
+		partial void OnApplyTemplateImpl()
+		{
+			Handler?.UpdateValue(nameof(IContentView.Content));
+		}
+
+		protected override Size MeasureOverride(double widthConstraint, double heightConstraint)
+		{
+			DesiredSize = this.ComputeDesiredSize(widthConstraint, heightConstraint);
+			return DesiredSize;
+		}
+
+		Size IContentView.CrossPlatformMeasure(double widthConstraint, double heightConstraint)
+		{
+			return this.MeasureContent(widthConstraint, heightConstraint);
+		}
+
+		protected override Size ArrangeOverride(Rect bounds)
+		{
+			Frame = this.ComputeFrame(bounds);
+			Handler?.PlatformArrange(Frame);
+			return Frame.Size;
+		}
+
+		Size IContentView.CrossPlatformArrange(Rect bounds)
+		{
+			this.ArrangeContent(bounds);
+			return bounds.Size;
+		}
+#nullable disable
+
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/src/Core/HandlerImpl/TimePicker/TimePicker.Android.cs b/src/Controls/src/Core/TimePicker/TimePicker.Android.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/TimePicker/TimePicker.Android.cs
rename to src/Controls/src/Core/TimePicker/TimePicker.Android.cs
diff --git a/src/Controls/src/Core/HandlerImpl/TimePicker/TimePicker.cs b/src/Controls/src/Core/TimePicker/TimePicker.Mapper.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/TimePicker/TimePicker.cs
rename to src/Controls/src/Core/TimePicker/TimePicker.Mapper.cs
diff --git a/src/Controls/src/Core/HandlerImpl/TimePicker/TimePicker.Standard.cs b/src/Controls/src/Core/TimePicker/TimePicker.Standard.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/TimePicker/TimePicker.Standard.cs
rename to src/Controls/src/Core/TimePicker/TimePicker.Standard.cs
diff --git a/src/Controls/src/Core/HandlerImpl/TimePicker/TimePicker.Windows.cs b/src/Controls/src/Core/TimePicker/TimePicker.Windows.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/TimePicker/TimePicker.Windows.cs
rename to src/Controls/src/Core/TimePicker/TimePicker.Windows.cs
diff --git a/src/Controls/src/Core/TimePicker.cs b/src/Controls/src/Core/TimePicker/TimePicker.cs
similarity index 98%
rename from src/Controls/src/Core/TimePicker.cs
rename to src/Controls/src/Core/TimePicker/TimePicker.cs
index 1b4b6f0bc5fb..303a63be1d94 100644
--- a/src/Controls/src/Core/TimePicker.cs
+++ b/src/Controls/src/Core/TimePicker/TimePicker.cs
@@ -6,7 +6,7 @@
 namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/TimePicker.xml" path="Type[@FullName='Microsoft.Maui.Controls.TimePicker']/Docs/*" />
-	public partial class TimePicker : View, IFontElement, ITextElement, IElementConfiguration<TimePicker>
+	public partial class TimePicker : View, IFontElement, ITextElement, IElementConfiguration<TimePicker>, ITimePicker
 	{
 		/// <summary>Bindable property for <see cref="Format"/>.</summary>
 		public static readonly BindableProperty FormatProperty = BindableProperty.Create(nameof(Format), typeof(string), typeof(TimePicker), "t");
@@ -149,5 +149,7 @@ void ITextElement.OnCharacterSpacingPropertyChanged(double oldValue, double newV
 
 		void ITextElement.OnTextTransformChanged(TextTransform oldValue, TextTransform newValue)
 			=> InvalidateMeasureInternal(InvalidationTrigger.MeasureChanged);
+
+		Font ITextStyle.Font => this.ToFont();
 	}
 }
diff --git a/src/Controls/src/Core/HandlerImpl/TimePicker/TimePicker.iOS.cs b/src/Controls/src/Core/TimePicker/TimePicker.iOS.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/TimePicker/TimePicker.iOS.cs
rename to src/Controls/src/Core/TimePicker/TimePicker.iOS.cs
diff --git a/src/Controls/src/Core/HandlerImpl/Toolbar/Toolbar.Android.cs b/src/Controls/src/Core/Toolbar/Toolbar.Android.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Toolbar/Toolbar.Android.cs
rename to src/Controls/src/Core/Toolbar/Toolbar.Android.cs
diff --git a/src/Controls/src/Core/HandlerImpl/Toolbar/Toolbar.cs b/src/Controls/src/Core/Toolbar/Toolbar.Mapper.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Toolbar/Toolbar.cs
rename to src/Controls/src/Core/Toolbar/Toolbar.Mapper.cs
diff --git a/src/Controls/src/Core/HandlerImpl/Toolbar/Toolbar.Tizen.cs b/src/Controls/src/Core/Toolbar/Toolbar.Tizen.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Toolbar/Toolbar.Tizen.cs
rename to src/Controls/src/Core/Toolbar/Toolbar.Tizen.cs
diff --git a/src/Controls/src/Core/HandlerImpl/Toolbar/Toolbar.Windows.cs b/src/Controls/src/Core/Toolbar/Toolbar.Windows.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Toolbar/Toolbar.Windows.cs
rename to src/Controls/src/Core/Toolbar/Toolbar.Windows.cs
diff --git a/src/Controls/src/Core/Toolbar.cs b/src/Controls/src/Core/Toolbar/Toolbar.cs
similarity index 100%
rename from src/Controls/src/Core/Toolbar.cs
rename to src/Controls/src/Core/Toolbar/Toolbar.cs
diff --git a/src/Controls/src/Core/ToolbarItem.cs b/src/Controls/src/Core/Toolbar/ToolbarItem.cs
similarity index 100%
rename from src/Controls/src/Core/ToolbarItem.cs
rename to src/Controls/src/Core/Toolbar/ToolbarItem.cs
diff --git a/src/Controls/src/Core/ToolbarItemEventArgs.cs b/src/Controls/src/Core/Toolbar/ToolbarItemEventArgs.cs
similarity index 100%
rename from src/Controls/src/Core/ToolbarItemEventArgs.cs
rename to src/Controls/src/Core/Toolbar/ToolbarItemEventArgs.cs
diff --git a/src/Controls/src/Core/ToolbarItemOrder.cs b/src/Controls/src/Core/Toolbar/ToolbarItemOrder.cs
similarity index 100%
rename from src/Controls/src/Core/ToolbarItemOrder.cs
rename to src/Controls/src/Core/Toolbar/ToolbarItemOrder.cs
diff --git a/src/Controls/src/Core/ToolbarTracker.cs b/src/Controls/src/Core/Toolbar/ToolbarTracker.cs
similarity index 100%
rename from src/Controls/src/Core/ToolbarTracker.cs
rename to src/Controls/src/Core/Toolbar/ToolbarTracker.cs
diff --git a/src/Controls/src/Core/HandlerImpl/View/View.Android.cs b/src/Controls/src/Core/View/View.Android.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/View/View.Android.cs
rename to src/Controls/src/Core/View/View.Android.cs
diff --git a/src/Controls/src/Core/View.cs b/src/Controls/src/Core/View/View.cs
similarity index 84%
rename from src/Controls/src/Core/View.cs
rename to src/Controls/src/Core/View/View.cs
index 3d528c0d0ef5..43a9ca7429b1 100644
--- a/src/Controls/src/Core/View.cs
+++ b/src/Controls/src/Core/View/View.cs
@@ -8,11 +8,12 @@
 using Microsoft.Maui.Controls.Internals;
 using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.HotReload;
 
 namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/View.xml" path="Type[@FullName='Microsoft.Maui.Controls.View']/Docs/*" />
-	public partial class View : VisualElement, IViewController, IGestureController, IGestureRecognizers
+	public partial class View : VisualElement, IViewController, IGestureController, IGestureRecognizers, IView, IPropertyMapperView, IHotReloadableView, IControlsView
 	{
 		protected internal IGestureController GestureController => this;
 
@@ -230,5 +231,57 @@ void ValidateGesture(IGestureRecognizer gesture)
 			if (gesture is PinchGestureRecognizer && _gestureRecognizers.GetGesturesFor<PinchGestureRecognizer>().Count() > 1)
 				throw new InvalidOperationException($"Only one {nameof(PinchGestureRecognizer)} per view is allowed");
 		}
+
+#nullable enable
+		Thickness IView.Margin => Margin;
+		partial void HandlerChangedPartial();
+		GestureManager _gestureManager;
+
+		private protected override void OnHandlerChangedCore()
+		{
+			base.OnHandlerChangedCore();
+
+			HandlerChangedPartial();
+		}
+
+		protected PropertyMapper propertyMapper;
+
+		internal protected PropertyMapper<T> GetRendererOverrides<T>() where T : IView =>
+			(PropertyMapper<T>)(propertyMapper as PropertyMapper<T> ?? (propertyMapper = new PropertyMapper<T>()));
+
+		PropertyMapper IPropertyMapperView.GetPropertyMapperOverrides() => propertyMapper;
+
+		Primitives.LayoutAlignment IView.HorizontalLayoutAlignment => HorizontalOptions.ToCore();
+		Primitives.LayoutAlignment IView.VerticalLayoutAlignment => VerticalOptions.ToCore();
+
+		#region HotReload
+
+		IView IReplaceableView.ReplacedView =>
+			MauiHotReloadHelper.GetReplacedView(this) ?? this;
+
+		IReloadHandler IHotReloadableView.ReloadHandler { get; set; }
+
+		void IHotReloadableView.TransferState(IView newView)
+		{
+			//TODO: LEt you hot reload the the ViewModel
+			if (newView is View v)
+				v.BindingContext = BindingContext;
+		}
+
+		void IHotReloadableView.Reload()
+		{
+			Dispatcher.Dispatch(() =>
+			{
+				this.CheckHandlers();
+				//Handler = null;
+				var reloadHandler = ((IHotReloadableView)this).ReloadHandler;
+				reloadHandler?.Reload();
+				//TODO: if reload handler is null, Do a manual reload?
+			});
+		}
+
+		#endregion
+
+#nullable disable
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/src/Core/HandlerImpl/VisualElement/VisualElement.Android.cs b/src/Controls/src/Core/VisualElement/VisualElement.Android.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/VisualElement/VisualElement.Android.cs
rename to src/Controls/src/Core/VisualElement/VisualElement.Android.cs
diff --git a/src/Controls/src/Core/HandlerImpl/VisualElement/VisualElement.cs b/src/Controls/src/Core/VisualElement/VisualElement.Mapper.cs
similarity index 95%
rename from src/Controls/src/Core/HandlerImpl/VisualElement/VisualElement.cs
rename to src/Controls/src/Core/VisualElement/VisualElement.Mapper.cs
index fa98561e72d0..f702843fbb8a 100644
--- a/src/Controls/src/Core/HandlerImpl/VisualElement/VisualElement.cs
+++ b/src/Controls/src/Core/VisualElement/VisualElement.Mapper.cs
@@ -4,7 +4,7 @@
 
 namespace Microsoft.Maui.Controls
 {
-	/// <include file="../../../../docs/Microsoft.Maui.Controls/VisualElement.xml" path="Type[@FullName='Microsoft.Maui.Controls.VisualElement']/Docs/*" />
+	/// <include file="../../../docs/Microsoft.Maui.Controls/VisualElement.xml" path="Type[@FullName='Microsoft.Maui.Controls.VisualElement']/Docs/*" />
 	public partial class VisualElement
 	{
 		public static IPropertyMapper<IView, IViewHandler> ControlsVisualElementMapper =
diff --git a/src/Controls/src/Core/HandlerImpl/VisualElement/VisualElement.Platform.cs b/src/Controls/src/Core/VisualElement/VisualElement.Platform.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/VisualElement/VisualElement.Platform.cs
rename to src/Controls/src/Core/VisualElement/VisualElement.Platform.cs
diff --git a/src/Controls/src/Core/HandlerImpl/VisualElement/VisualElement.Standard.cs b/src/Controls/src/Core/VisualElement/VisualElement.Standard.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/VisualElement/VisualElement.Standard.cs
rename to src/Controls/src/Core/VisualElement/VisualElement.Standard.cs
diff --git a/src/Controls/src/Core/HandlerImpl/VisualElement/VisualElement.Tizen.cs b/src/Controls/src/Core/VisualElement/VisualElement.Tizen.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/VisualElement/VisualElement.Tizen.cs
rename to src/Controls/src/Core/VisualElement/VisualElement.Tizen.cs
diff --git a/src/Controls/src/Core/HandlerImpl/VisualElement/VisualElement.Windows.cs b/src/Controls/src/Core/VisualElement/VisualElement.Windows.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/VisualElement/VisualElement.Windows.cs
rename to src/Controls/src/Core/VisualElement/VisualElement.Windows.cs
diff --git a/src/Controls/src/Core/VisualElement.cs b/src/Controls/src/Core/VisualElement/VisualElement.cs
similarity index 81%
rename from src/Controls/src/Core/VisualElement.cs
rename to src/Controls/src/Core/VisualElement/VisualElement.cs
index 8439cc244eef..5b91b38c97d1 100644
--- a/src/Controls/src/Core/VisualElement.cs
+++ b/src/Controls/src/Core/VisualElement/VisualElement.cs
@@ -6,13 +6,14 @@
 using Microsoft.Maui.Controls.Internals;
 using Microsoft.Maui.Controls.Shapes;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Layouts;
 using Geometry = Microsoft.Maui.Controls.Shapes.Geometry;
 using Rect = Microsoft.Maui.Graphics.Rect;
 
 namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/VisualElement.xml" path="Type[@FullName='Microsoft.Maui.Controls.VisualElement']/Docs/*" />
-	public partial class VisualElement : NavigableElement, IAnimatable, IVisualElementController, IResourcesProvider, IStyleElement, IFlowDirectionController, IPropertyPropagationController, IVisualController, IWindowController
+	public partial class VisualElement : NavigableElement, IAnimatable, IVisualElementController, IResourcesProvider, IStyleElement, IFlowDirectionController, IPropertyPropagationController, IVisualController, IWindowController, IView, IControlsVisualElement
 	{
 		/// <include file="../../docs/Microsoft.Maui.Controls/VisualElement.xml" path="//Member[@MemberName='NavigationProperty']/Docs/*" />
 		public new static readonly BindableProperty NavigationProperty = NavigableElement.NavigationProperty;
@@ -1361,6 +1362,492 @@ void UpdateBoundsComponents(Rect bounds)
 			BatchCommit();
 		}
 
+#nullable enable
+		Semantics? _semantics;
+		bool _isLoadedFired;
+		EventHandler? _loaded;
+		EventHandler? _unloaded;
+		bool _watchingPlatformLoaded;
+		Rect _frame = new Rect(0, 0, -1, -1);
+		event EventHandler? _windowChanged;
+		event EventHandler? _platformContainerViewChanged;
+
+		public Rect Frame
+		{
+			get => _frame;
+			set
+			{
+				if (_frame == value)
+					return;
+
+				UpdateBoundsComponents(value);
+			}
+		}
+
+		new public IViewHandler? Handler
+		{
+			get => (IViewHandler?)base.Handler;
+			set => base.Handler = value;
+		}
+
+		private protected override void OnHandlerChangedCore()
+		{
+			base.OnHandlerChangedCore();
+
+			IsPlatformEnabled = Handler != null;
+			UpdatePlatformUnloadedLoadedWiring(Window);
+		}
+
+		Paint? IView.Background
+		{
+			get
+			{
+				if (!Brush.IsNullOrEmpty(Background))
+					return Background;
+				if (BackgroundColor.IsNotDefault())
+					return new SolidColorBrush(BackgroundColor);
+
+				return null;
+			}
+		}
+
+		IShape IView.Clip => Clip;
+
+		IShadow IView.Shadow => Shadow;
+
+		/// <summary>Bindable property for <see cref="Shadow"/>.</summary>
+		public static readonly BindableProperty ShadowProperty =
+ 			BindableProperty.Create(nameof(Shadow), typeof(Shadow), typeof(VisualElement), defaultValue: null,
+				propertyChanging: (bindable, oldvalue, newvalue) =>
+				{
+					if (oldvalue != null)
+						(bindable as VisualElement)?.StopNotifyingShadowChanges();
+				},
+				propertyChanged: (bindable, oldvalue, newvalue) =>
+				{
+					if (newvalue != null)
+						(bindable as VisualElement)?.NotifyShadowChanges();
+				});
+
+		public Shadow Shadow
+		{
+			get { return (Shadow)GetValue(ShadowProperty); }
+			set { SetValue(ShadowProperty, value); }
+		}
+
+		/// <summary>Bindable property for <see cref="ZIndex"/>.</summary>
+		public static readonly BindableProperty ZIndexProperty =
+			BindableProperty.Create(nameof(ZIndex), typeof(int), typeof(VisualElement), default(int),
+				propertyChanged: ZIndexPropertyChanged);
+
+		static void ZIndexPropertyChanged(BindableObject bindable, object oldValue, object newValue)
+		{
+			if (bindable is IView view)
+			{
+				view.Handler?.Invoke(nameof(IView.ZIndex));
+			}
+		}
+
+		public int ZIndex
+		{
+			get { return (int)GetValue(ZIndexProperty); }
+			set { SetValue(ZIndexProperty, value); }
+		}
+
+		public Size DesiredSize { get; protected set; }
+
+		public void Arrange(Rect bounds)
+		{
+			Layout(bounds);
+		}
+
+		Size IView.Arrange(Rect bounds)
+		{
+			return ArrangeOverride(bounds);
+		}
+
+		// ArrangeOverride provides a way to allow subclasses (e.g., ScrollView) to override Arrange even though
+		// the interface has to be explicitly implemented to avoid conflict with the old Arrange method
+		protected virtual Size ArrangeOverride(Rect bounds)
+		{
+			Frame = this.ComputeFrame(bounds);
+			Handler?.PlatformArrange(Frame);
+			return Frame.Size;
+		}
+
+		/// <include file="../../../docs/Microsoft.Maui.Controls/VisualElement.xml" path="//Member[@MemberName='Layout']/Docs/*" />
+		public void Layout(Rect bounds)
+		{
+			Bounds = bounds;
+		}
+
+		void IView.InvalidateMeasure()
+		{
+			InvalidateMeasureOverride();
+		}
+
+		// InvalidateMeasureOverride provides a way to allow subclasses (e.g., Layout) to override InvalidateMeasure even though
+		// the interface has to be explicitly implemented to avoid conflict with the VisualElement.InvalidateMeasure method
+		protected virtual void InvalidateMeasureOverride() => Handler?.Invoke(nameof(IView.InvalidateMeasure));
+
+		void IView.InvalidateArrange()
+		{
+		}
+
+		Size IView.Measure(double widthConstraint, double heightConstraint)
+		{
+			return MeasureOverride(widthConstraint, heightConstraint);
+		}
+
+		// MeasureOverride provides a way to allow subclasses (e.g., Layout) to override Measure even though
+		// the interface has to be explicitly implemented to avoid conflict with the old Measure method
+		protected virtual Size MeasureOverride(double widthConstraint, double heightConstraint)
+		{
+			DesiredSize = this.ComputeDesiredSize(widthConstraint, heightConstraint);
+			return DesiredSize;
+		}
+
+		bool IView.IsFocused
+		{
+			get => (bool)GetValue(IsFocusedProperty);
+			set => SetValueCore(IsFocusedPropertyKey, value);
+		}
+
+		FlowDirection IView.FlowDirection => FlowDirection;
+
+		Primitives.LayoutAlignment IView.HorizontalLayoutAlignment => default;
+		Primitives.LayoutAlignment IView.VerticalLayoutAlignment => default;
+
+		Visibility IView.Visibility => IsVisible.ToVisibility();
+
+		Semantics? IView.Semantics => UpdateSemantics();
+
+		private protected virtual Semantics? UpdateSemantics()
+		{
+			if (!this.IsSet(SemanticProperties.HintProperty) &&
+				!this.IsSet(SemanticProperties.DescriptionProperty) &&
+				!this.IsSet(SemanticProperties.HeadingLevelProperty))
+			{
+				_semantics = null;
+				return _semantics;
+			}
+
+			_semantics ??= new Semantics();
+			_semantics.Description = SemanticProperties.GetDescription(this);
+			_semantics.HeadingLevel = SemanticProperties.GetHeadingLevel(this);
+			_semantics.Hint = SemanticProperties.GetHint(this);
+			return _semantics;
+		}
+
+		static double EnsurePositive(double value)
+		{
+			if (value < 0)
+			{
+				return 0;
+			}
+
+			return value;
+		}
+
+		double IView.Width
+		{
+			get
+			{
+				if (!IsSet(WidthRequestProperty))
+				{
+					return Primitives.Dimension.Unset;
+				}
+
+				// Access once up front to avoid multiple GetValue calls
+				var value = WidthRequest;
+
+				if (value == -1)
+				{
+					return Primitives.Dimension.Unset;
+				}
+
+				value = EnsurePositive(value);
+				return value;
+			}
+		}
+
+		double IView.Height
+		{
+			get
+			{
+				if (!IsSet(HeightRequestProperty))
+				{
+					return Primitives.Dimension.Unset;
+				}
+
+				// Access once up front to avoid multiple GetValue calls
+				var value = HeightRequest;
+
+				if (value == -1)
+				{
+					return Primitives.Dimension.Unset;
+				}
+
+				value = EnsurePositive(value);
+				return value;
+			}
+		}
+
+		double IView.MinimumWidth
+		{
+			get
+			{
+				if (!IsSet(MinimumWidthRequestProperty))
+				{
+					return Primitives.Dimension.Unset;
+				}
+
+				// Access once up front to avoid multiple GetValue calls
+				var value = MinimumWidthRequest;
+				value = EnsurePositive(value);
+				return value;
+			}
+		}
+
+		double IView.MinimumHeight
+		{
+			get
+			{
+				if (!IsSet(MinimumHeightRequestProperty))
+				{
+					return Primitives.Dimension.Unset;
+				}
+
+				// Access once up front to avoid multiple GetValue calls
+				var value = MinimumHeightRequest;
+				value = EnsurePositive(value);
+				return value;
+			}
+		}
+
+		double IView.MaximumWidth
+		{
+			get
+			{
+				// Access once up front to avoid multiple GetValue calls
+				var value = MaximumWidthRequest;
+				value = EnsurePositive(value);
+				return value;
+			}
+		}
+
+		double IView.MaximumHeight
+		{
+			get
+			{
+				// Access once up front to avoid multiple GetValue calls
+				var value = MaximumHeightRequest;
+				value = EnsurePositive(value);
+				return value;
+			}
+		}
+
+		Thickness IView.Margin => Thickness.Zero;
+
+		IElementHandler? Maui.IElement.Handler
+		{
+			get => base.Handler;
+			set
+			{
+				if (value != null && value is not IViewHandler)
+					throw new InvalidOperationException("Handler must be of type IViewHandler");
+
+				base.Handler = value;
+			}
+		}
+
+		void NotifyShadowChanges()
+		{
+			var shadow = Shadow;
+
+			if (shadow is not null)
+			{
+				SetInheritedBindingContext(shadow, BindingContext);
+				_shadowChanged ??= (sender, e) => OnPropertyChanged(nameof(Shadow));
+				_shadowProxy ??= new();
+				_shadowProxy.Subscribe(shadow, _shadowChanged);
+			}
+		}
+
+		void StopNotifyingShadowChanges()
+		{
+			var shadow = Shadow;
+
+			if (shadow is not null)
+			{
+				SetInheritedBindingContext(shadow, null);
+				_shadowProxy?.Unsubscribe();
+			}
+		}
+
+		void OnShadowChanged(object? sender, PropertyChangedEventArgs e)
+		{
+			OnPropertyChanged(nameof(Shadow));
+		}
+
+		void PropagateBindingContextToBrush()
+		{
+			if (Background != null)
+				SetInheritedBindingContext(Background, BindingContext);
+		}
+
+		void PropagateBindingContextToShadow()
+		{
+			if (Shadow != null)
+				SetInheritedBindingContext(Shadow, BindingContext);
+		}
+
+		/// <summary>
+		/// Indicates if a VisualElement is connected to the main object tree.
+		/// </summary>
+		public bool IsLoaded
+		{
+			get
+			{
+#if PLATFORM
+				bool isLoaded = (Handler as IPlatformViewHandler)?.PlatformView?.IsLoaded() == true;
+#else
+				bool isLoaded = Window != null;
+#endif
+
+				return isLoaded;
+			}
+		}
+
+		/// <summary>
+		/// Occurs when a VisualElement has been constructed and added to the object tree.
+		/// This event may occur before the VisualElement has been measured so should not be relied on for size information.  
+		/// </summary>
+		public event EventHandler? Loaded
+		{
+			add
+			{
+				_loaded += value;
+				UpdatePlatformUnloadedLoadedWiring(Window);
+				if (_isLoadedFired)
+					_loaded?.Invoke(this, EventArgs.Empty);
+
+			}
+			remove
+			{
+				_loaded -= value;
+				UpdatePlatformUnloadedLoadedWiring(Window);
+			}
+		}
+
+		/// <summary>
+		/// Occurs when this VisualElement is no longer connected to the main object tree.
+		/// </summary>
+		public event EventHandler? Unloaded
+		{
+			add
+			{
+				_unloaded += value;
+				UpdatePlatformUnloadedLoadedWiring(Window);
+			}
+			remove
+			{
+				_unloaded -= value;
+				UpdatePlatformUnloadedLoadedWiring(Window);
+			}
+		}
+
+		event EventHandler? IControlsVisualElement.WindowChanged
+		{
+			add => _windowChanged += value;
+			remove => _windowChanged -= value;
+		}
+
+		event EventHandler? IControlsVisualElement.PlatformContainerViewChanged
+		{
+			add => _platformContainerViewChanged += value;
+			remove => _platformContainerViewChanged -= value;
+		}
+
+		void OnLoadedCore()
+		{
+			if (_isLoadedFired)
+				return;
+
+			_isLoadedFired = true;
+			_loaded?.Invoke(this, EventArgs.Empty);
+		}
+
+		void OnUnloadedCore()
+		{
+			if (!_isLoadedFired)
+				return;
+
+			_isLoadedFired = false;
+			_unloaded?.Invoke(this, EventArgs.Empty);
+		}
+
+		static void OnWindowChanged(BindableObject bindable, object? oldValue, object? newValue)
+		{
+			if (bindable is not VisualElement visualElement)
+				return;
+
+			if (visualElement._watchingPlatformLoaded && oldValue is Window oldWindow)
+				oldWindow.HandlerChanged -= visualElement.OnWindowHandlerChanged;
+
+			visualElement.UpdatePlatformUnloadedLoadedWiring(newValue as Window);
+			visualElement.InvalidateStateTriggers(newValue != null);
+			visualElement._windowChanged?.Invoke(visualElement, EventArgs.Empty);
+		}
+
+		void OnWindowHandlerChanged(object? sender, EventArgs e)
+		{
+			UpdatePlatformUnloadedLoadedWiring(Window);
+		}
+
+		// We only want to wire up to platform loaded events
+		// if the user is watching for them. Otherwise
+		// this will get wired up for every single VE that's on 
+		// the screen
+		void UpdatePlatformUnloadedLoadedWiring(Window? window)
+		{
+			// If I'm not attached to a window and I haven't started watching any platform events
+			// then it's not useful to wire anything up. We will just wait until
+			// This VE gets connected to the xplat Window before wiring up any events
+			if (!_watchingPlatformLoaded && window == null)
+				return;
+
+			if (_unloaded == null && _loaded == null)
+			{
+				if (window is not null)
+					window.HandlerChanged -= OnWindowHandlerChanged;
+
+#if PLATFORM
+				_loadedUnloadedToken?.Dispose();
+				_loadedUnloadedToken = null;
+#endif
+
+				_watchingPlatformLoaded = false;
+				return;
+			}
+
+			if (!_watchingPlatformLoaded)
+			{
+				if (window is not null)
+					window.HandlerChanged += OnWindowHandlerChanged;
+
+				_watchingPlatformLoaded = true;
+			}
+
+			HandlePlatformUnloadedLoaded();
+		}
+
+		partial void HandlePlatformUnloadedLoaded();
+
+		internal IView? ParentView => ((this as IView)?.Parent as IView);
+#nullable disable
+
+
 		public class FocusRequestArgs : EventArgs
 		{
 			public bool Focus { get; set; }
diff --git a/src/Controls/src/Core/HandlerImpl/VisualElement/VisualElement.iOS.cs b/src/Controls/src/Core/VisualElement/VisualElement.iOS.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/VisualElement/VisualElement.iOS.cs
rename to src/Controls/src/Core/VisualElement/VisualElement.iOS.cs
diff --git a/src/Controls/src/Core/VisualElementChangedEventArgs.cs b/src/Controls/src/Core/VisualElement/VisualElementChangedEventArgs.cs
similarity index 100%
rename from src/Controls/src/Core/VisualElementChangedEventArgs.cs
rename to src/Controls/src/Core/VisualElement/VisualElementChangedEventArgs.cs
diff --git a/src/Controls/src/Core/VisualElement_StyleSheet.cs b/src/Controls/src/Core/VisualElement/VisualElement_StyleSheet.cs
similarity index 100%
rename from src/Controls/src/Core/VisualElement_StyleSheet.cs
rename to src/Controls/src/Core/VisualElement/VisualElement_StyleSheet.cs
diff --git a/src/Controls/src/Core/WebNavigatedEventArgs.cs b/src/Controls/src/Core/WebView/WebNavigatedEventArgs.cs
similarity index 100%
rename from src/Controls/src/Core/WebNavigatedEventArgs.cs
rename to src/Controls/src/Core/WebView/WebNavigatedEventArgs.cs
diff --git a/src/Controls/src/Core/WebNavigatingEventArgs.cs b/src/Controls/src/Core/WebView/WebNavigatingEventArgs.cs
similarity index 100%
rename from src/Controls/src/Core/WebNavigatingEventArgs.cs
rename to src/Controls/src/Core/WebView/WebNavigatingEventArgs.cs
diff --git a/src/Controls/src/Core/WebNavigationEventArgs.cs b/src/Controls/src/Core/WebView/WebNavigationEventArgs.cs
similarity index 100%
rename from src/Controls/src/Core/WebNavigationEventArgs.cs
rename to src/Controls/src/Core/WebView/WebNavigationEventArgs.cs
diff --git a/src/Controls/src/Core/HandlerImpl/WebView/WebView.Android.cs b/src/Controls/src/Core/WebView/WebView.Android.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/WebView/WebView.Android.cs
rename to src/Controls/src/Core/WebView/WebView.Android.cs
diff --git a/src/Controls/src/Core/HandlerImpl/WebView/WebView.cs b/src/Controls/src/Core/WebView/WebView.Mapper.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/WebView/WebView.cs
rename to src/Controls/src/Core/WebView/WebView.Mapper.cs
diff --git a/src/Controls/src/Core/HandlerImpl/WebView/WebView.Standard.cs b/src/Controls/src/Core/WebView/WebView.Standard.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/WebView/WebView.Standard.cs
rename to src/Controls/src/Core/WebView/WebView.Standard.cs
diff --git a/src/Controls/src/Core/HandlerImpl/WebView/WebView.Windows.cs b/src/Controls/src/Core/WebView/WebView.Windows.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/WebView/WebView.Windows.cs
rename to src/Controls/src/Core/WebView/WebView.Windows.cs
diff --git a/src/Controls/src/Core/WebView.cs b/src/Controls/src/Core/WebView/WebView.cs
similarity index 90%
rename from src/Controls/src/Core/WebView.cs
rename to src/Controls/src/Core/WebView/WebView.cs
index ac446c1e66a7..d160c49a9648 100644
--- a/src/Controls/src/Core/WebView.cs
+++ b/src/Controls/src/Core/WebView/WebView.cs
@@ -11,7 +11,7 @@
 namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/WebView.xml" path="Type[@FullName='Microsoft.Maui.Controls.WebView']/Docs/*" />
-	public partial class WebView : View, IWebViewController, IElementConfiguration<WebView>
+	public partial class WebView : View, IWebViewController, IElementConfiguration<WebView>, IWebView
 	{
 		/// <summary>Bindable property for <see cref="Source"/>.</summary>
 		public static readonly BindableProperty SourceProperty = BindableProperty.Create("Source", typeof(WebViewSource), typeof(WebView), default(WebViewSource),
@@ -49,6 +49,9 @@ public partial class WebView : View, IWebViewController, IElementConfiguration<W
 
 		readonly Lazy<PlatformConfigurationRegistry<WebView>> _platformConfigurationRegistry;
 
+		bool _canGoBack;
+		bool _canGoForward;
+
 		/// <include file="../../docs/Microsoft.Maui.Controls/WebView.xml" path="//Member[@MemberName='.ctor']/Docs/*" />
 		public WebView()
 		{
@@ -297,5 +300,43 @@ static string EscapeJsString(string js)
 
 			return js;
 		}
+
+		IWebViewSource IWebView.Source => Source;
+
+		bool IWebView.CanGoBack
+		{
+			get => _canGoBack;
+			set
+			{
+				_canGoBack = value;
+				((IWebViewController)this).CanGoBack = _canGoBack;
+				Handler?.UpdateValue(nameof(IWebView.CanGoBack));
+			}
+		}
+
+		bool IWebView.CanGoForward
+		{
+			get => _canGoForward;
+			set
+			{
+				_canGoForward = value;
+				((IWebViewController)this).CanGoForward = _canGoForward;
+				Handler?.UpdateValue(nameof(IWebView.CanGoForward));
+			}
+		}
+
+		bool IWebView.Navigating(WebNavigationEvent evnt, string url)
+		{
+			var args = new WebNavigatingEventArgs(evnt, new UrlWebViewSource { Url = url }, url);
+			(this as IWebViewController)?.SendNavigating(args);
+
+			return args.Cancel;
+		}
+
+		void IWebView.Navigated(WebNavigationEvent evnt, string url, WebNavigationResult result)
+		{
+			var args = new WebNavigatedEventArgs(evnt, new UrlWebViewSource { Url = url }, url, result);
+			(this as IWebViewController)?.SendNavigated(args);
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/src/Core/HandlerImpl/WebView/WebView.iOS.cs b/src/Controls/src/Core/WebView/WebView.iOS.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/WebView/WebView.iOS.cs
rename to src/Controls/src/Core/WebView/WebView.iOS.cs
diff --git a/src/Controls/src/Core/WebViewSource.cs b/src/Controls/src/Core/WebView/WebViewSource.cs
similarity index 100%
rename from src/Controls/src/Core/WebViewSource.cs
rename to src/Controls/src/Core/WebView/WebViewSource.cs
diff --git a/src/Controls/src/Core/WebViewSourceTypeConverter.cs b/src/Controls/src/Core/WebView/WebViewSourceTypeConverter.cs
similarity index 100%
rename from src/Controls/src/Core/WebViewSourceTypeConverter.cs
rename to src/Controls/src/Core/WebView/WebViewSourceTypeConverter.cs
diff --git a/src/Controls/src/Core/HandlerImpl/Window/Window.Android.cs b/src/Controls/src/Core/Window/Window.Android.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Window/Window.Android.cs
rename to src/Controls/src/Core/Window/Window.Android.cs
diff --git a/src/Controls/src/Core/HandlerImpl/Window/Window.cs b/src/Controls/src/Core/Window/Window.Mapper.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Window/Window.cs
rename to src/Controls/src/Core/Window/Window.Mapper.cs
diff --git a/src/Controls/src/Core/HandlerImpl/Window/Window.Tizen.cs b/src/Controls/src/Core/Window/Window.Tizen.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Window/Window.Tizen.cs
rename to src/Controls/src/Core/Window/Window.Tizen.cs
diff --git a/src/Controls/src/Core/HandlerImpl/Window/Window.Windows.cs b/src/Controls/src/Core/Window/Window.Windows.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Window/Window.Windows.cs
rename to src/Controls/src/Core/Window/Window.Windows.cs
diff --git a/src/Controls/src/Core/HandlerImpl/Window/Window.Impl.cs b/src/Controls/src/Core/Window/Window.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Window/Window.Impl.cs
rename to src/Controls/src/Core/Window/Window.cs
diff --git a/src/Controls/src/Core/HandlerImpl/Window/Window.iOS.cs b/src/Controls/src/Core/Window/Window.iOS.cs
similarity index 100%
rename from src/Controls/src/Core/HandlerImpl/Window/Window.iOS.cs
rename to src/Controls/src/Core/Window/Window.iOS.cs

From 1ed49ca880906cef6895316d7e820f446b720ecc Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Tue, 20 Jun 2023 05:23:44 -0500
Subject: [PATCH 016/105] Just run the pack every time (#15588)

* Just run the pack everytime

* - add conditional path for clean/pack

* - fix pack calls
---
 eng/cake/dotnet.cake | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/eng/cake/dotnet.cake b/eng/cake/dotnet.cake
index c4cfb3c761bb..3dddfb55cfd1 100644
--- a/eng/cake/dotnet.cake
+++ b/eng/cake/dotnet.cake
@@ -465,16 +465,14 @@ bool RunPackTarget()
         return true;
 
     // Does the user want to run a pack as part of a different target?
-    if (HasArgument("pack"))
+    if (HasArgument("pack") && Argument<string>("pack", "true") != "false")
         return true;
         
     // If the request is to open a different sln then let's see if pack has ever run
     // if it hasn't then lets pack maui so the sln will open
     if (Argument<string>("sln", null) != null)
     {
-        var mauiPacks = MakeAbsolute(Directory("./bin/dotnet/packs/Microsoft.Maui.Sdk")).ToString();
-        if (!DirectoryExists(mauiPacks))
-            return true;
+        return Argument<string>("pack", "true") == "true";
     }
 
     return false;

From 3e787961d7351454da318be5a685378b2b599f3f Mon Sep 17 00:00:00 2001
From: Dan Siegel <me@dansiegel.net>
Date: Tue, 20 Jun 2023 06:15:28 -0600
Subject: [PATCH 017/105] feat: adding IWindowCreator (#14921)

* feat: adding IWindowCreator

* chore: add Application to the api

* chore: fix nullability

* chore: adding tests

* chore: fixing unhappy path test

* chore: pr review move window creator to beginning of CreateWindow

---------

Co-authored-by: Shane Neuville <shneuvil@microsoft.com>
---
 .../src/Core/Application/Application.cs       |  7 ++-
 src/Controls/src/Core/IWindowCreator.cs       |  6 ++
 .../net-android/PublicAPI.Unshipped.txt       |  2 +
 .../PublicAPI/net-ios/PublicAPI.Unshipped.txt |  4 +-
 .../net-maccatalyst/PublicAPI.Unshipped.txt   |  4 +-
 .../net-tizen/PublicAPI.Unshipped.txt         |  4 +-
 .../net-windows/PublicAPI.Unshipped.txt       |  2 +
 .../PublicAPI/net/PublicAPI.Unshipped.txt     |  4 +-
 .../netstandard/PublicAPI.Unshipped.txt       |  2 +
 .../tests/Core.UnitTests/ApplicationTests.cs  | 58 +++++++++++++++++++
 10 files changed, 88 insertions(+), 5 deletions(-)
 create mode 100644 src/Controls/src/Core/IWindowCreator.cs

diff --git a/src/Controls/src/Core/Application/Application.cs b/src/Controls/src/Core/Application/Application.cs
index 6a0541e234bf..596e495547af 100644
--- a/src/Controls/src/Core/Application/Application.cs
+++ b/src/Controls/src/Core/Application/Application.cs
@@ -495,13 +495,18 @@ void IApplication.ThemeChanged()
 
 		protected virtual Window CreateWindow(IActivationState? activationState)
 		{
+			var windowCreator = activationState?.Context.Services.GetService<IWindowCreator>();
+			var window = windowCreator?.CreateWindow(this, activationState);
+			if (window is not null)
+				return window;
+
 			if (Windows.Count > 1)
 				throw new NotImplementedException($"Either set {nameof(MainPage)} or override {nameof(Application.CreateWindow)}.");
 
 			if (Windows.Count > 0)
 				return Windows[0];
 
-			if (_singleWindowMainPage != null)
+			if (_singleWindowMainPage is not null)
 				return new Window(_singleWindowMainPage);
 
 			throw new NotImplementedException($"Either set {nameof(MainPage)} or override {nameof(Application.CreateWindow)}.");
diff --git a/src/Controls/src/Core/IWindowCreator.cs b/src/Controls/src/Core/IWindowCreator.cs
new file mode 100644
index 000000000000..ae5706312b2e
--- /dev/null
+++ b/src/Controls/src/Core/IWindowCreator.cs
@@ -0,0 +1,6 @@
+namespace Microsoft.Maui.Controls;
+
+public interface IWindowCreator
+{
+	Window CreateWindow(Application app, IActivationState? activationState);
+}
diff --git a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
index 69f909650cd5..c09743196b38 100644
--- a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -1,6 +1,8 @@
 #nullable enable
 *REMOVED*override Microsoft.Maui.Controls.RefreshView.MeasureOverride(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
 Microsoft.Maui.Controls.Border.~Border() -> void
+Microsoft.Maui.Controls.IWindowCreator
+Microsoft.Maui.Controls.IWindowCreator.CreateWindow(Microsoft.Maui.Controls.Application! app, Microsoft.Maui.IActivationState? activationState) -> Microsoft.Maui.Controls.Window!
 Microsoft.Maui.Controls.Handlers.Compatibility.FrameRenderer.FrameRenderer(Android.Content.Context! context, Microsoft.Maui.IPropertyMapper! mapper) -> void
 Microsoft.Maui.Controls.Handlers.Compatibility.FrameRenderer.FrameRenderer(Android.Content.Context! context, Microsoft.Maui.IPropertyMapper! mapper, Microsoft.Maui.CommandMapper! commandMapper) -> void
 override Microsoft.Maui.Controls.Handlers.Items.CarouselViewAdapter<TItemsView, TItemsViewSource>.GetItemViewType(int position) -> int
diff --git a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index 0c7ca08728d0..735b73a38ff3 100644
--- a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -1,6 +1,8 @@
 #nullable enable
 *REMOVED*override Microsoft.Maui.Controls.RefreshView.MeasureOverride(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
 Microsoft.Maui.Controls.Border.~Border() -> void
+Microsoft.Maui.Controls.IWindowCreator
+Microsoft.Maui.Controls.IWindowCreator.CreateWindow(Microsoft.Maui.Controls.Application! app, Microsoft.Maui.IActivationState? activationState) -> Microsoft.Maui.Controls.Window!
 Microsoft.Maui.Controls.Handlers.Compatibility.PhoneFlyoutPageRenderer.FlyoutOverlapsDetailsInPopoverMode.get -> bool
 Microsoft.Maui.Controls.Handlers.Compatibility.PhoneFlyoutPageRenderer.FlyoutOverlapsDetailsInPopoverMode.set -> void
 Microsoft.Maui.Controls.LayoutOptions.Equals(Microsoft.Maui.Controls.LayoutOptions other) -> bool
@@ -93,4 +95,4 @@ Microsoft.Maui.Controls.IValueConverter.ConvertBack(object? value, System.Type!
 ~static Microsoft.Maui.Controls.GridExtensions.AddWithSpan(this Microsoft.Maui.Controls.Grid grid, Microsoft.Maui.IView view, int row = 0, int column = 0, int rowSpan = 1, int columnSpan = 1) -> void
 *REMOVED*override Microsoft.Maui.Controls.Handlers.Compatibility.PhoneFlyoutPageRenderer.WillRotate(UIKit.UIInterfaceOrientation toInterfaceOrientation, double duration) -> void
 ~virtual Microsoft.Maui.Controls.Handlers.Items.ItemsViewController<TItemsView>.DetermineCellReuseId(Foundation.NSIndexPath indexPath) -> string
-override Microsoft.Maui.Controls.Handlers.Items.ItemsViewHandler<TItemsView>.GetDesiredSize(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
\ No newline at end of file
+override Microsoft.Maui.Controls.Handlers.Items.ItemsViewHandler<TItemsView>.GetDesiredSize(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
diff --git a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index 0c7ca08728d0..735b73a38ff3 100644
--- a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -1,6 +1,8 @@
 #nullable enable
 *REMOVED*override Microsoft.Maui.Controls.RefreshView.MeasureOverride(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
 Microsoft.Maui.Controls.Border.~Border() -> void
+Microsoft.Maui.Controls.IWindowCreator
+Microsoft.Maui.Controls.IWindowCreator.CreateWindow(Microsoft.Maui.Controls.Application! app, Microsoft.Maui.IActivationState? activationState) -> Microsoft.Maui.Controls.Window!
 Microsoft.Maui.Controls.Handlers.Compatibility.PhoneFlyoutPageRenderer.FlyoutOverlapsDetailsInPopoverMode.get -> bool
 Microsoft.Maui.Controls.Handlers.Compatibility.PhoneFlyoutPageRenderer.FlyoutOverlapsDetailsInPopoverMode.set -> void
 Microsoft.Maui.Controls.LayoutOptions.Equals(Microsoft.Maui.Controls.LayoutOptions other) -> bool
@@ -93,4 +95,4 @@ Microsoft.Maui.Controls.IValueConverter.ConvertBack(object? value, System.Type!
 ~static Microsoft.Maui.Controls.GridExtensions.AddWithSpan(this Microsoft.Maui.Controls.Grid grid, Microsoft.Maui.IView view, int row = 0, int column = 0, int rowSpan = 1, int columnSpan = 1) -> void
 *REMOVED*override Microsoft.Maui.Controls.Handlers.Compatibility.PhoneFlyoutPageRenderer.WillRotate(UIKit.UIInterfaceOrientation toInterfaceOrientation, double duration) -> void
 ~virtual Microsoft.Maui.Controls.Handlers.Items.ItemsViewController<TItemsView>.DetermineCellReuseId(Foundation.NSIndexPath indexPath) -> string
-override Microsoft.Maui.Controls.Handlers.Items.ItemsViewHandler<TItemsView>.GetDesiredSize(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
\ No newline at end of file
+override Microsoft.Maui.Controls.Handlers.Items.ItemsViewHandler<TItemsView>.GetDesiredSize(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
diff --git a/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
index e0e193c04706..59345b33b394 100644
--- a/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
@@ -1,5 +1,7 @@
-#nullable enable
+#nullable enable
 Microsoft.Maui.Controls.Border.~Border() -> void
+Microsoft.Maui.Controls.IWindowCreator
+Microsoft.Maui.Controls.IWindowCreator.CreateWindow(Microsoft.Maui.Controls.Application! app, Microsoft.Maui.IActivationState? activationState) -> Microsoft.Maui.Controls.Window!
 Microsoft.Maui.Controls.LayoutOptions.Equals(Microsoft.Maui.Controls.LayoutOptions other) -> bool
 Microsoft.Maui.Controls.Region.Equals(Microsoft.Maui.Controls.Region other) -> bool
 Microsoft.Maui.Controls.Shapes.Matrix.Equals(Microsoft.Maui.Controls.Shapes.Matrix other) -> bool
diff --git a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index d000525aa54d..4f17f691caa8 100644
--- a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -1,6 +1,8 @@
 #nullable enable
 *REMOVED*override Microsoft.Maui.Controls.RefreshView.MeasureOverride(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
 Microsoft.Maui.Controls.Border.~Border() -> void
+Microsoft.Maui.Controls.IWindowCreator
+Microsoft.Maui.Controls.IWindowCreator.CreateWindow(Microsoft.Maui.Controls.Application! app, Microsoft.Maui.IActivationState? activationState) -> Microsoft.Maui.Controls.Window!
 Microsoft.Maui.Controls.Platform.CollectionViewExtensions
 Microsoft.Maui.Controls.Platform.ShapesExtensions
 Microsoft.Maui.Controls.Handlers.Items.StructuredItemsViewHandler<TItemsView>.~StructuredItemsViewHandler() -> void
diff --git a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
index 98654b9bafe1..4d3df32a7b67 100644
--- a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -1,6 +1,8 @@
-#nullable enable
+#nullable enable
 *REMOVED*override Microsoft.Maui.Controls.RefreshView.MeasureOverride(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
 Microsoft.Maui.Controls.Border.~Border() -> void
+Microsoft.Maui.Controls.IWindowCreator
+Microsoft.Maui.Controls.IWindowCreator.CreateWindow(Microsoft.Maui.Controls.Application! app, Microsoft.Maui.IActivationState? activationState) -> Microsoft.Maui.Controls.Window!
 Microsoft.Maui.Controls.LayoutOptions.Equals(Microsoft.Maui.Controls.LayoutOptions other) -> bool
 Microsoft.Maui.Controls.Region.Equals(Microsoft.Maui.Controls.Region other) -> bool
 Microsoft.Maui.Controls.Shapes.Matrix.Equals(Microsoft.Maui.Controls.Shapes.Matrix other) -> bool
diff --git a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
index db25389b7cce..12b6149e4df5 100644
--- a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -1,6 +1,8 @@
 #nullable enable
 *REMOVED*override Microsoft.Maui.Controls.RefreshView.MeasureOverride(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
 Microsoft.Maui.Controls.Border.~Border() -> void
+Microsoft.Maui.Controls.IWindowCreator
+Microsoft.Maui.Controls.IWindowCreator.CreateWindow(Microsoft.Maui.Controls.Application! app, Microsoft.Maui.IActivationState? activationState) -> Microsoft.Maui.Controls.Window!
 Microsoft.Maui.Controls.LayoutOptions.Equals(Microsoft.Maui.Controls.LayoutOptions other) -> bool
 Microsoft.Maui.Controls.Region.Equals(Microsoft.Maui.Controls.Region other) -> bool
 Microsoft.Maui.Controls.Shapes.Matrix.Equals(Microsoft.Maui.Controls.Shapes.Matrix other) -> bool
diff --git a/src/Controls/tests/Core.UnitTests/ApplicationTests.cs b/src/Controls/tests/Core.UnitTests/ApplicationTests.cs
index 674f36174edd..428c581cba0e 100644
--- a/src/Controls/tests/Core.UnitTests/ApplicationTests.cs
+++ b/src/Controls/tests/Core.UnitTests/ApplicationTests.cs
@@ -1,4 +1,5 @@
 using System;
+using NSubstitute;
 using Xunit;
 
 namespace Microsoft.Maui.Controls.Core.UnitTests
@@ -181,6 +182,63 @@ public void OnStartFiresOnceFromWindowCreated()
 
 		}
 
+		[Fact]
+		public void FailsOnNoPageOrWindowCreator()
+		{
+			IApplication app = new Application();
+			var ex = Record.Exception(() => app.CreateWindow(null));
+
+			Assert.IsType<NotImplementedException>(ex);
+
+			Assert.Equal($"Either set {nameof(Application.MainPage)} or override {nameof(IApplication.CreateWindow)}.", ex.Message);
+		}
+
+		[Fact]
+		public void CreatesWindowFromIWindowCreator()
+		{
+			var app = new Application();
+
+			var window = new Window(new ContentPage
+			{
+				Content = new Label
+				{
+					Text = "Hello World"
+				}
+			});
+			var windowCreator = Substitute.For<IWindowCreator>();
+			var services = Substitute.For<IServiceProvider>();
+			services.GetService(typeof(IWindowCreator)).Returns(windowCreator);
+			var mauiContext = Substitute.For<IMauiContext>();
+			mauiContext.Services.Returns(services);
+			var activationState = Substitute.For<IActivationState>();
+			activationState.Context.Returns(mauiContext);
+
+			windowCreator.CreateWindow(app, activationState).Returns(window);
+			var iApp = (IApplication)app;
+			iApp.CreateWindow(activationState);
+			Assert.Single(app.Windows);
+			Assert.Same(window, app.Windows[0]);
+		}
+
+		[Fact]
+		public void FailsOnNoPageAndNoRegistrationForIWindowCreator()
+		{
+			var app = new Application();
+
+			var services = Substitute.For<IServiceProvider>();
+			services.GetService(typeof(IWindowCreator)).Returns(null);
+			var mauiContext = Substitute.For<IMauiContext>();
+			mauiContext.Services.Returns(services);
+			var activationState = Substitute.For<IActivationState>();
+			activationState.Context.Returns(mauiContext);
+
+			var iApp = (IApplication)app;
+			var ex = Record.Exception(() => iApp.CreateWindow(activationState));
+			Assert.IsType<NotImplementedException>(ex);
+
+			Assert.Equal($"Either set {nameof(Application.MainPage)} or override {nameof(IApplication.CreateWindow)}.", ex.Message);
+		}
+
 		class StubApp : Application
 		{
 			public int OnStartCount { get; private set; }

From 0543e03cbe7331ae2c106c67a9eaefc575f75945 Mon Sep 17 00:00:00 2001
From: Rui Marinho <me@ruimarinho.net>
Date: Tue, 20 Jun 2023 16:19:19 +0100
Subject: [PATCH 018/105] [uitests] Fix xcode uitests (#15749)

* [build] Remove not used yml

* [uitests] Fix XCode provision to use 14.3
---
 .../common/controlgallery-android.yml         |  75 ----------
 eng/pipelines/common/controlgallery-ios.yml   | 134 ------------------
 .../common/controlgallery-windows.yml         |  27 ----
 eng/pipelines/common/ui-tests.yml             |   4 +-
 4 files changed, 2 insertions(+), 238 deletions(-)
 delete mode 100644 eng/pipelines/common/controlgallery-android.yml
 delete mode 100644 eng/pipelines/common/controlgallery-ios.yml
 delete mode 100644 eng/pipelines/common/controlgallery-windows.yml

diff --git a/eng/pipelines/common/controlgallery-android.yml b/eng/pipelines/common/controlgallery-android.yml
deleted file mode 100644
index 422006163d40..000000000000
--- a/eng/pipelines/common/controlgallery-android.yml
+++ /dev/null
@@ -1,75 +0,0 @@
-steps:
-  - checkout: self
-    clean: true
-
-  - task: xamops.azdevex.provisionator-task.provisionator@1
-    displayName: 'Provisionator'
-    condition: eq(variables['provisioning'], 'true')
-    inputs:
-      provisioning_script: $(System.DefaultWorkingDirectory)/$(provisionator.path)
-      provisioning_extra_args: $(provisionator.extraArguments)
-    env:
-      AUTH_TOKEN_GITHUB_COM: $(github--pat--vs-mobiletools-engineering-service2)
-  
-  - task: Bash@3
-    displayName: 'Cake Provision'
-    condition: eq(variables['provisioningCake'], 'true')
-    inputs:
-      targetType: 'filePath'
-      filePath: 'build.sh'
-      arguments: --target provision --TeamProject="$(System.TeamProject)"
-
-  - task: UseDotNet@2
-    displayName: 'Install .net core $(DOTNET_VERSION)'
-    condition: ne(variables['DOTNET_VERSION'], '')
-    inputs:
-      version: $(DOTNET_VERSION)
-      packageType: 'sdk'
-  
-  # - script: '/bin/bash -c "sudo $AGENT_HOMEDIRECTORY/scripts/select-xamarin-sdk.sh ${{ parameters.monoVersion }}"'
-  #   displayName: 'Select MONO ${{ parameters.monoVersion }}'
-  
-  - task: Bash@3
-    displayName: 'Build Android $(renderers)'
-    inputs:
-      targetType: 'filePath'
-      filePath: 'build.sh'
-      arguments: --target cg-android --ANDROID_RENDERERS="$(renderers)" --GoogleMapsAPIKey="$(GoogleMapsAPIKey)" --configuration=$(BuildConfiguration)
-
-  - task: Bash@3
-    displayName: 'Build Android UITests'
-    inputs:
-      targetType: 'filePath'
-      filePath: 'build.sh'
-      arguments: --target cg-android-build-tests --configuration=$(BuildConfiguration)
-
-  - task: CopyFiles@2
-    displayName: 'Copy Android Files for UITest'
-    inputs:
-      Contents: |
-        **/Android.UITests/bin/$(BuildConfiguration)/Newtonsoft.Json.*
-        **/Android.UITests/bin/$(BuildConfiguration)/nunit.*
-        **/Android.UITests/bin/$(BuildConfiguration)/NUnit3.*
-        **/Android.UITests/bin/$(BuildConfiguration)/Plugin.*
-        **/Android.UITests/bin/$(BuildConfiguration)/Microsoft.Maui.*
-        **/Android.UITests/bin/$(BuildConfiguration)/Xamarin.*
-        **/Android.UITests/bin/$(BuildConfiguration)/Controls.*
-      TargetFolder: '$(build.artifactstagingdirectory)/android'
-      CleanTargetFolder: true
-      flattenFolders: true
-
-  - task: CopyFiles@2
-    displayName: 'Copy $(renderers)'
-    inputs:
-      SourceFolder: src/Compatibility/ControlGallery/src/Android/bin/$(BuildConfiguration)/
-      Contents: '**/*.apk'
-      TargetFolder: '$(build.artifactstagingdirectory)/androidApp'
-      CleanTargetFolder: true
-      flattenFolders: true
-  
-  - task: PublishBuildArtifacts@1
-    displayName: 'Publish Artifact: AndroidApps'
-    condition: always()
-    inputs:
-      PathtoPublish: '$(build.artifactstagingdirectory)'
-      ArtifactName: OSXArtifacts
diff --git a/eng/pipelines/common/controlgallery-ios.yml b/eng/pipelines/common/controlgallery-ios.yml
deleted file mode 100644
index b147d1243b0c..000000000000
--- a/eng/pipelines/common/controlgallery-ios.yml
+++ /dev/null
@@ -1,134 +0,0 @@
-steps:
-  - checkout: self
-    clean: true
-
-  - task: xamops.azdevex.provisionator-task.provisionator@1
-    displayName: 'Provision Xcode'
-    condition: ne(variables['REQUIRED_XCODE'], '')
-    inputs:
-      provisioning_script: $(System.DefaultWorkingDirectory)/$(provisionator.xcode)
-    env:
-      AUTH_TOKEN_GITHUB_COM: $(github--pat--vs-mobiletools-engineering-service2)
-
-  - task: xamops.azdevex.provisionator-task.provisionator@1
-    displayName: 'Provisionator'
-    condition: eq(variables['provisioning'], 'true')
-    inputs:
-      provisioning_script: $(System.DefaultWorkingDirectory)/$(provisionator.path)
-      provisioning_extra_args: $(provisionator.extraArguments)
-    env:
-      AUTH_TOKEN_GITHUB_COM: $(github--pat--vs-mobiletools-engineering-service2)
-
-  - script: |
-      echo "##vso[task.prependpath]/Library/Frameworks/Mono.framework/Versions/Current/Commands/"
-      echo "##vso[task.prependpath]~/Library/Developer/Xamarin/android-sdk-macosx"
-    displayName: 'Setup SDK Paths'
-    condition: ne(variables['osx2019VmPool'], 'Azure Pipelines')
-
-  - task: Bash@3
-    displayName: 'Cake Provision'
-    condition: eq(variables['provisioningCake'], 'true')
-    inputs:
-      targetType: 'filePath'
-      filePath: 'build.sh'
-      arguments: --target provision --TeamProject="$(System.TeamProject)"
-
-  - task: UseDotNet@2
-    displayName: 'Install .net core $(DOTNET_VERSION)'
-    condition: ne(variables['DOTNET_VERSION'], '')
-    inputs:
-      version: $(DOTNET_VERSION)
-      packageType: 'sdk'
-
-  - task: InstallAppleProvisioningProfile@1
-    displayName: 'Install the iOS provisioning profile'
-    inputs:
-      provProfileSecureFile: 'Components iOS Provisioning.mobileprovision'
-  - task: InstallAppleProvisioningProfile@1
-    displayName: 'Install the macOS provisioning profile'
-    inputs:
-      provProfileSecureFile: 'Components Mac Provisioning.mobileprovision'
-  - task: InstallAppleProvisioningProfile@1
-    displayName: 'Install the tvOS provisioning profile'
-    inputs:
-      provProfileSecureFile: 'Components tvOS Provisioning.mobileprovision'
-  - task: InstallAppleCertificate@2
-    displayName: 'Install the iOS certificate'
-    inputs:
-      certSecureFile: 'Components iOS Certificate.p12'
-  - task: InstallAppleCertificate@2
-    condition: eq(variables['System.JobName'], 'macos')
-    displayName: 'Install the macOS certificate'
-    inputs:
-      certSecureFile: 'Components Mac Certificate.p12'
-
-  - task: Bash@3
-    displayName: 'Build Control Gallery IPA'
-    inputs:
-      targetType: 'filePath'
-      filePath: 'build.sh'
-      arguments: --target cg-ios --configuration=$(BuildConfiguration)
-
-  - task: Bash@3
-    displayName: 'Build iOS UITests Tests'
-    inputs:
-      targetType: 'filePath'
-      filePath: 'build.sh'
-      arguments: --target cg-ios-build-tests --configuration=$(BuildConfiguration)
-
-  - task: CopyFiles@2
-    displayName: 'Copy iOS Files for UITest'
-    inputs:
-      Contents: |
-        **/CompatibilityControlGalleryiOS.ipa
-        **/iOS.UITests/bin/$(BuildConfiguration)/Newtonsoft.Json.*
-        **/iOS.UITests/bin/$(BuildConfiguration)/nunit.*
-        **/iOS.UITests/bin/$(BuildConfiguration)/NUnit3.*
-        **/iOS.UITests/bin/$(BuildConfiguration)/Plugin.*
-        **/iOS.UITests/bin/$(BuildConfiguration)/Microsoft.Maui.*
-        **/iOS.UITests/bin/$(BuildConfiguration)/Xamarin.*
-        **/iOS.UITests/bin/$(BuildConfiguration)/Controls.*
-      TargetFolder: '$(build.artifactstagingdirectory)/ios'
-      flattenFolders: true
-
-  - task: CopyFiles@2
-    displayName: 'Copy iOS dSYM'
-    inputs:
-      SourceFolder: 'src/Compatibility/ControlGallery/src/iOS/bin/iPhone/$(BuildConfiguration)/CompatibilityControlGalleryiOS.app.dSYM/'
-      TargetFolder: '$(build.artifactstagingdirectory)/ios/iPhone/CompatibilityControlGalleryiOS.app.dSYM/'
-      CleanTargetFolder: false
-      flattenFolders: false
-
-  - task: CopyFiles@2
-    displayName: 'Copy iOS App'
-    inputs:
-      SourceFolder: 'src/Compatibility/ControlGallery/src/iOS/bin/iPhoneSimulator/$(BuildConfiguration)/CompatibilityControlGalleryiOS.app/'
-      TargetFolder: '$(build.artifactstagingdirectory)/ios/iPhoneSimulator/CompatibilityControlGalleryiOS.app/'
-      CleanTargetFolder: false
-      flattenFolders: false
-
-  - task: CopyFiles@2
-    displayName: 'Copy test-cloud.exe'
-    inputs:
-      Contents: '**/Xamarin.UITest.*/tools/test-cloud.exe'
-      TargetFolder: '$(build.artifactstagingdirectory)/testcloud'
-      OverWrite: true
-      flattenFolders: true
-
-  - task: CopyFiles@2
-    displayName: 'Copy Cake File'
-    inputs:
-      Contents: |
-        build.cake
-        build/provisioning/provisioning.csx
-        build/provisioning/xcode.csx
-      TargetFolder: '$(build.artifactstagingdirectory)'
-      CleanTargetFolder: false
-      flattenFolders: true
-
-  - task: PublishBuildArtifacts@1
-    displayName: 'Publish Artifact: iOS'
-    condition: always()
-    inputs:
-      PathtoPublish: '$(build.artifactstagingdirectory)'
-      ArtifactName: OSXArtifacts
diff --git a/eng/pipelines/common/controlgallery-windows.yml b/eng/pipelines/common/controlgallery-windows.yml
deleted file mode 100644
index d15f284bffa7..000000000000
--- a/eng/pipelines/common/controlgallery-windows.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-steps:
-  - checkout: self
-    clean: true
-
-  - task: xamops.azdevex.provisionator-task.provisionator@1
-    displayName: 'Provisionator'
-    condition: eq(variables['provisioning'], 'true')
-    inputs:
-      provisioning_script: $(System.DefaultWorkingDirectory)/$(provisionator.path)
-      provisioning_extra_args: $(provisionator.extraArguments)
-    env:
-      AUTH_TOKEN_GITHUB_COM: $(github--pat--vs-mobiletools-engineering-service2)
-
-  - powershell: |
-      $(System.DefaultWorkingDirectory)/build.ps1 --target provision --TeamProject="$(System.TeamProject)"
-    displayName: 'Cake Provision'
-    condition: eq(variables['provisioningCake'], 'true')
-
-  - powershell: |
-      $(System.DefaultWorkingDirectory)/build.ps1 --target VS-WINUI --TeamProject="$(System.TeamProject)"
-    displayName: 'Build WinUI Solution'
-  
-  - task: PublishBuildArtifacts@1
-    displayName: 'Publish Artifact: ${{ parameters.artifactsName }}'
-    condition: always()
-    inputs:
-      ArtifactName: WINUI
diff --git a/eng/pipelines/common/ui-tests.yml b/eng/pipelines/common/ui-tests.yml
index cf0b1225e69a..eb2ed0d2dd8a 100644
--- a/eng/pipelines/common/ui-tests.yml
+++ b/eng/pipelines/common/ui-tests.yml
@@ -69,7 +69,7 @@ stages:
                     parameters:
                       platform: ios
                       ${{ if eq(version, 'latest') }}:
-                        version: 16.2
+                        version: 16.4
                       ${{ if ne(version, 'latest') }}:
                         version: ${{ version }}
                       path: ${{ project.ios }}
@@ -115,7 +115,7 @@ stages:
                 displayName: ${{ coalesce(project.desc, project.name) }}
                 pool: ${{ parameters.macosPool }}
                 variables:
-                  REQUIRED_XCODE: 14.2.0
+                  REQUIRED_XCODE: $(DEVICETESTS_REQUIRED_XCODE)
                 steps:
                   - template: ui-tests-steps.yml
                     parameters:

From 549d3ac4bf61b23619aa60e9a774812e8d87fdbf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Jun 2023 06:10:40 +0800
Subject: [PATCH 019/105] Bump cake.tool from 2.1.0 to 2.3.0 (#15752)

Bumps [cake.tool](https://github.com/cake-build/cake) from 2.1.0 to 2.3.0.
- [Release notes](https://github.com/cake-build/cake/releases)
- [Changelog](https://github.com/cake-build/cake/blob/develop/ReleaseNotes.md)
- [Commits](https://github.com/cake-build/cake/compare/v2.1.0...v2.3.0)

---
updated-dependencies:
- dependency-name: cake.tool
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .config/dotnet-tools.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index bd75e4c80518..41d23caf22bb 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "cake.tool": {
-      "version": "2.1.0",
+      "version": "2.3.0",
       "commands": [
         "dotnet-cake"
       ]

From 329046ff092b387c0889208d2921ab545df18324 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Tue, 20 Jun 2023 17:12:19 -0500
Subject: [PATCH 020/105] [android] support more system font names (#15759)

Context: https://github.com/dotnet/maui/issues/10713
Context: https://github.com/supershopping/ShellFlyoutLagging

In reviewing the above customer sample, I noticed time spent in:

    79.52ms microsoft.maui!Microsoft.Maui.Handlers.LabelHandler.MapFont(Microsoft.Maui.Handlers.ILabelHandler,Microsoft.Maui.ILabel)
    20.71ms microsoft.extensions.logging.abstractions!Microsoft.Extensions.Logging.LoggerExtensions.LogWarning(Microsoft.Extensions

What warning are we trying to log? It seems like it is impacting the
time it takes for the first Shell flyout to open.

Adding more logging, I found:

    06-19 15:31:19.834  5706  5706 I DOTNET  : Unable to load font 'sans-serif-medium' from assets.
    06-19 15:31:19.840  5706  5706 I DOTNET  : Unable to load font 'sans-serif-medium.ttf' from assets.
    06-19 15:31:19.840  5706  5706 I DOTNET  : Unable to load font 'Fonts/sans-serif-medium.ttf' from assets.
    06-19 15:31:19.841  5706  5706 I DOTNET  : Unable to load font 'fonts/sans-serif-medium.ttf' from assets.
    06-19 15:31:19.841  5706  5706 I DOTNET  : Unable to load font 'sans-serif-medium.otf' from assets.
    06-19 15:31:19.842  5706  5706 I DOTNET  : Unable to load font 'Fonts/sans-serif-medium.otf' from assets.
    06-19 15:31:19.842  5706  5706 I DOTNET  : Unable to load font 'fonts/sans-serif-medium.otf' from assets.

Which is likely just trying to load one of:

* https://github.com/dotnet/maui/blob/0543e03cbe7331ae2c106c67a9eaefc575f75945/src/Controls/src/Core/Shell/BaseShellItem.cs#L517
* https://github.com/dotnet/maui/blob/0543e03cbe7331ae2c106c67a9eaefc575f75945/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellItemRenderer.cs#L248

In 2d354d10, we added support for certain Android system fonts. I think
we should just expand this further to support various Android fonts
like:

    sans-serif-black
    sans-serif-condensed
    sans-serif-condensed-light
    sans-serif-light
    sans-serif-medium

You can use these in Android such as:

    android:fontFamily="sans-serif-medium"

We can load this `Typeface` from C# such as:

    Typeface.Create("sans-serif-medium", TypefaceStyle.Normal)

See: https://stackoverflow.com/a/14344132

In MAUI apps, customers are likely using a `Fonts/` folder, so if they
use these names, they are likely trying to load a system font.

After these changes, I see this result on a Pixel 5:

    Before:
    79.52ms microsoft.maui!Microsoft.Maui.Handlers.LabelHandler.MapFont(Microsoft.Maui.Handlers.ILabelHandler,Microsoft.Maui.ILabel)
    After:
    26.91ms microsoft.maui!Microsoft.Maui.Handlers.LabelHandler.MapFont(Microsoft.Maui.Handlers.ILabelHandler,Microsoft.Maui.ILabel)

So, I think this saves ~52ms of time for the first Shell flyout opening
in this sample.
---
 src/Core/src/Fonts/FontManager.Android.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Core/src/Fonts/FontManager.Android.cs b/src/Core/src/Fonts/FontManager.Android.cs
index 531a9fffad07..3ec89043ff8d 100644
--- a/src/Core/src/Fonts/FontManager.Android.cs
+++ b/src/Core/src/Fonts/FontManager.Android.cs
@@ -143,6 +143,11 @@ public FontSize GetFontSize(Font font, float defaultFontSize = 0)
 				case "serif":
 					return Typeface.Serif;
 				default:
+					if (fontfamily.StartsWith("sansserif-", StringComparison.OrdinalIgnoreCase) ||
+						fontfamily.StartsWith("sans-serif-", StringComparison.OrdinalIgnoreCase))
+					{
+						return Typeface.Create(fontfamily, TypefaceStyle.Normal);
+					}
 					return null;
 			}
 		}

From dd8f82a5658fc53c6f550ef07b61541b6ebf9f9c Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Wed, 21 Jun 2023 04:48:40 -0500
Subject: [PATCH 021/105] Android x nuget bumps (#15746)

* Android ecosystem nugets bumped

* - remove backqueue

* - fix tests

* - fix back navigation visibility

---------

Co-authored-by: moljac <mcvjetko@holisticware.net>
---
 eng/AndroidX.targets                          | 12 ++---
 eng/Versions.props                            |  2 +-
 .../src/Core/NavigationPage/NavigationPage.cs |  1 +
 .../NavigationPage/NavigationPageTests.cs     | 39 +++++++++++++++
 .../Navigation/StackNavigationManager.cs      | 50 ++++++++-----------
 .../Android/NavigationViewExtensions.cs       | 32 ++++++++++++
 .../NavigationViewHandlerTests.Android.cs     | 13 ++++-
 7 files changed, 110 insertions(+), 39 deletions(-)
 create mode 100644 src/Core/src/Platform/Android/NavigationViewExtensions.cs

diff --git a/eng/AndroidX.targets b/eng/AndroidX.targets
index d16531bbed2f..93a74336d158 100644
--- a/eng/AndroidX.targets
+++ b/eng/AndroidX.targets
@@ -18,19 +18,19 @@
     />
     <PackageReference
         Update="Xamarin.AndroidX.Navigation.UI"
-        Version="2.5.3.3"
+        Version="2.6.0"
     />
     <PackageReference
         Update="Xamarin.AndroidX.Navigation.Fragment"
-        Version="2.5.3.3"
+        Version="2.6.0"
     />
     <PackageReference
         Update="Xamarin.AndroidX.Navigation.Runtime"
-        Version="2.5.3.3"
+        Version="2.6.0"
     />
     <PackageReference
         Update="Xamarin.AndroidX.Navigation.Common"
-        Version="2.5.3.3"
+        Version="2.6.0"
     />
     <PackageReference
         Update="Xamarin.AndroidX.MediaRouter"
@@ -59,7 +59,7 @@
     />
     <PackageReference
         Update="Xamarin.AndroidX.Window.WindowJava"
-        Version="1.0.0.13"
+        Version="1.1.0"
     />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/eng/Versions.props b/eng/Versions.props
index 48fd17fa6690..9a426cecef97 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -55,7 +55,7 @@
     <!-- GLIDE - the android maven artifact in /src/Core/AndroidNative/maui/build.gradle -->
     <!-- must be kept in sync with the binding library version to it here: -->
     <_XamarinAndroidGlideVersion>4.15.1</_XamarinAndroidGlideVersion>
-    <_XamarinAndroidXSecurityVersion>1.1.0-alpha05</_XamarinAndroidXSecurityVersion>
+    <_XamarinAndroidXSecurityVersion>1.1.0-alpha06</_XamarinAndroidXSecurityVersion>
     <_XamarinGoogleCryptoTinkAndroidVersion>1.9.0.1</_XamarinGoogleCryptoTinkAndroidVersion>
     <!-- Android Maps -->
     <XamarinGooglePlayServicesMaps>118.1.0.2</XamarinGooglePlayServicesMaps>
diff --git a/src/Controls/src/Core/NavigationPage/NavigationPage.cs b/src/Controls/src/Core/NavigationPage/NavigationPage.cs
index ac45c2f92671..5363b584e704 100644
--- a/src/Controls/src/Core/NavigationPage/NavigationPage.cs
+++ b/src/Controls/src/Core/NavigationPage/NavigationPage.cs
@@ -467,6 +467,7 @@ void IStackNavigation.NavigationFinished(IReadOnlyList<IView> newStack)
 				SyncToNavigationStack(newStack);
 				CurrentPage = (Page)newStack[newStack.Count - 1];
 				RootPage = (Page)newStack[0];
+				FindMyToolbar()?.Handler?.UpdateValue(nameof(IToolbar.BackButtonVisible));
 			}
 
 			var completionSource = _currentNavigationCompletionSource;
diff --git a/src/Controls/tests/DeviceTests/Elements/NavigationPage/NavigationPageTests.cs b/src/Controls/tests/DeviceTests/Elements/NavigationPage/NavigationPageTests.cs
index 8e64340d6923..018cd0bd5d2a 100644
--- a/src/Controls/tests/DeviceTests/Elements/NavigationPage/NavigationPageTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/NavigationPage/NavigationPageTests.cs
@@ -92,6 +92,45 @@ await CreateHandlerAndAddToWindow<WindowHandlerStub>(new Window(navPage), async
 		}
 
 #if !IOS && !MACCATALYST
+
+		[Fact(DisplayName = "Swapping Navigation Toggles BackButton Correctly")]
+		public async Task SwappingNavigationTogglesBackButtonCorrectly()
+		{
+			SetupBuilder();
+			var navPage = new NavigationPage(new ContentPage());
+
+			await CreateHandlerAndAddToWindow<WindowHandlerStub>(new Window(navPage), async (handler) =>
+			{
+				await navPage.PushAsync(new ContentPage());
+				var navigation = navPage.Navigation;
+				var stackNavigationView = navPage as IStackNavigationView;
+				List<Page> _currentNavStack = navigation.NavigationStack.ToList();
+
+				var singlePage = new ContentPage();
+				stackNavigationView.RequestNavigation(
+						new NavigationRequest(
+							new List<ContentPage>
+							{
+								singlePage
+							}, false));
+
+				await OnLoadedAsync(singlePage);
+				await (navPage.CurrentNavigationTask ?? Task.CompletedTask);
+
+				// Wait for back button to hide
+				Assert.True(await AssertionExtensions.Wait(() => !IsBackButtonVisible(handler)));
+
+				stackNavigationView.RequestNavigation(
+					   new NavigationRequest(_currentNavStack, true));
+
+				await OnLoadedAsync(_currentNavStack.Last());
+				await (navPage.CurrentNavigationTask ?? Task.CompletedTask);
+
+				// Wait for back button to reveal itself
+				Assert.True(await AssertionExtensions.Wait(() => IsBackButtonVisible(handler)));
+			}, timeOut: TimeSpan.FromMinutes(2));
+		}
+
 		[Fact(DisplayName = "Back Button Visibility Changes with push/pop")]
 		public async Task BackButtonVisibilityChangesWithPushPop()
 		{
diff --git a/src/Core/src/Platform/Android/Navigation/StackNavigationManager.cs b/src/Core/src/Platform/Android/Navigation/StackNavigationManager.cs
index b7efcce2a60a..135d26f40f30 100644
--- a/src/Core/src/Platform/Android/Navigation/StackNavigationManager.cs
+++ b/src/Core/src/Platform/Android/Navigation/StackNavigationManager.cs
@@ -7,6 +7,7 @@
 using AndroidX.Navigation.Fragment;
 using AndroidX.Navigation.UI;
 using Java.Interop;
+using Java.Lang;
 using AToolbar = AndroidX.AppCompat.Widget.Toolbar;
 using AView = Android.Views.View;
 
@@ -140,17 +141,8 @@ void ApplyNavigationRequest(NavigationRequest args)
 
 			IsAnimated = animated;
 
-			var iterator = NavController.BackQueue.Iterator();
 			var fragmentNavDestinations = new List<FragmentNavigator.Destination>();
-
-			while (iterator.HasNext)
-			{
-				if (iterator.Next() is NavBackStackEntry nbse &&
-					nbse.Destination is FragmentNavigator.Destination nvd)
-				{
-					fragmentNavDestinations.Add(nvd);
-				}
-			}
+			navController.IterateBackStack(d => fragmentNavDestinations.Add(d));
 
 			// Current BackStack has less entries then incoming new page stack
 			// This will add Back Stack Entries until the back stack and the new stack 
@@ -183,19 +175,16 @@ void ApplyNavigationRequest(NavigationRequest args)
 			// We only keep destinations around that are on the backstack
 			// This iterates over the new backstack and removes any destinations
 			// that are no longer apart of the back stack
-			var iterateNewStack = NavController.BackQueue.Iterator();
+
+			var iterateNewStack = NavController.Graph.Iterator();
 			int startId = -1;
-			while (iterateNewStack.HasNext)
-			{
-				if (iterateNewStack.Next() is NavBackStackEntry nbse &&
-					nbse.Destination is FragmentNavigator.Destination nvd)
-				{
-					fragmentNavDestinations.Remove(nvd);
 
-					if (startId == -1)
-						startId = nvd.Id;
-				}
-			}
+			navController.IterateBackStack(nvd =>
+			{
+				if (startId == -1)
+					startId = nvd.Id;
+				fragmentNavDestinations.Remove(nvd);
+			});
 
 			foreach (var activeDestinations in fragmentNavDestinations)
 			{
@@ -247,14 +236,6 @@ List<int> Initialize(IReadOnlyList<IView> pages)
 		{
 			var navController = NavController;
 
-			// We are subtracting one because the navgraph itself is the first item on the stack
-			int PlatformNavigationStackCount = navController.BackQueue.Size() - 1;
-
-			// set this to one because when the graph is first attached to the controller
-			// it will add the graph and the first destination
-			if (PlatformNavigationStackCount < 0)
-				PlatformNavigationStackCount = 1;
-
 			List<int> destinations = new List<int>();
 
 			NavDestination navDestination;
@@ -268,6 +249,15 @@ List<int> Initialize(IReadOnlyList<IView> pages)
 			NavGraph.StartDestination = destinations[0];
 			navController.SetGraph(NavGraph, null);
 
+			int PlatformNavigationStackCount = 0;
+
+			navController.IterateBackStack(_ => PlatformNavigationStackCount++);
+
+			// set this to one because when the graph is first attached to the controller
+			// it will add the graph and the first destination
+			if (PlatformNavigationStackCount < 0)
+				PlatformNavigationStackCount = 1;
+
 			for (var i = PlatformNavigationStackCount; i < pages.Count; i++)
 			{
 				var dest = destinations[i];
@@ -586,4 +576,4 @@ internal void Disconnect()
 			}
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/src/Core/src/Platform/Android/NavigationViewExtensions.cs b/src/Core/src/Platform/Android/NavigationViewExtensions.cs
new file mode 100644
index 000000000000..9ee6a3a5587d
--- /dev/null
+++ b/src/Core/src/Platform/Android/NavigationViewExtensions.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using AndroidX.Navigation.Fragment;
+using AndroidX.Navigation;
+using Java.Lang;
+using Microsoft.Maui.Graphics;
+
+namespace Microsoft.Maui.Platform
+{
+	internal static partial class NavigationViewExtensions
+	{
+
+		public static void IterateBackStack(this NavController navController, Action<FragmentNavigator.Destination> action)
+		{
+			var iterator = navController.Graph.Iterator();
+
+			while (iterator.HasNext)
+			{
+				if (iterator.Next() is FragmentNavigator.Destination nvd)
+				{
+					try
+					{
+						if (navController.GetBackStackEntry(nvd.Id).Destination is FragmentNavigator.Destination found)
+							action.Invoke(found);
+					}
+					catch (IllegalArgumentException) { }
+				}
+			}
+		}
+	}
+}
diff --git a/src/Core/tests/DeviceTests/Handlers/Navigation/NavigationViewHandlerTests.Android.cs b/src/Core/tests/DeviceTests/Handlers/Navigation/NavigationViewHandlerTests.Android.cs
index 2255937e86f0..6242230112d5 100644
--- a/src/Core/tests/DeviceTests/Handlers/Navigation/NavigationViewHandlerTests.Android.cs
+++ b/src/Core/tests/DeviceTests/Handlers/Navigation/NavigationViewHandlerTests.Android.cs
@@ -6,6 +6,9 @@
 using AndroidX.AppCompat.App;
 using AndroidX.AppCompat.Widget;
 using AndroidX.Fragment.App;
+using AndroidX.Navigation.Fragment;
+using AndroidX.Navigation;
+using Java.Lang;
 using Microsoft.Maui.DeviceTests.Stubs;
 using Microsoft.Maui.Handlers;
 using Xunit;
@@ -15,8 +18,14 @@ namespace Microsoft.Maui.DeviceTests
 {
 	public partial class NavigationViewHandlerTests
 	{
-		int GetNativeNavigationStackCount(NavigationViewHandler navigationViewHandler) =>
-			navigationViewHandler.StackNavigationManager.NavHost.NavController.BackQueue.Size() - 1;
+		int GetNativeNavigationStackCount(NavigationViewHandler navigationViewHandler)
+		{
+			int i = 0;
+			var navController = navigationViewHandler.StackNavigationManager.NavHost.NavController;
+			navController.IterateBackStack(_ => i++);
+
+			return i;
+		}
 
 		Task CreateNavigationViewHandlerAsync(IStackNavigationView navigationView, Func<NavigationViewHandler, Task> action)
 		{

From 45a69aa8dccf1e0238f152d2a17b927eb30e2106 Mon Sep 17 00:00:00 2001
From: Manuel de la Pena <mandel@microsoft.com>
Date: Wed, 21 Jun 2023 06:07:54 -0400
Subject: [PATCH 022/105] [CI] Move away from template parameters to help
 moving to a matrix strategy. (#15761)

We are tyring to minimize the size of the yaml so that we get to a point
in which we can have all templates in a single pipeline. To do so, we
can move to use matrix strategies that minimize the size of the
generated code, but this comes at a price.

One of the issues with using a matrix strategy is that it gets expanded
at runtime, but not at compile time. That results in a problem, which is
that templates need to know all its parameters at COMPILE time. This
supposes a problem when using the provision tempalte, because we cannot
expand the matrix at compile time. We can fix that using conditions at
runtime. The side effect of this is that there are going to be more
steps in the pipeline that get skipped, yet it is a small price to pay
for the final goal.
---
 eng/pipelines/common/device-tests-steps.yml |   1 -
 eng/pipelines/common/maui-templates.yml     |   2 -
 eng/pipelines/common/pack.yml               |   1 -
 eng/pipelines/common/provision.yml          | 273 ++++++++++----------
 eng/pipelines/common/ui-tests-steps.yml     |   3 -
 eng/pipelines/handlers.yml                  |   2 -
 6 files changed, 143 insertions(+), 139 deletions(-)

diff --git a/eng/pipelines/common/device-tests-steps.yml b/eng/pipelines/common/device-tests-steps.yml
index b6ef7d5e8dcf..4b75ef4cc3fc 100644
--- a/eng/pipelines/common/device-tests-steps.yml
+++ b/eng/pipelines/common/device-tests-steps.yml
@@ -13,7 +13,6 @@ parameters:
 steps:
   - template: provision.yml
     parameters:
-      platform: macos
       skipXcode: ${{ eq(parameters.platform, 'android') }}
       provisionatorChannel: ${{ parameters.provisionatorChannel }}
 
diff --git a/eng/pipelines/common/maui-templates.yml b/eng/pipelines/common/maui-templates.yml
index 586fb40fb1b0..61264bc96e9f 100644
--- a/eng/pipelines/common/maui-templates.yml
+++ b/eng/pipelines/common/maui-templates.yml
@@ -76,7 +76,6 @@ jobs:
 
     - template: provision.yml
       parameters:
-        platform: ${{ BuildPlatform.name }}
         checkoutDirectory: ${{ parameters.checkoutDirectory }}
 
     - task: DownloadBuildArtifacts@0
@@ -135,7 +134,6 @@ jobs:
 
     - template: provision.yml
       parameters:
-        platform: macos
         skipXcode: ${{ eq(RunPlatform.testName, 'RunOnAndroid') }}
         checkoutDirectory: ${{ parameters.checkoutDirectory }}
 
diff --git a/eng/pipelines/common/pack.yml b/eng/pipelines/common/pack.yml
index 58ecc3e84d08..d04fcd6549e1 100644
--- a/eng/pipelines/common/pack.yml
+++ b/eng/pipelines/common/pack.yml
@@ -36,7 +36,6 @@ steps:
   - template: provision.yml
     parameters:
       checkoutDirectory: ${{ parameters.checkoutDirectory }}
-      platform: ${{ parameters.platform }}
       poolName: ${{ parameters.poolName }}
       provisionatorChannel: ${{ parameters.provisionatorChannel }}
       gitHubToken: ${{ parameters.gitHubToken }}
diff --git a/eng/pipelines/common/provision.yml b/eng/pipelines/common/provision.yml
index a977db31c942..a897faa2f3e5 100644
--- a/eng/pipelines/common/provision.yml
+++ b/eng/pipelines/common/provision.yml
@@ -1,5 +1,4 @@
 parameters:
-  platform : ''
   poolName: ''
   skipXcode: false
   skipVS: true
@@ -14,146 +13,160 @@ parameters:
 
 steps:
   # Prepare macOS
-  - ${{ if eq(parameters.platform, 'macos') }}:
-    - template: agent-cleanser/v1.yml@yaml-templates
-      parameters:
-        UninstallMono: false
-        UninstallXamarinMac: false
-        CleanseAgentToolsDotNet: true           # Cleanse all .NET versions under the agent tools directory and use only those provisioned by the pipeline
-        SelfHealPowerShell: false
-        AUTH_TOKEN_GITHUB_COM: $(github--pat--vs-mobiletools-engineering-service2)
-    # Provision Xcode
-    - ${{ if ne(parameters.skipXcode, 'true') }}:
-      - task: xamops.azdevex.provisionator-task.provisionator@2
-        displayName: 'Provision Xcode'
-        inputs:
-          provisioning_script: ${{ parameters.checkoutDirectory }}/${{ parameters.provisionatorXCodePath }}
-          provisioning_extra_args: ${{ parameters.provisionatorExtraArguments }}
-          github_token: ${{ parameters.gitHubToken }}
-        env:
-          PROVISIONATOR_CHANNEL: ${{ parameters.provisionatorChannel }}
-    # Provision Additional Software
-    - ${{ if ne(parameters.skipProvisioning, 'true') }}:
-      - task: xamops.azdevex.provisionator-task.provisionator@2
-        displayName: 'Provision Additional Software'
-        continueOnError: true 
-        inputs:
-          provisioning_script: ${{ parameters.checkoutDirectory }}/${{ parameters.provisionatorPath }}
-          provisioning_extra_args: ${{ parameters.provisionatorExtraArguments }}
-          github_token: ${{ parameters.gitHubToken }}
-        env:
-          PROVISIONATOR_CHANNEL: ${{ parameters.provisionatorChannel }}
-
-    # Setup SDK Paths
-    - bash: |
-        echo "##vso[task.prependpath]/Library/Frameworks/Mono.framework/Versions/Current/Commands/"
-        echo "##vso[task.prependpath]~/Library/Developer/Xamarin/android-sdk-macosx"
-      displayName: 'Setup SDK Paths'
-      condition: ne(variables['osx2019VmPool'], 'Azure Pipelines')
-    # Setup JDK Paths
-    - bash: |
-        echo "##vso[task.setvariable variable=JI_JAVA_HOME]$(JAVA_HOME_11_X64)"
-        echo "##vso[task.setvariable variable=JAVA_HOME]$(JAVA_HOME_11_X64)"
-      displayName: 'Setup JDK Paths'
-    # Configure VS Mac for Xcode
-    - bash: |
-        set -x
-        mkdir -p ~/Library/Preferences/Xamarin
-        rm -f ~/Library/Preferences/Xamarin/Settings.plist
-        /usr/libexec/PlistBuddy -c "add :AppleSdkRoot string $(dirname $(dirname $(xcode-select -p)))" ~/Library/Preferences/Xamarin/Settings.plist || true
-        cat ~/Library/Preferences/Xamarin/Settings.plist || true
-      displayName: 'Configure Visual Studio'
-    # Install Certificates and Provisioning Profiles
-    - task: InstallAppleProvisioningProfile@1
-      displayName: 'Install the iOS provisioning profile'
-      inputs:
-        provProfileSecureFile: 'Components iOS Provisioning.mobileprovision'
-    - task: InstallAppleProvisioningProfile@1
-      displayName: 'Install the macOS provisioning profile'
-      inputs:
-        provProfileSecureFile: 'Components Mac Provisioning.mobileprovision'
-    - task: InstallAppleProvisioningProfile@1
-      displayName: 'Install the tvOS provisioning profile'
+  - template: agent-cleanser/v1.yml@yaml-templates
+    parameters:
+      condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin'))
+      UninstallMono: false
+      UninstallXamarinMac: false
+      CleanseAgentToolsDotNet: true           # Cleanse all .NET versions under the agent tools directory and use only those provisioned by the pipeline
+      SelfHealPowerShell: false
+      AUTH_TOKEN_GITHUB_COM: $(github--pat--vs-mobiletools-engineering-service2)
+  # Provision Xcode
+  - ${{ if ne(parameters.skipXcode, 'true') }}:
+    - task: xamops.azdevex.provisionator-task.provisionator@2
+      condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin'))
+      displayName: 'Provision Xcode'
       inputs:
-        provProfileSecureFile: 'Components tvOS Provisioning.mobileprovision'
-    - task: InstallAppleCertificate@2
-      displayName: 'Install the iOS certificate'
+        provisioning_script: ${{ parameters.checkoutDirectory }}/${{ parameters.provisionatorXCodePath }}
+        provisioning_extra_args: ${{ parameters.provisionatorExtraArguments }}
+        github_token: ${{ parameters.gitHubToken }}
+      env:
+        PROVISIONATOR_CHANNEL: ${{ parameters.provisionatorChannel }}
+  # Provision Additional Software
+  - ${{ if ne(parameters.skipProvisioning, 'true') }}:
+    - task: xamops.azdevex.provisionator-task.provisionator@2
+      displayName: 'Provision Additional Software'
+      condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin'))
+      continueOnError: true 
       inputs:
-        certSecureFile: 'Components iOS Certificate.p12'
-    - task: InstallAppleCertificate@2
-      condition: eq(variables['System.JobName'], 'macos')
-      displayName: 'Install the macOS certificate'
-      inputs:
-        certSecureFile: 'Components Mac Certificate.p12'
+        provisioning_script: ${{ parameters.checkoutDirectory }}/${{ parameters.provisionatorPath }}
+        provisioning_extra_args: ${{ parameters.provisionatorExtraArguments }}
+        github_token: ${{ parameters.gitHubToken }}
+      env:
+        PROVISIONATOR_CHANNEL: ${{ parameters.provisionatorChannel }}
 
-  # Prepare Windows
-  - ${{ if eq(parameters.platform, 'windows') }}:
-    - powershell: |
-        if (-not $(where.exe pwsh)) {
-          $url = "https://github.com/PowerShell/PowerShell/releases/download/v$env:POWERSHELL_VERSION/PowerShell-$env:POWERSHELL_VERSION-win-x64.msi"
-          $output = "$env:TEMP\PowerShell.msi"
-          Remove-Item -Force $output -ErrorAction Ignore
-          Invoke-WebRequest -Uri $url -OutFile $output
-          msiexec.exe /package $output /quiet ADD_EXPLORER_CONTEXT_MENU_OPENPOWERSHELL=1 ENABLE_PSREMOTING=1 REGISTER_MANIFEST=1
-        }
-      displayName: 'Install PowerShell Core'
-    - ${{ if ne(parameters.skipVS, 'true') }}:
-      - task: xamops.azdevex.provisionator-task.provisionator@2
-        displayName: 'Provision Visual Studio'
-        inputs:
-          provisioning_script: ${{ parameters.checkoutDirectory }}/${{ parameters.provisionatorVSPath }}
-          provisioning_extra_args: ${{ parameters.provisionatorExtraArguments }}
-          github_token: ${{ parameters.gitHubToken }}
-        env:
-          PROVISIONATOR_CHANNEL: ${{ parameters.provisionatorChannel }}
-      - pwsh: |
-          $msbuild = "$env:ProgramFiles/Microsoft Visual Studio/2022/Preview/MSBuild/Current/Bin/MSBuild.exe"
-          echo "##vso[task.setvariable variable=MSBUILD_EXE]$msbuild"
-        displayName: 'Setup MSBuild Paths'
+  # Setup SDK Paths
+  - bash: |
+      echo "##vso[task.prependpath]/Library/Frameworks/Mono.framework/Versions/Current/Commands/"
+      echo "##vso[task.prependpath]~/Library/Developer/Xamarin/android-sdk-macosx"
+    displayName: 'Setup SDK Paths'
+    condition: and(succeeded(), ne(variables['osx2019VmPool'], 'Azure Pipelines'), eq(variables['Agent.OS'], 'Darwin'))
+  # Setup JDK Paths
+  - bash: |
+      echo "##vso[task.setvariable variable=JI_JAVA_HOME]$(JAVA_HOME_11_X64)"
+      echo "##vso[task.setvariable variable=JAVA_HOME]$(JAVA_HOME_11_X64)"
+    displayName: 'Setup JDK Paths'
+    condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin'))
+  # Configure VS Mac for Xcode
+  - bash: |
+      set -x
+      mkdir -p ~/Library/Preferences/Xamarin
+      rm -f ~/Library/Preferences/Xamarin/Settings.plist
+      /usr/libexec/PlistBuddy -c "add :AppleSdkRoot string $(dirname $(dirname $(xcode-select -p)))" ~/Library/Preferences/Xamarin/Settings.plist || true
+      cat ~/Library/Preferences/Xamarin/Settings.plist || true
+    displayName: 'Configure Visual Studio'
+    condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin'))
+  # Install Certificates and Provisioning Profiles
+  - task: InstallAppleProvisioningProfile@1
+    displayName: 'Install the iOS provisioning profile'
+    condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin'))
+    inputs:
+      provProfileSecureFile: 'Components iOS Provisioning.mobileprovision'
+  - task: InstallAppleProvisioningProfile@1
+    displayName: 'Install the macOS provisioning profile'
+    condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin'))
+    inputs:
+      provProfileSecureFile: 'Components Mac Provisioning.mobileprovision'
+  - task: InstallAppleProvisioningProfile@1
+    displayName: 'Install the tvOS provisioning profile'
+    condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin'))
+    inputs:
+      provProfileSecureFile: 'Components tvOS Provisioning.mobileprovision'
+  - task: InstallAppleCertificate@2
+    displayName: 'Install the iOS certificate'
+    condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin'))
+    inputs:
+      certSecureFile: 'Components iOS Certificate.p12'
+  - task: InstallAppleCertificate@2
+    condition: eq(variables['System.JobName'], 'macos')
+    displayName: 'Install the macOS certificate'
+    inputs:
+      certSecureFile: 'Components Mac Certificate.p12'
 
-    # Provision Additional Software
-    - ${{ if ne(parameters.skipProvisioning, 'true') }}:
-      - task: xamops.azdevex.provisionator-task.provisionator@2
-        displayName: 'Provision Additional Software'
-        inputs:
-          provisioning_script: ${{ parameters.checkoutDirectory }}/${{ parameters.provisionatorPath }}
-          provisioning_extra_args: ${{ parameters.provisionatorExtraArguments }}
-          github_token: ${{ parameters.gitHubToken }}
-        env:
-          PROVISIONATOR_CHANNEL: ${{ parameters.provisionatorChannel }}
+  # Prepare Windows
+  - powershell: |
+      if (-not $(where.exe pwsh)) {
+        $url = "https://github.com/PowerShell/PowerShell/releases/download/v$env:POWERSHELL_VERSION/PowerShell-$env:POWERSHELL_VERSION-win-x64.msi"
+        $output = "$env:TEMP\PowerShell.msi"
+        Remove-Item -Force $output -ErrorAction Ignore
+        Invoke-WebRequest -Uri $url -OutFile $output
+        msiexec.exe /package $output /quiet ADD_EXPLORER_CONTEXT_MENU_OPENPOWERSHELL=1 ENABLE_PSREMOTING=1 REGISTER_MANIFEST=1
+      }
+    displayName: 'Install PowerShell Core'
+    condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
 
+  - ${{ if ne(parameters.skipVS, 'true') }}:
+    - task: xamops.azdevex.provisionator-task.provisionator@2
+      displayName: 'Provision Visual Studio'
+      condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
+      inputs:
+        provisioning_script: ${{ parameters.checkoutDirectory }}/${{ parameters.provisionatorVSPath }}
+        provisioning_extra_args: ${{ parameters.provisionatorExtraArguments }}
+        github_token: ${{ parameters.gitHubToken }}
+      env:
+        PROVISIONATOR_CHANNEL: ${{ parameters.provisionatorChannel }}
     - pwsh: |
-        if ($env:JAVA_HOME_11_X64) {
-          $env:JAVA_HOME = $env:JAVA_HOME_11_X64
-        } else {
-          $path = (Get-ChildItem $env:ProgramFiles\Microsoft\jdk-11.*\bin\java.exe) | Select-Object -First 1
-          if ($path -and (Test-Path $path)) {
-            $env:JAVA_HOME = $path.Directory.Parent.FullName
-          }
-        }
-        if ($env:JAVA_HOME) {
-          echo "##vso[task.setvariable variable=JAVA_HOME]$env:JAVA_HOME"
-          echo "JAVA_HOME set to '$env:JAVA_HOME'"
-        } else {
-          echo "Unable to set JAVA_HOME"
+        $msbuild = "$env:ProgramFiles/Microsoft Visual Studio/2022/Preview/MSBuild/Current/Bin/MSBuild.exe"
+        echo "##vso[task.setvariable variable=MSBUILD_EXE]$msbuild"
+      displayName: 'Setup MSBuild Paths'
+      condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
+
+  # Provision Additional Software
+  - ${{ if ne(parameters.skipProvisioning, 'true') }}:
+    - task: xamops.azdevex.provisionator-task.provisionator@2
+      displayName: 'Provision Additional Software'
+      condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
+      inputs:
+        provisioning_script: ${{ parameters.checkoutDirectory }}/${{ parameters.provisionatorPath }}
+        provisioning_extra_args: ${{ parameters.provisionatorExtraArguments }}
+        github_token: ${{ parameters.gitHubToken }}
+      env:
+        PROVISIONATOR_CHANNEL: ${{ parameters.provisionatorChannel }}
+
+  - pwsh: |
+      if ($env:JAVA_HOME_11_X64) {
+        $env:JAVA_HOME = $env:JAVA_HOME_11_X64
+      } else {
+        $path = (Get-ChildItem $env:ProgramFiles\Microsoft\jdk-11.*\bin\java.exe) | Select-Object -First 1
+        if ($path -and (Test-Path $path)) {
+          $env:JAVA_HOME = $path.Directory.Parent.FullName
         }
-      displayName: 'Setup JDK Paths'
+      }
+      if ($env:JAVA_HOME) {
+        echo "##vso[task.setvariable variable=JAVA_HOME]$env:JAVA_HOME"
+        echo "JAVA_HOME set to '$env:JAVA_HOME'"
+      } else {
+        echo "Unable to set JAVA_HOME"
+      }
+    displayName: 'Setup JDK Paths'
+    condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
 
-    - pwsh: |
+  - pwsh: |
+      if ($env:ANDROID_SDK_ROOT) {
+        echo "ANDROID_SDK_ROOT already set to '$env:ANDROID_SDK_ROOT'"
+      } else {
+        if ((Test-Path "${env:ProgramFiles(x86)}\Android\android-sdk")) {
+          $env:ANDROID_SDK_ROOT = "${env:ProgramFiles(x86)}\Android\android-sdk"
+        }
         if ($env:ANDROID_SDK_ROOT) {
-          echo "ANDROID_SDK_ROOT already set to '$env:ANDROID_SDK_ROOT'"
+          echo "##vso[task.setvariable variable=ANDROID_SDK_ROOT]$env:ANDROID_SDK_ROOT"
+          echo "ANDROID_SDK_ROOT set to '$env:ANDROID_SDK_ROOT'"
         } else {
-          if ((Test-Path "${env:ProgramFiles(x86)}\Android\android-sdk")) {
-            $env:ANDROID_SDK_ROOT = "${env:ProgramFiles(x86)}\Android\android-sdk"
-          }
-          if ($env:ANDROID_SDK_ROOT) {
-            echo "##vso[task.setvariable variable=ANDROID_SDK_ROOT]$env:ANDROID_SDK_ROOT"
-            echo "ANDROID_SDK_ROOT set to '$env:ANDROID_SDK_ROOT'"
-          } else {
-            echo "Unable to set ANDROID_SDK_ROOT"
-          }
+          echo "Unable to set ANDROID_SDK_ROOT"
         }
-      displayName: 'Setup ANDROID_SDK_ROOT Paths'
+      }
+    displayName: 'Setup ANDROID_SDK_ROOT Paths'
+    condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
 
   # Prepare Both
   - task: UseDotNet@2                 # https://docs.microsoft.com/en-us/azure/devops/pipelines/tasks/tool/dotnet-core-tool-installer?view=azure-devops
diff --git a/eng/pipelines/common/ui-tests-steps.yml b/eng/pipelines/common/ui-tests-steps.yml
index 8a5b646a103f..09de53e00b47 100644
--- a/eng/pipelines/common/ui-tests-steps.yml
+++ b/eng/pipelines/common/ui-tests-steps.yml
@@ -14,13 +14,10 @@ steps:
   - template: provision.yml
     parameters:
       ${{ if eq(parameters.platform, 'windows') }}:
-        platform: windows
         skipProvisioning: true
       ${{ if ne(parameters.platform, 'windows') }}:
-        platform: macos
         skipProvisioning: false
       skipXcode: false
-        
       provisionatorChannel: ${{ parameters.provisionatorChannel }}
 
   - task: PowerShell@2
diff --git a/eng/pipelines/handlers.yml b/eng/pipelines/handlers.yml
index d891f269cdb0..dfd639fae944 100644
--- a/eng/pipelines/handlers.yml
+++ b/eng/pipelines/handlers.yml
@@ -150,7 +150,6 @@ stages:
             steps:
               - template: common/provision.yml
                 parameters:
-                  platform: ${{ BuildPlatform.name }}
                   poolName: ${{ BuildPlatform.poolName }}
                   gitHubToken: $(github--pat--vs-mobiletools-engineering-service2)
               - pwsh: ./build.ps1 --target=dotnet --configuration="${{ BuildConfiguration }}" --verbosity=diagnostic
@@ -220,7 +219,6 @@ stages:
           steps:
             - template: common/provision.yml
               parameters:
-                platform: ${{ BuildPlatform.name }}
                 poolName: ${{ BuildPlatform.poolName }}
 
             - task: DownloadBuildArtifacts@0

From 84f6aeacef95aa052c6c46c6207d1255b04b971e Mon Sep 17 00:00:00 2001
From: Manuel de la Pena <mandel@microsoft.com>
Date: Wed, 31 May 2023 10:58:52 -0400
Subject: [PATCH 023/105] [CI] Remove template explosion on the maui templates
 build tests.

Move to minimize the size of the yaml by using a matrix over expanding
the same templates twice. This will reduce the final size of the yaml of
the pipeline.
---
 eng/pipelines/common/maui-templates.yml | 131 +++++++++++++-----------
 1 file changed, 69 insertions(+), 62 deletions(-)

diff --git a/eng/pipelines/common/maui-templates.yml b/eng/pipelines/common/maui-templates.yml
index 61264bc96e9f..650c778ee3cd 100644
--- a/eng/pipelines/common/maui-templates.yml
+++ b/eng/pipelines/common/maui-templates.yml
@@ -55,68 +55,75 @@ parameters:
     default: []
 
 jobs:
-- ${{ each BuildPlatform in parameters.BuildPlatforms }}:
-  - job: build_${{ BuildPlatform.name }}
-    workspace:
-      clean: all
-    displayName: ${{ BuildPlatform.name }}
-    timeoutInMinutes: 240
-    condition: ${{ parameters.condition}}
-    pool:
-      name: ${{ BuildPlatform.poolName }}
-      vmImage: ${{ BuildPlatform.vmImage }}
-      demands:
-        - macOS.Name -equals Ventura
-        - macOS.Architecture -equals x64
-    steps:
-
-    - ${{ each step in parameters.prepareSteps }}:
-      - ${{ each pair in step }}:
-          ${{ pair.key }}: ${{ pair.value }}
-
-    - template: provision.yml
-      parameters:
-        checkoutDirectory: ${{ parameters.checkoutDirectory }}
-
-    - task: DownloadBuildArtifacts@0
-      displayName: 'Download Packages'
-      inputs:
-        artifactName: ${{ parameters.artifactName }}
-        itemPattern: ${{ parameters.artifactItemPattern }}
-        downloadPath: $(System.DefaultWorkingDirectory)/artifacts
-
-    - pwsh: Move-Item -Path artifacts\${{ parameters.artifactName }}\*.nupkg -Destination artifacts -Force
-      displayName: Move the downloaded artifacts
-
-    - pwsh: ./build.ps1 --target=dotnet-local-workloads --verbosity=diagnostic
-      displayName: 'Install .NET (Local Workloads)'
-      retryCountOnTaskFailure: 3
-      workingDirectory: ${{ parameters.checkoutDirectory }}
-      env:
-        DOTNET_TOKEN: $(dotnetbuilds-internal-container-read-token)
-        PRIVATE_BUILD: $(PrivateBuild)
-
-    - task: DotNetCoreCLI@2
-      inputs:
-        projects: ${{ parameters.checkoutDirectory }}/src/TestUtils/src/Microsoft.Maui.IntegrationTests/Microsoft.Maui.IntegrationTests.csproj
-      displayName: Build Microsoft.Maui.IntegrationTests
-
-    - task: DotNetCoreCLI@2
-      inputs:
-        command: test
-        projects: ${{ parameters.checkoutDirectory }}/src/TestUtils/src/Microsoft.Maui.IntegrationTests/bin/Debug/net7.0/Microsoft.Maui.IntegrationTests.dll
-        arguments: --logger "console;verbosity=normal" --filter "FullyQualifiedName=Microsoft.Maui.IntegrationTests.TemplateTests"
-        publishTestResults: true
-        testRunTitle: ${{ BuildPlatform.name }} template build tests
-      displayName: ${{ BuildPlatform.name }} template build tests
-      continueOnError: true
-
-    - pwsh: |
-        Write-Host "Current job status is: $env:AGENT_JOBSTATUS"
-        if ($env:AGENT_JOBSTATUS -eq "SucceededWithIssues") {
-            Write-Host "##vso[task.complete result=Failed;]DONE"
-        }
-      displayName: Fail if any issues occurred
+- job: build_maui_templates
+  workspace:
+    clean: all
+  displayName: 'Build platform:'
+  timeoutInMinutes: 240
+  condition: ${{ parameters.condition}}
+  strategy:
+    matrix:
+      ${{ each BuildPlatform in parameters.BuildPlatforms }}:
+        ${{ BuildPlatform.name }}:
+          POOL_NAME: ${{ BuildPlatform.poolName }}
+          POOL_VIMAGE: ${{ BuildPlatform.vmImage }}
+          PLATFORM_NAME: ${{ BuildPlatform.name }}
+
+  pool:
+    name: $(POOL_NAME)
+    vmImage: $(POOL_VIMAGE)
+    demands:
+      - macOS.Name -equals Ventura
+      - macOS.Architecture -equals x64
+  steps:
+
+  - ${{ each step in parameters.prepareSteps }}:
+    - ${{ each pair in step }}:
+        ${{ pair.key }}: ${{ pair.value }}
+
+  - template: provision.yml
+    parameters:
+      checkoutDirectory: ${{ parameters.checkoutDirectory }}
+
+  - task: DownloadBuildArtifacts@0
+    displayName: 'Download Packages'
+    inputs:
+      artifactName: ${{ parameters.artifactName }}
+      itemPattern: ${{ parameters.artifactItemPattern }}
+      downloadPath: $(System.DefaultWorkingDirectory)/artifacts
+
+  - pwsh: Move-Item -Path artifacts\${{ parameters.artifactName }}\*.nupkg -Destination artifacts -Force
+    displayName: Move the downloaded artifacts
+
+  - pwsh: ./build.ps1 --target=dotnet-local-workloads --verbosity=diagnostic
+    displayName: 'Install .NET (Local Workloads)'
+    retryCountOnTaskFailure: 3
+    workingDirectory: ${{ parameters.checkoutDirectory }}
+    env:
+      DOTNET_TOKEN: $(dotnetbuilds-internal-container-read-token)
+      PRIVATE_BUILD: $(PrivateBuild)
+
+  - task: DotNetCoreCLI@2
+    inputs:
+      projects: ${{ parameters.checkoutDirectory }}/src/TestUtils/src/Microsoft.Maui.IntegrationTests/Microsoft.Maui.IntegrationTests.csproj
+    displayName: Build Microsoft.Maui.IntegrationTests
+
+  - task: DotNetCoreCLI@2
+    inputs:
+      command: test
+      projects: ${{ parameters.checkoutDirectory }}/src/TestUtils/src/Microsoft.Maui.IntegrationTests/bin/Debug/net7.0/Microsoft.Maui.IntegrationTests.dll
+      arguments: --logger "console;verbosity=normal" --filter "FullyQualifiedName=Microsoft.Maui.IntegrationTests.TemplateTests"
+      publishTestResults: true
+      testRunTitle: $(PLATFORM_NAME) template build tests
+    displayName: $(PLATFORM_NAME) template build tests
+    continueOnError: true
+
+  - pwsh: |
+      Write-Host "Current job status is: $env:AGENT_JOBSTATUS"
+      if ($env:AGENT_JOBSTATUS -eq "SucceededWithIssues") {
+          Write-Host "##vso[task.complete result=Failed;]DONE"
+      }
+    displayName: Fail if any issues occurred
 
 - ${{ each RunPlatform in parameters.RunPlatforms }}:
   - job: run_${{ RunPlatform.testName }}

From 52b612d40ff5c34de55212b7e313e91a8496b8a6 Mon Sep 17 00:00:00 2001
From: Manuel de la Pena <mandel@microsoft.com>
Date: Fri, 16 Jun 2023 10:50:27 -0400
Subject: [PATCH 024/105] The provison template expects the platformname to be
 lower.

---
 eng/pipelines/common/maui-templates.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/pipelines/common/maui-templates.yml b/eng/pipelines/common/maui-templates.yml
index 650c778ee3cd..1e5af899b9bb 100644
--- a/eng/pipelines/common/maui-templates.yml
+++ b/eng/pipelines/common/maui-templates.yml
@@ -67,7 +67,7 @@ jobs:
         ${{ BuildPlatform.name }}:
           POOL_NAME: ${{ BuildPlatform.poolName }}
           POOL_VIMAGE: ${{ BuildPlatform.vmImage }}
-          PLATFORM_NAME: ${{ BuildPlatform.name }}
+          PLATFORM_NAME: ${{ lower(BuildPlatform.name) }}
 
   pool:
     name: $(POOL_NAME)

From 3622625fd9a3c686feacea85c5d3820a8b5cafc6 Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Wed, 21 Jun 2023 20:35:51 -0500
Subject: [PATCH 025/105] Sync aar file with latest java changes (#15780)

---
 src/Core/src/maui.aar | Bin 72481 -> 72492 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/Core/src/maui.aar b/src/Core/src/maui.aar
index d4b3ebc7ab9b7e1ad782943fd268392ae4128944..b68ad45329a99750051637a7f5c6261123998c30 100644
GIT binary patch
delta 23148
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
XI+xZO0V)CbmjN3A8U`O30RR91iv3CM

delta 23146
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
V;Ti!d0qvIz8vz;y6d3^k004F%`5FKK


From 34179675a5980338b4918c56ffc46c6067b60ae7 Mon Sep 17 00:00:00 2001
From: Gerald Versluis <gerald.versluis@microsoft.com>
Date: Thu, 22 Jun 2023 15:30:42 +0200
Subject: [PATCH 026/105] Run daily code formatting on .NET SDK 7.0.304
 (#15790)

* Update dotnet-format-daily.yml

* Update dotnet-format-daily.yml

* Update dotnet-format-daily.yml

* Update dotnet-format-daily.yml
---
 .github/workflows/dotnet-format-daily.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/dotnet-format-daily.yml b/.github/workflows/dotnet-format-daily.yml
index 1dd1786a51eb..825a0e43d66d 100644
--- a/.github/workflows/dotnet-format-daily.yml
+++ b/.github/workflows/dotnet-format-daily.yml
@@ -17,6 +17,11 @@ jobs:
         with:
           ref: ${{ github.head_ref }}
 
+      - name: Setup .NET Core SDK
+        uses: actions/setup-dotnet@v3.2.0
+        with:
+          dotnet-version: 7.0.304
+
       - name: Run dotnet format
         run: dotnet format .\Microsoft.Maui.sln --no-restore --exclude Templates/src BlazorWebView/src/SharedSource/BlazorWebViewDeveloperTools.cs BlazorWebView/src/SharedSource/BlazorWebViewServiceCollectionExtensions.cs Graphics/src/Graphics.Win2D/W2DCanvas.cs Graphics/src/Graphics.Win2D/W2DExtensions.cs
     
@@ -40,4 +45,4 @@ jobs:
             area/infrastructure 🏗️
           assignees: rmarinho, jsuarezruiz
           reviewers: rmarinho, jsuarezruiz
-          branch: housekeeping/fix-codeformatting
\ No newline at end of file
+          branch: housekeeping/fix-codeformatting

From c3f42a93976ca2e19f0ff657df6cdb94fc0bcef0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Su=C3=A1rez?= <javiersuarezruiz@hotmail.com>
Date: Thu, 22 Jun 2023 16:43:20 +0200
Subject: [PATCH 027/105] [Windows] Implement ItemsUpdatingScrollMode on
 CollectionView (#15601)

* Implement ItemsUpdatingScrollMode on CollectionView Windows

* Unsubscribe before a subscription

* Fixed wrong name
---
 .../ScrollModeGalleries/EnumPicker.cs         | 34 +++++++++++
 .../ItemsUpdatingScrollModeGallery.xaml       | 47 ++++++++++++++++
 .../ItemsUpdatingScrollModeGallery.xaml.cs    | 56 +++++++++++++++++++
 .../ScrollModeGalleries/ScrollModeGallery.cs  |  6 +-
 .../ScrollModeTestGallery.xaml.cs             |  5 --
 .../Items/ItemsViewHandler.Windows.cs         | 46 +++++++++++++++
 6 files changed, 187 insertions(+), 7 deletions(-)
 create mode 100644 src/Controls/samples/Controls.Sample/Pages/Controls/CollectionViewGalleries/ScrollModeGalleries/EnumPicker.cs
 create mode 100644 src/Controls/samples/Controls.Sample/Pages/Controls/CollectionViewGalleries/ScrollModeGalleries/ItemsUpdatingScrollModeGallery.xaml
 create mode 100644 src/Controls/samples/Controls.Sample/Pages/Controls/CollectionViewGalleries/ScrollModeGalleries/ItemsUpdatingScrollModeGallery.xaml.cs

diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/CollectionViewGalleries/ScrollModeGalleries/EnumPicker.cs b/src/Controls/samples/Controls.Sample/Pages/Controls/CollectionViewGalleries/ScrollModeGalleries/EnumPicker.cs
new file mode 100644
index 000000000000..454830d93460
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/CollectionViewGalleries/ScrollModeGalleries/EnumPicker.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Reflection;
+using Microsoft.Maui.Controls;
+
+namespace Maui.Controls.Sample.Pages.CollectionViewGalleries.ScrollModeGalleries
+{
+	class EnumPicker : Picker
+	{
+		public static readonly BindableProperty EnumTypeProperty =
+			BindableProperty.Create(nameof(EnumType), typeof(Type), typeof(EnumPicker),
+				propertyChanged: (bindable, oldValue, newValue) =>
+				{
+					EnumPicker picker = (EnumPicker)bindable;
+
+					if (oldValue != null)
+					{
+						picker.ItemsSource = null;
+					}
+					if (newValue != null)
+					{
+						if (!((Type)newValue).GetTypeInfo().IsEnum)
+							throw new ArgumentException("EnumPicker: EnumType property must be enumeration type");
+
+						picker.ItemsSource = Enum.GetValues((Type)newValue);
+					}
+				});
+
+		public Type EnumType
+		{
+			set => SetValue(EnumTypeProperty, value);
+			get => (Type)GetValue(EnumTypeProperty);
+		}
+	}
+}
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/CollectionViewGalleries/ScrollModeGalleries/ItemsUpdatingScrollModeGallery.xaml b/src/Controls/samples/Controls.Sample/Pages/Controls/CollectionViewGalleries/ScrollModeGalleries/ItemsUpdatingScrollModeGallery.xaml
new file mode 100644
index 000000000000..a17ada17649a
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/CollectionViewGalleries/ScrollModeGalleries/ItemsUpdatingScrollModeGallery.xaml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage 
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    x:Class="Maui.Controls.Sample.Pages.CollectionViewGalleries.ScrollModeGalleries.ItemsUpdatingScrollModeGallery"
+    xmlns:controls="clr-namespace:Maui.Controls.Sample.Pages.CollectionViewGalleries.ScrollModeGalleries"
+    Title="ItemsUpdatingScrollMode Gallery">
+    <Grid 
+        RowDefinitions="Auto, *" Margin="20">
+        <StackLayout
+            Orientation="Horizontal"
+            HorizontalOptions="Center">
+            <Label 
+                Text="UpdatingScrollMode: "
+            VerticalTextAlignment="Center" />
+            <controls:EnumPicker 
+                x:Name="enumPicker"
+                EnumType="{x:Type ItemsUpdatingScrollMode}"
+                SelectedIndex="0"
+                SelectedIndexChanged="OnItemsUpdatingScrollModeChanged" />
+        </StackLayout>
+        <CollectionView 
+            x:Name="CollectionView"
+            Grid.Row="1"
+            ItemsSource="{Binding Items}">
+            <CollectionView.ItemTemplate>
+                <DataTemplate>
+                    <Grid 
+                        Padding="12">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <Label 
+                            Text="{Binding Text1}"
+                            FontAttributes="Bold" />
+                        <Label 
+                            Grid.Row="1"
+                            Text="{Binding Text2}"
+                            FontAttributes="Italic"
+                            VerticalOptions="End" />
+                    </Grid>
+                </DataTemplate>
+            </CollectionView.ItemTemplate>
+        </CollectionView>
+    </Grid>
+</ContentPage>
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/CollectionViewGalleries/ScrollModeGalleries/ItemsUpdatingScrollModeGallery.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/Controls/CollectionViewGalleries/ScrollModeGalleries/ItemsUpdatingScrollModeGallery.xaml.cs
new file mode 100644
index 000000000000..a70f0913b904
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/CollectionViewGalleries/ScrollModeGalleries/ItemsUpdatingScrollModeGallery.xaml.cs
@@ -0,0 +1,56 @@
+using System;
+using System.Collections.ObjectModel;
+using System.Threading.Tasks;
+using Microsoft.Maui;
+using Microsoft.Maui.Controls;
+
+namespace Maui.Controls.Sample.Pages.CollectionViewGalleries.ScrollModeGalleries
+{
+	public class ItemsUpdatingScrollModeItem
+	{
+		public string Text1 { get; set; }
+		public string Text2 { get; set; }
+	}
+
+	public class ItemsUpdatingScrollModeViewModel : BindableObject
+	{
+		public ObservableCollection<ItemsUpdatingScrollModeItem> Items { get; private set; } = new ObservableCollection<ItemsUpdatingScrollModeItem>();
+
+		public async Task LoadItemsAsync()
+		{
+			for (int i = 0; i < 50; i++)
+			{
+				Items.Add(new ItemsUpdatingScrollModeItem
+				{
+					Text1 = $"Title {i + 1}",
+					Text2 = $"Subtitle {i + 1}",
+				});
+
+				await Task.Delay(1000);
+			}
+		}
+	}
+
+	public partial class ItemsUpdatingScrollModeGallery : ContentPage
+	{
+		ItemsUpdatingScrollModeViewModel _viewModel;
+		public ItemsUpdatingScrollModeGallery()
+		{
+			InitializeComponent();
+
+			BindingContext = _viewModel = new ItemsUpdatingScrollModeViewModel();
+		}
+
+		protected override async void OnAppearing()
+		{
+			base.OnAppearing();
+
+			await _viewModel.LoadItemsAsync();
+		}
+
+		void OnItemsUpdatingScrollModeChanged(object sender, EventArgs e)
+		{
+			CollectionView.ItemsUpdatingScrollMode = (ItemsUpdatingScrollMode)(sender as EnumPicker).SelectedItem;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/CollectionViewGalleries/ScrollModeGalleries/ScrollModeGallery.cs b/src/Controls/samples/Controls.Sample/Pages/Controls/CollectionViewGalleries/ScrollModeGalleries/ScrollModeGallery.cs
index 8de44ba44c01..daa9ee5b62e0 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/CollectionViewGalleries/ScrollModeGalleries/ScrollModeGallery.cs
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/CollectionViewGalleries/ScrollModeGalleries/ScrollModeGallery.cs
@@ -23,10 +23,12 @@ public ScrollModeGallery()
 					{
 						descriptionLabel,
 						GalleryBuilder.NavButton("Scroll Modes Testing", () =>
-							new ScrollModeTestGallery(), Navigation)
+							new ScrollModeTestGallery(), Navigation),
+						GalleryBuilder.NavButton("ItemsUpdatingScrollMode Gallery", () =>
+							new ItemsUpdatingScrollModeGallery(), Navigation)
 					}
 				}
 			};
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/CollectionViewGalleries/ScrollModeGalleries/ScrollModeTestGallery.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/Controls/CollectionViewGalleries/ScrollModeGalleries/ScrollModeTestGallery.xaml.cs
index c4f2a142933a..9e831d163ecf 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/CollectionViewGalleries/ScrollModeGalleries/ScrollModeTestGallery.xaml.cs
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/CollectionViewGalleries/ScrollModeGalleries/ScrollModeTestGallery.xaml.cs
@@ -1,9 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 using Microsoft.Maui.Controls;
 using Microsoft.Maui.Controls.Xaml;
 
diff --git a/src/Controls/src/Core/Handlers/Items/ItemsViewHandler.Windows.cs b/src/Controls/src/Core/Handlers/Items/ItemsViewHandler.Windows.cs
index 3335091dc0ee..c6a360102fc0 100644
--- a/src/Controls/src/Core/Handlers/Items/ItemsViewHandler.Windows.cs
+++ b/src/Controls/src/Core/Handlers/Items/ItemsViewHandler.Windows.cs
@@ -106,7 +106,53 @@ public static void MapIsVisible(ItemsViewHandler<TItemsView> handler, ItemsView
 
 		public static void MapItemsUpdatingScrollMode(ItemsViewHandler<TItemsView> handler, ItemsView itemsView)
 		{
+			handler.UpdateItemsUpdatingScrollMode();
+		}
+
+		void UpdateItemsUpdatingScrollMode()
+		{
+			if (PlatformView is null || PlatformView.Items is null)
+				return;
+
+			if (VirtualView.ItemsUpdatingScrollMode == ItemsUpdatingScrollMode.KeepScrollOffset)
+			{
+				// The scroll position is maintained when new items are added as the default,
+				// so we don't need to watch for data changes
+				PlatformView.Items.VectorChanged -= OnItemsVectorChanged;
+			}
+			else
+			{
+				PlatformView.Items.VectorChanged -= OnItemsVectorChanged;
+				PlatformView.Items.VectorChanged += OnItemsVectorChanged;
+			}
+		}
+
+		void OnItemsVectorChanged(global::Windows.Foundation.Collections.IObservableVector<object> sender, global::Windows.Foundation.Collections.IVectorChangedEventArgs @event)
+		{
+			if (VirtualView is null)
+				return;
+
+			if (sender is not ItemCollection items)
+				return;
+
+			var itemsCount = items.Count;
+
+			if (itemsCount == 0)
+				return;
+
+			if (VirtualView.ItemsUpdatingScrollMode == ItemsUpdatingScrollMode.KeepItemsInView)
+			{
+				var firstItem = items[0];
+				// Keeps the first item in the list displayed when new items are added.
+				ListViewBase.ScrollIntoView(firstItem);
+			}
 
+			if (VirtualView.ItemsUpdatingScrollMode == ItemsUpdatingScrollMode.KeepLastItemInView)
+			{
+				var lastItem = items[itemsCount - 1];
+				// Adjusts the scroll offset to keep the last item in the list displayed when new items are added.
+				ListViewBase.ScrollIntoView(lastItem);
+			}
 		}
 
 		protected abstract ListViewBase SelectListViewBase();

From ca63ab6c118f7b4152ed24fe40eaa294927f9c4f Mon Sep 17 00:00:00 2001
From: Rui Marinho <me@ruimarinho.net>
Date: Thu, 22 Jun 2023 22:20:18 +0100
Subject: [PATCH 028/105] [uitests] Run Control gallery tests with cake on iOS
 and Android (#15657)

* Initial work to run Xamarin.UITest from cake

* Fix tool merge

* Fix xamarin nunit test lib location

* Add compatibility uitests

* Fix

* Fix name

* Add dotnet-legacy-controlgallery

* fix cake

* Try only build android

* Build build tasks first

* Publish NUnit test results

* Cleanup

* Draft for iOS control gallery cake

* Try fix testresults xml

* Specify testresults directory

* Try fix publish nunit results

* Small fixes

* Try run on iOS

* Try run on iOS azdo

* Make 2 cake targets

* Try fix results path

* Custom pool and build sample

* Add where clause to iOS

* Add default platform

* Fail task if tests fail

* Provision on macos

* Try revert

* Try run in Debug

* Run for all issues

* Update variables and timeout

* Install NUnit3

* Fix iOS Path

* Run all iOS

* Remove retry

* Ignore tests on Android

* Ignore iOS UITests

* Add tests results per platform

* Move to 14.3 on mac

* Ignore more tests on iOS

* Ignore a couple of tests on Android

* Try find TestResult

* Ignore another test on iOS

* Update Issue2411.cs

* Update src/Compatibility/ControlGallery/src/Issues.Shared/TestPages/TestPages.cs

* Update Issue198.cs

* Fails on maui android

* Ignore more tests on android

* More ignore on Android

---------

Co-authored-by: Shane Neuville <shneuvil@microsoft.com>
---
 eng/cake/dotnet.cake                          |  18 +++
 eng/cake/helpers.cake                         |  35 +++++
 eng/devices/android.cake                      | 115 +++++++++++-----
 eng/devices/ios.cake                          | 127 +++++++++++++-----
 .../common/ui-tests-compatibility-steps.yml   |  65 +++++++++
 eng/pipelines/common/ui-tests-steps.yml       |   6 +-
 eng/pipelines/common/ui-tests.yml             |  78 ++++++++++-
 eng/pipelines/ui-tests.yml                    |  24 ++++
 .../src/Issues.Shared/Bugzilla26032.xaml.cs   |   1 +
 .../src/Issues.Shared/Bugzilla45926.cs        |   1 +
 .../src/Issues.Shared/Bugzilla51503.cs        |   1 +
 .../src/Issues.Shared/Bugzilla52419.cs        |   1 +
 .../src/Issues.Shared/Github5623.xaml.cs      |   1 +
 .../src/Issues.Shared/Issue13203.cs           |   1 +
 .../src/Issues.Shared/Issue1583_1.cs          |   1 +
 .../src/Issues.Shared/Issue1667.cs            |   1 +
 .../src/Issues.Shared/Issue1747.xaml.cs       |   1 +
 .../src/Issues.Shared/Issue1799.cs            |   1 +
 .../src/Issues.Shared/Issue198.cs             |   1 +
 .../src/Issues.Shared/Issue2035.cs            |   1 +
 .../src/Issues.Shared/Issue2259.cs            |   1 +
 .../src/Issues.Shared/Issue2411.cs            |   2 +
 .../src/Issues.Shared/Issue2981.cs            |   1 +
 .../src/Issues.Shared/Issue3390.cs            |   1 +
 .../src/Issues.Shared/Issue4597.cs            |   7 +-
 .../src/Issues.Shared/Issue5367.cs            |   1 +
 .../src/Issues.Shared/Issue5500.cs            |   1 +
 .../src/Issues.Shared/Issue7534.cs            |   1 +
 .../src/Issues.Shared/Issue7700.cs            |   2 +
 .../src/Issues.Shared/Issue773.cs             |   1 +
 .../src/Issues.Shared/Issue8167.cs            |   1 +
 .../src/Issues.Shared/Issue8291.cs            |   1 +
 .../src/Issues.Shared/Issue9088.cs            |   1 +
 .../src/Issues.Shared/Issue9827.xaml.cs       |   1 +
 .../src/Issues.Shared/LabelTextType.cs        |   1 +
 .../src/Issues.Shared/TestPages/TestPages.cs  |  16 ++-
 .../Tests/Legacy-CellsUITests.cs              |   1 +
 37 files changed, 446 insertions(+), 74 deletions(-)
 create mode 100644 eng/pipelines/common/ui-tests-compatibility-steps.yml

diff --git a/eng/cake/dotnet.cake b/eng/cake/dotnet.cake
index 3dddfb55cfd1..0fd440073a02 100644
--- a/eng/cake/dotnet.cake
+++ b/eng/cake/dotnet.cake
@@ -162,6 +162,24 @@ Task("dotnet-samples")
         RunMSBuildWithDotNet("./Microsoft.Maui.Samples.slnf", properties, binlogPrefix: "sample-");
     });
 
+Task("dotnet-legacy-controlgallery")
+    .IsDependentOn("dotnet-legacy-controlgallery-android")
+    .IsDependentOn("dotnet-legacy-controlgallery-ios");
+
+Task("dotnet-legacy-controlgallery-ios")
+    .Does(() =>
+    {
+        var properties = new Dictionary<string, string>();
+        RunMSBuildWithDotNet("./src/Compatibility/ControlGallery/src/iOS/Compatibility.ControlGallery.iOS.csproj", properties, binlogPrefix: "controlgallery-ios-");
+    });
+
+Task("dotnet-legacy-controlgallery-android")
+    .Does(() =>
+    {
+        var properties = new Dictionary<string, string>();
+        RunMSBuildWithDotNet("./src/Compatibility/ControlGallery/src/Android/Compatibility.ControlGallery.Android.csproj", properties, binlogPrefix: "controlgallery-android-");
+    });
+
 Task("dotnet-samples-test")
     .Does(() =>
     {
diff --git a/eng/cake/helpers.cake b/eng/cake/helpers.cake
index 628bec7ccfa5..3374fb95a8fe 100644
--- a/eng/cake/helpers.cake
+++ b/eng/cake/helpers.cake
@@ -121,3 +121,38 @@ bool IsTarget(string target) =>
 
 bool TargetStartsWith(string target) =>
     Argument<string>("target", "Default").StartsWith(target, StringComparison.InvariantCultureIgnoreCase);
+
+void RunTestsNunit(string unitTestLibrary, NUnit3Settings settings)
+{
+    try
+    {
+        NUnit3(new [] { unitTestLibrary }, settings);
+    }
+    catch
+    {
+        SetTestResultsEnvironmentVariables(settings.Work?.ToString());
+        throw;
+    }
+
+    SetTestResultsEnvironmentVariables(settings.Work?.ToString());
+
+    void SetTestResultsEnvironmentVariables(string? path)
+    {
+        var doc = new System.Xml.XmlDocument();
+        if(string.IsNullOrEmpty(path))
+        {
+            doc.Load("TestResult.xml");
+        }
+        else
+        {
+            doc.Load($"{path}/TestResult.xml");
+        }
+                
+        var root = doc.DocumentElement;
+
+        foreach(System.Xml.XmlAttribute attr in root.Attributes)
+        {
+            SetEnvironmentVariable($"NUNIT_{attr.Name}", attr.Value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/eng/devices/android.cake b/eng/devices/android.cake
index ac669407d519..7974deb5577f 100644
--- a/eng/devices/android.cake
+++ b/eng/devices/android.cake
@@ -3,6 +3,8 @@
 #load "../cake/helpers.cake"
 #load "../cake/dotnet.cake"
 
+#tool nuget:?package=NUnit.ConsoleRunner&version=3.16.3
+
 string TARGET = Argument("target", "Test");
 const string defaultVersion = "30";
 const string dotnetVersion = "net7.0";
@@ -24,10 +26,12 @@ var TEST_APP_PACKAGE_NAME = Argument("package", EnvironmentVariable("ANDROID_TES
 var TEST_APP_INSTRUMENTATION = Argument("instrumentation", EnvironmentVariable("ANDROID_TEST_APP_INSTRUMENTATION") ?? "");
 var TEST_RESULTS = Argument("results", EnvironmentVariable("ANDROID_TEST_RESULTS") ?? "");
 
+string TEST_WHERE = Argument("where", EnvironmentVariable("NUNIT_TEST_WHERE") ?? $"");
 var androidVersion = Argument("apiversion", EnvironmentVariable("ANDROID_PLATFORM_VERSION") ?? defaultVersion);
 
 // other
 string CONFIGURATION = Argument("configuration", "Debug");
+string TEST_FRAMEWORK = "net472";
 string ANDROID_AVD = "DEVICE_TESTS_EMULATOR";
 string DEVICE_ID = "";
 string DEVICE_ARCH = "";
@@ -149,7 +153,7 @@ Task("Build")
 	.Does(() =>
 {
 	var name = System.IO.Path.GetFileNameWithoutExtension(PROJECT.FullPath);
-	var binlog = $"{BINLOG_DIR}/{name}-{CONFIGURATION}-android.binlog";
+	var binlog = $"{BINLOG_DIR}/{name}-{CONFIGURATION}-android--{DateTime.UtcNow.ToFileTimeUtc()}.binlog";
 
 	if (USE_DOTNET)
 	{
@@ -291,13 +295,82 @@ Task("Test")
 Task("uitest")
 	.Does(() =>
 {
-	if (string.IsNullOrEmpty(TEST_APP)) {
+	SetupAppPackageNameAndResult();
+	
+	CleanDirectories(TEST_RESULTS);
+
+	InstallApk(TEST_APP, TEST_APP_PACKAGE_NAME, TEST_RESULTS);
+
+	//we need to build tests first to pass ExtraDefineConstants
+	Information("Build UITests project {0}", PROJECT.FullPath);
+	var name = System.IO.Path.GetFileNameWithoutExtension(PROJECT.FullPath);
+	var binlog = $"{BINLOG_DIR}/{name}-{CONFIGURATION}-android-{DateTime.UtcNow.ToFileTimeUtc()}.binlog";
+	DotNetCoreBuild(PROJECT.FullPath, new DotNetCoreBuildSettings {
+			Configuration = CONFIGURATION,
+			ArgumentCustomization = args => args
+				.Append("/p:ExtraDefineConstants=ANDROID")
+				.Append("/bl:" + binlog),
+			ToolPath = DOTNET_PATH,
+	});
+	
+	SetEnvironmentVariable("APPIUM_LOG_FILE", $"{BINLOG_DIR}/appium_android.log");
+
+	Information("Run UITests project {0}", PROJECT.FullPath);
+	RunTestWithLocalDotNet(PROJECT.FullPath, CONFIGURATION,	noBuild: true);
+});
+
+Task("cg-uitest")
+	.Does(() =>
+{
+	SetupAppPackageNameAndResult();
+	
+	CleanDirectories(TEST_RESULTS);
+
+	InstallApk(TEST_APP, TEST_APP_PACKAGE_NAME, TEST_RESULTS);
+
+	//set env var for the app path for Xamarin.UITest setup
+	SetEnvironmentVariable("APP_APK", $"{TEST_APP}");
+
+	// build the test library
+	var binDir = PROJECT.GetDirectory().Combine("bin").Combine(CONFIGURATION + "/" + TEST_FRAMEWORK).FullPath;
+	Information("BinDir: {0}", binDir);
+	var name = System.IO.Path.GetFileNameWithoutExtension(PROJECT.FullPath);
+	var binlog = $"{binDir}/{name}-{CONFIGURATION}-android-{DateTime.UtcNow.ToFileTimeUtc()}.binlog";
+	Information("Build UITests project {0}", PROJECT.FullPath);
+	DotNetBuild(PROJECT.FullPath, new DotNetBuildSettings {
+			Configuration = CONFIGURATION,
+			ArgumentCustomization = args => args
+				.Append("/bl:" + binlog),
+			ToolPath = DOTNET_PATH,
+	});
+	
+	var testLibDllPath = $"{binDir}/Microsoft.Maui.Controls.Android.UITests.dll";
+	Information("Run UITests lib {0}", testLibDllPath);
+	var nunitSettings = new NUnit3Settings { 
+		Configuration = CONFIGURATION,
+		OutputFile = $"{TEST_RESULTS}/android/run_uitests_output-{DateTime.UtcNow.ToFileTimeUtc()}.log",
+		Work = $"{TEST_RESULTS}/android/"
+	};
+
+	if(!string.IsNullOrEmpty(TEST_WHERE))
+	{
+		Information("Add Where filter to NUnit {0}", TEST_WHERE);
+		nunitSettings.Where = TEST_WHERE;
+	}
+	RunTestsNunit(testLibDllPath, nunitSettings);
+});
+
+RunTarget(TARGET);
+
+void SetupAppPackageNameAndResult()
+{
+   if (string.IsNullOrEmpty(TEST_APP)) {
 		if (string.IsNullOrEmpty(TEST_APP_PROJECT.FullPath))
 			throw new Exception("If no app was specified, an app must be provided.");
 		
 		var binFolder = TEST_APP_PROJECT.GetDirectory().Combine("bin");
 		Information("Test app bin folder {0}", binFolder);
-		var binDir = binFolder.Combine($"Release/{dotnetVersion}-android").FullPath;
+		var binDir = binFolder.Combine($"{CONFIGURATION}/{TARGET_FRAMEWORK}").FullPath;
 		var apps = GetFiles(binDir + "/*-Signed.apk");
 		if (apps.Any()) {
 			TEST_APP = apps.FirstOrDefault().FullPath;
@@ -323,9 +396,10 @@ Task("uitest")
 	Information("Test App Instrumentation: {0}", TEST_APP_INSTRUMENTATION);
 	Information("Test Results Directory: {0}", TEST_RESULTS);
 	Information("Test project: {0}", PROJECT);
+}
 
-	CleanDirectories(TEST_RESULTS);
-
+void InstallApk(string testApp, string testAppPackageName, string testResultsDirectory)
+{
 	if (DEVICE_BOOT_WAIT) {
 		Information("Waiting for the emulator to finish booting...");
 
@@ -348,35 +422,14 @@ Task("uitest")
 	Information("{0}", string.Join("\n", lines));
 
 	//install apk on the emulator
-	Information("Install with xharness: {0}",TEST_APP);
+	Information("Install with xharness: {0}", testApp);
 	var settings = new DotNetToolSettings {
 		DiagnosticOutput = true,
 		ArgumentCustomization = args=>args.Append("run xharness android install " +
-			$"--app=\"{TEST_APP}\" " +
-			$"--package-name=\"{TEST_APP_PACKAGE_NAME}\" " +
-			$"--output-directory=\"{TEST_RESULTS}\" " +
+			$"--app=\"{testApp}\" " +
+			$"--package-name=\"{testAppPackageName}\" " +
+			$"--output-directory=\"{testResultsDirectory}\" " +
 			$"--verbosity=\"Debug\" ")
 	};
 	DotNetTool("tool", settings);
-
-	//we need to build tests first to pass ExtraDefineConstants
-	Information("Build UITests project {0}", PROJECT.FullPath);
-	var name = System.IO.Path.GetFileNameWithoutExtension(PROJECT.FullPath);
-	var binlog = $"{BINLOG_DIR}/{name}-{CONFIGURATION}-android.binlog";
-	DotNetBuild(PROJECT.FullPath, new DotNetBuildSettings {
-			Configuration = CONFIGURATION,
-			ToolPath = DOTNET_PATH,
-			ArgumentCustomization = args => args
-				.Append("/p:ExtraDefineConstants=ANDROID")
-				.Append("/bl:" + binlog)
-				//.Append("/tl")
-			
-	});
-
-	SetEnvironmentVariable("APPIUM_LOG_FILE", $"{BINLOG_DIR}/appium_android.log");
-
-	Information("Run UITests project {0}",PROJECT.FullPath);
-	RunTestWithLocalDotNet(PROJECT.FullPath, CONFIGURATION, noBuild: true);
-});
-
-RunTarget(TARGET);
\ No newline at end of file
+}
diff --git a/eng/devices/ios.cake b/eng/devices/ios.cake
index 639a4ac26d5a..d14681fd8868 100644
--- a/eng/devices/ios.cake
+++ b/eng/devices/ios.cake
@@ -2,6 +2,8 @@
 #load "../cake/helpers.cake"
 #load "../cake/dotnet.cake"
 
+#tool nuget:?package=NUnit.ConsoleRunner&version=3.16.3
+
 string TARGET = Argument("target", "Test");
 
 const string defaultVersion = "16.2";
@@ -20,6 +22,8 @@ var TEST_APP = Argument("app", EnvironmentVariable("IOS_TEST_APP") ?? "");
 FilePath TEST_APP_PROJECT = Argument("appproject", EnvironmentVariable("IOS_TEST_APP_PROJECT") ?? "");
 var TEST_RESULTS = Argument("results", EnvironmentVariable("IOS_TEST_RESULTS") ?? "");
 
+string TEST_WHERE = Argument("where", EnvironmentVariable("NUNIT_TEST_WHERE") ?? $"");
+
 //these are for appium iOS UITests
 var udid = Argument("udid", EnvironmentVariable("IOS_SIMULATOR_UDID") ?? "");
 var iosVersion = Argument("apiversion", EnvironmentVariable("IOS_PLATFORM_VERSION") ?? defaultVersion);
@@ -29,6 +33,7 @@ string PLATFORM = TEST_DEVICE.ToLower().Contains("simulator") ? "iPhoneSimulator
 string DOTNET_PLATFORM = TEST_DEVICE.ToLower().Contains("simulator") ? "iossimulator-x64" : "ios-x64";
 string CONFIGURATION = Argument("configuration", "Debug");
 bool DEVICE_CLEANUP = Argument("cleanup", true);
+string TEST_FRAMEWORK = "net472";
 
 Information("Project File: {0}", PROJECT);
 Information("Build Binary Log (binlog): {0}", BINLOG_DIR);
@@ -204,7 +209,80 @@ Task("Test")
 Task("uitest")
 	.Does(() =>
 {
-	if (string.IsNullOrEmpty(TEST_APP) ) {
+	SetupAppPackageNameAndResult();
+
+	CleanDirectories(TEST_RESULTS);
+
+	InstallIpa(TEST_APP, "", TEST_DEVICE, TEST_RESULTS, iosVersion);
+
+	//we need to build tests first to pass ExtraDefineConstants
+	Information("Build UITests project {0}", PROJECT.FullPath);
+	var name = System.IO.Path.GetFileNameWithoutExtension(PROJECT.FullPath);
+	var binlog = $"{BINLOG_DIR}/{name}-{CONFIGURATION}-ios.binlog";
+	DotNetBuild(PROJECT.FullPath, new DotNetBuildSettings {
+			Configuration = CONFIGURATION,
+			ToolPath = DOTNET_PATH,
+			ArgumentCustomization = args => args
+				.Append("/p:ExtraDefineConstants=IOSUITEST")
+				.Append("/bl:" + binlog)
+				//.Append("/tl")
+			
+	});
+
+	SetEnvironmentVariable("APPIUM_LOG_FILE", $"{BINLOG_DIR}/appium_ios.log");
+
+	Information("Run UITests project {0}",PROJECT.FullPath);
+	RunTestWithLocalDotNet(PROJECT.FullPath, CONFIGURATION, noBuild: true);
+});
+
+Task("cg-uitest")
+	.Does(() =>
+{
+	SetupAppPackageNameAndResult();
+	
+	CleanDirectories(TEST_RESULTS);
+
+	InstallIpa(TEST_APP, "com.microsoft.mauicompatibilitygallery", TEST_DEVICE, $"{TEST_RESULTS}/ios", iosVersion);
+
+	//set env var for the app path for Xamarin.UITest setup
+	SetEnvironmentVariable("iOS_APP", $"{TEST_APP}");
+
+	// build the test library
+	var binDir = PROJECT.GetDirectory().Combine("bin").Combine(CONFIGURATION + "/" + TEST_FRAMEWORK).FullPath;
+	Information("BinDir: {0}", binDir);
+	var name = System.IO.Path.GetFileNameWithoutExtension(PROJECT.FullPath);
+	var binlog = $"{binDir}/{name}-{CONFIGURATION}-ios.binlog";
+	Information("Build UITests project {0}", PROJECT.FullPath);
+	DotNetBuild(PROJECT.FullPath, new DotNetBuildSettings {
+			Configuration = CONFIGURATION,
+			ArgumentCustomization = args => args
+				.Append("/bl:" + binlog),
+			ToolPath = DOTNET_PATH,
+	});
+	
+	var testLibDllPath = $"{binDir}/Microsoft.Maui.Controls.iOS.UITests.dll";
+	Information("Run UITests lib {0}", testLibDllPath);
+	var nunitSettings = new NUnit3Settings { 
+		Configuration = CONFIGURATION,
+		OutputFile = $"{TEST_RESULTS}/ios/run_uitests_output.log",
+		Work = $"{TEST_RESULTS}/ios"
+	};
+
+	Information("Outputfile {0}", nunitSettings.OutputFile);
+
+	if(!string.IsNullOrEmpty(TEST_WHERE))
+	{
+		Information("Add Where filter to NUnit {0}", TEST_WHERE);
+		nunitSettings.Where = TEST_WHERE;
+	}
+	RunTestsNunit(testLibDllPath, nunitSettings);
+});
+
+RunTarget(TARGET);
+
+void SetupAppPackageNameAndResult()
+{
+   if (string.IsNullOrEmpty(TEST_APP) ) {
 		if (string.IsNullOrEmpty(TEST_APP_PROJECT.FullPath))
 			throw new Exception("If no app was specified, an app must be provided.");
 		var binDir = USE_DOTNET
@@ -212,27 +290,30 @@ Task("uitest")
 			: TEST_APP_PROJECT.GetDirectory().Combine("bin").Combine(PLATFORM).Combine(CONFIGURATION).FullPath;
 		Information("BinDir: {0}", binDir);
 		var apps = GetDirectories(binDir + "/*.app");
+		if(apps.Count == 0)
+			throw new Exception("No app was found in the bin directory.");
+		
 		TEST_APP = apps.First().FullPath;
 	}
 	if (string.IsNullOrEmpty(TEST_RESULTS)) {
-		TEST_RESULTS = TEST_APP + "-results";
+		TEST_RESULTS =  GetTestResultsDirectory().FullPath;
 	}
 
 	Information("Test Device: {0}", TEST_DEVICE);
 	Information("Test App: {0}", TEST_APP);
 	Information("Test Results Directory: {0}", TEST_RESULTS);
+}
 
-	CleanDirectories(TEST_RESULTS);
-
-	Information("Install with xharness: {0}",TEST_APP);
+void InstallIpa(string testApp, string testAppPackageName, string testDevice, string testResultsDirectory, string version)
+{
+	Information("Install with xharness: {0}",testApp);
 	var settings = new DotNetToolSettings {
 		DiagnosticOutput = true,
 		ArgumentCustomization = args => args.Append("run xharness apple install " +
-		$"--app=\"{TEST_APP}\" " +
-		$"--targets=\"{TEST_DEVICE}\" " +
-		$"--output-directory=\"{TEST_RESULTS}\" " +
+		$"--app=\"{testApp}\" " +
+		$"--targets=\"{testDevice}\" " +
+		$"--output-directory=\"{testResultsDirectory}\" " +
 		$"--verbosity=\"Debug\" ")
-
 	};
 
 	try {
@@ -243,30 +324,8 @@ Task("uitest")
 	 	var xharness = sims.Where(s => s.Name.Contains("XHarness")).ToArray();
 		var simXH = xharness.First();
 		Information("The emulator to run tests: {0} {1}", simXH.Name, simXH.UDID);
-		Information("The platform version to run tests: {0}", iosVersion);
+		Information("The platform version to run tests: {0}", version);
 		SetEnvironmentVariable("IOS_SIMULATOR_UDID",simXH.UDID);
-		SetEnvironmentVariable("IOS_PLATFORM_VERSION", iosVersion);
-		
+		SetEnvironmentVariable("IOS_PLATFORM_VERSION", version);
 	}
-
-	//we need to build tests first to pass ExtraDefineConstants
-	Information("Build UITests project {0}", PROJECT.FullPath);
-	var name = System.IO.Path.GetFileNameWithoutExtension(PROJECT.FullPath);
-	var binlog = $"{BINLOG_DIR}/{name}-{CONFIGURATION}-ios.binlog";
-	DotNetBuild(PROJECT.FullPath, new DotNetBuildSettings {
-			Configuration = CONFIGURATION,
-			ToolPath = DOTNET_PATH,
-			ArgumentCustomization = args => args
-				.Append("/p:ExtraDefineConstants=IOSUITEST")
-				.Append("/bl:" + binlog)
-				//.Append("/tl")
-			
-	});
-
-	SetEnvironmentVariable("APPIUM_LOG_FILE", $"{BINLOG_DIR}/appium_ios.log");
-
-	Information("Run UITests project {0}",PROJECT.FullPath);
-	RunTestWithLocalDotNet(PROJECT.FullPath, CONFIGURATION, noBuild: true);
-});
-
-RunTarget(TARGET);
+}
diff --git a/eng/pipelines/common/ui-tests-compatibility-steps.yml b/eng/pipelines/common/ui-tests-compatibility-steps.yml
new file mode 100644
index 000000000000..0f2d64eb3415
--- /dev/null
+++ b/eng/pipelines/common/ui-tests-compatibility-steps.yml
@@ -0,0 +1,65 @@
+parameters:
+  platform: '' # [ android, ios, windows, catalyst ]
+  path: '' # path to csproj
+  device: '' # the xharness device to use
+  cakeArgs: '' # additional cake args
+  app: '' #path to app to test
+  version: '' #the iOS version'
+  provisionatorChannel: 'latest'
+  agentPoolAccessToken: ''
+  configuration : "Release"
+  where : "cat==Issues"
+  targetSample: "dotnet-legacy-controlgallery"
+  provisionPlatform: "windows"
+
+steps:
+
+  - template: provision.yml
+    parameters:
+      ${{ if eq(parameters.platform, 'windows') }}:
+        platform: windows
+        skipProvisioning: true
+      ${{ if ne(parameters.platform, 'windows') }}:
+        platform: macos
+        skipProvisioning: false
+      skipXcode: false
+      provisionatorChannel: ${{ parameters.provisionatorChannel }}
+ 
+  - pwsh: ./build.ps1 --target=dotnet --configuration="${{ parameters.configuration }}" --verbosity=diagnostic
+    displayName: 'Install .NET'
+    retryCountOnTaskFailure: 3
+    env:
+      DOTNET_TOKEN: $(dotnetbuilds-internal-container-read-token)
+      PRIVATE_BUILD: $(PrivateBuild)
+
+  - pwsh: echo "##vso[task.prependpath]$(DotNet.Dir)"
+    displayName: 'Add .NET to PATH'
+
+  - pwsh: ./build.ps1 --target=dotnet-buildtasks --configuration="${{ parameters.configuration }}"
+    displayName: 'Build the MSBuild Tasks'
+
+  - pwsh: ./build.ps1 --target=${{ parameters.targetSample }} --configuration="${{ parameters.configuration }}" --${{ parameters.platform }} --verbosity=diagnostic
+    displayName: 'Build the Legacy ControlGallery'
+
+  - pwsh: ./build.ps1 -Script eng/devices/${{ parameters.platform }}.cake --target=cg-uitest --project="${{ parameters.path }}" --appproject="${{ parameters.app }}" --device="${{ parameters.device }}" --apiversion="${{ parameters.version }}" --configuration="${{ parameters.configuration }}" --results="$(TestResultsDirectory)" --binlog="$(LogDirectory)" ${{ parameters.cakeArgs }} --verbosity=diagnostic --where="${{ parameters.where }}"
+    displayName: $(Agent.JobName)
+    # retryCountOnTaskFailure: 2
+  
+  - task: PublishTestResults@2
+    displayName: Publish the $(System.PhaseName) test results
+    condition: always()
+    inputs:
+      testResultsFormat: NUnit
+      testResultsFiles: '**/TestResult*.xml'
+      testRunTitle: '$(System.PhaseName)'
+      searchFolder: '$(TestResultsDirectory)'
+      failTaskOnFailedTests: true
+
+  - task: PublishBuildArtifacts@1
+    condition: always()
+    displayName: publish artifacts
+
+  # This must always be placed as the last step in the job
+  - template: agent-rebooter/mac.v1.yml@yaml-templates
+    parameters:
+      AgentPoolAccessToken: ${{ parameters.agentPoolAccessToken }}
diff --git a/eng/pipelines/common/ui-tests-steps.yml b/eng/pipelines/common/ui-tests-steps.yml
index 09de53e00b47..f5e2b9ac67af 100644
--- a/eng/pipelines/common/ui-tests-steps.yml
+++ b/eng/pipelines/common/ui-tests-steps.yml
@@ -56,11 +56,6 @@ steps:
   - pwsh: ./build.ps1 --target=dotnet-samples --configuration="${{ parameters.configuration }}" --${{ parameters.platform }} --verbosity=diagnostic --usenuget=false
     displayName: 'Build the samples'
 
-  # - bash: |
-  #     sudo xcode-select --reset
-  #   displayName: 'XCode reset'
-  #   condition: ne('${{ parameters.platform }}' , 'windows')
-
   - pwsh: ./build.ps1 -Script eng/devices/${{ parameters.platform }}.cake --target=uitest --project="${{ parameters.path }}" --appproject="${{ parameters.app }}" --device="${{ parameters.device }}" --apiversion="${{ parameters.version }}" --configuration="${{ parameters.configuration }}" --results="$(TestResultsDirectory)" --binlog="$(LogDirectory)" ${{ parameters.cakeArgs }} --verbosity=diagnostic
     displayName: $(Agent.JobName)
     retryCountOnTaskFailure: 2
@@ -72,6 +67,7 @@ steps:
       testResultsFormat: VSTest
       testResultsFiles: '$(TestResultsDirectory)/*.trx'
       testRunTitle: '$(System.PhaseName)'
+      failTaskOnFailedTests: true
 
   - task: PublishBuildArtifacts@1
     condition: always()
diff --git a/eng/pipelines/common/ui-tests.yml b/eng/pipelines/common/ui-tests.yml
index eb2ed0d2dd8a..6207766dce86 100644
--- a/eng/pipelines/common/ui-tests.yml
+++ b/eng/pipelines/common/ui-tests.yml
@@ -3,6 +3,8 @@ parameters:
   iosPool: { }
   windowsPool: { }
   macosPool: { }
+  androidCompatibilityPool: { }
+  iosCompatibilityPool: { }
   androidApiLevels: [ 30 ]
   iosVersions: [ 'latest' ]
   provisionatorChannel: 'latest'
@@ -15,6 +17,10 @@ parameters:
       winui: /optional/path/to/winui.csproj
       mac: /optional/path/to/mac.csproj
       app: /optional/path/to/app.csproj
+      compatibilityAndroidApp: /optional/path/to/app.csproj
+      compatibilityAndroidTestProject: /optional/path/to/android.csproj
+      compatibilityiOSTestProject: /optional/path/to/ios.csproj
+      compatibilityiOSApp: /optional/path/to/app.csproj
 
 stages:
 
@@ -125,4 +131,74 @@ stages:
                       path: ${{ project.mac }}
                       app: ${{ project.app }}
                       provisionatorChannel: ${{ parameters.provisionatorChannel }}
-                      agentPoolAccessToken: ${{ parameters.agentPoolAccessToken }}
\ No newline at end of file
+                      agentPoolAccessToken: ${{ parameters.agentPoolAccessToken }}
+
+  - stage: android_compatibility_ui_tests
+    displayName: Android Compatibility UITests
+    dependsOn: []
+    jobs:
+      - ${{ each project in parameters.projects }}:
+        - ${{ if ne(project.android, '') }}:
+          - ${{ each api in parameters.androidApiLevels }}:
+            - ${{ if not(containsValue(project.androidApiLevelsExclude, api)) }}:
+              - job: android_compatibility_ui_tests_${{ project.name }}_${{ api }}
+                timeoutInMinutes: 240
+                workspace:
+                  clean: all
+                displayName: ${{ coalesce(project.desc, project.name) }} (API ${{ api }})
+                pool: ${{ parameters.androidCompatibilityPool }}
+                variables:
+                  ${{ if ge(api, 24) }}:
+                    ANDROID_EMULATORS: "system-images;android-${{ api }};google_apis_playstore;x86"
+                  ${{ if lt(api, 24) }}:
+                    ANDROID_EMULATORS: "system-images;android-${{ api }};google_apis;x86"
+                  REQUIRED_XCODE: $(DEVICETESTS_REQUIRED_XCODE)
+                steps:
+                  - template: ui-tests-compatibility-steps.yml
+                    parameters:
+                      platform: android
+                      provisionPlatform: macos
+                      configuration: Debug
+                      version: ${{ api }}
+                      path: ${{ project.compatibilityAndroidTestProject }}
+                      app: ${{ project.compatibilityAndroidApp }}
+                      targetSample: "dotnet-legacy-controlgallery-android"
+                      device: android-emulator-32_${{ api }}
+                      provisionatorChannel: ${{ parameters.provisionatorChannel }}
+                      agentPoolAccessToken: ${{ parameters.agentPoolAccessToken }}
+
+  - stage: ios_compatibility_ui_tests
+    displayName: iOS Compatibility UITests
+    dependsOn: []
+    jobs:
+      - ${{ each project in parameters.projects }}:
+        - ${{ if ne(project.ios, '') }}:
+          - ${{ each version in parameters.iosVersions }}:
+            - ${{ if not(containsValue(project.iosVersionsExclude, version)) }}:
+              - job: ios_compatibility_ui_tests_${{ project.name }}_${{ replace(version, '.', '_') }}
+                timeoutInMinutes: 240
+                workspace:
+                  clean: all
+                displayName: ${{ coalesce(project.desc, project.name) }} (v${{ version }})
+                pool: ${{ parameters.iosCompatibilityPool }}
+                variables:
+                  REQUIRED_XCODE: $(DEVICETESTS_REQUIRED_XCODE)
+                steps:
+                  - template: ui-tests-compatibility-steps.yml
+                    parameters:
+                      platform: ios
+                      provisionPlatform: macos
+                      configuration: Debug
+                      ${{ if eq(version, 'latest') }}:
+                        version: 16.2
+                      ${{ if ne(version, 'latest') }}:
+                        version: ${{ version }}
+                      path: ${{ project.compatibilityiOSTestProject }}
+                      app: ${{ project.compatibilityiOSApp }}
+                      targetSample: "dotnet-legacy-controlgallery-ios"
+                      ${{ if eq(version, 'latest') }}:
+                        device: ios-simulator-64
+                      ${{ if ne(version, 'latest') }}:
+                        device: ios-simulator-64_${{ version }}
+                      provisionatorChannel: ${{ parameters.provisionatorChannel }}
+                      agentPoolAccessToken: ${{ parameters.agentPoolAccessToken }}
diff --git a/eng/pipelines/ui-tests.yml b/eng/pipelines/ui-tests.yml
index 152785c5864c..7dfe455b79d4 100644
--- a/eng/pipelines/ui-tests.yml
+++ b/eng/pipelines/ui-tests.yml
@@ -87,6 +87,24 @@ parameters:
       name: $(macosTestsVmPool)
       vmImage: $(macosTestsVmImage)
 
+  - name: androidCompatibilityPool
+    type: object
+    default:
+      name: $(androidTestsVmPool)
+      vmImage: $(androidTestsVmImage)
+      demands:
+        - macOS.Name -equals Ventura
+        - macOS.Architecture -equals x64
+
+  - name: iosCompatibilityPool
+    type: object
+    default:
+      name: $(androidTestsVmPool)
+      vmImage: $(androidTestsVmImage)
+      demands:
+        - macOS.Name -equals Ventura
+        - macOS.Architecture -equals x64
+
 
 resources:
   repositories:
@@ -104,6 +122,8 @@ stages:
       iosPool: ${{ parameters.iosPool }}
       windowsPool: ${{ parameters.windowsPool }}
       macosPool: ${{ parameters.macosPool }}
+      androidCompatibilityPool: ${{ parameters.androidCompatibilityPool }}
+      iosCompatibilityPool: ${{ parameters.iosCompatibilityPool }}
       agentPoolAccessToken: $(AgentPoolAccessToken)
       ${{ if or(parameters.BuildEverything, and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'devdiv'))) }}:
         androidApiLevels: [ 30 ]
@@ -141,6 +161,10 @@ stages:
           ios: $(System.DefaultWorkingDirectory)/src/Controls/tests/UITests/Controls.AppiumTests.csproj
           winui: $(System.DefaultWorkingDirectory)/src/Controls/tests/UITests/Controls.AppiumTests.csproj
           mac: $(System.DefaultWorkingDirectory)/src/Controls/tests/UITests/Controls.AppiumTests.csproj
+          compatibilityAndroidApp: $(System.DefaultWorkingDirectory)/src/Compatibility/ControlGallery/src/Android/Compatibility.ControlGallery.Android.csproj 
+          compatibilityAndroidTestProject: $(System.DefaultWorkingDirectory)/src/Compatibility/ControlGallery/test/Android.UITests/Compatibility.ControlGallery.Android.UITests.csproj
+          compatibilityiOSApp: $(System.DefaultWorkingDirectory)/src/Compatibility/ControlGallery/src/iOS/Compatibility.ControlGallery.iOS.csproj 
+          compatibilityiOSTestProject: $(System.DefaultWorkingDirectory)/src/Compatibility/ControlGallery/test/iOS.UITests/Compatibility.ControlGallery.iOS.UITests.csproj
         # - name: blazorwebview
         #   desc: BlazorWebView
         #   androidApiLevelsExclude: [ 27, 26, 25, 24, 23, 22, 21 ] # BlazorWebView requires a recent version of Chrome
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla26032.xaml.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla26032.xaml.cs
index 61798509bc4e..b86382351db3 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla26032.xaml.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla26032.xaml.cs
@@ -53,6 +53,7 @@ protected override void Init()
 #if UITEST
 		[Test]
 		[Compatibility.UITests.FailsOnMauiIOS]
+		[Compatibility.UITests.FailsOnMauiAndroid]
 		public void SelectedItemTap()
 		{
 			var id = "1";
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla45926.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla45926.cs
index 3ee1b39f4dec..5603d28edd9a 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla45926.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla45926.cs
@@ -66,6 +66,7 @@ protected override void Init()
 
 #if UITEST
 		[Test]
+		[Compatibility.UITests.FailsOnMauiAndroid]
 		public void Issue45926Test()
 		{
 			RunningApp.WaitForElement(q => q.Marked("New Page"));
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla51503.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla51503.cs
index 72d2ec356bc8..c2c5f54f7849 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla51503.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla51503.cs
@@ -64,6 +64,7 @@ public ChildPage()
 
 #if UITEST
 		[Test]
+		[Controls.Compatibility.UITests.FailsOnMauiAndroid]
 		public void Issue51503Test()
 		{
 			for (int i = 0; i < 3; i++)
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla52419.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla52419.cs
index 4d3b0c9abd4d..502d65f61195 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla52419.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla52419.cs
@@ -31,6 +31,7 @@ protected override void Init()
 
 #if __ANDROID__
 		[Test]
+		[Compatibility.UITests.FailsOnMauiAndroid]
 		public void Bugzilla52419Test()
 		{
 			RunningApp.WaitForElement(q => q.Marked("Push new page"));
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Github5623.xaml.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Github5623.xaml.cs
index b1b0f9d89b6f..d43b9231ca6f 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Github5623.xaml.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Github5623.xaml.cs
@@ -117,6 +117,7 @@ protected override void Init()
 #if UITEST
 		[Test]
 		[Compatibility.UITests.FailsOnMauiIOS]
+		[Compatibility.UITests.FailsOnMauiAndroid]
 		public void CollectionViewInfiniteScroll()
 		{
 			RunningApp.WaitForElement("CollectionView5623");
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue13203.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue13203.cs
index da4eb2431f2f..e6550f79bf63 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue13203.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue13203.cs
@@ -50,6 +50,7 @@ class Item
 
 #if UITEST
 		[Test]
+		[Compatibility.UITests.FailsOnMauiIOS]
 		public void CollectionShouldInvalidateOnVisibilityChange()
 		{
 			RunningApp.WaitForElement(Success);
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1583_1.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1583_1.cs
index 2d4f2e604c34..7dae8d245eed 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1583_1.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1583_1.cs
@@ -67,6 +67,7 @@ void Load(string url)
 #if UITEST
 		[Test]
 		[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.UwpIgnore)]
+		[Compatibility.UITests.FailsOnMauiIOS]
 		public async Task Issue1583_1_WebviewTest()
 		{
 			RunningApp.WaitForElement(q => q.Marked("label"), "Could not find label", TimeSpan.FromSeconds(10), null, null);
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1667.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1667.cs
index 77ed2c4780c3..9fdab5bb4884 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1667.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1667.cs
@@ -117,6 +117,7 @@ public void TestCursorPositionAndSelection()
 #if __IOS__
 		[Test]
 		[NUnit.Framework.Category(UITestCategories.ManualReview)]
+		[Compatibility.UITests.FailsOnMauiIOS]
 		public void TestCursorColorOniOS()
 		{
 			RunningApp.WaitForElement("CursorTextEntry");
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1747.xaml.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1747.xaml.cs
index 4163c509134d..df3a60acabfa 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1747.xaml.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1747.xaml.cs
@@ -77,6 +77,7 @@ public bool ShouldBeEnabled
 
 #if UITEST
 		[Test]
+		[Compatibility.UITests.FailsOnMauiIOS]
 		public void Issue1747Test()
 		{
 			RunningApp.WaitForElement(q => q.Marked(ToggleButtonAutomationId));
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1799.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1799.cs
index 7e225b5fcc1e..2554636f7919 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1799.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1799.cs
@@ -40,6 +40,7 @@ protected override void Init()
 
 #if UITEST
 		[Test]
+		[Compatibility.UITests.FailsOnMauiIOS]
 		public void ListViewWithoutDataDoesNotCrash()
 		{
 			var result = RunningApp.WaitForElement(ListView);
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue198.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue198.cs
index b09b401c43e1..1aec3573621d 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue198.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue198.cs
@@ -67,6 +67,7 @@ protected override void Init()
 #if UITEST
 		[Test]
 		[UiTest(typeof(TabbedPage))]
+		[Compatibility.UITests.FailsOnMauiIOS]
 		public void Issue198TestsNREWithPopModal()
 		{
 			RunningApp.WaitForElement(q => q.Marked("Page One"));
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2035.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2035.cs
index 3d978e72ac58..6bdbdaf0a5d0 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2035.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2035.cs
@@ -28,6 +28,7 @@ protected override void Init()
 
 #if UITEST
 		[Test]
+		[Compatibility.UITests.FailsOnMauiIOS]
 		public void Issue2035Test()
 		{
 			RunningApp.WaitForElement(q => q.Marked(Success));
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2259.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2259.cs
index bfe009c7063a..1a6dfe9de4d0 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2259.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2259.cs
@@ -157,6 +157,7 @@ protected override void Init()
 #if UITEST
 		[Test]
 		[UiTest(typeof(ListView), "ScrollTo")]
+		[Compatibility.UITests.FailsOnMauiIOS]
 		public void Issue2259Tests()
 		{
 			for (int i = 0; i < 20; i++)
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2411.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2411.cs
index 4f7ebc9af350..9c0ed16fe1b8 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2411.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2411.cs
@@ -34,6 +34,7 @@ protected override void Init()
 
 #if UITEST
 		[Test]
+		[Compatibility.UITests.FailsOnMauiIOS]
 #if __ANDROID__
         [Ignore("Appearing event is tied to virtualization in TabbedPage for Material")]
 #endif
@@ -66,6 +67,7 @@ public void Issue2411ScrollToPositionMakeVisible()
 
 		[Test]
 		[Issue(IssueTracker.Github, 2411, "ScrollToPosition.End crashing in TabbedPage", PlatformAffected.Android)]
+		[Compatibility.UITests.FailsOnMauiIOS]
 #if __MACOS__
         [Ignore("ScrollTo not implemented on MacOS")]
 #endif
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2981.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2981.cs
index 90245b2f1730..67853e1b6e0f 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2981.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2981.cs
@@ -32,6 +32,7 @@ protected override void Init()
 		// (like LongPress) don't really work. The test should work manually on a touch screen, though.
 
 		[Test]
+		[Compatibility.UITests.FailsOnMauiIOS]
 		public void Issue2981Test()
 		{
 			RunningApp.Screenshot("I am at Issue 1");
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue3390.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue3390.cs
index 181f49b277e6..fb2731f6ac5f 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue3390.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue3390.cs
@@ -53,6 +53,7 @@ protected override void Init()
 
 #if UITEST
 		[Test]
+		[Compatibility.UITests.FailsOnMauiIOS]
 		public void Issue3390Test()
 		{
 			RunningApp.Tap("Click me");
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue4597.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue4597.cs
index 9951760d3575..ab8bc9d4c019 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue4597.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue4597.cs
@@ -176,6 +176,7 @@ protected override void Init()
 #if !WINDOWS
 		[Test]
 		[Compatibility.UITests.FailsOnMauiIOS]
+		[Compatibility.UITests.FailsOnMauiAndroid]
 		public void ImageFromFileSourceAppearsAndDisappearsCorrectly()
 		{
 			RunTest(nameof(Image), true);
@@ -184,6 +185,7 @@ public void ImageFromFileSourceAppearsAndDisappearsCorrectly()
 		[Test]
 		[NUnit.Framework.Category(UITestCategories.RequiresInternetConnection)]
 		[Compatibility.UITests.FailsOnMauiIOS]
+		[Compatibility.UITests.FailsOnMauiAndroid]
 		public void ImageFromUriSourceAppearsAndDisappearsCorrectly()
 		{
 			RunTest(nameof(Image), false);
@@ -199,6 +201,7 @@ public void ButtonFromFileSourceAppearsAndDisappearsCorrectly()
 
 		[Test]
 		[NUnit.Framework.Category(UITestCategories.RequiresInternetConnection)]
+		[Compatibility.UITests.FailsOnMauiIOS]
 		public void ButtonFromUriSourceAppearsAndDisappearsCorrectly()
 		{
 			RunTest(nameof(Button), false);
@@ -207,6 +210,7 @@ public void ButtonFromUriSourceAppearsAndDisappearsCorrectly()
 
 		[Test]
 		[Compatibility.UITests.FailsOnMauiIOS]
+		[FailsOnMauiAndroid]
 		public void ImageButtonFromFileSourceAppearsAndDisappearsCorrectly()
 		{
 			RunTest(nameof(ImageButton), true);
@@ -214,6 +218,7 @@ public void ImageButtonFromFileSourceAppearsAndDisappearsCorrectly()
 
 		[Test]
 		[Compatibility.UITests.FailsOnMauiIOS]
+		[FailsOnMauiAndroid]
 		[NUnit.Framework.Category(UITestCategories.RequiresInternetConnection)]
 		public void ImageButtonFromUriSourceAppearsAndDisappearsCorrectly()
 		{
@@ -227,8 +232,8 @@ public void ImageCellFromFileSourceAppearsAndDisappearsCorrectly()
 			ImageCellTest(true);
 		}
 
-[Microsoft.Maui.Controls.Compatibility.UITests.FailsOnMauiAndroid]
 		[Test]
+		[Microsoft.Maui.Controls.Compatibility.UITests.FailsOnMauiAndroid]
 		[NUnit.Framework.Category(UITestCategories.RequiresInternetConnection)]
 		public void ImageCellFromUriSourceAppearsAndDisappearsCorrectly()
 		{
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue5367.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue5367.cs
index 5dc35a1f7ce9..f8a213e15222 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue5367.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue5367.cs
@@ -52,6 +52,7 @@ protected override void Init()
 		[Test]
 		[UiTest(typeof(Editor))]
 		[Compatibility.UITests.FailsOnMauiIOS]
+		[Compatibility.UITests.FailsOnMauiAndroid]
 		public void Issue5367TestMaxLengthCrashesApp()
 		{
 			RunningApp.WaitForElement(MaxLengthEditor);
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue5500.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue5500.cs
index e29c0d6e6f21..04d525cbaf47 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue5500.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue5500.cs
@@ -64,6 +64,7 @@ protected override void OnAppearing()
 
 #if UITEST && __IOS__
 		[Test]
+		[Compatibility.UITests.FailsOnMauiIOS]
 		public void VerifyEditorTextChangeEventsAreFiring()
 		{
 			RunningApp.WaitForElement("EditorAutomationId");
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue7534.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue7534.cs
index e4d341f38830..98385bb38792 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue7534.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue7534.cs
@@ -49,6 +49,7 @@ protected override void Init()
 
 #if UITEST && __ANDROID__
 		[Test]
+		[Compatibility.UITests.FailsOnMauiAndroid]
 		public void ExpectingPageNotToBreak()
 		{
 			RunningApp.Screenshot("Test passed, label is showing as it should!");
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue7700.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue7700.cs
index cbd633623d82..648f1d13940b 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue7700.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue7700.cs
@@ -142,6 +142,7 @@ ContentPage GroupedCollectionViewPage()
 
 #if UITEST
 		[Test]
+		[FailsOnMauiAndroid]
 		public void AddingItemToUnviewedCollectionViewShouldNotCrash()
 		{
 			RunningApp.WaitForElement(Add1);
@@ -152,6 +153,7 @@ public void AddingItemToUnviewedCollectionViewShouldNotCrash()
 		}
 
 		[Test]
+		[FailsOnMauiAndroid]
 		public void AddingGroupToUnviewedGroupedCollectionViewShouldNotCrash()
 		{
 			RunningApp.WaitForElement(Add2);
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue773.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue773.cs
index 00593466cf3a..21084546baa6 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue773.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue773.cs
@@ -25,6 +25,7 @@ protected override void Init()
 		[Test]
 		[Issue (IssueTracker.Github, 773, "Horizontal ScrollView locks after rotation - relayout correctly after rotation", PlatformAffected.iOS)]
 		[UiTest (typeof(ScrollView))]
+		[Compatibility.UITests.FailsOnMauiAndroid]
 		public void Issue773TestsRotationRelayoutIssue ()
 		{
 			RunningApp.SetOrientationLandscape ();
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue8167.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue8167.cs
index 27c9dc251ba5..0e3f540e1ea4 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue8167.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue8167.cs
@@ -110,6 +110,7 @@ void RaisePropertyChanged(string propertyName)
 
 #if UITEST
 		[Test]
+		[Compatibility.UITests.FailsOnMauiIOS]
 		public void ThreadpoolBindingUpdateShouldNotCrash()
 		{
 			RunningApp.WaitForElement(Run);
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue8291.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue8291.cs
index 8e638d0b89d0..e19f57cd831f 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue8291.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue8291.cs
@@ -51,6 +51,7 @@ protected override void Init()
 
 #if UITEST && __ANDROID__
 		[Test]
+		[FailsOnMauiAndroid]
 		public void ContextMenuShowsUpWhenPressAndHoldTextOnEditorAndEntryField()
 		{
 			RunningApp.TouchAndHold("PressEditor");
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue9088.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue9088.cs
index f622981e2bba..7620704f576f 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue9088.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue9088.cs
@@ -82,6 +82,7 @@ protected override void Init()
 #if UITEST && __SHELL__
 
 		[Test]
+		[FailsOnMauiAndroid]
 		public void Issue9088SwipeViewConfictWithShellMenuSwipeInFromLeft()
 		{
 			RunningApp.WaitForElement(x => x.Marked(SwipeViewId));
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue9827.xaml.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue9827.xaml.cs
index 02b52ec647f4..c80fc9119876 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue9827.xaml.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue9827.xaml.cs
@@ -50,6 +50,7 @@ protected override void OnAppearing()
 
 #if UITEST
 		[Test]
+		[Compatibility.UITests.FailsOnMauiAndroid]
 		public void Issue9827Test()
 		{
 			RunningApp.WaitForElement("Pos:0");
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/LabelTextType.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/LabelTextType.cs
index dcf5774e062b..beb17363874e 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/LabelTextType.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/LabelTextType.cs
@@ -72,6 +72,7 @@ protected override void Init()
 #if UITEST
 		[Test]
 		[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.UwpIgnore)]
+		[Compatibility.UITests.FailsOnMauiIOS]
 		public void LabelToggleHtmlAndPlainTextTest() 
 		{
 			RunningApp.WaitForElement ("TextTypeLabel");
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/TestPages/TestPages.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/TestPages/TestPages.cs
index eb817877ca3d..fdcd3bec1788 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/TestPages/TestPages.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/TestPages/TestPages.cs
@@ -96,8 +96,13 @@ static IApp InitializeApp()
 #if __ANDROID__
 		static IApp InitializeAndroidApp()
 		{
-			var fullApkPath = IOPath.Combine(TestContext.CurrentContext.TestDirectory, AppPaths.ApkPath);
+			var envApkPath = Environment.GetEnvironmentVariable("APP_APK");
 
+
+			var fullApkPath = string.IsNullOrEmpty(envApkPath) ? IOPath.Combine(TestContext.CurrentContext.TestDirectory, AppPaths.ApkPath)
+																: envApkPath;
+
+			System.Diagnostics.Debug.WriteLine($"FullAppPath: {fullApkPath}");
 			var appConfiguration = ConfigureApp.Android.ApkFile(fullApkPath).Debug();
 
 			if (TestContext.Parameters.Exists("IncludeScreenShots") &&
@@ -146,10 +151,17 @@ static IApp InitializeiOSApp()
 				iOSVersion = _iosVersion;
 			}*/
 
+
+			var enviOSPath = Environment.GetEnvironmentVariable("iOS_APP");
+
+
+			var fullApkPath = string.IsNullOrEmpty(enviOSPath) ? IOPath.Combine(TestContext.CurrentContext.TestDirectory, AppPaths.iOSPath)
+																: enviOSPath;
+
 			// Running on the simulator
 			var app = ConfigureApp.iOS
 							.PreferIdeSettings()
-							.AppBundle(AppPaths.iOSPath)
+							.AppBundle(fullApkPath)
 							.Debug()
 							.StartApp();
 
diff --git a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/Legacy-CellsUITests.cs b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/Legacy-CellsUITests.cs
index 7dd6f9767601..54d47bb65950 100644
--- a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/Legacy-CellsUITests.cs
+++ b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/Legacy-CellsUITests.cs
@@ -318,6 +318,7 @@ public void CellsGalleryEntryCellTable()
 		}
 
 		[Test]
+		[Compatibility.UITests.FailsOnMauiAndroid]
 		[Category(UITestCategories.Cells)]
 		[Description("EntryCell fires .Completed event")]
 		[UiTest(typeof(EntryCell), "Completed")]

From 5419846b1f20bdab1b5ce1dff40287edc5c38f12 Mon Sep 17 00:00:00 2001
From: "E.Z. Hart" <hartez@users.noreply.github.com>
Date: Thu, 22 Jun 2023 15:47:41 -0600
Subject: [PATCH 029/105] Formalize virtual layout concepts and fix iOS memory
 leaks (#15303)

* iOS

* Windows updates

* Android

* Auto-format source code

* Added ScrollView/ContentView to more tests;
Add proxy to avoid UIScrollView event handlers preventing handler GC;

* Add public API tracking info for Tizen

* - fix windows merge

* [android] ScrollView leak test requires 2-sec delay

* Use `AssertionExtensions.Wait()`

---------

Co-authored-by: GitHub Actions Autoformatter <autoformat@example.com>
Co-authored-by: Shane Neuville <shneuvil@microsoft.com>
Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
---
 .../Handlers/Windows/FrameRenderer.cs         |   3 +-
 .../Handlers/iOS/FrameRenderer.cs             |   3 +-
 .../src/Core/ContentPage/ContentPage.cs       |   4 +-
 src/Controls/src/Core/ContentPresenter.cs     |   4 +-
 src/Controls/src/Core/Frame/Frame.cs          |   4 +-
 .../Core/RadioButton/RadioButton.Android.cs   |   3 +-
 .../src/Core/ScrollView/ScrollView.cs         |   4 +-
 .../src/Core/TemplatedView/TemplatedView.cs   |   4 +-
 .../Elements/ContentView/ContentViewTests.cs  |  37 ++++
 .../NavigationPage/NavigationPageTests.cs     |   4 +
 .../Elements/ScrollView/ScrollViewTests.cs    |  52 +++++
 .../DeviceTests/Elements/Shell/ShellTests.cs  |   4 +
 src/Core/src/Core/IContentView.cs             |  17 +-
 src/Core/src/Core/ICrossPlatformLayout.cs     |  22 ++
 .../src/Core/ICrossPlatformLayoutBacking.cs   |  18 ++
 src/Core/src/Core/ILayout.cs                  |  19 +-
 .../Handlers/Border/BorderHandler.Android.cs  |   6 +-
 .../Handlers/Border/BorderHandler.Windows.cs  |   6 +-
 .../src/Handlers/Border/BorderHandler.iOS.cs  |   6 +-
 .../ContentView/ContentViewHandler.Android.cs |   9 +-
 .../ContentView/ContentViewHandler.Windows.cs |  11 +-
 .../ContentView/ContentViewHandler.iOS.cs     |   9 +-
 .../Handlers/Layout/LayoutHandler.Android.cs  |   6 +-
 .../Handlers/Layout/LayoutHandler.Windows.cs  |   6 +-
 .../src/Handlers/Layout/LayoutHandler.iOS.cs  |   6 +-
 .../RadioButton/RadioButtonHandler.iOS.cs     |   3 +-
 .../ScrollView/ScrollViewHandler.Android.cs   |  48 +++--
 .../ScrollView/ScrollViewHandler.Windows.cs   |  36 ++--
 .../ScrollView/ScrollViewHandler.iOS.cs       | 202 ++++++++++++------
 .../SwipeItemViewHandler.Android.cs           |   6 +-
 .../SwipeItemView/SwipeItemViewHandler.iOS.cs |   6 +-
 .../SwipeView/SwipeViewHandler.Android.cs     |   6 +-
 .../SwipeView/SwipeViewHandler.iOS.cs         |   6 +-
 .../src/Platform/Android/ContentViewGroup.cs  |  21 +-
 .../src/Platform/Android/LayoutViewGroup.cs   |  20 +-
 src/Core/src/Platform/Windows/ContentPanel.cs |  28 +--
 src/Core/src/Platform/Windows/LayoutPanel.cs  |  41 +---
 src/Core/src/Platform/Windows/MauiPanel.cs    |  56 +++++
 src/Core/src/Platform/iOS/ContentView.cs      |  42 ----
 src/Core/src/Platform/iOS/LayoutView.cs       |  62 ------
 src/Core/src/Platform/iOS/MauiView.cs         |  75 ++++++-
 .../src/Platform/iOS/PageViewController.cs    |   3 +-
 .../Platform/iOS/SemanticSwitchContentView.cs |   3 +-
 .../net-android/PublicAPI.Unshipped.txt       |  14 ++
 .../PublicAPI/net-ios/PublicAPI.Unshipped.txt |  24 ++-
 .../net-maccatalyst/PublicAPI.Unshipped.txt   |  24 ++-
 .../net-tizen/PublicAPI.Unshipped.txt         |  12 +-
 .../net-windows/PublicAPI.Unshipped.txt       |  20 +-
 .../src/PublicAPI/net/PublicAPI.Unshipped.txt |  12 +-
 .../netstandard/PublicAPI.Unshipped.txt       |  10 +
 .../netstandard2.0/PublicAPI.Unshipped.txt    |  12 +-
 51 files changed, 662 insertions(+), 397 deletions(-)
 create mode 100644 src/Core/src/Core/ICrossPlatformLayout.cs
 create mode 100644 src/Core/src/Core/ICrossPlatformLayoutBacking.cs
 create mode 100644 src/Core/src/Platform/Windows/MauiPanel.cs

diff --git a/src/Controls/src/Core/Compatibility/Handlers/Windows/FrameRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/Windows/FrameRenderer.cs
index b37fb3a41d37..8b8ba15ae638 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/Windows/FrameRenderer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/Windows/FrameRenderer.cs
@@ -125,8 +125,7 @@ void PackChild()
 
 			var view = new ContentPanel
 			{
-				CrossPlatformMeasure = ((IContentView)Element).CrossPlatformMeasure,
-				CrossPlatformArrange = ((IContentView)Element).CrossPlatformArrange
+				CrossPlatformLayout = Element
 			};
 
 			view.Content = Element.Content.ToPlatform(MauiContext);
diff --git a/src/Controls/src/Core/Compatibility/Handlers/iOS/FrameRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/iOS/FrameRenderer.cs
index f23d67f9c4ee..da4a06268787 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/iOS/FrameRenderer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/iOS/FrameRenderer.cs
@@ -49,8 +49,7 @@ protected override void OnElementChanged(ElementChangedEventArgs<Frame> e)
 
 			if (e.NewElement != null)
 			{
-				_actualView.CrossPlatformArrange = (e.NewElement as IContentView).CrossPlatformArrange;
-				_actualView.CrossPlatformMeasure = (e.NewElement as IContentView).CrossPlatformMeasure;
+				_actualView.CrossPlatformLayout = e.NewElement;
 
 				SetupLayer();
 				UpdateShadow();
diff --git a/src/Controls/src/Core/ContentPage/ContentPage.cs b/src/Controls/src/Core/ContentPage/ContentPage.cs
index 7ce00866f664..9619d6228bfb 100644
--- a/src/Controls/src/Core/ContentPage/ContentPage.cs
+++ b/src/Controls/src/Core/ContentPage/ContentPage.cs
@@ -62,13 +62,13 @@ protected override Size ArrangeOverride(Rect bounds)
 			return Frame.Size;
 		}
 
-		Size IContentView.CrossPlatformMeasure(double widthConstraint, double heightConstraint)
+		Size ICrossPlatformLayout.CrossPlatformMeasure(double widthConstraint, double heightConstraint)
 		{
 			_ = this.MeasureContent(widthConstraint, heightConstraint);
 			return new Size(widthConstraint, heightConstraint);
 		}
 
-		Size IContentView.CrossPlatformArrange(Rect bounds)
+		Size ICrossPlatformLayout.CrossPlatformArrange(Rect bounds)
 		{
 			Frame = bounds;
 			this.ArrangeContent(bounds);
diff --git a/src/Controls/src/Core/ContentPresenter.cs b/src/Controls/src/Core/ContentPresenter.cs
index 9635fb4e9132..b9b33fd1e3da 100644
--- a/src/Controls/src/Core/ContentPresenter.cs
+++ b/src/Controls/src/Core/ContentPresenter.cs
@@ -106,7 +106,7 @@ protected override Size MeasureOverride(double widthConstraint, double heightCon
 			return DesiredSize;
 		}
 
-		Size IContentView.CrossPlatformMeasure(double widthConstraint, double heightConstraint)
+		Size ICrossPlatformLayout.CrossPlatformMeasure(double widthConstraint, double heightConstraint)
 		{
 			return this.MeasureContent(widthConstraint, heightConstraint);
 		}
@@ -118,7 +118,7 @@ protected override Size ArrangeOverride(Rect bounds)
 			return Frame.Size;
 		}
 
-		Size IContentView.CrossPlatformArrange(Rect bounds)
+		Size ICrossPlatformLayout.CrossPlatformArrange(Rect bounds)
 		{
 			this.ArrangeContent(bounds);
 			return bounds.Size;
diff --git a/src/Controls/src/Core/Frame/Frame.cs b/src/Controls/src/Core/Frame/Frame.cs
index 6648be56e869..b99e8556599e 100644
--- a/src/Controls/src/Core/Frame/Frame.cs
+++ b/src/Controls/src/Core/Frame/Frame.cs
@@ -108,7 +108,7 @@ IShadow IView.Shadow
 		// TODO fix iOS/WinUI to work the same as Android
 		// once this has been fixed on iOS/WinUI we should centralize 
 		// this code and Border into LayoutExtensions
-		Size IContentView.CrossPlatformArrange(Graphics.Rect bounds)
+		Size ICrossPlatformLayout.CrossPlatformArrange(Graphics.Rect bounds)
 		{
 #if !WINDOWS
 			bounds = bounds.Inset(((IBorderElement)this).BorderWidth); // Windows' implementation would cause an incorrect double-counting of the inset
@@ -117,7 +117,7 @@ Size IContentView.CrossPlatformArrange(Graphics.Rect bounds)
 			return bounds.Size;
 		}
 
-		Size IContentView.CrossPlatformMeasure(double widthConstraint, double heightConstraint)
+		Size ICrossPlatformLayout.CrossPlatformMeasure(double widthConstraint, double heightConstraint)
 		{
 			var inset = Padding;
 #if !WINDOWS
diff --git a/src/Controls/src/Core/RadioButton/RadioButton.Android.cs b/src/Controls/src/Core/RadioButton/RadioButton.Android.cs
index 253d00d5762d..0f26e3932f39 100644
--- a/src/Controls/src/Core/RadioButton/RadioButton.Android.cs
+++ b/src/Controls/src/Core/RadioButton/RadioButton.Android.cs
@@ -39,8 +39,7 @@ public static void MapContent(IRadioButtonHandler handler, RadioButton radioButt
 
 			var viewGroup = new ContentViewGroup(radioButton.Context)
 			{
-				CrossPlatformMeasure = radioButton.VirtualView.CrossPlatformMeasure,
-				CrossPlatformArrange = radioButton.VirtualView.CrossPlatformArrange
+				CrossPlatformLayout = radioButton.VirtualView
 			};
 
 			return viewGroup;
diff --git a/src/Controls/src/Core/ScrollView/ScrollView.cs b/src/Controls/src/Core/ScrollView/ScrollView.cs
index 5f5139b39c03..1f9750a27e2b 100644
--- a/src/Controls/src/Core/ScrollView/ScrollView.cs
+++ b/src/Controls/src/Core/ScrollView/ScrollView.cs
@@ -429,7 +429,7 @@ protected override Size MeasureOverride(double widthConstraint, double heightCon
 			return DesiredSize;
 		}
 
-		Size IContentView.CrossPlatformMeasure(double widthConstraint, double heightConstraint)
+		Size ICrossPlatformLayout.CrossPlatformMeasure(double widthConstraint, double heightConstraint)
 		{
 			if ((this as IContentView)?.PresentedContent is not IView content)
 			{
@@ -465,7 +465,7 @@ protected override Size ArrangeOverride(Rect bounds)
 			return Frame.Size;
 		}
 
-		Size IContentView.CrossPlatformArrange(Rect bounds)
+		Size ICrossPlatformLayout.CrossPlatformArrange(Rect bounds)
 		{
 			if (this is IScrollView scrollView)
 			{
diff --git a/src/Controls/src/Core/TemplatedView/TemplatedView.cs b/src/Controls/src/Core/TemplatedView/TemplatedView.cs
index 4f27524bc68c..a07569efd7a5 100644
--- a/src/Controls/src/Core/TemplatedView/TemplatedView.cs
+++ b/src/Controls/src/Core/TemplatedView/TemplatedView.cs
@@ -124,7 +124,7 @@ protected override Size MeasureOverride(double widthConstraint, double heightCon
 			return DesiredSize;
 		}
 
-		Size IContentView.CrossPlatformMeasure(double widthConstraint, double heightConstraint)
+		Size ICrossPlatformLayout.CrossPlatformMeasure(double widthConstraint, double heightConstraint)
 		{
 			return this.MeasureContent(widthConstraint, heightConstraint);
 		}
@@ -136,7 +136,7 @@ protected override Size ArrangeOverride(Rect bounds)
 			return Frame.Size;
 		}
 
-		Size IContentView.CrossPlatformArrange(Rect bounds)
+		Size ICrossPlatformLayout.CrossPlatformArrange(Rect bounds)
 		{
 			this.ArrangeContent(bounds);
 			return bounds.Size;
diff --git a/src/Controls/tests/DeviceTests/Elements/ContentView/ContentViewTests.cs b/src/Controls/tests/DeviceTests/Elements/ContentView/ContentViewTests.cs
index 258939f5580b..e963b2095315 100644
--- a/src/Controls/tests/DeviceTests/Elements/ContentView/ContentViewTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/ContentView/ContentViewTests.cs
@@ -76,5 +76,42 @@ await InvokeOnMainThreadAsync(() =>
 				Assert.True(child.BindingContext == bindingContext);
 			});
 		}
+
+		[Fact(DisplayName = "ContentView Does Not Leak")]
+		public async Task DoesNotLeak()
+		{
+			SetupBuilder();
+			WeakReference viewReference = null;
+			WeakReference handlerReference = null;
+			WeakReference platformReference = null;
+
+			{
+				var view = new Microsoft.Maui.Controls.ContentView();
+				var page = new ContentPage { Content = view };
+				await CreateHandlerAndAddToWindow(page, () =>
+				{
+					viewReference = new(view);
+					handlerReference = new(view.Handler);
+					platformReference = new(view.Handler.PlatformView);
+					page.Content = null;
+				});
+			}
+
+			Assert.NotNull(viewReference);
+			Assert.NotNull(platformReference);
+			Assert.NotNull(handlerReference);
+
+			// Multiple GCs are sometimes required on iOS
+			for (int i = 0; i < 3; i++)
+			{
+				await Task.Yield();
+				GC.Collect();
+				GC.WaitForPendingFinalizers();
+			}
+
+			Assert.False(viewReference.IsAlive, "View should not be alive!");
+			Assert.False(handlerReference.IsAlive, "Handler should not be alive!");
+			Assert.False(platformReference.IsAlive, "PlatformView should not be alive!");
+		}
 	}
 }
diff --git a/src/Controls/tests/DeviceTests/Elements/NavigationPage/NavigationPageTests.cs b/src/Controls/tests/DeviceTests/Elements/NavigationPage/NavigationPageTests.cs
index 018cd0bd5d2a..3371f7bed597 100644
--- a/src/Controls/tests/DeviceTests/Elements/NavigationPage/NavigationPageTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/NavigationPage/NavigationPageTests.cs
@@ -37,6 +37,8 @@ void SetupBuilder()
 					handlers.AddHandler<Label, LabelHandler>();
 					handlers.AddHandler<Button, ButtonHandler>();
 					handlers.AddHandler<CollectionView, CollectionViewHandler>();
+					handlers.AddHandler(typeof(Controls.ContentView), typeof(ContentViewHandler));
+					handlers.AddHandler(typeof(ScrollView), typeof(ScrollViewHandler));
 				});
 			});
 		}
@@ -313,6 +315,8 @@ await CreateHandlerAndAddToWindow<WindowHandlerStub>(new Window(navPage), async
 						new Label(),
 						new Button(),
 						new CollectionView(),
+						new ScrollView(),
+						new ContentView()
 					}
 				};
 				pageReference = new WeakReference(page);
diff --git a/src/Controls/tests/DeviceTests/Elements/ScrollView/ScrollViewTests.cs b/src/Controls/tests/DeviceTests/Elements/ScrollView/ScrollViewTests.cs
index c65078c92b3a..9dd3c8e77488 100644
--- a/src/Controls/tests/DeviceTests/Elements/ScrollView/ScrollViewTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/ScrollView/ScrollViewTests.cs
@@ -8,6 +8,7 @@
 using Microsoft.Maui.Controls;
 using Microsoft.Maui.Graphics;
 using Microsoft.Maui.Handlers;
+using Microsoft.Maui.Hosting;
 using Xunit;
 
 namespace Microsoft.Maui.DeviceTests
@@ -77,6 +78,57 @@ await AttachAndRun(scroll, async (handler) =>
 			});
 		}
 
+		[Fact(DisplayName = "ScrollView Does Not Leak")]
+		public async Task DoesNotLeak()
+		{
+			SetupBuilder();
+			WeakReference viewReference = null;
+			WeakReference handlerReference = null;
+			WeakReference platformReference = null;
+
+			{
+				var view = new Microsoft.Maui.Controls.ScrollView();
+				var page = new ContentPage { Content = view };
+				await CreateHandlerAndAddToWindow(page, () =>
+				{
+					viewReference = new(view);
+					handlerReference = new(view.Handler);
+					platformReference = new(view.Handler.PlatformView);
+					page.Content = null;
+				});
+			}
+
+			Assert.NotNull(viewReference);
+			Assert.NotNull(platformReference);
+			Assert.NotNull(handlerReference);
+
+			// Android requires an actual 2-second day
+			// iOS requires multiple GCs
+			await AssertionExtensions.Wait(() =>
+			{
+				GC.Collect();
+				GC.WaitForPendingFinalizers();
+				return !viewReference.IsAlive && !handlerReference.IsAlive && !platformReference.IsAlive;
+			}, timeout: 3000);
+
+			Assert.False(viewReference.IsAlive, "View should not be alive!");
+			Assert.False(handlerReference.IsAlive, "Handler should not be alive!");
+			Assert.False(platformReference.IsAlive, "PlatformView should not be alive!");
+		}
+
+		void SetupBuilder()
+		{
+			EnsureHandlerCreated(builder =>
+			{
+				builder.ConfigureMauiHandlers(handlers =>
+				{
+					handlers.AddHandler<Label, LabelHandler>();
+					handlers.AddHandler<IScrollView, ScrollViewHandler>();
+					handlers.AddHandler<Grid, LayoutHandler>();
+				});
+			});
+		}
+
 		static async Task AssertContentSizeChanged(Task<bool> changed)
 		{
 			await WaitAssert(() => changed.IsCompleted && changed.Result, timeout: 5000, message: "PropertyChanged event with PropertyName 'ContentSize' did not fire").ConfigureAwait(false);
diff --git a/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.cs b/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.cs
index de73cc507e09..fb8196080344 100644
--- a/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.cs
@@ -40,6 +40,8 @@ void SetupBuilder()
 					SetupShellHandlers(handlers);
 					handlers.AddHandler(typeof(NavigationPage), typeof(NavigationViewHandler));
 					handlers.AddHandler(typeof(Button), typeof(ButtonHandler));
+					handlers.AddHandler(typeof(Controls.ContentView), typeof(ContentViewHandler));
+					handlers.AddHandler(typeof(ScrollView), typeof(ScrollViewHandler));
 					handlers.AddHandler(typeof(CollectionView), typeof(CollectionViewHandler));
 				});
 			});
@@ -986,6 +988,8 @@ await CreateHandlerAndAddToWindow<ShellHandler>(shell, async (handler) =>
 					{
 						new Label(),
 						new Button(),
+						new Controls.ContentView(),
+						new ScrollView(),
 						new CollectionView(),
 					}
 				};
diff --git a/src/Core/src/Core/IContentView.cs b/src/Core/src/Core/IContentView.cs
index 2d703a1c8dc5..ae404691bc1d 100644
--- a/src/Core/src/Core/IContentView.cs
+++ b/src/Core/src/Core/IContentView.cs
@@ -5,7 +5,7 @@ namespace Microsoft.Maui
 	/// <summary>
 	/// A View that contains another View.
 	/// </summary>
-	public interface IContentView : IView, IPadding
+	public interface IContentView : IView, IPadding, ICrossPlatformLayout
 	{
 		/// <summary>
 		/// Gets the raw content of this view.
@@ -16,20 +16,5 @@ public interface IContentView : IView, IPadding
 		/// Gets the content of this view as it will be rendered in the user interface, including any transformations or applied templates.
 		/// </summary>
 		IView? PresentedContent { get; }
-
-		/// <summary>
-		/// Measures the desired size of the IContentView within the given constraints.
-		/// </summary>
-		/// <param name="widthConstraint">The width limit for measuring the IContentView.</param>
-		/// <param name="heightConstraint">The height limit for measuring the IContentView.</param>
-		/// <returns>The desired size of the IContentView.</returns>
-		Size CrossPlatformMeasure(double widthConstraint, double heightConstraint);
-
-		/// <summary>
-		/// Arranges the content of the IContentView within the given bounds.
-		/// </summary>
-		/// <param name="bounds">The bounds in which the IContentView's content should be arranged.</param>
-		/// <returns>The actual size of the arranged IContentView.</returns>
-		Size CrossPlatformArrange(Rect bounds);
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Core/ICrossPlatformLayout.cs b/src/Core/src/Core/ICrossPlatformLayout.cs
new file mode 100644
index 000000000000..135ee3ae17b2
--- /dev/null
+++ b/src/Core/src/Core/ICrossPlatformLayout.cs
@@ -0,0 +1,22 @@
+using Microsoft.Maui.Graphics;
+
+namespace Microsoft.Maui
+{
+	public interface ICrossPlatformLayout
+	{
+		/// <summary>
+		/// Measures the desired size of the ICrossPlatformLayout within the given constraints.
+		/// </summary>
+		/// <param name="widthConstraint">The width limit for measuring the ICrossPlatformLayout.</param>
+		/// <param name="heightConstraint">The height limit for measuring the ICrossPlatformLayout.</param>
+		/// <returns>The desired size of the ILayout.</returns>
+		Size CrossPlatformMeasure(double widthConstraint, double heightConstraint);
+
+		/// <summary>
+		/// Arranges the children of the ICrossPlatformLayout within the given bounds.
+		/// </summary>
+		/// <param name="bounds">The bounds in which the ICrossPlatformLayout's children should be arranged.</param>
+		/// <returns>The actual size of the arranged ICrossPlatformLayout.</returns>
+		Size CrossPlatformArrange(Rect bounds);
+	}
+}
diff --git a/src/Core/src/Core/ICrossPlatformLayoutBacking.cs b/src/Core/src/Core/ICrossPlatformLayoutBacking.cs
new file mode 100644
index 000000000000..336689303bb5
--- /dev/null
+++ b/src/Core/src/Core/ICrossPlatformLayoutBacking.cs
@@ -0,0 +1,18 @@
+namespace Microsoft.Maui
+{
+	/// <summary>
+	/// Indicates a control which supports cross-platform layout operations
+	/// </summary>
+	public interface ICrossPlatformLayoutBacking
+	{
+		/// <summary>
+		/// Gets or sets the implementation of cross-platform layout operations to be carried out by this control
+		/// </summary>
+		/// <remarks>
+		/// This property is the bridge between the platform-level backing control and the cross-platform-level
+		/// layout. It is typically connected by the handler, which may add additional logic to normalize layout
+		/// and content behaviors across the various platforms. 
+		/// </remarks>
+		public ICrossPlatformLayout? CrossPlatformLayout { get; set; }
+	}
+}
diff --git a/src/Core/src/Core/ILayout.cs b/src/Core/src/Core/ILayout.cs
index f172e94c8697..3f7b860697e7 100644
--- a/src/Core/src/Core/ILayout.cs
+++ b/src/Core/src/Core/ILayout.cs
@@ -1,28 +1,11 @@
-using Microsoft.Maui.Graphics;
-
 namespace Microsoft.Maui
 {
 	/// <summary>
 	/// Provides the base properties and methods for all Layout elements.
 	/// Use Layout elements to position and size child elements in .NET MAUI applications.
 	/// </summary>
-	public interface ILayout : IView, IContainer, ISafeAreaView, IPadding
+	public interface ILayout : IView, IContainer, ISafeAreaView, IPadding, ICrossPlatformLayout
 	{
-		/// <summary>
-		/// Measures the desired size of the ILayout within the given constraints.
-		/// </summary>
-		/// <param name="widthConstraint">The width limit for measuring the ILayout.</param>
-		/// <param name="heightConstraint">The height limit for measuring the ILayout.</param>
-		/// <returns>The desired size of the ILayout.</returns>
-		Size CrossPlatformMeasure(double widthConstraint, double heightConstraint);
-
-		/// <summary>
-		/// Arranges the children of the ILayout within the given bounds.
-		/// </summary>
-		/// <param name="bounds">The bounds in which the ILayout's children should be arranged.</param>
-		/// <returns>The actual size of the arranged ILayout.</returns>
-		Size CrossPlatformArrange(Rect bounds);
-
 		/// <summary>
 		/// Specifies whether the ILayout clips its content to its boundaries.
 		/// </summary>
diff --git a/src/Core/src/Handlers/Border/BorderHandler.Android.cs b/src/Core/src/Handlers/Border/BorderHandler.Android.cs
index ea2d07c50529..dab55056a341 100644
--- a/src/Core/src/Handlers/Border/BorderHandler.Android.cs
+++ b/src/Core/src/Handlers/Border/BorderHandler.Android.cs
@@ -13,8 +13,7 @@ protected override ContentViewGroup CreatePlatformView()
 
 			var viewGroup = new ContentViewGroup(Context)
 			{
-				CrossPlatformMeasure = VirtualView.CrossPlatformMeasure,
-				CrossPlatformArrange = VirtualView.CrossPlatformArrange
+				CrossPlatformLayout = VirtualView
 			};
 
 			// We only want to use a hardware layer for the entering view because its quite likely
@@ -30,8 +29,7 @@ public override void SetVirtualView(IView view)
 			_ = VirtualView ?? throw new InvalidOperationException($"{nameof(VirtualView)} should have been set by base class.");
 			_ = PlatformView ?? throw new InvalidOperationException($"{nameof(PlatformView)} should have been set by base class.");
 
-			PlatformView.CrossPlatformMeasure = VirtualView.CrossPlatformMeasure;
-			PlatformView.CrossPlatformArrange = VirtualView.CrossPlatformArrange;
+			PlatformView.CrossPlatformLayout = VirtualView;
 		}
 
 		static void UpdateContent(IBorderHandler handler)
diff --git a/src/Core/src/Handlers/Border/BorderHandler.Windows.cs b/src/Core/src/Handlers/Border/BorderHandler.Windows.cs
index 0dead03ee7ec..a62283780f3d 100644
--- a/src/Core/src/Handlers/Border/BorderHandler.Windows.cs
+++ b/src/Core/src/Handlers/Border/BorderHandler.Windows.cs
@@ -11,8 +11,7 @@ public override void SetVirtualView(IView view)
 			_ = PlatformView ?? throw new InvalidOperationException($"{nameof(PlatformView)} should have been set by base class.");
 			_ = VirtualView ?? throw new InvalidOperationException($"{nameof(VirtualView)} should have been set by base class.");
 
-			PlatformView.CrossPlatformMeasure = VirtualView.CrossPlatformMeasure;
-			PlatformView.CrossPlatformArrange = VirtualView.CrossPlatformArrange;
+			PlatformView.CrossPlatformLayout = VirtualView;
 		}
 
 		static void UpdateContent(IBorderHandler handler)
@@ -37,8 +36,7 @@ protected override ContentPanel CreatePlatformView()
 
 			var view = new ContentPanel
 			{
-				CrossPlatformMeasure = VirtualView.CrossPlatformMeasure,
-				CrossPlatformArrange = VirtualView.CrossPlatformArrange
+				CrossPlatformLayout = VirtualView
 			};
 
 			return view;
diff --git a/src/Core/src/Handlers/Border/BorderHandler.iOS.cs b/src/Core/src/Handlers/Border/BorderHandler.iOS.cs
index 353c5876fe7c..c92feb112750 100644
--- a/src/Core/src/Handlers/Border/BorderHandler.iOS.cs
+++ b/src/Core/src/Handlers/Border/BorderHandler.iOS.cs
@@ -14,8 +14,7 @@ protected override ContentView CreatePlatformView()
 
 			return new ContentView
 			{
-				CrossPlatformMeasure = VirtualView.CrossPlatformMeasure,
-				CrossPlatformArrange = VirtualView.CrossPlatformArrange
+				CrossPlatformLayout = VirtualView
 			};
 		}
 
@@ -40,8 +39,7 @@ public override void SetVirtualView(IView view)
 			_ = VirtualView ?? throw new InvalidOperationException($"{nameof(VirtualView)} should have been set by base class.");
 
 			PlatformView.View = view;
-			PlatformView.CrossPlatformMeasure = VirtualView.CrossPlatformMeasure;
-			PlatformView.CrossPlatformArrange = VirtualView.CrossPlatformArrange;
+			PlatformView.CrossPlatformLayout = VirtualView;
 		}
 
 		static void UpdateContent(IBorderHandler handler)
diff --git a/src/Core/src/Handlers/ContentView/ContentViewHandler.Android.cs b/src/Core/src/Handlers/ContentView/ContentViewHandler.Android.cs
index 45f89dba74ca..8240a5c00469 100644
--- a/src/Core/src/Handlers/ContentView/ContentViewHandler.Android.cs
+++ b/src/Core/src/Handlers/ContentView/ContentViewHandler.Android.cs
@@ -13,8 +13,7 @@ protected override ContentViewGroup CreatePlatformView()
 
 			var viewGroup = new ContentViewGroup(Context)
 			{
-				CrossPlatformMeasure = VirtualView.CrossPlatformMeasure,
-				CrossPlatformArrange = VirtualView.CrossPlatformArrange
+				CrossPlatformLayout = VirtualView
 			};
 
 			viewGroup.SetClipChildren(false);
@@ -28,8 +27,7 @@ public override void SetVirtualView(IView view)
 			_ = VirtualView ?? throw new InvalidOperationException($"{nameof(VirtualView)} should have been set by base class.");
 			_ = PlatformView ?? throw new InvalidOperationException($"{nameof(PlatformView)} should have been set by base class.");
 
-			PlatformView.CrossPlatformMeasure = VirtualView.CrossPlatformMeasure;
-			PlatformView.CrossPlatformArrange = VirtualView.CrossPlatformArrange;
+			PlatformView.CrossPlatformLayout = VirtualView;
 		}
 
 		static void UpdateContent(IContentViewHandler handler)
@@ -52,8 +50,7 @@ public static void MapContent(IContentViewHandler handler, IContentView page)
 		protected override void DisconnectHandler(ContentViewGroup platformView)
 		{
 			// If we're being disconnected from the xplat element, then we should no longer be managing its children
-			platformView.CrossPlatformMeasure = null;
-			platformView.CrossPlatformArrange = null;
+			platformView.CrossPlatformLayout = null;
 			platformView.RemoveAllViews();
 			base.DisconnectHandler(platformView);
 		}
diff --git a/src/Core/src/Handlers/ContentView/ContentViewHandler.Windows.cs b/src/Core/src/Handlers/ContentView/ContentViewHandler.Windows.cs
index b1303431bafc..a5afa833f0e2 100644
--- a/src/Core/src/Handlers/ContentView/ContentViewHandler.Windows.cs
+++ b/src/Core/src/Handlers/ContentView/ContentViewHandler.Windows.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace Microsoft.Maui.Handlers
 {
@@ -13,8 +11,7 @@ public override void SetVirtualView(IView view)
 			_ = PlatformView ?? throw new InvalidOperationException($"{nameof(PlatformView)} should have been set by base class.");
 			_ = VirtualView ?? throw new InvalidOperationException($"{nameof(VirtualView)} should have been set by base class.");
 
-			PlatformView.CrossPlatformMeasure = VirtualView.CrossPlatformMeasure;
-			PlatformView.CrossPlatformArrange = VirtualView.CrossPlatformArrange;
+			PlatformView.CrossPlatformLayout = VirtualView;
 		}
 
 		static void UpdateContent(IContentViewHandler handler)
@@ -38,8 +35,7 @@ protected override ContentPanel CreatePlatformView()
 
 			var view = new ContentPanel
 			{
-				CrossPlatformMeasure = VirtualView.CrossPlatformMeasure,
-				CrossPlatformArrange = VirtualView.CrossPlatformArrange
+				CrossPlatformLayout = VirtualView
 			};
 
 			return view;
@@ -52,8 +48,7 @@ public static void MapContent(IContentViewHandler handler, IContentView page)
 
 		protected override void DisconnectHandler(ContentPanel platformView)
 		{
-			platformView.CrossPlatformMeasure = null;
-			platformView.CrossPlatformArrange = null;
+			platformView.CrossPlatformLayout = null;
 			base.DisconnectHandler(platformView);
 		}
 	}
diff --git a/src/Core/src/Handlers/ContentView/ContentViewHandler.iOS.cs b/src/Core/src/Handlers/ContentView/ContentViewHandler.iOS.cs
index 2a076b28fd2f..0a4e4010869f 100644
--- a/src/Core/src/Handlers/ContentView/ContentViewHandler.iOS.cs
+++ b/src/Core/src/Handlers/ContentView/ContentViewHandler.iOS.cs
@@ -12,8 +12,7 @@ protected override ContentView CreatePlatformView()
 
 			return new ContentView
 			{
-				CrossPlatformMeasure = VirtualView.CrossPlatformMeasure,
-				CrossPlatformArrange = VirtualView.CrossPlatformArrange
+				CrossPlatformLayout = VirtualView
 			};
 		}
 
@@ -24,8 +23,7 @@ public override void SetVirtualView(IView view)
 			_ = VirtualView ?? throw new InvalidOperationException($"{nameof(VirtualView)} should have been set by base class.");
 
 			PlatformView.View = view;
-			PlatformView.CrossPlatformMeasure = VirtualView.CrossPlatformMeasure;
-			PlatformView.CrossPlatformArrange = VirtualView.CrossPlatformArrange;
+			PlatformView.CrossPlatformLayout = VirtualView;
 		}
 
 		static void UpdateContent(IContentViewHandler handler)
@@ -56,8 +54,7 @@ public static void MapContent(IContentViewHandler handler, IContentView page)
 
 		protected override void DisconnectHandler(ContentView platformView)
 		{
-			platformView.CrossPlatformMeasure = null;
-			platformView.CrossPlatformArrange = null;
+			platformView.CrossPlatformLayout = null;
 			platformView.RemoveFromSuperview();
 			base.DisconnectHandler(platformView);
 		}
diff --git a/src/Core/src/Handlers/Layout/LayoutHandler.Android.cs b/src/Core/src/Handlers/Layout/LayoutHandler.Android.cs
index 0bc96cabef1a..b8d66d7655ab 100644
--- a/src/Core/src/Handlers/Layout/LayoutHandler.Android.cs
+++ b/src/Core/src/Handlers/Layout/LayoutHandler.Android.cs
@@ -15,8 +15,7 @@ protected override LayoutViewGroup CreatePlatformView()
 
 			var viewGroup = new LayoutViewGroup(Context!)
 			{
-				CrossPlatformMeasure = VirtualView.CrossPlatformMeasure,
-				CrossPlatformArrange = VirtualView.CrossPlatformArrange
+				CrossPlatformLayout = VirtualView
 			};
 
 			// .NET MAUI layouts should not impose clipping on their children	
@@ -33,8 +32,7 @@ public override void SetVirtualView(IView view)
 			_ = VirtualView ?? throw new InvalidOperationException($"{nameof(VirtualView)} should have been set by base class.");
 			_ = MauiContext ?? throw new InvalidOperationException($"{nameof(MauiContext)} should have been set by base class.");
 
-			PlatformView.CrossPlatformMeasure = VirtualView.CrossPlatformMeasure;
-			PlatformView.CrossPlatformArrange = VirtualView.CrossPlatformArrange;
+			PlatformView.CrossPlatformLayout = VirtualView;
 
 			PlatformView.RemoveAllViews();
 
diff --git a/src/Core/src/Handlers/Layout/LayoutHandler.Windows.cs b/src/Core/src/Handlers/Layout/LayoutHandler.Windows.cs
index 615f81d18cd6..3d339a1a5b54 100644
--- a/src/Core/src/Handlers/Layout/LayoutHandler.Windows.cs
+++ b/src/Core/src/Handlers/Layout/LayoutHandler.Windows.cs
@@ -24,8 +24,7 @@ public override void SetVirtualView(IView view)
 			_ = VirtualView ?? throw new InvalidOperationException($"{nameof(VirtualView)} should have been set by base class.");
 			_ = MauiContext ?? throw new InvalidOperationException($"{nameof(MauiContext)} should have been set by base class.");
 
-			PlatformView.CrossPlatformMeasure = VirtualView.CrossPlatformMeasure;
-			PlatformView.CrossPlatformArrange = VirtualView.CrossPlatformArrange;
+			PlatformView.CrossPlatformLayout = VirtualView;
 
 			PlatformView.Children.Clear();
 
@@ -89,8 +88,7 @@ protected override LayoutPanel CreatePlatformView()
 
 			var view = new LayoutPanel
 			{
-				CrossPlatformMeasure = VirtualView.CrossPlatformMeasure,
-				CrossPlatformArrange = VirtualView.CrossPlatformArrange,
+				CrossPlatformLayout = VirtualView
 			};
 
 			return view;
diff --git a/src/Core/src/Handlers/Layout/LayoutHandler.iOS.cs b/src/Core/src/Handlers/Layout/LayoutHandler.iOS.cs
index 8023623c97b4..13b4c557fb42 100644
--- a/src/Core/src/Handlers/Layout/LayoutHandler.iOS.cs
+++ b/src/Core/src/Handlers/Layout/LayoutHandler.iOS.cs
@@ -14,7 +14,10 @@ protected override LayoutView CreatePlatformView()
 				throw new InvalidOperationException($"{nameof(VirtualView)} must be set to create a LayoutViewGroup");
 			}
 
-			return new();
+			return new()
+			{
+				CrossPlatformLayout = VirtualView
+			};
 		}
 
 		public override void SetVirtualView(IView view)
@@ -26,6 +29,7 @@ public override void SetVirtualView(IView view)
 			_ = MauiContext ?? throw new InvalidOperationException($"{nameof(MauiContext)} should have been set by base class.");
 
 			PlatformView.View = view;
+			PlatformView.CrossPlatformLayout = VirtualView;
 
 			// Remove any previous children 
 			PlatformView.ClearSubviews();
diff --git a/src/Core/src/Handlers/RadioButton/RadioButtonHandler.iOS.cs b/src/Core/src/Handlers/RadioButton/RadioButtonHandler.iOS.cs
index fc4fc8dccc9a..6290c87e5d74 100644
--- a/src/Core/src/Handlers/RadioButton/RadioButtonHandler.iOS.cs
+++ b/src/Core/src/Handlers/RadioButton/RadioButtonHandler.iOS.cs
@@ -19,8 +19,7 @@ public override void SetVirtualView(IView view)
 			_ = VirtualView ?? throw new InvalidOperationException($"{nameof(VirtualView)} should have been set by base class.");
 
 			PlatformView.View = view;
-			PlatformView.CrossPlatformMeasure = VirtualView.CrossPlatformMeasure;
-			PlatformView.CrossPlatformArrange = VirtualView.CrossPlatformArrange;
+			PlatformView.CrossPlatformLayout = VirtualView;
 		}
 
 		static void UpdateContent(IRadioButtonHandler handler)
diff --git a/src/Core/src/Handlers/ScrollView/ScrollViewHandler.Android.cs b/src/Core/src/Handlers/ScrollView/ScrollViewHandler.Android.cs
index 5f378f7e4306..16d4da49daae 100644
--- a/src/Core/src/Handlers/ScrollView/ScrollViewHandler.Android.cs
+++ b/src/Core/src/Handlers/ScrollView/ScrollViewHandler.Android.cs
@@ -1,22 +1,22 @@
-using System;
-using Android.Views;
+using Android.Views;
 using Microsoft.Maui.Graphics;
 using static Microsoft.Maui.Layouts.LayoutExtensions;
 
 namespace Microsoft.Maui.Handlers
 {
-	public partial class ScrollViewHandler : ViewHandler<IScrollView, MauiScrollView>
+	public partial class ScrollViewHandler : ViewHandler<IScrollView, MauiScrollView>, ICrossPlatformLayout
 	{
 		const string InsetPanelTag = "MAUIContentInsetPanel";
 
 		protected override MauiScrollView CreatePlatformView()
 		{
 			var scrollView = new MauiScrollView(
-				new Android.Views.ContextThemeWrapper(MauiContext!.Context, Resource.Style.scrollViewTheme), null!,
-					Resource.Attribute.scrollViewStyle);
-
-			scrollView.ClipToOutline = true;
-			scrollView.FillViewport = true;
+				new ContextThemeWrapper(MauiContext!.Context, Resource.Style.scrollViewTheme), null!,
+					Resource.Attribute.scrollViewStyle)
+			{
+				ClipToOutline = true,
+				FillViewport = true
+			};
 
 			return scrollView;
 		}
@@ -106,7 +106,12 @@ public static void MapContent(IScrollViewHandler handler, IScrollView scrollView
 			if (handler.PlatformView == null || handler.MauiContext == null)
 				return;
 
-			UpdateInsetView(scrollView, handler);
+			if (handler is not ICrossPlatformLayout crossPlatformLayout)
+			{
+				return;
+			}
+
+			UpdateInsetView(scrollView, handler, crossPlatformLayout);
 		}
 
 		public static void MapHorizontalScrollBarVisibility(IScrollViewHandler handler, IScrollView scrollView)
@@ -165,7 +170,7 @@ The methods below exist to support inserting/updating the extra padding/margin l
 			return handler.PlatformView.FindViewWithTag(InsetPanelTag) as ContentViewGroup;
 		}
 
-		static void UpdateInsetView(IScrollView scrollView, IScrollViewHandler handler)
+		static void UpdateInsetView(IScrollView scrollView, IScrollViewHandler handler, ICrossPlatformLayout crossPlatformLayout)
 		{
 			if (scrollView.PresentedContent == null || handler.MauiContext == null)
 			{
@@ -184,11 +189,11 @@ static void UpdateInsetView(IScrollView scrollView, IScrollViewHandler handler)
 			}
 			else
 			{
-				InsertInsetView(handler, scrollView, nativeContent);
+				InsertInsetView(handler, scrollView, nativeContent, crossPlatformLayout);
 			}
 		}
 
-		static void InsertInsetView(IScrollViewHandler handler, IScrollView scrollView, View nativeContent)
+		static void InsertInsetView(IScrollViewHandler handler, IScrollView scrollView, View nativeContent, ICrossPlatformLayout crossPlatformLayout)
 		{
 			if (scrollView.PresentedContent == null || handler.MauiContext?.Context == null)
 			{
@@ -197,7 +202,7 @@ static void InsertInsetView(IScrollViewHandler handler, IScrollView scrollView,
 
 			var paddingShim = new ContentViewGroup(handler.MauiContext.Context)
 			{
-				CrossPlatformMeasure = IncludeScrollViewInsets(scrollView.PresentedContent.Measure, scrollView),
+				CrossPlatformLayout = crossPlatformLayout,
 				Tag = InsetPanelTag
 			};
 
@@ -206,16 +211,10 @@ static void InsertInsetView(IScrollViewHandler handler, IScrollView scrollView,
 			handler.PlatformView.SetContent(paddingShim);
 		}
 
-		static Func<double, double, Size> IncludeScrollViewInsets(Func<double, double, Size> internalMeasure, IScrollView scrollView)
+		Size ICrossPlatformLayout.CrossPlatformMeasure(double widthConstraint, double heightConstraint)
 		{
-			return (widthConstraint, heightConstraint) =>
-			{
-				return InsetScrollView(widthConstraint, heightConstraint, internalMeasure, scrollView);
-			};
-		}
+			var scrollView = VirtualView;
 
-		static Size InsetScrollView(double widthConstraint, double heightConstraint, Func<double, double, Size> internalMeasure, IScrollView scrollView)
-		{
 			var padding = scrollView.Padding;
 
 			if (scrollView.PresentedContent == null)
@@ -227,7 +226,7 @@ static Size InsetScrollView(double widthConstraint, double heightConstraint, Fun
 			var measurementWidth = widthConstraint - padding.HorizontalThickness;
 			var measurementHeight = heightConstraint - padding.VerticalThickness;
 
-			var result = internalMeasure.Invoke(measurementWidth, measurementHeight);
+			var result = scrollView.CrossPlatformMeasure(measurementWidth, measurementHeight);
 
 			// ... and add the padding back in to the final result
 			var fullSize = new Size(result.Width + padding.HorizontalThickness, result.Height + padding.VerticalThickness);
@@ -244,5 +243,10 @@ static Size InsetScrollView(double widthConstraint, double heightConstraint, Fun
 
 			return fullSize.AdjustForFill(new Rect(0, 0, widthConstraint, heightConstraint), scrollView.PresentedContent);
 		}
+
+		Size ICrossPlatformLayout.CrossPlatformArrange(Rect bounds)
+		{
+			return VirtualView.CrossPlatformArrange(bounds);
+		}
 	}
 }
diff --git a/src/Core/src/Handlers/ScrollView/ScrollViewHandler.Windows.cs b/src/Core/src/Handlers/ScrollView/ScrollViewHandler.Windows.cs
index 64119f61c227..9fde79709726 100644
--- a/src/Core/src/Handlers/ScrollView/ScrollViewHandler.Windows.cs
+++ b/src/Core/src/Handlers/ScrollView/ScrollViewHandler.Windows.cs
@@ -6,11 +6,12 @@
 using Microsoft.Maui.Graphics;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+using Windows.UI.Core;
 using static Microsoft.Maui.Layouts.LayoutExtensions;
 
 namespace Microsoft.Maui.Handlers
 {
-	public partial class ScrollViewHandler : ViewHandler<IScrollView, ScrollViewer>
+	public partial class ScrollViewHandler : ViewHandler<IScrollView, ScrollViewer>, ICrossPlatformLayout
 	{
 		const string ContentPanelTag = "MAUIScrollViewContentPanel";
 
@@ -36,7 +37,12 @@ public static void MapContent(IScrollViewHandler handler, IScrollView scrollView
 			if (handler.PlatformView == null || handler.MauiContext == null)
 				return;
 
-			UpdateContentPanel(scrollView, handler);
+			if (handler is not ICrossPlatformLayout crossPlatformLayout)
+			{
+				return;
+			}
+
+			UpdateContentPanel(scrollView, handler, crossPlatformLayout);
 		}
 
 		public static void MapHorizontalScrollBarVisibility(IScrollViewHandler handler, IScrollView scrollView)
@@ -103,7 +109,7 @@ The methods below exist to support inserting/updating the padding/margin panel.
 			return null;
 		}
 
-		static void UpdateContentPanel(IScrollView scrollView, IScrollViewHandler handler)
+		static void UpdateContentPanel(IScrollView scrollView, IScrollViewHandler handler, ICrossPlatformLayout crossPlatformLayout)
 		{
 			if (scrollView.PresentedContent == null || handler.MauiContext == null)
 			{
@@ -124,11 +130,11 @@ static void UpdateContentPanel(IScrollView scrollView, IScrollViewHandler handle
 			}
 			else
 			{
-				InsertContentPanel(scrollViewer, scrollView, nativeContent);
+				InsertContentPanel(scrollViewer, scrollView, nativeContent, crossPlatformLayout);
 			}
 		}
 
-		static void InsertContentPanel(ScrollViewer scrollViewer, IScrollView scrollView, FrameworkElement nativeContent)
+		static void InsertContentPanel(ScrollViewer scrollViewer, IScrollView scrollView, FrameworkElement nativeContent, ICrossPlatformLayout crossPlatformLayout)
 		{
 			if (scrollView.PresentedContent == null)
 			{
@@ -137,8 +143,7 @@ static void InsertContentPanel(ScrollViewer scrollViewer, IScrollView scrollView
 
 			var paddingShim = new ContentPanel()
 			{
-				CrossPlatformMeasure = IncludeScrollViewInsets(scrollView.CrossPlatformMeasure, scrollView),
-				CrossPlatformArrange = scrollView.CrossPlatformArrange,
+				CrossPlatformLayout = crossPlatformLayout,
 				Tag = ContentPanelTag
 			};
 
@@ -147,16 +152,10 @@ static void InsertContentPanel(ScrollViewer scrollViewer, IScrollView scrollView
 			scrollViewer.Content = paddingShim;
 		}
 
-		static Func<double, double, Size> IncludeScrollViewInsets(Func<double, double, Size> internalMeasure, IScrollView scrollView)
+		Size ICrossPlatformLayout.CrossPlatformMeasure(double widthConstraint, double heightConstraint)
 		{
-			return (widthConstraint, heightConstraint) =>
-			{
-				return InsetScrollView(widthConstraint, heightConstraint, internalMeasure, scrollView);
-			};
-		}
+			var scrollView = VirtualView;
 
-		static Size InsetScrollView(double widthConstraint, double heightConstraint, Func<double, double, Size> internalMeasure, IScrollView scrollView)
-		{
 			var padding = scrollView.Padding;
 			var presentedContent = scrollView.PresentedContent;
 
@@ -169,7 +168,7 @@ static Size InsetScrollView(double widthConstraint, double heightConstraint, Fun
 			var measurementWidth = widthConstraint - padding.HorizontalThickness;
 			var measurementHeight = heightConstraint - padding.VerticalThickness;
 
-			var result = internalMeasure.Invoke(measurementWidth, measurementHeight);
+			var result = scrollView.CrossPlatformMeasure(measurementWidth, measurementHeight);
 
 			// ... and add the padding back in to the final result
 			var fullSize = new Size(result.Width + padding.HorizontalThickness, result.Height + padding.VerticalThickness);
@@ -187,5 +186,10 @@ static Size InsetScrollView(double widthConstraint, double heightConstraint, Fun
 			// If the presented content has LayoutAlignment Fill, we'll need to adjust the measurement to account for that
 			return fullSize.AdjustForFill(new Rect(0, 0, widthConstraint, heightConstraint), presentedContent);
 		}
+
+		Size ICrossPlatformLayout.CrossPlatformArrange(Rect bounds)
+		{
+			return VirtualView.CrossPlatformArrange(bounds);
+		}
 	}
 }
diff --git a/src/Core/src/Handlers/ScrollView/ScrollViewHandler.iOS.cs b/src/Core/src/Handlers/ScrollView/ScrollViewHandler.iOS.cs
index 3ea7c6ec287b..411e4894c63d 100644
--- a/src/Core/src/Handlers/ScrollView/ScrollViewHandler.iOS.cs
+++ b/src/Core/src/Handlers/ScrollView/ScrollViewHandler.iOS.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Drawing;
 using System.Text;
 using CoreGraphics;
@@ -12,10 +13,12 @@
 
 namespace Microsoft.Maui.Handlers
 {
-	public partial class ScrollViewHandler : ViewHandler<IScrollView, UIScrollView>
+	public partial class ScrollViewHandler : ViewHandler<IScrollView, UIScrollView>, ICrossPlatformLayout
 	{
 		const nint ContentPanelTag = 0x845fed;
 
+		readonly ScrollEventProxy _eventProxy = new();
+
 		public override bool NeedsContainer
 		{
 			get
@@ -39,27 +42,14 @@ protected override void ConnectHandler(UIScrollView platformView)
 		{
 			base.ConnectHandler(platformView);
 
-			platformView.Scrolled += Scrolled;
-			platformView.ScrollAnimationEnded += ScrollAnimationEnded;
+			_eventProxy.Connect(VirtualView, platformView);
 		}
 
 		protected override void DisconnectHandler(UIScrollView platformView)
 		{
 			base.DisconnectHandler(platformView);
 
-			platformView.Scrolled -= Scrolled;
-			platformView.ScrollAnimationEnded -= ScrollAnimationEnded;
-		}
-
-		void ScrollAnimationEnded(object? sender, EventArgs e)
-		{
-			VirtualView.ScrollFinished();
-		}
-
-		void Scrolled(object? sender, EventArgs e)
-		{
-			VirtualView.HorizontalOffset = PlatformView.ContentOffset.X;
-			VirtualView.VerticalOffset = PlatformView.ContentOffset.Y;
+			_eventProxy.Disconnect(platformView);
 		}
 
 		public static void MapContent(IScrollViewHandler handler, IScrollView scrollView)
@@ -67,7 +57,14 @@ public static void MapContent(IScrollViewHandler handler, IScrollView scrollView
 			if (handler.PlatformView == null || handler.MauiContext == null)
 				return;
 
-			UpdateContentView(scrollView, handler);
+			if (handler is not ICrossPlatformLayout crossPlatformLayout)
+			{
+				return;
+			}
+
+			// We'll use the local cross-platform layout methods defined in our handler (which wrap the ScrollView's default methods)
+			// so we can normalize the behavior of the scrollview to match the other platforms
+			UpdateContentView(scrollView, handler, crossPlatformLayout);
 		}
 
 		// We don't actually have this mapped because we don't need it, but we can't remove it because it's public
@@ -144,7 +141,7 @@ public static void MapRequestScrollTo(IScrollViewHandler handler, IScrollView sc
 			return null;
 		}
 
-		static void UpdateContentView(IScrollView scrollView, IScrollViewHandler handler)
+		static void UpdateContentView(IScrollView scrollView, IScrollViewHandler handler, ICrossPlatformLayout crossPlatformLayout)
 		{
 			if (scrollView.PresentedContent == null || handler.MauiContext == null)
 			{
@@ -165,11 +162,11 @@ static void UpdateContentView(IScrollView scrollView, IScrollViewHandler handler
 			}
 			else
 			{
-				InsertContentView(platformScrollView, scrollView, nativeContent);
+				InsertContentView(platformScrollView, scrollView, nativeContent, crossPlatformLayout);
 			}
 		}
 
-		static void InsertContentView(UIScrollView platformScrollView, IScrollView scrollView, UIView platformContent)
+		static void InsertContentView(UIScrollView platformScrollView, IScrollView scrollView, UIView platformContent, ICrossPlatformLayout crossPlatformLayout)
 		{
 			if (scrollView.PresentedContent == null)
 			{
@@ -179,57 +176,18 @@ static void InsertContentView(UIScrollView platformScrollView, IScrollView scrol
 			var contentContainer = new ContentView()
 			{
 				View = scrollView.PresentedContent,
-				CrossPlatformMeasure = ConstrainToScrollView(scrollView.CrossPlatformMeasure, platformScrollView, scrollView),
 				Tag = ContentPanelTag
 			};
 
-			contentContainer.CrossPlatformArrange = ArrangeScrollViewContent(scrollView.CrossPlatformArrange, contentContainer, platformScrollView, scrollView);
+			// This is where we normally would inject the cross-platform ScrollView's layout logic; instead, we're injecting the
+			// methods from this handler so it can make some adjustments for things like Padding before the default logic is invoked
+			contentContainer.CrossPlatformLayout = crossPlatformLayout;
 
 			platformScrollView.ClearSubviews();
 			contentContainer.AddSubview(platformContent);
 			platformScrollView.AddSubview(contentContainer);
 		}
 
-		static Func<Rect, Size> ArrangeScrollViewContent(Func<Rect, Size> internalArrange, ContentView container, UIScrollView platformScrollView, IScrollView scrollView)
-		{
-			return (rect) =>
-			{
-				if (container.Superview is UIScrollView uiScrollView)
-				{
-					// Ensure the container is at least the size of the UIScrollView itself, so that the 
-					// cross-platform layout logic makes sense and the contents don't arrange outside the 
-					// container. (Everything will look correct if they do, but hit testing won't work properly.)
-
-					var scrollViewBounds = uiScrollView.Bounds;
-					var containerBounds = container.Bounds;
-
-					container.Bounds = new CGRect(0, 0,
-						Math.Max(containerBounds.Width, scrollViewBounds.Width),
-						Math.Max(containerBounds.Height, scrollViewBounds.Height));
-					container.Center = new CGPoint(container.Bounds.GetMidX(), container.Bounds.GetMidY());
-				}
-
-				var contentSize = internalArrange(rect);
-
-				// The UIScrollView's bounds are available, so we can use them to make sure the ContentSize makes sense
-				// for the ScrollView orientation
-				var viewportBounds = platformScrollView.Bounds;
-				var viewportHeight = viewportBounds.Height;
-				var viewportWidth = viewportBounds.Width;
-				SetContentSizeForOrientation(platformScrollView, viewportWidth, viewportHeight, scrollView.Orientation, contentSize);
-
-				return contentSize;
-			};
-		}
-
-		static Func<double, double, Size> ConstrainToScrollView(Func<double, double, Size> internalMeasure, UIScrollView platformScrollView, IScrollView scrollView)
-		{
-			return (widthConstraint, heightConstraint) =>
-			{
-				return MeasureScrollViewContent(widthConstraint, heightConstraint, internalMeasure, platformScrollView, scrollView);
-			};
-		}
-
 		static Size MeasureScrollViewContent(double widthConstraint, double heightConstraint, Func<double, double, Size> internalMeasure, UIScrollView platformScrollView, IScrollView scrollView)
 		{
 			var presentedContent = scrollView.PresentedContent;
@@ -341,5 +299,125 @@ static void SetContentSizeForOrientation(UIScrollView uiScrollView, double viewp
 
 			uiScrollView.ContentSize = contentSize;
 		}
+
+		Size ICrossPlatformLayout.CrossPlatformMeasure(double widthConstraint, double heightConstraint)
+		{
+			var scrollView = VirtualView;
+			var platformScrollView = PlatformView;
+
+			var presentedContent = scrollView.PresentedContent;
+			if (presentedContent == null)
+			{
+				return Size.Zero;
+			}
+
+			var scrollViewBounds = platformScrollView.Bounds;
+			var padding = scrollView.Padding;
+
+			if (widthConstraint == 0)
+			{
+				widthConstraint = scrollViewBounds.Width;
+			}
+
+			if (heightConstraint == 0)
+			{
+				heightConstraint = scrollViewBounds.Height;
+			}
+
+			// Account for the ScrollView Padding before measuring the content
+			widthConstraint = AccountForPadding(widthConstraint, padding.HorizontalThickness);
+			heightConstraint = AccountForPadding(heightConstraint, padding.VerticalThickness);
+
+			// Now handle the actual cross-platform measurement of the ScrollView's content
+			var result = scrollView.CrossPlatformMeasure(widthConstraint, heightConstraint);
+
+			return result.AdjustForFill(new Rect(0, 0, widthConstraint, heightConstraint), presentedContent);
+		}
+
+		Size ICrossPlatformLayout.CrossPlatformArrange(Rect bounds)
+		{
+			var scrollView = VirtualView;
+			var platformScrollView = PlatformView;
+			var container = GetContentView(platformScrollView);
+
+			if (container?.Superview is UIScrollView uiScrollView)
+			{
+				// Ensure the container is at least the size of the UIScrollView itself, so that the 
+				// cross-platform layout logic makes sense and the contents don't arrange outside the 
+				// container. (Everything will look correct if they do, but hit testing won't work properly.)
+
+				var scrollViewBounds = uiScrollView.Bounds;
+				var containerBounds = container.Bounds;
+
+				container.Bounds = new CGRect(0, 0,
+					Math.Max(containerBounds.Width, scrollViewBounds.Width),
+					Math.Max(containerBounds.Height, scrollViewBounds.Height));
+				container.Center = new CGPoint(container.Bounds.GetMidX(), container.Bounds.GetMidY());
+			}
+
+			var contentSize = scrollView.CrossPlatformArrange(bounds);
+
+			// The UIScrollView's bounds are available, so we can use them to make sure the ContentSize makes sense
+			// for the ScrollView orientation
+			var viewportBounds = platformScrollView.Bounds;
+			var viewportHeight = viewportBounds.Height;
+			var viewportWidth = viewportBounds.Width;
+			SetContentSizeForOrientation(platformScrollView, viewportWidth, viewportHeight, scrollView.Orientation, contentSize);
+
+			return contentSize;
+		}
+
+		class ScrollEventProxy
+		{
+			WeakReference<IScrollView>? _virtualView;
+
+			IScrollView? VirtualView => _virtualView is not null && _virtualView.TryGetTarget(out var v) ? v : null;
+
+			public void Connect(IScrollView virtualView, UIScrollView platformView)
+			{
+				_virtualView = new(virtualView);
+
+				platformView.Scrolled += Scrolled;
+				platformView.ScrollAnimationEnded += ScrollAnimationEnded;
+			}
+
+			public void Disconnect(UIScrollView platformView)
+			{
+				_virtualView = null;
+
+				platformView.Scrolled -= Scrolled;
+				platformView.ScrollAnimationEnded -= ScrollAnimationEnded;
+			}
+
+			void OnButtonTouchUpInside(object? sender, EventArgs e)
+			{
+				if (VirtualView is IButton virtualView)
+				{
+					virtualView.Released();
+					virtualView.Clicked();
+				}
+			}
+
+			void ScrollAnimationEnded(object? sender, EventArgs e)
+			{
+				VirtualView?.ScrollFinished();
+			}
+
+			void Scrolled(object? sender, EventArgs e)
+			{
+				if (VirtualView == null)
+				{
+					return;
+				}
+
+				if (sender is not UIScrollView platformView)
+				{
+					return;
+				}
+
+				VirtualView.HorizontalOffset = platformView.ContentOffset.X;
+				VirtualView.VerticalOffset = platformView.ContentOffset.Y;
+			}
+		}
 	}
 }
diff --git a/src/Core/src/Handlers/SwipeItemView/SwipeItemViewHandler.Android.cs b/src/Core/src/Handlers/SwipeItemView/SwipeItemViewHandler.Android.cs
index d7143b88dbe6..bb1f25098087 100644
--- a/src/Core/src/Handlers/SwipeItemView/SwipeItemViewHandler.Android.cs
+++ b/src/Core/src/Handlers/SwipeItemView/SwipeItemViewHandler.Android.cs
@@ -14,8 +14,7 @@ protected override ContentViewGroup CreatePlatformView()
 
 			var viewGroup = new ContentViewGroup(Context)
 			{
-				CrossPlatformMeasure = VirtualView.CrossPlatformMeasure,
-				CrossPlatformArrange = VirtualView.CrossPlatformArrange
+				CrossPlatformLayout = VirtualView
 			};
 
 			return viewGroup;
@@ -27,8 +26,7 @@ public override void SetVirtualView(IView view)
 			_ = VirtualView ?? throw new InvalidOperationException($"{nameof(VirtualView)} should have been set by base class.");
 			_ = PlatformView ?? throw new InvalidOperationException($"{nameof(PlatformView)} should have been set by base class.");
 
-			PlatformView.CrossPlatformMeasure = VirtualView.CrossPlatformMeasure;
-			PlatformView.CrossPlatformArrange = VirtualView.CrossPlatformArrange;
+			PlatformView.CrossPlatformLayout = VirtualView;
 		}
 
 		void UpdateContent()
diff --git a/src/Core/src/Handlers/SwipeItemView/SwipeItemViewHandler.iOS.cs b/src/Core/src/Handlers/SwipeItemView/SwipeItemViewHandler.iOS.cs
index 879ece58de34..c455d94a3f88 100644
--- a/src/Core/src/Handlers/SwipeItemView/SwipeItemViewHandler.iOS.cs
+++ b/src/Core/src/Handlers/SwipeItemView/SwipeItemViewHandler.iOS.cs
@@ -9,8 +9,7 @@ protected override ContentView CreatePlatformView()
 		{
 			return new ContentView
 			{
-				CrossPlatformMeasure = VirtualView.CrossPlatformMeasure,
-				CrossPlatformArrange = VirtualView.CrossPlatformArrange
+				CrossPlatformLayout = VirtualView
 			};
 		}
 
@@ -20,8 +19,7 @@ public override void SetVirtualView(IView view)
 			_ = VirtualView ?? throw new InvalidOperationException($"{nameof(VirtualView)} should have been set by base class.");
 			_ = PlatformView ?? throw new InvalidOperationException($"{nameof(PlatformView)} should have been set by base class.");
 
-			PlatformView.CrossPlatformMeasure = VirtualView.CrossPlatformMeasure;
-			PlatformView.CrossPlatformArrange = VirtualView.CrossPlatformArrange;
+			PlatformView.CrossPlatformLayout = VirtualView;
 		}
 
 		void UpdateContent()
diff --git a/src/Core/src/Handlers/SwipeView/SwipeViewHandler.Android.cs b/src/Core/src/Handlers/SwipeView/SwipeViewHandler.Android.cs
index 2e8c91f2016f..0051a77d295e 100644
--- a/src/Core/src/Handlers/SwipeView/SwipeViewHandler.Android.cs
+++ b/src/Core/src/Handlers/SwipeView/SwipeViewHandler.Android.cs
@@ -8,8 +8,7 @@ protected override MauiSwipeView CreatePlatformView()
 		{
 			var returnValue = new MauiSwipeView(Context)
 			{
-				CrossPlatformMeasure = VirtualView.CrossPlatformMeasure,
-				CrossPlatformArrange = VirtualView.CrossPlatformArrange
+				CrossPlatformLayout = VirtualView
 			};
 
 			returnValue.SetElement(VirtualView);
@@ -22,8 +21,7 @@ public override void SetVirtualView(IView view)
 			_ = VirtualView ?? throw new InvalidOperationException($"{nameof(VirtualView)} should have been set by base class.");
 			_ = PlatformView ?? throw new InvalidOperationException($"{nameof(PlatformView)} should have been set by base class.");
 
-			PlatformView.CrossPlatformMeasure = VirtualView.CrossPlatformMeasure;
-			PlatformView.CrossPlatformArrange = VirtualView.CrossPlatformArrange;
+			PlatformView.CrossPlatformLayout = VirtualView;
 		}
 
 		public static void MapLeftItems(ISwipeViewHandler handler, ISwipeView view)
diff --git a/src/Core/src/Handlers/SwipeView/SwipeViewHandler.iOS.cs b/src/Core/src/Handlers/SwipeView/SwipeViewHandler.iOS.cs
index 0a0f57c40960..b2ff0b64cc38 100644
--- a/src/Core/src/Handlers/SwipeView/SwipeViewHandler.iOS.cs
+++ b/src/Core/src/Handlers/SwipeView/SwipeViewHandler.iOS.cs
@@ -10,8 +10,7 @@ protected override MauiSwipeView CreatePlatformView()
 		{
 			return new MauiSwipeView
 			{
-				CrossPlatformMeasure = VirtualView.CrossPlatformMeasure,
-				CrossPlatformArrange = VirtualView.CrossPlatformArrange,
+				CrossPlatformLayout = VirtualView,
 				Element = VirtualView
 			};
 		}
@@ -22,8 +21,7 @@ public override void SetVirtualView(IView view)
 			_ = PlatformView ?? throw new InvalidOperationException($"{nameof(PlatformView)} should have been set by base class.");
 
 			PlatformView.Element = VirtualView;
-			PlatformView.CrossPlatformMeasure = VirtualView.CrossPlatformMeasure;
-			PlatformView.CrossPlatformArrange = VirtualView.CrossPlatformArrange;
+			PlatformView.CrossPlatformLayout = VirtualView;
 		}
 
 		public static void MapContent(ISwipeViewHandler handler, ISwipeView view)
diff --git a/src/Core/src/Platform/Android/ContentViewGroup.cs b/src/Core/src/Platform/Android/ContentViewGroup.cs
index f0da14fc9b14..98a121e9a320 100644
--- a/src/Core/src/Platform/Android/ContentViewGroup.cs
+++ b/src/Core/src/Platform/Android/ContentViewGroup.cs
@@ -9,8 +9,7 @@
 
 namespace Microsoft.Maui.Platform
 {
-	// TODO ezhart At this point, this is almost exactly a clone of LayoutViewGroup; we may be able to drop this class entirely
-	public class ContentViewGroup : PlatformContentViewGroup
+	public class ContentViewGroup : PlatformContentViewGroup, ICrossPlatformLayoutBacking
 	{
 		IBorderStroke? _clip;
 		readonly Context _context;
@@ -42,6 +41,21 @@ public ContentViewGroup(Context context, IAttributeSet attrs, int defStyleAttr,
 			_context = context;
 		}
 
+		public ICrossPlatformLayout? CrossPlatformLayout
+		{
+			get; set;
+		}
+
+		Graphics.Size CrossPlatformMeasure(double widthConstraint, double heightConstraint)
+		{
+			return CrossPlatformLayout?.CrossPlatformMeasure(widthConstraint, heightConstraint) ?? Graphics.Size.Zero;
+		}
+
+		Graphics.Size CrossPlatformArrange(Graphics.Rect bounds)
+		{
+			return CrossPlatformLayout?.CrossPlatformArrange(bounds) ?? Graphics.Size.Zero;
+		}
+
 		protected override void OnMeasure(int widthMeasureSpec, int heightMeasureSpec)
 		{
 			if (CrossPlatformMeasure == null)
@@ -96,9 +110,6 @@ internal IBorderStroke? Clip
 			}
 		}
 
-		internal Func<double, double, Graphics.Size>? CrossPlatformMeasure { get; set; }
-		internal Func<Graphics.Rect, Graphics.Size>? CrossPlatformArrange { get; set; }
-
 		protected override Path? GetClipPath(int width, int height)
 		{
 			if (Clip is null || Clip?.Shape is null)
diff --git a/src/Core/src/Platform/Android/LayoutViewGroup.cs b/src/Core/src/Platform/Android/LayoutViewGroup.cs
index 538ab0cd4ef2..2c2bbf0b4325 100644
--- a/src/Core/src/Platform/Android/LayoutViewGroup.cs
+++ b/src/Core/src/Platform/Android/LayoutViewGroup.cs
@@ -11,7 +11,7 @@
 
 namespace Microsoft.Maui.Platform
 {
-	public class LayoutViewGroup : ViewGroup
+	public class LayoutViewGroup : ViewGroup, ICrossPlatformLayoutBacking
 	{
 		readonly ARect _clipRect = new();
 		readonly Context _context;
@@ -47,6 +47,21 @@ public LayoutViewGroup(Context context, IAttributeSet attrs, int defStyleAttr, i
 
 		public bool ClipsToBounds { get; set; }
 
+		public ICrossPlatformLayout? CrossPlatformLayout
+		{
+			get; set;
+		}
+
+		Graphics.Size CrossPlatformMeasure(double widthConstraint, double heightConstraint)
+		{
+			return CrossPlatformLayout?.CrossPlatformMeasure(widthConstraint, heightConstraint) ?? Graphics.Size.Zero;
+		}
+
+		Graphics.Size CrossPlatformArrange(Graphics.Rect bounds)
+		{
+			return CrossPlatformLayout?.CrossPlatformArrange(bounds) ?? Graphics.Size.Zero;
+		}
+
 		// TODO: Possibly reconcile this code with ViewHandlerExtensions.MeasureVirtualView
 		// If you make changes here please review if those changes should also
 		// apply to ViewHandlerExtensions.MeasureVirtualView
@@ -116,8 +131,5 @@ public override bool OnTouchEvent(MotionEvent? e)
 
 			return base.OnTouchEvent(e);
 		}
-
-		internal Func<double, double, Size>? CrossPlatformMeasure { get; set; }
-		internal Func<Rectangle, Size>? CrossPlatformArrange { get; set; }
 	}
 }
diff --git a/src/Core/src/Platform/Windows/ContentPanel.cs b/src/Core/src/Platform/Windows/ContentPanel.cs
index 735de66847d8..2a80de485958 100644
--- a/src/Core/src/Platform/Windows/ContentPanel.cs
+++ b/src/Core/src/Platform/Windows/ContentPanel.cs
@@ -6,14 +6,13 @@
 using Microsoft.Maui.Graphics.Win2D;
 using Microsoft.UI.Composition;
 using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Hosting;
 using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Shapes;
 
 namespace Microsoft.Maui.Platform
 {
-	public class ContentPanel : Panel
+	public class ContentPanel : MauiPanel
 	{
 		readonly Path? _borderPath;
 		IShape? _borderShape;
@@ -31,32 +30,9 @@ internal FrameworkElement? Content
 			}
 		}
 
-		internal Func<double, double, Size>? CrossPlatformMeasure { get; set; }
-		internal Func<Graphics.Rect, Size>? CrossPlatformArrange { get; set; }
-
-		protected override global::Windows.Foundation.Size MeasureOverride(global::Windows.Foundation.Size availableSize)
-		{
-			if (CrossPlatformMeasure == null || (availableSize.Width * availableSize.Height == 0))
-			{
-				return base.MeasureOverride(availableSize);
-			}
-
-			var measure = CrossPlatformMeasure(availableSize.Width, availableSize.Height);
-
-			return measure.ToPlatform();
-		}
-
 		protected override global::Windows.Foundation.Size ArrangeOverride(global::Windows.Foundation.Size finalSize)
 		{
-			if (CrossPlatformArrange == null)
-			{
-				return base.ArrangeOverride(finalSize);
-			}
-
-			var width = finalSize.Width;
-			var height = finalSize.Height;
-
-			var actual = CrossPlatformArrange(new Graphics.Rect(0, 0, width, height));
+			var actual = base.ArrangeOverride(finalSize);
 
 			_borderPath?.Arrange(new global::Windows.Foundation.Rect(0, 0, finalSize.Width, finalSize.Height));
 
diff --git a/src/Core/src/Platform/Windows/LayoutPanel.cs b/src/Core/src/Platform/Windows/LayoutPanel.cs
index 0e095d1abee3..3c375a3caa97 100644
--- a/src/Core/src/Platform/Windows/LayoutPanel.cs
+++ b/src/Core/src/Platform/Windows/LayoutPanel.cs
@@ -1,6 +1,4 @@
 #nullable enable
-using System;
-using Microsoft.Maui.Graphics;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media;
 using WRect = global::Windows.Foundation.Rect;
@@ -9,54 +7,21 @@
 
 namespace Microsoft.Maui.Platform
 {
-	public class LayoutPanel : Panel
+	public class LayoutPanel : MauiPanel
 	{
 		Canvas? _backgroundLayer;
-
-		internal Func<double, double, Size>? CrossPlatformMeasure { get; set; }
-		internal Func<Rect, Size>? CrossPlatformArrange { get; set; }
-
 		public bool ClipsToBounds { get; set; }
 
-		// TODO: Possibly reconcile this code with ViewHandlerExtensions.MeasureVirtualView
-		// If you make changes here please review if those changes should also
-		// apply to ViewHandlerExtensions.MeasureVirtualView
-		protected override WSize MeasureOverride(WSize availableSize)
-		{
-			if (CrossPlatformMeasure == null)
-			{
-				return base.MeasureOverride(availableSize);
-			}
-
-			var width = availableSize.Width;
-			var height = availableSize.Height;
-
-			var crossPlatformSize = CrossPlatformMeasure(width, height);
-
-			width = crossPlatformSize.Width;
-			height = crossPlatformSize.Height;
-
-			return new WSize(width, height);
-		}
-
 		// TODO: Possibly reconcile this code with ViewHandlerExtensions.LayoutVirtualView
 		// If you make changes here please review if those changes should also
 		// apply to ViewHandlerExtensions.LayoutVirtualView
 		protected override WSize ArrangeOverride(WSize finalSize)
 		{
-			if (CrossPlatformArrange == null)
-			{
-				return base.ArrangeOverride(finalSize);
-			}
-
-			var width = finalSize.Width;
-			var height = finalSize.Height;
-
-			CrossPlatformArrange(new Rect(0, 0, width, height));
+			var actual = base.ArrangeOverride(finalSize);
 
 			Clip = ClipsToBounds ? new RectangleGeometry { Rect = new WRect(0, 0, finalSize.Width, finalSize.Height) } : null;
 
-			return finalSize;
+			return actual;
 		}
 
 		public void UpdateInputTransparent(bool inputTransparent, Brush? background)
diff --git a/src/Core/src/Platform/Windows/MauiPanel.cs b/src/Core/src/Platform/Windows/MauiPanel.cs
new file mode 100644
index 000000000000..e729243e16fc
--- /dev/null
+++ b/src/Core/src/Platform/Windows/MauiPanel.cs
@@ -0,0 +1,56 @@
+#nullable enable
+using System;
+using Microsoft.Maui.Graphics;
+using Microsoft.UI.Xaml.Controls;
+using WSize = global::Windows.Foundation.Size;
+
+namespace Microsoft.Maui.Platform
+{
+	public abstract class MauiPanel : Panel, ICrossPlatformLayoutBacking
+	{
+		public ICrossPlatformLayout? CrossPlatformLayout
+		{
+			get; set;
+		}
+
+		Size CrossPlatformMeasure(double widthConstraint, double heightConstraint)
+		{
+			return CrossPlatformLayout?.CrossPlatformMeasure(widthConstraint, heightConstraint) ?? Size.Zero;
+		}
+
+		Size CrossPlatformArrange(Rect bounds)
+		{
+			return CrossPlatformLayout?.CrossPlatformArrange(bounds) ?? Size.Zero;
+		}
+
+		// TODO: Possibly reconcile this code with ViewHandlerExtensions.MeasureVirtualView
+		// If you make changes here please review if those changes should also
+		// apply to ViewHandlerExtensions.MeasureVirtualView
+		protected override WSize MeasureOverride(global::Windows.Foundation.Size availableSize)
+		{
+			if (CrossPlatformMeasure == null || (availableSize.Width * availableSize.Height == 0))
+			{
+				return base.MeasureOverride(availableSize);
+			}
+
+			var measure = CrossPlatformMeasure(availableSize.Width, availableSize.Height);
+
+			return measure.ToPlatform();
+		}
+
+		protected override WSize ArrangeOverride(WSize finalSize)
+		{
+			if (CrossPlatformArrange == null)
+			{
+				return base.ArrangeOverride(finalSize);
+			}
+
+			var width = finalSize.Width;
+			var height = finalSize.Height;
+
+			var actual = CrossPlatformArrange(new Rect(0, 0, width, height));
+
+			return actual.ToPlatform();
+		}
+	}
+}
diff --git a/src/Core/src/Platform/iOS/ContentView.cs b/src/Core/src/Platform/iOS/ContentView.cs
index c142b3d44173..331325c111a6 100644
--- a/src/Core/src/Platform/iOS/ContentView.cs
+++ b/src/Core/src/Platform/iOS/ContentView.cs
@@ -17,43 +17,11 @@ public ContentView()
 			Layer.CornerCurve = CACornerCurve.Continuous;
 		}
 
-		public override CGSize SizeThatFits(CGSize size)
-		{
-			if (CrossPlatformMeasure == null)
-			{
-				return base.SizeThatFits(size);
-			}
-
-			var widthConstraint = size.Width;
-			var heightConstraint = size.Height;
-
-			var crossPlatformSize = CrossPlatformMeasure(widthConstraint, heightConstraint);
-
-			CacheMeasureConstraints(widthConstraint, heightConstraint);
-
-			return crossPlatformSize.ToCGSize();
-		}
-
 		public override void LayoutSubviews()
 		{
 			base.LayoutSubviews();
 
 			var bounds = AdjustForSafeArea(Bounds).ToRectangle();
-			var widthConstraint = bounds.Width;
-			var heightConstraint = bounds.Height;
-
-			// If the SuperView is a MauiView (backing a cross-platform ContentView or Layout), then measurement
-			// has already happened via SizeThatFits and doesn't need to be repeated in LayoutSubviews. But we
-			// _do_ need LayoutSubviews to make a measurement pass if the parent is something else (for example,
-			// the window); there's no guarantee that SizeThatFits has been called in that case.
-
-			if (!IsMeasureValid(widthConstraint, heightConstraint) && Superview is not MauiView)
-			{
-				CrossPlatformMeasure?.Invoke(widthConstraint, heightConstraint);
-				CacheMeasureConstraints(widthConstraint, heightConstraint);
-			}
-
-			CrossPlatformArrange?.Invoke(bounds);
 
 			if (ChildMaskLayer != null)
 				ChildMaskLayer.Frame = bounds;
@@ -63,16 +31,6 @@ public override void LayoutSubviews()
 			LayoutSubviewsChanged?.Invoke(this, EventArgs.Empty);
 		}
 
-		public override void SetNeedsLayout()
-		{
-			InvalidateConstraintsCache();
-			base.SetNeedsLayout();
-			Superview?.SetNeedsLayout();
-		}
-
-		internal Func<double, double, Size>? CrossPlatformMeasure { get; set; }
-		internal Func<Rect, Size>? CrossPlatformArrange { get; set; }
-
 		internal IBorderStroke? Clip
 		{
 			get
diff --git a/src/Core/src/Platform/iOS/LayoutView.cs b/src/Core/src/Platform/iOS/LayoutView.cs
index 0a3dc610c2d5..bf80c04b0497 100644
--- a/src/Core/src/Platform/iOS/LayoutView.cs
+++ b/src/Core/src/Platform/iOS/LayoutView.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Drawing;
 using CoreGraphics;
-using Microsoft.Maui.Graphics;
 using UIKit;
 
 namespace Microsoft.Maui.Platform
@@ -10,65 +7,6 @@ public class LayoutView : MauiView
 	{
 		bool _userInteractionEnabled;
 
-
-		// TODO: Possibly reconcile this code with ViewHandlerExtensions.MeasureVirtualView
-		// If you make changes here please review if those changes should also
-		// apply to ViewHandlerExtensions.MeasureVirtualView
-		public override CGSize SizeThatFits(CGSize size)
-		{
-			if (View is not ILayout layout)
-			{
-				return base.SizeThatFits(size);
-			}
-
-			var width = size.Width;
-			var height = size.Height;
-
-			var crossPlatformSize = layout.CrossPlatformMeasure(width, height);
-
-			CacheMeasureConstraints(width, height);
-
-			return crossPlatformSize.ToCGSize();
-		}
-
-		// TODO: Possibly reconcile this code with ViewHandlerExtensions.LayoutVirtualView
-		// If you make changes here please review if those changes should also
-		// apply to ViewHandlerExtensions.LayoutVirtualView
-		public override void LayoutSubviews()
-		{
-			base.LayoutSubviews();
-
-			if (View is not ILayout layout)
-			{
-				return;
-			}
-
-			var bounds = AdjustForSafeArea(Bounds).ToRectangle();
-
-			var widthConstraint = bounds.Width;
-			var heightConstraint = bounds.Height;
-
-			// If the SuperView is a MauiView (backing a cross-platform ContentView or Layout), then measurement
-			// has already happened via SizeThatFits and doesn't need to be repeated in LayoutSubviews. But we
-			// _do_ need LayoutSubviews to make a measurement pass if the parent is something else (for example,
-			// the window); there's no guarantee that SizeThatFits has been called in that case.
-
-			if (!IsMeasureValid(widthConstraint, heightConstraint) && Superview is not MauiView)
-			{
-				layout.CrossPlatformMeasure(widthConstraint, heightConstraint);
-				CacheMeasureConstraints(widthConstraint, heightConstraint);
-			}
-
-			layout.CrossPlatformArrange(bounds);
-		}
-
-		public override void SetNeedsLayout()
-		{
-			InvalidateConstraintsCache();
-			base.SetNeedsLayout();
-			Superview?.SetNeedsLayout();
-		}
-
 		public override void SubviewAdded(UIView uiview)
 		{
 			InvalidateConstraintsCache();
diff --git a/src/Core/src/Platform/iOS/MauiView.cs b/src/Core/src/Platform/iOS/MauiView.cs
index 81ba7e7c40ca..153c7019b9ec 100644
--- a/src/Core/src/Platform/iOS/MauiView.cs
+++ b/src/Core/src/Platform/iOS/MauiView.cs
@@ -1,11 +1,12 @@
 using System;
 using CoreGraphics;
+using Microsoft.Maui.Graphics;
 using ObjCRuntime;
 using UIKit;
 
 namespace Microsoft.Maui.Platform
 {
-	public abstract class MauiView : UIView
+	public abstract class MauiView : UIView, ICrossPlatformLayoutBacking
 	{
 		static bool? _respondsToSafeArea;
 
@@ -13,6 +14,7 @@ public abstract class MauiView : UIView
 		double _lastMeasureWidth = double.NaN;
 
 		WeakReference<IView>? _reference;
+		WeakReference<ICrossPlatformLayout>? _crossPlatformLayoutReference;
 
 		public IView? View
 		{
@@ -57,5 +59,76 @@ protected void CacheMeasureConstraints(double widthConstraint, double heightCons
 			_lastMeasureWidth = widthConstraint;
 			_lastMeasureHeight = heightConstraint;
 		}
+
+		public ICrossPlatformLayout? CrossPlatformLayout
+		{
+			get => _crossPlatformLayoutReference != null && _crossPlatformLayoutReference.TryGetTarget(out var v) ? v : null;
+			set => _crossPlatformLayoutReference = value == null ? null : new WeakReference<ICrossPlatformLayout>(value);
+		}
+
+		Size CrossPlatformMeasure(double widthConstraint, double heightConstraint)
+		{
+			return CrossPlatformLayout?.CrossPlatformMeasure(widthConstraint, heightConstraint) ?? Size.Zero;
+		}
+
+		Size CrossPlatformArrange(Rect bounds)
+		{
+			return CrossPlatformLayout?.CrossPlatformArrange(bounds) ?? Size.Zero;
+		}
+
+		public override CGSize SizeThatFits(CGSize size)
+		{
+			if (_crossPlatformLayoutReference == null)
+			{
+				return base.SizeThatFits(size);
+			}
+
+			var widthConstraint = size.Width;
+			var heightConstraint = size.Height;
+
+			var crossPlatformSize = CrossPlatformMeasure(widthConstraint, heightConstraint);
+
+			CacheMeasureConstraints(widthConstraint, heightConstraint);
+
+			return crossPlatformSize.ToCGSize();
+		}
+
+		// TODO: Possibly reconcile this code with ViewHandlerExtensions.LayoutVirtualView
+		// If you make changes here please review if those changes should also
+		// apply to ViewHandlerExtensions.LayoutVirtualView
+		public override void LayoutSubviews()
+		{
+			base.LayoutSubviews();
+
+			if (_crossPlatformLayoutReference == null)
+			{
+				return;
+			}
+
+			var bounds = AdjustForSafeArea(Bounds).ToRectangle();
+
+			var widthConstraint = bounds.Width;
+			var heightConstraint = bounds.Height;
+
+			// If the SuperView is a MauiView (backing a cross-platform ContentView or Layout), then measurement
+			// has already happened via SizeThatFits and doesn't need to be repeated in LayoutSubviews. But we
+			// _do_ need LayoutSubviews to make a measurement pass if the parent is something else (for example,
+			// the window); there's no guarantee that SizeThatFits has been called in that case.
+
+			if (!IsMeasureValid(widthConstraint, heightConstraint) && Superview is not MauiView)
+			{
+				CrossPlatformMeasure(widthConstraint, heightConstraint);
+				CacheMeasureConstraints(widthConstraint, heightConstraint);
+			}
+
+			CrossPlatformArrange(bounds);
+		}
+
+		public override void SetNeedsLayout()
+		{
+			InvalidateConstraintsCache();
+			base.SetNeedsLayout();
+			Superview?.SetNeedsLayout();
+		}
 	}
 }
diff --git a/src/Core/src/Platform/iOS/PageViewController.cs b/src/Core/src/Platform/iOS/PageViewController.cs
index c2f994a65ec3..3dc462be05f4 100644
--- a/src/Core/src/Platform/iOS/PageViewController.cs
+++ b/src/Core/src/Platform/iOS/PageViewController.cs
@@ -17,8 +17,7 @@ protected override UIView CreatePlatformView(IElement view)
 		{
 			return new ContentView
 			{
-				CrossPlatformArrange = ((IContentView)view).CrossPlatformArrange,
-				CrossPlatformMeasure = ((IContentView)view).CrossPlatformMeasure
+				CrossPlatformLayout = ((IContentView)view)
 			};
 		}
 
diff --git a/src/Core/src/Platform/iOS/SemanticSwitchContentView.cs b/src/Core/src/Platform/iOS/SemanticSwitchContentView.cs
index 5205abc74972..c8ba75310095 100644
--- a/src/Core/src/Platform/iOS/SemanticSwitchContentView.cs
+++ b/src/Core/src/Platform/iOS/SemanticSwitchContentView.cs
@@ -14,8 +14,7 @@ internal class SemanticSwitchContentView : ContentView
 
 	internal SemanticSwitchContentView(IContentView virtualView)
 	{
-		CrossPlatformMeasure = virtualView.CrossPlatformMeasure;
-		CrossPlatformArrange = virtualView.CrossPlatformArrange;
+		CrossPlatformLayout = virtualView;
 		IsAccessibilityElement = true;
 	}
 
diff --git a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
index 548fd0fc54d6..26815ca32050 100644
--- a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -16,6 +16,16 @@ Microsoft.Maui.Handlers.IImageSourcePartSetter
 Microsoft.Maui.Handlers.IImageSourcePartSetter.SetImageSource(Android.Graphics.Drawables.Drawable? obj) -> void
 Microsoft.Maui.Layouts.FlexBasis.Equals(Microsoft.Maui.Layouts.FlexBasis other) -> bool
 Microsoft.Maui.Platform.ImageSourcePartLoader.ImageSourcePartLoader(Microsoft.Maui.Handlers.IImageSourcePartSetter! handler) -> void
+Microsoft.Maui.ICrossPlatformLayout
+Microsoft.Maui.ICrossPlatformLayout.CrossPlatformArrange(Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
+Microsoft.Maui.ICrossPlatformLayout.CrossPlatformMeasure(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
+Microsoft.Maui.ICrossPlatformLayoutBacking
+Microsoft.Maui.ICrossPlatformLayoutBacking.CrossPlatformLayout.get -> Microsoft.Maui.ICrossPlatformLayout?
+Microsoft.Maui.ICrossPlatformLayoutBacking.CrossPlatformLayout.set -> void
+Microsoft.Maui.Platform.ContentViewGroup.CrossPlatformLayout.get -> Microsoft.Maui.ICrossPlatformLayout?
+Microsoft.Maui.Platform.ContentViewGroup.CrossPlatformLayout.set -> void
+Microsoft.Maui.Platform.LayoutViewGroup.CrossPlatformLayout.get -> Microsoft.Maui.ICrossPlatformLayout?
+Microsoft.Maui.Platform.LayoutViewGroup.CrossPlatformLayout.set -> void
 Microsoft.Maui.Platform.ShapeExtensions
 Microsoft.Maui.PlatformContentViewGroup
 Microsoft.Maui.PlatformContentViewGroup.PlatformContentViewGroup(Android.Content.Context? context) -> void
@@ -87,3 +97,7 @@ override Microsoft.Maui.Platform.WrapperView.Visibility.get -> Android.Views.Vie
 override Microsoft.Maui.Platform.WrapperView.Visibility.set -> void
 ~override Microsoft.Maui.Platform.WrapperView.DrawShadow(Android.Graphics.Canvas canvas, int viewWidth, int viewHeight) -> void
 ~override Microsoft.Maui.Platform.WrapperView.GetClipPath(int width, int height) -> Android.Graphics.Path
+*REMOVED*Microsoft.Maui.IContentView.CrossPlatformArrange(Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
+*REMOVED*Microsoft.Maui.IContentView.CrossPlatformMeasure(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
+*REMOVED*Microsoft.Maui.ILayout.CrossPlatformArrange(Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
+*REMOVED*Microsoft.Maui.ILayout.CrossPlatformMeasure(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
\ No newline at end of file
diff --git a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index ff3ef725e6b8..fb3dec4d44f1 100644
--- a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -16,11 +16,19 @@ Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>.Add(string! key, Syste
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>.Add(string! key, System.Action<TViewHandler, TVirtualView>! action) -> void
 Microsoft.Maui.Handlers.IImageSourcePartSetter
 Microsoft.Maui.Handlers.IImageSourcePartSetter.SetImageSource(UIKit.UIImage? obj) -> void
+Microsoft.Maui.ICrossPlatformLayout
+Microsoft.Maui.ICrossPlatformLayout.CrossPlatformArrange(Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
+Microsoft.Maui.ICrossPlatformLayout.CrossPlatformMeasure(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
+Microsoft.Maui.ICrossPlatformLayoutBacking
+Microsoft.Maui.ICrossPlatformLayoutBacking.CrossPlatformLayout.get -> Microsoft.Maui.ICrossPlatformLayout?
+Microsoft.Maui.ICrossPlatformLayoutBacking.CrossPlatformLayout.set -> void
 Microsoft.Maui.Layouts.FlexBasis.Equals(Microsoft.Maui.Layouts.FlexBasis other) -> bool
 Microsoft.Maui.LifecycleEvents.iOSLifecycle.PerformFetch
 Microsoft.Maui.Platform.ImageSourcePartLoader.ImageSourcePartLoader(Microsoft.Maui.Handlers.IImageSourcePartSetter! handler) -> void
 Microsoft.Maui.Platform.KeyboardAutoManagerScroll
 Microsoft.Maui.Platform.MauiImageView.MauiImageView(Microsoft.Maui.Handlers.IImageHandler! handler) -> void
+Microsoft.Maui.Platform.MauiView.CrossPlatformLayout.get -> Microsoft.Maui.ICrossPlatformLayout?
+Microsoft.Maui.Platform.MauiView.CrossPlatformLayout.set -> void
 Microsoft.Maui.SizeRequest.Equals(Microsoft.Maui.SizeRequest other) -> bool
 Microsoft.Maui.Platform.MauiScrollView
 Microsoft.Maui.Platform.MauiScrollView.MauiScrollView() -> void
@@ -38,6 +46,9 @@ override Microsoft.Maui.Platform.MauiRefreshView.Bounds.set -> void
 override Microsoft.Maui.Platform.MauiScrollView.ScrollRectToVisible(CoreGraphics.CGRect rect, bool animated) -> void
 override Microsoft.Maui.Platform.MauiTextView.Font.get -> UIKit.UIFont?
 override Microsoft.Maui.Platform.MauiTextView.Font.set -> void
+override Microsoft.Maui.Platform.MauiView.LayoutSubviews() -> void
+override Microsoft.Maui.Platform.MauiView.SetNeedsLayout() -> void
+override Microsoft.Maui.Platform.MauiView.SizeThatFits(CoreGraphics.CGSize size) -> CoreGraphics.CGSize
 override Microsoft.Maui.SizeRequest.Equals(object? obj) -> bool
 override Microsoft.Maui.SizeRequest.GetHashCode() -> int
 static Microsoft.Maui.CommandMapperExtensions.AppendToMapping<TVirtualView, TViewHandler>(this Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>! commandMapper, string! key, System.Action<TViewHandler, TVirtualView, object?>! method) -> void
@@ -77,4 +88,15 @@ static Microsoft.Maui.SizeRequest.operator ==(Microsoft.Maui.SizeRequest left, M
 virtual Microsoft.Maui.MauiUIApplicationDelegate.PerformFetch(UIKit.UIApplication! application, System.Action<UIKit.UIBackgroundFetchResult>! completionHandler) -> void
 Microsoft.Maui.Platform.MauiView.CacheMeasureConstraints(double widthConstraint, double heightConstraint) -> void
 Microsoft.Maui.Platform.MauiView.InvalidateConstraintsCache() -> void
-Microsoft.Maui.Platform.MauiView.IsMeasureValid(double widthConstraint, double heightConstraint) -> bool
\ No newline at end of file
+Microsoft.Maui.Platform.MauiView.IsMeasureValid(double widthConstraint, double heightConstraint) -> bool
+*REMOVED*Microsoft.Maui.IContentView.CrossPlatformArrange(Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
+*REMOVED*Microsoft.Maui.IContentView.CrossPlatformMeasure(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
+*REMOVED*Microsoft.Maui.ILayout.CrossPlatformArrange(Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
+*REMOVED*Microsoft.Maui.ILayout.CrossPlatformMeasure(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
+*REMOVED*override Microsoft.Maui.Platform.ContentView.SetNeedsLayout() -> void
+*REMOVED*override Microsoft.Maui.Platform.ContentView.SizeThatFits(CoreGraphics.CGSize size) -> CoreGraphics.CGSize
+*REMOVED*override Microsoft.Maui.Platform.LayoutView.LayoutSubviews() -> void
+*REMOVED*override Microsoft.Maui.Platform.LayoutView.SetNeedsLayout() -> void
+*REMOVED*override Microsoft.Maui.Platform.LayoutView.SetNeedsLayout() -> void
+*REMOVED*override Microsoft.Maui.Platform.LayoutView.SizeThatFits(CoreGraphics.CGSize size) -> CoreGraphics.CGSize
+*REMOVED*override Microsoft.Maui.Platform.ContentView.SetNeedsLayout() -> void
\ No newline at end of file
diff --git a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index aed971633aba..acf55c354e5d 100644
--- a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -16,10 +16,18 @@ Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>.Add(string! key, Syste
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>.Add(string! key, System.Action<TViewHandler, TVirtualView>! action) -> void
 Microsoft.Maui.Handlers.IImageSourcePartSetter
 Microsoft.Maui.Handlers.IImageSourcePartSetter.SetImageSource(UIKit.UIImage? obj) -> void
+Microsoft.Maui.ICrossPlatformLayout
+Microsoft.Maui.ICrossPlatformLayout.CrossPlatformArrange(Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
+Microsoft.Maui.ICrossPlatformLayout.CrossPlatformMeasure(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
+Microsoft.Maui.ICrossPlatformLayoutBacking
+Microsoft.Maui.ICrossPlatformLayoutBacking.CrossPlatformLayout.get -> Microsoft.Maui.ICrossPlatformLayout?
+Microsoft.Maui.ICrossPlatformLayoutBacking.CrossPlatformLayout.set -> void
 Microsoft.Maui.Layouts.FlexBasis.Equals(Microsoft.Maui.Layouts.FlexBasis other) -> bool
 Microsoft.Maui.Platform.ImageSourcePartLoader.ImageSourcePartLoader(Microsoft.Maui.Handlers.IImageSourcePartSetter! handler) -> void
 Microsoft.Maui.Platform.MauiImageView.MauiImageView(Microsoft.Maui.Handlers.IImageHandler! handler) -> void
 Microsoft.Maui.Platform.MauiView.CacheMeasureConstraints(double widthConstraint, double heightConstraint) -> void
+Microsoft.Maui.Platform.MauiView.CrossPlatformLayout.get -> Microsoft.Maui.ICrossPlatformLayout?
+Microsoft.Maui.Platform.MauiView.CrossPlatformLayout.set -> void
 Microsoft.Maui.Platform.MauiView.InvalidateConstraintsCache() -> void
 Microsoft.Maui.Platform.MauiView.IsMeasureValid(double widthConstraint, double heightConstraint) -> bool
 Microsoft.Maui.SizeRequest.Equals(Microsoft.Maui.SizeRequest other) -> bool
@@ -40,6 +48,9 @@ override Microsoft.Maui.Platform.MauiRefreshView.Bounds.set -> void
 override Microsoft.Maui.Platform.MauiScrollView.ScrollRectToVisible(CoreGraphics.CGRect rect, bool animated) -> void
 override Microsoft.Maui.Platform.MauiTextView.Font.get -> UIKit.UIFont?
 override Microsoft.Maui.Platform.MauiTextView.Font.set -> void
+override Microsoft.Maui.Platform.MauiView.LayoutSubviews() -> void
+override Microsoft.Maui.Platform.MauiView.SetNeedsLayout() -> void
+override Microsoft.Maui.Platform.MauiView.SizeThatFits(CoreGraphics.CGSize size) -> CoreGraphics.CGSize
 override Microsoft.Maui.SizeRequest.Equals(object? obj) -> bool
 override Microsoft.Maui.SizeRequest.GetHashCode() -> int
 static Microsoft.Maui.CommandMapperExtensions.AppendToMapping<TVirtualView, TViewHandler>(this Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>! commandMapper, string! key, System.Action<TViewHandler, TVirtualView, object?>! method) -> void
@@ -77,4 +88,15 @@ static Microsoft.Maui.PropertyMapperExtensions.ReplaceMapping<TVirtualView, TVie
 static Microsoft.Maui.SizeRequest.operator !=(Microsoft.Maui.SizeRequest left, Microsoft.Maui.SizeRequest right) -> bool
 static Microsoft.Maui.SizeRequest.operator ==(Microsoft.Maui.SizeRequest left, Microsoft.Maui.SizeRequest right) -> bool
 Microsoft.Maui.LifecycleEvents.iOSLifecycle.PerformFetch
-virtual Microsoft.Maui.MauiUIApplicationDelegate.PerformFetch(UIKit.UIApplication! application, System.Action<UIKit.UIBackgroundFetchResult>! completionHandler) -> void
\ No newline at end of file
+virtual Microsoft.Maui.MauiUIApplicationDelegate.PerformFetch(UIKit.UIApplication! application, System.Action<UIKit.UIBackgroundFetchResult>! completionHandler) -> void
+*REMOVED*Microsoft.Maui.IContentView.CrossPlatformArrange(Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
+*REMOVED*Microsoft.Maui.IContentView.CrossPlatformMeasure(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
+*REMOVED*Microsoft.Maui.ILayout.CrossPlatformArrange(Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
+*REMOVED*Microsoft.Maui.ILayout.CrossPlatformMeasure(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
+*REMOVED*override Microsoft.Maui.Platform.ContentView.SetNeedsLayout() -> void
+*REMOVED*override Microsoft.Maui.Platform.ContentView.SizeThatFits(CoreGraphics.CGSize size) -> CoreGraphics.CGSize
+*REMOVED*override Microsoft.Maui.Platform.LayoutView.LayoutSubviews() -> void
+*REMOVED*override Microsoft.Maui.Platform.LayoutView.SetNeedsLayout() -> void
+*REMOVED*override Microsoft.Maui.Platform.LayoutView.SetNeedsLayout() -> void
+*REMOVED*override Microsoft.Maui.Platform.LayoutView.SizeThatFits(CoreGraphics.CGSize size) -> CoreGraphics.CGSize
+*REMOVED*override Microsoft.Maui.Platform.ContentView.SetNeedsLayout() -> void
\ No newline at end of file
diff --git a/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
index b796cbafaa1c..50b7567c9dc1 100644
--- a/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
@@ -9,6 +9,12 @@ Microsoft.Maui.ICommandMapper.Invoke(Microsoft.Maui.IElementHandler! viewHandler
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>.Add(string! key, System.Action<TViewHandler, TVirtualView, object?>! action) -> void
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>.Add(string! key, System.Action<TViewHandler, TVirtualView>! action) -> void
+Microsoft.Maui.ICrossPlatformLayout
+Microsoft.Maui.ICrossPlatformLayout.CrossPlatformArrange(Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
+Microsoft.Maui.ICrossPlatformLayout.CrossPlatformMeasure(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
+Microsoft.Maui.ICrossPlatformLayoutBacking
+Microsoft.Maui.ICrossPlatformLayoutBacking.CrossPlatformLayout.get -> Microsoft.Maui.ICrossPlatformLayout?
+Microsoft.Maui.ICrossPlatformLayoutBacking.CrossPlatformLayout.set -> void
 Microsoft.Maui.Layouts.FlexBasis.Equals(Microsoft.Maui.Layouts.FlexBasis other) -> bool
 Microsoft.Maui.SizeRequest.Equals(Microsoft.Maui.SizeRequest other) -> bool
 Microsoft.Maui.Handlers.IImageSourcePartSetter
@@ -41,4 +47,8 @@ static Microsoft.Maui.PropertyMapperExtensions.ModifyMapping<TVirtualView, TView
 static Microsoft.Maui.PropertyMapperExtensions.PrependToMapping<TVirtualView, TViewHandler>(this Microsoft.Maui.IPropertyMapper<Microsoft.Maui.IElement!, Microsoft.Maui.IElementHandler!>! propertyMapper, string! key, System.Action<TViewHandler, TVirtualView>! method) -> void
 static Microsoft.Maui.PropertyMapperExtensions.ReplaceMapping<TVirtualView, TViewHandler>(this Microsoft.Maui.IPropertyMapper<Microsoft.Maui.IElement!, Microsoft.Maui.IElementHandler!>! propertyMapper, string! key, System.Action<TViewHandler, TVirtualView>! method) -> void
 static Microsoft.Maui.SizeRequest.operator !=(Microsoft.Maui.SizeRequest left, Microsoft.Maui.SizeRequest right) -> bool
-static Microsoft.Maui.SizeRequest.operator ==(Microsoft.Maui.SizeRequest left, Microsoft.Maui.SizeRequest right) -> bool
\ No newline at end of file
+static Microsoft.Maui.SizeRequest.operator ==(Microsoft.Maui.SizeRequest left, Microsoft.Maui.SizeRequest right) -> bool
+*REMOVED*Microsoft.Maui.IContentView.CrossPlatformArrange(Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
+*REMOVED*Microsoft.Maui.IContentView.CrossPlatformMeasure(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
+*REMOVED*Microsoft.Maui.ILayout.CrossPlatformArrange(Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
+*REMOVED*Microsoft.Maui.ILayout.CrossPlatformMeasure(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
\ No newline at end of file
diff --git a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index 31164b188d41..9ca1a2718908 100644
--- a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -5,6 +5,12 @@ Microsoft.Maui.IApplication.UserAppTheme.get -> Microsoft.Maui.ApplicationModel.
 Microsoft.Maui.Hosting.MauiApp.DisposeAsync() -> System.Threading.Tasks.ValueTask
 Microsoft.Maui.Handlers.IImageSourcePartSetter
 Microsoft.Maui.Handlers.IImageSourcePartSetter.SetImageSource(Microsoft.UI.Xaml.Media.ImageSource? obj) -> void
+Microsoft.Maui.ICrossPlatformLayout
+Microsoft.Maui.ICrossPlatformLayout.CrossPlatformArrange(Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
+Microsoft.Maui.ICrossPlatformLayout.CrossPlatformMeasure(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
+Microsoft.Maui.ICrossPlatformLayoutBacking
+Microsoft.Maui.ICrossPlatformLayoutBacking.CrossPlatformLayout.get -> Microsoft.Maui.ICrossPlatformLayout?
+Microsoft.Maui.ICrossPlatformLayoutBacking.CrossPlatformLayout.set -> void
 Microsoft.Maui.IWindow.TitleBarDragRectangles.get -> Microsoft.Maui.Graphics.Rect[]?
 Microsoft.Maui.ICommandMapper
 Microsoft.Maui.ICommandMapper.GetCommand(string! key) -> System.Action<Microsoft.Maui.IElementHandler!, Microsoft.Maui.IElement!, object?>?
@@ -14,12 +20,18 @@ Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>.Add(string! key, Syste
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>.Add(string! key, System.Action<TViewHandler, TVirtualView>! action) -> void
 Microsoft.Maui.Layouts.FlexBasis.Equals(Microsoft.Maui.Layouts.FlexBasis other) -> bool
 Microsoft.Maui.Platform.ImageSourcePartLoader.ImageSourcePartLoader(Microsoft.Maui.Handlers.IImageSourcePartSetter! handler) -> void
+Microsoft.Maui.Platform.MauiPanel
+Microsoft.Maui.Platform.MauiPanel.CrossPlatformLayout.get -> Microsoft.Maui.ICrossPlatformLayout?
+Microsoft.Maui.Platform.MauiPanel.CrossPlatformLayout.set -> void
+Microsoft.Maui.Platform.MauiPanel.MauiPanel() -> void
 Microsoft.Maui.Platform.MauiWebView.MauiWebView(Microsoft.Maui.Handlers.WebViewHandler! handler) -> void
 Microsoft.Maui.SizeRequest.Equals(Microsoft.Maui.SizeRequest other) -> bool
 override Microsoft.Maui.Handlers.ContentViewHandler.DisconnectHandler(Microsoft.Maui.Platform.ContentPanel! platformView) -> void
 override Microsoft.Maui.Handlers.MenuFlyoutHandler.DisconnectHandler(Microsoft.UI.Xaml.Controls.MenuFlyout! platformView) -> void
 override Microsoft.Maui.Layouts.FlexBasis.Equals(object? obj) -> bool
 override Microsoft.Maui.Layouts.FlexBasis.GetHashCode() -> int
+override Microsoft.Maui.Platform.MauiPanel.ArrangeOverride(Windows.Foundation.Size finalSize) -> Windows.Foundation.Size
+override Microsoft.Maui.Platform.MauiPanel.MeasureOverride(Windows.Foundation.Size availableSize) -> Windows.Foundation.Size
 override Microsoft.Maui.SizeRequest.Equals(object? obj) -> bool
 override Microsoft.Maui.SizeRequest.GetHashCode() -> int
 static Microsoft.Maui.CommandMapperExtensions.AppendToMapping<TVirtualView, TViewHandler>(this Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>! commandMapper, string! key, System.Action<TViewHandler, TVirtualView, object?>! method) -> void
@@ -50,4 +62,10 @@ static Microsoft.Maui.PropertyMapperExtensions.ModifyMapping<TVirtualView, TView
 static Microsoft.Maui.PropertyMapperExtensions.PrependToMapping<TVirtualView, TViewHandler>(this Microsoft.Maui.IPropertyMapper<Microsoft.Maui.IElement!, Microsoft.Maui.IElementHandler!>! propertyMapper, string! key, System.Action<TViewHandler, TVirtualView>! method) -> void
 static Microsoft.Maui.PropertyMapperExtensions.ReplaceMapping<TVirtualView, TViewHandler>(this Microsoft.Maui.IPropertyMapper<Microsoft.Maui.IElement!, Microsoft.Maui.IElementHandler!>! propertyMapper, string! key, System.Action<TViewHandler, TVirtualView>! method) -> void
 static Microsoft.Maui.SizeRequest.operator !=(Microsoft.Maui.SizeRequest left, Microsoft.Maui.SizeRequest right) -> bool
-static Microsoft.Maui.SizeRequest.operator ==(Microsoft.Maui.SizeRequest left, Microsoft.Maui.SizeRequest right) -> bool
\ No newline at end of file
+static Microsoft.Maui.SizeRequest.operator ==(Microsoft.Maui.SizeRequest left, Microsoft.Maui.SizeRequest right) -> bool
+*REMOVED*Microsoft.Maui.IContentView.CrossPlatformArrange(Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
+*REMOVED*Microsoft.Maui.IContentView.CrossPlatformMeasure(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
+*REMOVED*Microsoft.Maui.ILayout.CrossPlatformArrange(Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
+*REMOVED*Microsoft.Maui.ILayout.CrossPlatformMeasure(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
+*REMOVED*override Microsoft.Maui.Platform.ContentPanel.MeasureOverride(Windows.Foundation.Size availableSize) -> Windows.Foundation.Size
+*REMOVED*override Microsoft.Maui.Platform.LayoutPanel.MeasureOverride(Windows.Foundation.Size availableSize) -> Windows.Foundation.Size
diff --git a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
index f44a342bccd7..8cf45a61435b 100644
--- a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -11,6 +11,12 @@ Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>.Add(string! key, Syste
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>.Add(string! key, System.Action<TViewHandler, TVirtualView>! action) -> void
 Microsoft.Maui.Handlers.IImageSourcePartSetter
 Microsoft.Maui.Handlers.IImageSourcePartSetter.SetImageSource(object? obj) -> void
+Microsoft.Maui.ICrossPlatformLayout
+Microsoft.Maui.ICrossPlatformLayout.CrossPlatformArrange(Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
+Microsoft.Maui.ICrossPlatformLayout.CrossPlatformMeasure(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
+Microsoft.Maui.ICrossPlatformLayoutBacking
+Microsoft.Maui.ICrossPlatformLayoutBacking.CrossPlatformLayout.get -> Microsoft.Maui.ICrossPlatformLayout?
+Microsoft.Maui.ICrossPlatformLayoutBacking.CrossPlatformLayout.set -> void
 Microsoft.Maui.Layouts.FlexBasis.Equals(Microsoft.Maui.Layouts.FlexBasis other) -> bool
 Microsoft.Maui.Platform.ImageSourcePartLoader.ImageSourcePartLoader(Microsoft.Maui.Handlers.IImageSourcePartSetter! handler) -> void
 Microsoft.Maui.SizeRequest.Equals(Microsoft.Maui.SizeRequest other) -> bool
@@ -41,4 +47,8 @@ static Microsoft.Maui.PropertyMapperExtensions.ModifyMapping<TVirtualView, TView
 static Microsoft.Maui.PropertyMapperExtensions.PrependToMapping<TVirtualView, TViewHandler>(this Microsoft.Maui.IPropertyMapper<Microsoft.Maui.IElement!, Microsoft.Maui.IElementHandler!>! propertyMapper, string! key, System.Action<TViewHandler, TVirtualView>! method) -> void
 static Microsoft.Maui.PropertyMapperExtensions.ReplaceMapping<TVirtualView, TViewHandler>(this Microsoft.Maui.IPropertyMapper<Microsoft.Maui.IElement!, Microsoft.Maui.IElementHandler!>! propertyMapper, string! key, System.Action<TViewHandler, TVirtualView>! method) -> void
 static Microsoft.Maui.SizeRequest.operator !=(Microsoft.Maui.SizeRequest left, Microsoft.Maui.SizeRequest right) -> bool
-static Microsoft.Maui.SizeRequest.operator ==(Microsoft.Maui.SizeRequest left, Microsoft.Maui.SizeRequest right) -> bool
\ No newline at end of file
+static Microsoft.Maui.SizeRequest.operator ==(Microsoft.Maui.SizeRequest left, Microsoft.Maui.SizeRequest right) -> bool
+*REMOVED*Microsoft.Maui.IContentView.CrossPlatformArrange(Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
+*REMOVED*Microsoft.Maui.IContentView.CrossPlatformMeasure(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
+*REMOVED*Microsoft.Maui.ILayout.CrossPlatformArrange(Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
+*REMOVED*Microsoft.Maui.ILayout.CrossPlatformMeasure(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
\ No newline at end of file
diff --git a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
index b7cff3959b8b..8cf45a61435b 100644
--- a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -11,6 +11,12 @@ Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>.Add(string! key, Syste
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>.Add(string! key, System.Action<TViewHandler, TVirtualView>! action) -> void
 Microsoft.Maui.Handlers.IImageSourcePartSetter
 Microsoft.Maui.Handlers.IImageSourcePartSetter.SetImageSource(object? obj) -> void
+Microsoft.Maui.ICrossPlatformLayout
+Microsoft.Maui.ICrossPlatformLayout.CrossPlatformArrange(Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
+Microsoft.Maui.ICrossPlatformLayout.CrossPlatformMeasure(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
+Microsoft.Maui.ICrossPlatformLayoutBacking
+Microsoft.Maui.ICrossPlatformLayoutBacking.CrossPlatformLayout.get -> Microsoft.Maui.ICrossPlatformLayout?
+Microsoft.Maui.ICrossPlatformLayoutBacking.CrossPlatformLayout.set -> void
 Microsoft.Maui.Layouts.FlexBasis.Equals(Microsoft.Maui.Layouts.FlexBasis other) -> bool
 Microsoft.Maui.Platform.ImageSourcePartLoader.ImageSourcePartLoader(Microsoft.Maui.Handlers.IImageSourcePartSetter! handler) -> void
 Microsoft.Maui.SizeRequest.Equals(Microsoft.Maui.SizeRequest other) -> bool
@@ -42,3 +48,7 @@ static Microsoft.Maui.PropertyMapperExtensions.PrependToMapping<TVirtualView, TV
 static Microsoft.Maui.PropertyMapperExtensions.ReplaceMapping<TVirtualView, TViewHandler>(this Microsoft.Maui.IPropertyMapper<Microsoft.Maui.IElement!, Microsoft.Maui.IElementHandler!>! propertyMapper, string! key, System.Action<TViewHandler, TVirtualView>! method) -> void
 static Microsoft.Maui.SizeRequest.operator !=(Microsoft.Maui.SizeRequest left, Microsoft.Maui.SizeRequest right) -> bool
 static Microsoft.Maui.SizeRequest.operator ==(Microsoft.Maui.SizeRequest left, Microsoft.Maui.SizeRequest right) -> bool
+*REMOVED*Microsoft.Maui.IContentView.CrossPlatformArrange(Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
+*REMOVED*Microsoft.Maui.IContentView.CrossPlatformMeasure(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
+*REMOVED*Microsoft.Maui.ILayout.CrossPlatformArrange(Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
+*REMOVED*Microsoft.Maui.ILayout.CrossPlatformMeasure(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
\ No newline at end of file
diff --git a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
index f44a342bccd7..8cf45a61435b 100644
--- a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
@@ -11,6 +11,12 @@ Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>.Add(string! key, Syste
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>.Add(string! key, System.Action<TViewHandler, TVirtualView>! action) -> void
 Microsoft.Maui.Handlers.IImageSourcePartSetter
 Microsoft.Maui.Handlers.IImageSourcePartSetter.SetImageSource(object? obj) -> void
+Microsoft.Maui.ICrossPlatformLayout
+Microsoft.Maui.ICrossPlatformLayout.CrossPlatformArrange(Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
+Microsoft.Maui.ICrossPlatformLayout.CrossPlatformMeasure(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
+Microsoft.Maui.ICrossPlatformLayoutBacking
+Microsoft.Maui.ICrossPlatformLayoutBacking.CrossPlatformLayout.get -> Microsoft.Maui.ICrossPlatformLayout?
+Microsoft.Maui.ICrossPlatformLayoutBacking.CrossPlatformLayout.set -> void
 Microsoft.Maui.Layouts.FlexBasis.Equals(Microsoft.Maui.Layouts.FlexBasis other) -> bool
 Microsoft.Maui.Platform.ImageSourcePartLoader.ImageSourcePartLoader(Microsoft.Maui.Handlers.IImageSourcePartSetter! handler) -> void
 Microsoft.Maui.SizeRequest.Equals(Microsoft.Maui.SizeRequest other) -> bool
@@ -41,4 +47,8 @@ static Microsoft.Maui.PropertyMapperExtensions.ModifyMapping<TVirtualView, TView
 static Microsoft.Maui.PropertyMapperExtensions.PrependToMapping<TVirtualView, TViewHandler>(this Microsoft.Maui.IPropertyMapper<Microsoft.Maui.IElement!, Microsoft.Maui.IElementHandler!>! propertyMapper, string! key, System.Action<TViewHandler, TVirtualView>! method) -> void
 static Microsoft.Maui.PropertyMapperExtensions.ReplaceMapping<TVirtualView, TViewHandler>(this Microsoft.Maui.IPropertyMapper<Microsoft.Maui.IElement!, Microsoft.Maui.IElementHandler!>! propertyMapper, string! key, System.Action<TViewHandler, TVirtualView>! method) -> void
 static Microsoft.Maui.SizeRequest.operator !=(Microsoft.Maui.SizeRequest left, Microsoft.Maui.SizeRequest right) -> bool
-static Microsoft.Maui.SizeRequest.operator ==(Microsoft.Maui.SizeRequest left, Microsoft.Maui.SizeRequest right) -> bool
\ No newline at end of file
+static Microsoft.Maui.SizeRequest.operator ==(Microsoft.Maui.SizeRequest left, Microsoft.Maui.SizeRequest right) -> bool
+*REMOVED*Microsoft.Maui.IContentView.CrossPlatformArrange(Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
+*REMOVED*Microsoft.Maui.IContentView.CrossPlatformMeasure(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
+*REMOVED*Microsoft.Maui.ILayout.CrossPlatformArrange(Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
+*REMOVED*Microsoft.Maui.ILayout.CrossPlatformMeasure(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
\ No newline at end of file

From ea08a38e955972dc89bafdc1e3a80ba8a53cc080 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 23 Jun 2023 03:16:03 +0000
Subject: [PATCH 030/105] [create-pull-request] automated change (#15801)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .../src/Core/Application/Application.cs       |   2 +-
 .../Android/Extensions/ToolbarExtensions.cs   |   2 +-
 src/Controls/src/Core/WebView/WebView.cs      |   2 +-
 .../Elements/Picker/PickerTests.Windows.cs    |   2 +-
 .../Shell/ShellTabBarTests.Windows.cs         |   2 +-
 .../Elements/Shell/ShellTests.Windows.cs      |   2 +-
 .../Elements/WebView/WebViewTests.Windows.cs  | 212 +++++++++---------
 src/Core/src/Layouts/GridLayoutManager.cs     |   2 +-
 .../Android/NavigationViewExtensions.cs       |   2 +-
 .../NavigationViewHandlerTests.Android.cs     |   2 +-
 .../Layouts/GridLayoutManagerTests.cs         |   6 +-
 .../AppiumUITestApp.cs                        |   2 +-
 12 files changed, 119 insertions(+), 119 deletions(-)

diff --git a/src/Controls/src/Core/Application/Application.cs b/src/Controls/src/Core/Application/Application.cs
index 596e495547af..7783a8403a35 100644
--- a/src/Controls/src/Core/Application/Application.cs
+++ b/src/Controls/src/Core/Application/Application.cs
@@ -349,7 +349,7 @@ public void SendOnAppLinkRequestReceived(Uri uri)
 		internal void SendResume()
 		{
 			if (Current is null)
-			Current = this;
+				Current = this;
 
 			OnResume();
 		}
diff --git a/src/Controls/src/Core/Platform/Android/Extensions/ToolbarExtensions.cs b/src/Controls/src/Core/Platform/Android/Extensions/ToolbarExtensions.cs
index 169a2b6b4449..00948ccb4ebb 100644
--- a/src/Controls/src/Core/Platform/Android/Extensions/ToolbarExtensions.cs
+++ b/src/Controls/src/Core/Platform/Android/Extensions/ToolbarExtensions.cs
@@ -155,7 +155,7 @@ public static void UpdateIconColor(this AToolbar nativeToolbar, Toolbar toolbar)
 				nativeToolbar.NavigationIcon.SetColorFilter(navIconColor, FilterMode.SrcAtop);
 			}
 
-			if(navIconColor != null && nativeToolbar.OverflowIcon != null)
+			if (navIconColor != null && nativeToolbar.OverflowIcon != null)
 			{
 				nativeToolbar.OverflowIcon.SetColorFilter(navIconColor, FilterMode.SrcAtop);
 			}
diff --git a/src/Controls/src/Core/WebView/WebView.cs b/src/Controls/src/Core/WebView/WebView.cs
index d160c49a9648..a83515c056c5 100644
--- a/src/Controls/src/Core/WebView/WebView.cs
+++ b/src/Controls/src/Core/WebView/WebView.cs
@@ -131,7 +131,7 @@ public async Task<string> EvaluateJavaScriptAsync(string script)
 				}
 				else
 					script = "try{eval('" + script + "')}catch(e){'null'};";
-			}   
+			}
 
 			string result;
 
diff --git a/src/Controls/tests/DeviceTests/Elements/Picker/PickerTests.Windows.cs b/src/Controls/tests/DeviceTests/Elements/Picker/PickerTests.Windows.cs
index 5bde80d2ebff..0f5d9dc64066 100644
--- a/src/Controls/tests/DeviceTests/Elements/Picker/PickerTests.Windows.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Picker/PickerTests.Windows.cs
@@ -32,7 +32,7 @@ public async Task HorizontalOptionsInitializesCorrectly()
 			var handler = await CreateHandlerAsync<PickerHandler>(picker);
 
 			await InvokeOnMainThreadAsync(() => Assert.Equal(UI.Xaml.HorizontalAlignment.Right, GetPlatformHorizontalOptions(handler.PlatformView)));
-			
+
 		}
 
 		[Fact(DisplayName = "VerticalOptions Initializes Correctly")]
diff --git a/src/Controls/tests/DeviceTests/Elements/Shell/ShellTabBarTests.Windows.cs b/src/Controls/tests/DeviceTests/Elements/Shell/ShellTabBarTests.Windows.cs
index 4e2be8090aae..727f79275b63 100644
--- a/src/Controls/tests/DeviceTests/Elements/Shell/ShellTabBarTests.Windows.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Shell/ShellTabBarTests.Windows.cs
@@ -7,10 +7,10 @@
 using Microsoft.Maui.Controls.Handlers;
 using Microsoft.Maui.Graphics;
 using Microsoft.Maui.Platform;
-using WNavigationViewItem = Microsoft.UI.Xaml.Controls.NavigationViewItem;
 using Xunit;
 using NavigationView = Microsoft.UI.Xaml.Controls.NavigationView;
 using WFrameworkElement = Microsoft.UI.Xaml.FrameworkElement;
+using WNavigationViewItem = Microsoft.UI.Xaml.Controls.NavigationViewItem;
 
 
 namespace Microsoft.Maui.DeviceTests
diff --git a/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.Windows.cs b/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.Windows.cs
index b1484c12928f..dfa78c18835d 100644
--- a/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.Windows.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.Windows.cs
@@ -10,10 +10,10 @@
 using Microsoft.Maui.Graphics;
 using Microsoft.Maui.Platform;
 using Microsoft.UI.Xaml;
-using WNavigationViewItem = Microsoft.UI.Xaml.Controls.NavigationViewItem;
 using Xunit;
 using NavigationView = Microsoft.UI.Xaml.Controls.NavigationView;
 using WFrameworkElement = Microsoft.UI.Xaml.FrameworkElement;
+using WNavigationViewItem = Microsoft.UI.Xaml.Controls.NavigationViewItem;
 
 
 namespace Microsoft.Maui.DeviceTests
diff --git a/src/Controls/tests/DeviceTests/Elements/WebView/WebViewTests.Windows.cs b/src/Controls/tests/DeviceTests/Elements/WebView/WebViewTests.Windows.cs
index 22ad63a2b024..841f1c102f17 100644
--- a/src/Controls/tests/DeviceTests/Elements/WebView/WebViewTests.Windows.cs
+++ b/src/Controls/tests/DeviceTests/Elements/WebView/WebViewTests.Windows.cs
@@ -6,20 +6,20 @@
 
 namespace Microsoft.Maui.DeviceTests
 {
-    [Category(TestCategory.WebView)]
-    public partial class WebViewTests : ControlsHandlerTestBase
-    {
-        [Fact(DisplayName = "Evaluate JavaScript returning a String value")]
-        public async Task EvaluateJavaScriptWithString()
-        {
-            SetupBuilder();
+	[Category(TestCategory.WebView)]
+	public partial class WebViewTests : ControlsHandlerTestBase
+	{
+		[Fact(DisplayName = "Evaluate JavaScript returning a String value")]
+		public async Task EvaluateJavaScriptWithString()
+		{
+			SetupBuilder();
 
-            string actual = string.Empty;
+			string actual = string.Empty;
 
-            var pageLoadTimeout = TimeSpan.FromSeconds(2);
+			var pageLoadTimeout = TimeSpan.FromSeconds(2);
 
-            string html =
-                @"
+			string html =
+				@"
 				<!DOCTYPE html>
 				<html>
 					<head>
@@ -36,59 +36,59 @@ WebView Unit Test
 					</body>
 				</html>
 				";
-            await InvokeOnMainThreadAsync(async () =>
-            {
-                var webView = new WebView()
-                {
-                    WidthRequest = 100,
-                    HeightRequest = 100,
-                    Source = new HtmlWebViewSource { Html = html }
-                };
-
-                var handler = CreateHandler(webView);
-
-                var platformView = handler.PlatformView;
-
-                // Setup the view to be displayed/parented and run our tests on it
-                await AttachAndRun(webView, async (handler) =>
-                {
-                    // Wait for the page to load
-                    var tcsLoaded = new TaskCompletionSource<bool>();
-                    var ctsTimeout = new CancellationTokenSource(pageLoadTimeout);
-                    ctsTimeout.Token.Register(() => tcsLoaded.TrySetException(new TimeoutException($"Failed to load HTML")));
-
-                    webView.Navigated += async (source, args) =>
-                    {
-                        // Set success when we have a successful nav result
-                        if (args.Result == WebNavigationResult.Success)
-                        {
-                            tcsLoaded.TrySetResult(args.Result == WebNavigationResult.Success);
-
-                            // Evaluate JavaScript
-                            var script = "test();";
-                            actual = await webView.EvaluateJavaScriptAsync(script);
-
-                            // If the result is equal to the script string result, the test has passed
-                            Assert.Equal("Test", actual);
-                        }
-                    };
-
-                    Assert.True(await tcsLoaded.Task);
-                });
-            });
-        }
-
-        [Fact(DisplayName = "Evaluate JavaScript returning an Integer value")]
-        public async Task EvaluateJavaScriptWithInteger()
-        {
-            SetupBuilder();
-
-            string actual = string.Empty;
-
-            var pageLoadTimeout = TimeSpan.FromSeconds(2);
-
-            string html =
-                @"
+			await InvokeOnMainThreadAsync(async () =>
+			{
+				var webView = new WebView()
+				{
+					WidthRequest = 100,
+					HeightRequest = 100,
+					Source = new HtmlWebViewSource { Html = html }
+				};
+
+				var handler = CreateHandler(webView);
+
+				var platformView = handler.PlatformView;
+
+				// Setup the view to be displayed/parented and run our tests on it
+				await AttachAndRun(webView, async (handler) =>
+				{
+					// Wait for the page to load
+					var tcsLoaded = new TaskCompletionSource<bool>();
+					var ctsTimeout = new CancellationTokenSource(pageLoadTimeout);
+					ctsTimeout.Token.Register(() => tcsLoaded.TrySetException(new TimeoutException($"Failed to load HTML")));
+
+					webView.Navigated += async (source, args) =>
+					{
+						// Set success when we have a successful nav result
+						if (args.Result == WebNavigationResult.Success)
+						{
+							tcsLoaded.TrySetResult(args.Result == WebNavigationResult.Success);
+
+							// Evaluate JavaScript
+							var script = "test();";
+							actual = await webView.EvaluateJavaScriptAsync(script);
+
+							// If the result is equal to the script string result, the test has passed
+							Assert.Equal("Test", actual);
+						}
+					};
+
+					Assert.True(await tcsLoaded.Task);
+				});
+			});
+		}
+
+		[Fact(DisplayName = "Evaluate JavaScript returning an Integer value")]
+		public async Task EvaluateJavaScriptWithInteger()
+		{
+			SetupBuilder();
+
+			string actual = string.Empty;
+
+			var pageLoadTimeout = TimeSpan.FromSeconds(2);
+
+			string html =
+				@"
 				<!DOCTYPE html>
 				<html>
 					<head>
@@ -105,46 +105,46 @@ WebView Unit Test
 					</body>
 				</html>
 				";
-            await InvokeOnMainThreadAsync(async () =>
-            {
-                var webView = new WebView()
-                {
-                    WidthRequest = 100,
-                    HeightRequest = 100,
-                    Source = new HtmlWebViewSource { Html = html }
-                };
-
-                var handler = CreateHandler(webView);
-
-                var platformView = handler.PlatformView;
-
-                // Setup the view to be displayed/parented and run our tests on it
-                await AttachAndRun(webView, async (handler) =>
-                {
-                    // Wait for the page to load
-                    var tcsLoaded = new TaskCompletionSource<bool>();
-                    var ctsTimeout = new CancellationTokenSource(pageLoadTimeout);
-                    ctsTimeout.Token.Register(() => tcsLoaded.TrySetException(new TimeoutException($"Failed to load HTML")));
-
-                    webView.Navigated += async (source, args) =>
-                    {
-                        // Set success when we have a successful nav result
-                        if (args.Result == WebNavigationResult.Success)
-                        {
-                            tcsLoaded.TrySetResult(args.Result == WebNavigationResult.Success);
-
-                            // Evaluate JavaScript
-                            var script = "test();";
-                            actual = await webView.EvaluateJavaScriptAsync(script);
-
-                            // If the result is equal to the script string result, the test has passed
-                            Assert.Equal(10, Convert.ToInt32(actual));
-                        }
-                    };
-
-                    Assert.True(await tcsLoaded.Task);
-                });
-            });
-        }
-    }
+			await InvokeOnMainThreadAsync(async () =>
+			{
+				var webView = new WebView()
+				{
+					WidthRequest = 100,
+					HeightRequest = 100,
+					Source = new HtmlWebViewSource { Html = html }
+				};
+
+				var handler = CreateHandler(webView);
+
+				var platformView = handler.PlatformView;
+
+				// Setup the view to be displayed/parented and run our tests on it
+				await AttachAndRun(webView, async (handler) =>
+				{
+					// Wait for the page to load
+					var tcsLoaded = new TaskCompletionSource<bool>();
+					var ctsTimeout = new CancellationTokenSource(pageLoadTimeout);
+					ctsTimeout.Token.Register(() => tcsLoaded.TrySetException(new TimeoutException($"Failed to load HTML")));
+
+					webView.Navigated += async (source, args) =>
+					{
+						// Set success when we have a successful nav result
+						if (args.Result == WebNavigationResult.Success)
+						{
+							tcsLoaded.TrySetResult(args.Result == WebNavigationResult.Success);
+
+							// Evaluate JavaScript
+							var script = "test();";
+							actual = await webView.EvaluateJavaScriptAsync(script);
+
+							// If the result is equal to the script string result, the test has passed
+							Assert.Equal(10, Convert.ToInt32(actual));
+						}
+					};
+
+					Assert.True(await tcsLoaded.Task);
+				});
+			});
+		}
+	}
 }
diff --git a/src/Core/src/Layouts/GridLayoutManager.cs b/src/Core/src/Layouts/GridLayoutManager.cs
index 009bfca9682b..7d7d656269ee 100644
--- a/src/Core/src/Layouts/GridLayoutManager.cs
+++ b/src/Core/src/Layouts/GridLayoutManager.cs
@@ -890,7 +890,7 @@ static void ExpandStars(double targetSize, double currentSize, Definition[] defs
 					// If the biggest current star size we have in the definitions is less than the
 					// targetStarSize, that means we have enough room to expand all of our star rows/columns
 					// to their full size.
-			
+
 					foreach (var definition in defs)
 					{
 						if (definition.IsStar)
diff --git a/src/Core/src/Platform/Android/NavigationViewExtensions.cs b/src/Core/src/Platform/Android/NavigationViewExtensions.cs
index 9ee6a3a5587d..b538c1b5a602 100644
--- a/src/Core/src/Platform/Android/NavigationViewExtensions.cs
+++ b/src/Core/src/Platform/Android/NavigationViewExtensions.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using AndroidX.Navigation.Fragment;
 using AndroidX.Navigation;
+using AndroidX.Navigation.Fragment;
 using Java.Lang;
 using Microsoft.Maui.Graphics;
 
diff --git a/src/Core/tests/DeviceTests/Handlers/Navigation/NavigationViewHandlerTests.Android.cs b/src/Core/tests/DeviceTests/Handlers/Navigation/NavigationViewHandlerTests.Android.cs
index 6242230112d5..2581b6658408 100644
--- a/src/Core/tests/DeviceTests/Handlers/Navigation/NavigationViewHandlerTests.Android.cs
+++ b/src/Core/tests/DeviceTests/Handlers/Navigation/NavigationViewHandlerTests.Android.cs
@@ -6,8 +6,8 @@
 using AndroidX.AppCompat.App;
 using AndroidX.AppCompat.Widget;
 using AndroidX.Fragment.App;
-using AndroidX.Navigation.Fragment;
 using AndroidX.Navigation;
+using AndroidX.Navigation.Fragment;
 using Java.Lang;
 using Microsoft.Maui.DeviceTests.Stubs;
 using Microsoft.Maui.Handlers;
diff --git a/src/Core/tests/UnitTests/Layouts/GridLayoutManagerTests.cs b/src/Core/tests/UnitTests/Layouts/GridLayoutManagerTests.cs
index 30da9b1e252d..6e4dbdcf7882 100644
--- a/src/Core/tests/UnitTests/Layouts/GridLayoutManagerTests.cs
+++ b/src/Core/tests/UnitTests/Layouts/GridLayoutManagerTests.cs
@@ -2953,7 +2953,7 @@ public void StarRowsAccountForPadding(double top, double bottom)
 		public void StarRowExpansionWorksWithDifferingScalars()
 		{
 			var grid = CreateGridLayout(rows: "*, 4.5*, *, 4.5*");
-			
+
 			grid.VerticalLayoutAlignment.Returns(LayoutAlignment.Fill);
 
 			var view0 = CreateTestView(new Size(100, 20));
@@ -2977,7 +2977,7 @@ public void StarRowExpansionWorksWithDifferingScalars()
 			Assert.Equal(expectedHeight, measure.Height);
 
 			// Now we'll arrange it at a larger height (as if we were filling up the height of a layout)
-			double arrangeHeight = measure.Height + 100; 
+			double arrangeHeight = measure.Height + 100;
 			manager.ArrangeChildren(new Rect(0, 0, measure.Width, arrangeHeight));
 
 			// Determine the destination Rect values that the manager passed in when calling Arrange() for each view
@@ -3055,7 +3055,7 @@ public void StarColumnExpansionWorksWithDifferingScalars()
 			Assert.Equal(expectedEvenRowWidth, view3Dest.Width, 1.0);
 		}
 
-		static Rect GetArrangedRect(IView view) 
+		static Rect GetArrangedRect(IView view)
 		{
 			var args = view.ReceivedCalls().Single(c => c.GetMethodInfo().Name == nameof(IView.Arrange)).GetArguments();
 			return (Rect)args[0];
diff --git a/src/TestUtils/src/TestUtils.Appium.UITests/AppiumUITestApp.cs b/src/TestUtils/src/TestUtils.Appium.UITests/AppiumUITestApp.cs
index 802c12f9c631..32790b58d148 100644
--- a/src/TestUtils/src/TestUtils.Appium.UITests/AppiumUITestApp.cs
+++ b/src/TestUtils/src/TestUtils.Appium.UITests/AppiumUITestApp.cs
@@ -290,7 +290,7 @@ public void DragCoordinates(float fromX, float fromY, float toX, float toY)
 					{ "toY", toY }
 				});
 			}
-			else if(IsMac)
+			else if (IsMac)
 			{
 				_driver?.ExecuteScript("macos: clickAndDragAndHold", new Dictionary<string, object>
 				{

From 4de67ed04a5726009f185674f11291e8a782f358 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Fri, 23 Jun 2023 07:31:36 -0500
Subject: [PATCH 031/105] [GraphicsTester] only build for maccatalyst-x64
 (#15798)

Context: https://dev.azure.com/xamarin/public/_build/results?buildId=89153&view=logs&j=5239058e-6f59-5db5-6c0e-6f79eefcd049&s=b7e1043e-3af4-5003-8e7a-4a0d8ac920f3&t=5a96ad5f-9988-5704-46b8-08f3710aee54&l=9849

Sometimes the MAUI build randomly fails with:

    error MSB3021: Unable to copy file "obj\Release\netstandard2.0\Microsoft.Maui.Graphics.Text.Markdig.dll" to "bin\Release\netstandard2.0\Microsoft.Maui.Graphics.Text.Markdig.dll"

Looking at the `.binlog` this happens inside of:

    Target Name=_RunRidSpecificBuild Project=GraphicsTester.MacCatalyst.csproj
    MSBuild
        Project Name=GraphicsTester.MacCatalyst.csproj File=D:\a\_work\1\s\src\Graphics\samples\GraphicsTester.MacCatalyst\GraphicsTester.MacCatalyst.csproj Targets=[_BuildRidSpecificAppBundle] GlobalProperties=[Configuration=Release, BuildingSolutionFile=true, CurrentSolutionConfigurationContents=<SolutionConfiguration>..., SolutionDir=D:\a\_work\1\s\, SolutionExt=.sln, SolutionFileName=Microsoft.Maui.sln, SolutionName=Microsoft.Maui, SolutionPath=D:\a\_work\1\s\Microsoft.Maui.sln, Platform=AnyCPU, RuntimeIdentifier=maccatalyst-x64, _CodesignItemsPath=obj\Release\net7.0-maccatalyst\codesignitems-maccatalyst-x64.items, _MtouchSymbolsList=, _UserFrameworksWithoutDebugSymbolsPath=obj\Release\net7.0-maccatalyst\user-frameworks-without-dsym-maccatalyst-x64.list, _IsMultiRidBuild=true, RuntimeIdentifiers=, _ProcessedBundleResourcesPath=obj\Release\net7.0-maccatalyst\\_ProcessedBundleResourcesPath.items, _ProcessedContentPath=obj\Release\net7.0-maccatalyst\\_ProcessedContentPath.items, _ProcessedImageAssetsPath=obj\Release\net7.0-maccatalyst\actool\_ProcessedImageAssetsPath.items, _ProcessedInterfaceDefinitionsPath=obj\Release\net7.0-maccatalyst\ibtool\_ProcessedInterfaceDefinitionsPath.items, _ProcessedSceneKitAssetsPath=obj\Release\net7.0-maccatalyst\copySceneKitAssets\_ProcessedSceneKitAssetsPath.items, _ProcessedColladaAssetsPath=obj\Release\net7.0-maccatalyst\collada\_ProcessedColladaAssetsPath.items, _ProcessedTextureAtlasesPath=obj\Release\net7.0-maccatalyst\atlas\_ProcessedTextureAtlasesPath.items, _ProcessedCoreMLModelsPath=obj\Release\net7.0-maccatalyst\coremlc\_ProcessedCoreMLModelsPath.items, _CompiledEntitlementsPath=obj\Release\net7.0-maccatalyst\Entitlements.xcent]
    MSBuild
        Project Name=GraphicsTester.MacCatalyst.csproj File=D:\a\_work\1\s\src\Graphics\samples\GraphicsTester.MacCatalyst\GraphicsTester.MacCatalyst.csproj Targets=[_BuildRidSpecificAppBundle] GlobalProperties=[Configuration=Release, BuildingSolutionFile=true, CurrentSolutionConfigurationContents=<SolutionConfiguration>..., SolutionDir=D:\a\_work\1\s\, SolutionExt=.sln, SolutionFileName=Microsoft.Maui.sln, SolutionName=Microsoft.Maui, SolutionPath=D:\a\_work\1\s\Microsoft.Maui.sln, Platform=AnyCPU, RuntimeIdentifier=maccatalyst-arm64, _CodesignItemsPath=obj\Release\net7.0-maccatalyst\codesignitems-maccatalyst-arm64.items, _MtouchSymbolsList=, _UserFrameworksWithoutDebugSymbolsPath=obj\Release\net7.0-maccatalyst\user-frameworks-without-dsym-maccatalyst-arm64.list, _IsMultiRidBuild=true, RuntimeIdentifiers=, _ProcessedBundleResourcesPath=obj\Release\net7.0-maccatalyst\\_ProcessedBundleResourcesPath.items, _ProcessedContentPath=obj\Release\net7.0-maccatalyst\\_ProcessedContentPath.items, _ProcessedImageAssetsPath=obj\Release\net7.0-maccatalyst\actool\_ProcessedImageAssetsPath.items, _ProcessedInterfaceDefinitionsPath=obj\Release\net7.0-maccatalyst\ibtool\_ProcessedInterfaceDefinitionsPath.items, _ProcessedSceneKitAssetsPath=obj\Release\net7.0-maccatalyst\copySceneKitAssets\_ProcessedSceneKitAssetsPath.items, _ProcessedColladaAssetsPath=obj\Release\net7.0-maccatalyst\collada\_ProcessedColladaAssetsPath.items, _ProcessedTextureAtlasesPath=obj\Release\net7.0-maccatalyst\atlas\_ProcessedTextureAtlasesPath.items, _ProcessedCoreMLModelsPath=obj\Release\net7.0-maccatalyst\coremlc\_ProcessedCoreMLModelsPath.items, _CompiledEntitlementsPath=obj\Release\net7.0-maccatalyst\Entitlements.xcent]

This workaround is in several projects, but not this one:

    <!-- Disable multi-RID builds to workaround a parallel build issue -->
    <RuntimeIdentifier Condition="$(TargetFramework.Contains('-maccatalyst'))">maccatalyst-x64</RuntimeIdentifier>

Let's see if this solves the issue.
---
 .../GraphicsTester.MacCatalyst.csproj                           | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Graphics/samples/GraphicsTester.MacCatalyst/GraphicsTester.MacCatalyst.csproj b/src/Graphics/samples/GraphicsTester.MacCatalyst/GraphicsTester.MacCatalyst.csproj
index f9f9e188b406..215e9f6c4eaa 100644
--- a/src/Graphics/samples/GraphicsTester.MacCatalyst/GraphicsTester.MacCatalyst.csproj
+++ b/src/Graphics/samples/GraphicsTester.MacCatalyst/GraphicsTester.MacCatalyst.csproj
@@ -8,6 +8,8 @@
     <LangVersion>10.0</LangVersion>
     <SupportedOSPlatformVersion>14.2</SupportedOSPlatformVersion>
     <IsPackable>false</IsPackable>
+    <!-- Disable multi-RID builds to workaround a parallel build issue -->
+    <RuntimeIdentifier Condition="$(TargetFramework.Contains('-maccatalyst'))">maccatalyst-x64</RuntimeIdentifier>
   </PropertyGroup>
 
   <ItemGroup>

From 4fb5a92ce087462fbd45325afa6d7b8e676d7daf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Su=C3=A1rez?= <javiersuarezruiz@hotmail.com>
Date: Fri, 23 Jun 2023 18:30:49 +0200
Subject: [PATCH 032/105] Fix Android Button issue updating background brush
 type (#15725)

---
 .../Pages/Controls/ButtonPage.xaml            | 10 +++++
 .../Pages/Controls/ButtonPage.xaml.cs         | 43 +++++++++++++++++--
 .../src/Platform/Android/ButtonExtensions.cs  |  9 +---
 3 files changed, 51 insertions(+), 11 deletions(-)

diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/ButtonPage.xaml b/src/Controls/samples/Controls.Sample/Pages/Controls/ButtonPage.xaml
index 897238a8ee38..1957c5036fda 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/ButtonPage.xaml
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/ButtonPage.xaml
@@ -81,6 +81,16 @@
                         </LinearGradientBrush>
                     </Button.Background>
                 </Button>
+                <Label
+                    Text="Changing SolidColorBrush to LinearGradientBrush"
+                    Style="{StaticResource Headline}"/>
+                <Button 
+                    x:Name="ChangeBrushButton"
+                    Text="Background"
+                    CornerRadius="12"
+                    BorderColor="Yellow"
+                    BorderWidth="4"
+                    Clicked="OnChangeBrushButtonClicked"/>
                 <Label
                     Text="TextColor"
                     Style="{StaticResource Headline}"/>
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/ButtonPage.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/Controls/ButtonPage.xaml.cs
index 0bdd5c9db9c5..44a441ace70c 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/ButtonPage.xaml.cs
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/ButtonPage.xaml.cs
@@ -2,16 +2,19 @@
 using System.Windows.Input;
 using Microsoft.Maui;
 using Microsoft.Maui.Controls;
+using Microsoft.Maui.Graphics;
 
 namespace Maui.Controls.Sample.Pages
 {
 	public partial class ButtonPage
 	{
-		int count;
+		int _count;
+		bool _useGradientBrush;
 
 		public ButtonPage()
 		{
 			InitializeComponent();
+			UpdateButtonBrush();
 
 			BindingContext = new ButtonPageViewModel();
 		}
@@ -66,8 +69,8 @@ void OnLineBreakModeButtonClicked(object sender, System.EventArgs e)
 
 		LineBreakMode SelectLineBreakMode()
 		{
-			count++;
-			switch (count)
+			_count++;
+			switch (_count)
 			{
 				case 1:
 					return LineBreakMode.CharacterWrap;
@@ -80,7 +83,7 @@ LineBreakMode SelectLineBreakMode()
 				case 5:
 					return LineBreakMode.TailTruncation;
 				default:
-					count = 0;
+					_count = 0;
 					return LineBreakMode.WordWrap;
 			}
 		}
@@ -92,6 +95,38 @@ void OnBackgroundButtonClicked(object sender, System.EventArgs e)
 			BackgroundButton.Text = $"Background tapped {_backgroundCount} times";
 			_backgroundCount++;
 		}
+
+		void OnChangeBrushButtonClicked(System.Object sender, System.EventArgs e)
+		{
+			UpdateButtonBrush();
+		}
+
+		void UpdateButtonBrush()
+		{
+			var solidColorBrush = new SolidColorBrush(Colors.Red);
+
+			var linearGradientBrush = new LinearGradientBrush
+			{
+				StartPoint = new Point(0, 0),
+				EndPoint = new Point(1, 0),
+				GradientStops = new GradientStopCollection
+				{
+					new GradientStop { Color = Colors.Orange, Offset = 0.2f },
+					new GradientStop { Color = Colors.OrangeRed, Offset = 0.8f }
+				}
+			};
+
+			if (_useGradientBrush)
+			{
+				ChangeBrushButton.Background = linearGradientBrush;
+				_useGradientBrush = false;
+			}
+			else
+			{
+				ChangeBrushButton.Background = solidColorBrush;
+				_useGradientBrush = true;
+			}
+		}
 	}
 
 	public class ButtonPageViewModel : BindableObject
diff --git a/src/Core/src/Platform/Android/ButtonExtensions.cs b/src/Core/src/Platform/Android/ButtonExtensions.cs
index 00c474f4dd93..e466fcd4ea36 100644
--- a/src/Core/src/Platform/Android/ButtonExtensions.cs
+++ b/src/Core/src/Platform/Android/ButtonExtensions.cs
@@ -1,4 +1,4 @@
-using Android.Widget;
+using Android.Widget;
 using Google.Android.Material.Button;
 using Microsoft.Maui.Graphics;
 
@@ -8,12 +8,7 @@ public static class ButtonExtensions
 	{
 		public static void UpdateBackground(this MaterialButton platformView, IButton button)
 		{
-			var background = button.Background;
-
-			if (background is SolidPaint)
-				platformView.UpdateBackground(background);
-			else
-				platformView.UpdateBorderDrawable(button);
+			platformView.UpdateBorderDrawable(button);
 		}
 
 		public static void UpdateStrokeColor(this MaterialButton platformView, IButton button)

From 4558c1f522b98b5480de6bed8b24446f88ee1517 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 Jun 2023 12:53:44 -0500
Subject: [PATCH 033/105] Bump Microsoft.AspNetCore.Components.Web from 7.0.7
 to 7.0.8 (#15823)

* Bump Microsoft.AspNetCore.Components.Web from 7.0.7 to 7.0.8

Bumps [Microsoft.AspNetCore.Components.Web](https://github.com/dotnet/aspnetcore) from 7.0.7 to 7.0.8.
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Changelog](https://github.com/dotnet/aspnetcore/blob/main/docs/ReleasePlanning.md)
- [Commits](https://github.com/dotnet/aspnetcore/compare/v7.0.7...v7.0.8)

---
updated-dependencies:
- dependency-name: Microsoft.AspNetCore.Components.Web
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update Versions.props

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Rui Marinho <me@ruimarinho.net>
---
 eng/Versions.props | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 9a426cecef97..669e20d3f87a 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -26,18 +26,18 @@
     <MicrosoftWindowsSDKBuildToolsPackageVersion>10.0.22621.756</MicrosoftWindowsSDKBuildToolsPackageVersion>
     <MicrosoftGraphicsWin2DPackageVersion>1.0.5.1</MicrosoftGraphicsWin2DPackageVersion>
     <!-- Everything else -->
-    <MicrosoftAspNetCoreAuthorizationPackageVersion>7.0.7</MicrosoftAspNetCoreAuthorizationPackageVersion>
-    <MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>7.0.7</MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>
-    <MicrosoftAspNetCoreAuthorizationPackageVersion>7.0.7</MicrosoftAspNetCoreAuthorizationPackageVersion>
-    <MicrosoftAspNetCoreAuthenticationGooglePackageVersion>7.0.7</MicrosoftAspNetCoreAuthenticationGooglePackageVersion>
-    <MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>7.0.7</MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>
+    <MicrosoftAspNetCoreAuthorizationPackageVersion>7.0.8</MicrosoftAspNetCoreAuthorizationPackageVersion>
+    <MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>7.0.8</MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>
+    <MicrosoftAspNetCoreAuthorizationPackageVersion>7.0.8</MicrosoftAspNetCoreAuthorizationPackageVersion>
+    <MicrosoftAspNetCoreAuthenticationGooglePackageVersion>7.0.8</MicrosoftAspNetCoreAuthenticationGooglePackageVersion>
+    <MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>7.0.8</MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>
     <MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>7.0.1</MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>
     <MicrosoftAspNetCoreComponentsFormsPackageVersion>7.0.1</MicrosoftAspNetCoreComponentsFormsPackageVersion>
     <MicrosoftAspNetCoreComponentsPackageVersion>7.0.1</MicrosoftAspNetCoreComponentsPackageVersion>
-    <MicrosoftAspNetCoreComponentsWebPackageVersion>7.0.7</MicrosoftAspNetCoreComponentsWebPackageVersion>
-    <MicrosoftAspNetCoreComponentsWebViewPackageVersion>7.0.7</MicrosoftAspNetCoreComponentsWebViewPackageVersion>
+    <MicrosoftAspNetCoreComponentsWebPackageVersion>7.0.8</MicrosoftAspNetCoreComponentsWebPackageVersion>
+    <MicrosoftAspNetCoreComponentsWebViewPackageVersion>7.0.8</MicrosoftAspNetCoreComponentsWebViewPackageVersion>
     <MicrosoftAspNetCoreMetadataPackageVersion>7.0.1</MicrosoftAspNetCoreMetadataPackageVersion>
-    <MicrosoftJSInteropPackageVersion>7.0.7</MicrosoftJSInteropPackageVersion>
+    <MicrosoftJSInteropPackageVersion>7.0.8</MicrosoftJSInteropPackageVersion>
     <!-- Other packages -->
     <MicrosoftCodeAnalysisNetAnalyzersVersion>7.0.3</MicrosoftCodeAnalysisNetAnalyzersVersion>
     <MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.3.4</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>

From a8f1c97baf02eb754c63007138148d3b621fbb26 Mon Sep 17 00:00:00 2001
From: Scott Banning <scoban@microsoft.com>
Date: Fri, 23 Jun 2023 15:33:42 -0700
Subject: [PATCH 034/105] Start docs for UITesting

---
 .github/DEVELOPMENT.md   | 12 +++++++
 docs/design/UITesting.md | 76 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 88 insertions(+)
 create mode 100644 docs/design/UITesting.md

diff --git a/.github/DEVELOPMENT.md b/.github/DEVELOPMENT.md
index d6e8fb3bcb22..268ff5b2547d 100644
--- a/.github/DEVELOPMENT.md
+++ b/.github/DEVELOPMENT.md
@@ -55,6 +55,7 @@ Always use main no matter what you are working on or where you are hoping your c
 │   ├── samples
 │   │   ├── Maui.Controls.Sample
 │   │   ├── Maui.Controls.Sample.Sandbox
+│   │   ├── Controls.Sample.UITests
 ├── Essentials 
 │   ├── samples
 │   │   ├── Essentials.Sample
@@ -66,6 +67,7 @@ Always use main no matter what you are working on or where you are hoping your c
 
 - *Maui.Controls.Sample*: Full gallery sample with all of the controls and features of .NET MAUI
 - *Maui.Controls.Sample.Sandbox*: Empty project useful for testing reproductions or use cases
+- *Contols.Sample.UITests*: Sample used for the automated UI tests
 - *Essentials.Sample*: Full gallery demonstrating  the library previously known as essentials. These are all the non UI related MAUI APIs.
 
 ### Device Test Projects
@@ -92,6 +94,16 @@ These are tests that will run on an actual device
 - *Essentials.DeviceTests*: Visual Runner running all the .NET MAUI essentials xunit tests.
 - *MauiBlazorWebView.DeviceTests*: Visual Runner for BlazorWebView tests. 
 
+### UI Test Projects
+
+These are tests used for exercising the UI through accessibility layers to simulate user interactions
+
+```
+├──  Controls
+│    ├── tests
+│    │   ├── UITests
+```
+
 ### Unit Test Projects
 
 These are tests that will not run on a device. This is useful for testing device independent logic.
diff --git a/docs/design/UITesting.md b/docs/design/UITesting.md
new file mode 100644
index 000000000000..721edc1a56b5
--- /dev/null
+++ b/docs/design/UITesting.md
@@ -0,0 +1,76 @@
+UI Testing
+===
+
+# Introduction
+
+Currently we are using [Appium](https://appium.io/docs/en/2.0/) to facilitate UI automation for Windows, Catalyst, iOS, and Android.
+Appium relies on different implementations called `drivers` for each platform that have different behaviors/functions.
+* Windows   - [WinAppDriver](https://github.com/appium/appium-windows-driver)
+* Catalyst  - [mac2](https://github.com/appium/appium-mac2-driver)
+* iOS       - [XCUITest](https://github.com/appium/appium-xcuitest-driver)
+* Android   - [UIAutomator2](https://github.com/appium/appium-uiautomator2-driver)
+
+## Creating a new test
+
+### The sample project
+
+The project that is used for UI Tests is located here: `src\Controls\samples\Controls.Sample.UITests\Controls.Sample.UITests.csproj`
+
+### Adding a GalleryPage
+
+Each test will need to have some UI to test against, we have some base classes you can derive from to make setting this up easier: [CoreGalleryPage](https://github.com/dotnet/maui/blob/main/src/Controls/samples/Controls.Sample.UITests/CoreViews/CoreGalleryPage.cs) and [ContentViewGalleryPage](https://github.com/dotnet/maui/blob/main/src/Controls/samples/Controls.Sample.UITests/Elements/ContentViewGalleryPage.cs)
+
+All controls you intend to interact with need to set the 'AutomationId' property as this will be what you use to query for the element.
+
+Once you have created your GalleryPage, add it to [CorePageView](https://github.com/dotnet/maui/blob/5419846b1f20bdab1b5ce1dff40287edc5c38f12/src/Controls/samples/Controls.Sample.UITests/CoreViews/CorePageView.cs#L45C41-L45C41) so that it will show up on the main page at launch.
+
+### Adding the test
+
+The project that hosts the tests is located here: `src\Controls\tests\UITests\Controls.AppiumTests.csproj`
+
+This project is using [NUnit](https://nunit.org/)
+
+All tests should derive from `UITestBase` and should override `FixtureSetup/FixtureTeardown` to navigate to the specific UI you want to test and navigate back when finished.
+
+```
+protected override void FixtureSetup()
+{
+    base.FixtureSetup();
+    App.NavigateToGallery(DragAndDropGallery);
+}
+```
+
+```
+protected override void FixtureTeardown()
+{
+    base.FixtureTeardown();
+    App.NavigateBack();
+}
+```
+
+The test will have access to gestures/interactions through the `App` property.
+
+```
+App.WaitForElement("btnLogin");
+App.EnterText("entryUsername", "user@email.com");
+App.EnterText("entryPassword", "Password");
+
+App.Tap("btnLogin");
+var lblStatus = App.WaitForElement("lblStatus").FirstOrDefault();
+var text = lblStatus?.Text;
+
+Assert.IsNotNull(text);
+Assert.IsTrue(text.StartsWith("Logging in", StringComparison.CurrentCulture));
+```
+
+## Running tests
+
+Please see the [wiki](https://github.com/dotnet/maui/wiki/UITests) for setting up/running tests.
+
+
+## Adding new functionality
+
+We are implementing the IApp interface from Xamarin UITests, the implementation of which is [here](https://github.com/dotnet/maui/blob/main/src/TestUtils/src/TestUtils.Appium.UITests/AppiumUITestApp.cs).
+
+## Known Issues
+- iOS doesn't support nested accessibility elements which will make some elements unreachable
\ No newline at end of file

From c3ee7d1b7b10cfb8451313afb2263e295e696ec0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Su=C3=A1rez?= <javiersuarezruiz@hotmail.com>
Date: Mon, 26 Jun 2023 01:30:36 +0200
Subject: [PATCH 035/105] Add SwipeItems to LogicalChildren  (#13864)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add SwipeItems to LogicalChildren

* Updated impl

* Auto-format source code

* Added Device Test

* More changes

* Allow the added test to run also on iOS

* Updated Impl

---------

Co-authored-by: GitHub Actions Autoformatter <autoformat@example.com>
Co-authored-by: Javier Suárez <6755973+jsuarezruiz@users.noreply.github.com>
---
 .../OpenCloseSwipeGallery.cs                  |  7 +-
 src/Controls/src/Core/SwipeView/SwipeView.cs  | 78 ++++++++++++++++++-
 .../SwipeView/SwipeViewTests.Android.cs       |  9 +++
 .../Elements/SwipeView/SwipeViewTests.cs      | 49 ++++++++++++
 .../Elements/SwipeView/SwipeViewTests.iOS.cs  | 24 ++++++
 .../src/Platform/Android/MauiSwipeView.cs     |  2 +
 src/Core/src/Platform/iOS/MauiSwipeView.cs    |  8 +-
 7 files changed, 169 insertions(+), 8 deletions(-)
 create mode 100644 src/Controls/tests/DeviceTests/Elements/SwipeView/SwipeViewTests.iOS.cs

diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/SwipeViewGalleries/OpenCloseSwipeGallery.cs b/src/Controls/samples/Controls.Sample/Pages/Controls/SwipeViewGalleries/OpenCloseSwipeGallery.cs
index ba12f2c16564..d859066dae1b 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/SwipeViewGalleries/OpenCloseSwipeGallery.cs
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/SwipeViewGalleries/OpenCloseSwipeGallery.cs
@@ -1,4 +1,5 @@
-using Microsoft.Maui;
+using System.Diagnostics;
+using Microsoft.Maui;
 using Microsoft.Maui.Controls;
 using Microsoft.Maui.Graphics;
 
@@ -146,6 +147,8 @@ public OpenCloseSwipeGallery()
 				bool animated = animatedCheckBox.IsChecked;
 				swipeView1.Open(OpenSwipeItem.LeftItems, animated);
 				swipeView2.Open(OpenSwipeItem.LeftItems, animated);
+
+				Debug.WriteLine($"swipeView1 IsOpen:{((ISwipeView)swipeView1).IsOpen}, swipeView2 IsOpen:{((ISwipeView)swipeView2).IsOpen}");
 			};
 
 			closeButton.Clicked += (sender, e) =>
@@ -153,6 +156,8 @@ public OpenCloseSwipeGallery()
 				bool animated = animatedCheckBox.IsChecked;
 				swipeView1.Close(animated);
 				swipeView2.Close(animated);
+
+				Debug.WriteLine($"swipeView1 IsOpen:{((ISwipeView)swipeView1).IsOpen}, swipeView2 IsOpen:{((ISwipeView)swipeView2).IsOpen}");
 			};
 		}
 	}
diff --git a/src/Controls/src/Core/SwipeView/SwipeView.cs b/src/Controls/src/Core/SwipeView/SwipeView.cs
index a51d1315796b..c21572abe188 100644
--- a/src/Controls/src/Core/SwipeView/SwipeView.cs
+++ b/src/Controls/src/Core/SwipeView/SwipeView.cs
@@ -11,6 +11,11 @@ public partial class SwipeView : ContentView, IElementConfiguration<SwipeView>,
 	{
 		readonly Lazy<PlatformConfigurationRegistry<SwipeView>> _platformConfigurationRegistry;
 
+		readonly List<ISwipeItem> _swipeItems = new List<ISwipeItem>();
+
+		private protected override IList<Element> LogicalChildrenInternalBackingStore	
+			=> new CastingList<Element, ISwipeItem>(_swipeItems);
+
 		/// <include file="../../docs/Microsoft.Maui.Controls/SwipeView.xml" path="//Member[@MemberName='.ctor']/Docs/*" />
 		public SwipeView()
 		{
@@ -212,11 +217,13 @@ void UpdateSwipeItemsParent(SwipeItems swipeItems)
 		}
 
 #nullable enable
+		const float SwipeMinimumDelta = 10f;
+
 		bool _isOpen;
 		double _previousScrollX;
 		double _previousScrollY;
 		View? _scrollParent;
-		const float SwipeMinimumDelta = 10f;
+		SwipeDirection? _swipeDirection;
 
 		ISwipeItems ISwipeView.LeftItems => new HandlerSwipeItems(LeftItems);
 
@@ -231,8 +238,12 @@ bool ISwipeView.IsOpen
 			get => _isOpen;
 			set
 			{
-				_isOpen = value;
-				Handler?.UpdateValue(nameof(ISwipeView.IsOpen));
+				if (_isOpen != value)
+				{
+					_isOpen = value;
+					UpdateLogicalChildren();
+					Handler?.UpdateValue(nameof(ISwipeView.IsOpen));
+				}
 			}
 		}
 
@@ -347,6 +358,7 @@ void OnParentScrolled(object? sender, ItemsViewScrolledEventArgs e)
 
 		void ISwipeView.SwipeStarted(SwipeViewSwipeStarted swipeStarted)
 		{
+			_swipeDirection = swipeStarted.SwipeDirection;
 			var swipeStartedEventArgs = new SwipeStartedEventArgs(swipeStarted.SwipeDirection);
 			((ISwipeViewController)this).SendSwipeStarted(swipeStartedEventArgs);
 		}
@@ -359,12 +371,32 @@ void ISwipeView.SwipeChanging(SwipeViewSwipeChanging swipeChanging)
 
 		void ISwipeView.SwipeEnded(SwipeViewSwipeEnded swipeEnded)
 		{
+			_swipeDirection = swipeEnded.SwipeDirection;
 			var swipeEndedEventArgs = new SwipeEndedEventArgs(swipeEnded.SwipeDirection, swipeEnded.IsOpen);
 			((ISwipeViewController)this).SendSwipeEnded(swipeEndedEventArgs);
 		}
 
 		void ISwipeView.RequestOpen(SwipeViewOpenRequest swipeOpenRequest)
 		{
+			switch (swipeOpenRequest.OpenSwipeItem)
+			{
+				case OpenSwipeItem.LeftItems:
+					_swipeDirection = SwipeDirection.Right;
+					break;
+				case OpenSwipeItem.TopItems:
+					_swipeDirection = SwipeDirection.Down;
+					break;
+				case OpenSwipeItem.RightItems:
+					_swipeDirection = SwipeDirection.Left;
+					break;
+				case OpenSwipeItem.BottomItems:
+					_swipeDirection = SwipeDirection.Up;
+					break;
+				default:
+					_swipeDirection = null;
+					break;
+			}
+
 			Handler?.Invoke(nameof(ISwipeView.RequestOpen), swipeOpenRequest);
 		}
 
@@ -373,6 +405,46 @@ void ISwipeView.RequestClose(SwipeViewCloseRequest swipeCloseRequest)
 			Handler?.Invoke(nameof(ISwipeView.RequestClose), swipeCloseRequest);
 		}
 
+		void UpdateLogicalChildren()
+		{
+			if (!_isOpen)
+			{
+				ClearLogicalChildren();
+				return;
+			}
+
+			var swipeItems = GetSwipeItemsByDirection(_swipeDirection);
+
+			if (swipeItems is null)
+				return;
+
+			foreach (var swipeItem in swipeItems)
+				AddLogicalChildInternal((Element)swipeItem);
+		}
+
+		SwipeItems? GetSwipeItemsByDirection(SwipeDirection? swipeDirection)
+		{
+			SwipeItems? swipeItems = null;
+
+			switch (swipeDirection)
+			{
+				case SwipeDirection.Left:
+					swipeItems = RightItems;
+					break;
+				case SwipeDirection.Right:
+					swipeItems = LeftItems;
+					break;
+				case SwipeDirection.Up:
+					swipeItems = BottomItems;
+					break;
+				case SwipeDirection.Down:
+					swipeItems = TopItems;
+					break;
+			}
+
+			return swipeItems;
+		}
+
 		class HandlerSwipeItems : List<Maui.ISwipeItem>, ISwipeItems
 		{
 			readonly SwipeItems _swipeItems;
diff --git a/src/Controls/tests/DeviceTests/Elements/SwipeView/SwipeViewTests.Android.cs b/src/Controls/tests/DeviceTests/Elements/SwipeView/SwipeViewTests.Android.cs
index 38f5ddc525ab..9006a022a5ff 100644
--- a/src/Controls/tests/DeviceTests/Elements/SwipeView/SwipeViewTests.Android.cs
+++ b/src/Controls/tests/DeviceTests/Elements/SwipeView/SwipeViewTests.Android.cs
@@ -68,5 +68,14 @@ await AttachAndRun(swipeView, async (handler) =>
 				Assert.NotEqual(0, swipeItem.Width);
 			});
 		}
+
+		MauiSwipeView GetPlatformControl(SwipeViewHandler handler) =>
+			handler.PlatformView;
+
+		Task<bool> HasChildren(SwipeViewHandler handler)
+		{
+			return InvokeOnMainThreadAsync(()
+				=> GetPlatformControl(handler).ChildCount != 0);
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/tests/DeviceTests/Elements/SwipeView/SwipeViewTests.cs b/src/Controls/tests/DeviceTests/Elements/SwipeView/SwipeViewTests.cs
index d068bf43c07d..f9bb54589dc7 100644
--- a/src/Controls/tests/DeviceTests/Elements/SwipeView/SwipeViewTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/SwipeView/SwipeViewTests.cs
@@ -1,7 +1,10 @@
 using System;
+using System.Threading.Tasks;
 using Microsoft.Maui.Controls;
+using Microsoft.Maui.Graphics;
 using Microsoft.Maui.Handlers;
 using Microsoft.Maui.Hosting;
+using Xunit;
 
 namespace Microsoft.Maui.DeviceTests
 {
@@ -23,5 +26,51 @@ void SetupBuilder()
 				});
 			});
 		}
+
+#if !WINDOWS
+		[Fact(DisplayName = "SwipeView LogicalChildren Works Correctly")]
+		public async Task SwipeViewLogicalChildren()
+		{
+			SetupBuilder();
+
+			var content = new Grid
+			{
+				HeightRequest = 60,
+				Background = new SolidPaint(Colors.White)
+			};
+
+			var swipeItem = new SwipeItem
+			{
+				BackgroundColor = Colors.Red,
+			};
+
+			var swipeItems = new SwipeItems
+				{
+					swipeItem
+				};
+
+			var swipeView = new SwipeView()
+			{
+				LeftItems = swipeItems,
+				Content = content
+			};
+
+			await InvokeOnMainThreadAsync(async () =>
+			{
+				var swipeViewHandler = CreateHandler<SwipeViewHandler>(swipeView);
+				await swipeViewHandler.PlatformView.AttachAndRun(async () =>
+				{
+					bool hasChildren = await HasChildren(swipeViewHandler);
+					Assert.True(hasChildren);
+
+					swipeView.Open(OpenSwipeItem.LeftItems, false);
+#pragma warning disable CS0618 // Type or member is obsolete
+					var logicalChildrenCount = swipeView.LogicalChildren.Count;
+#pragma warning restore CS0618 // Type or member is obsolete
+					Assert.Equal(1, logicalChildrenCount);
+				});
+			});
+		}
+#endif
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/tests/DeviceTests/Elements/SwipeView/SwipeViewTests.iOS.cs b/src/Controls/tests/DeviceTests/Elements/SwipeView/SwipeViewTests.iOS.cs
new file mode 100644
index 000000000000..e6dba6c2cbf0
--- /dev/null
+++ b/src/Controls/tests/DeviceTests/Elements/SwipeView/SwipeViewTests.iOS.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Handlers;
+using Microsoft.Maui.Platform;
+using Xunit;
+
+namespace Microsoft.Maui.DeviceTests
+{
+	[Category(TestCategory.SwipeView)]
+	public partial class SwipeViewTests : ControlsHandlerTestBase
+	{
+		MauiSwipeView GetPlatformControl(SwipeViewHandler handler) =>
+			handler.PlatformView;
+
+		Task<bool> HasChildren(SwipeViewHandler handler)
+		{
+			return InvokeOnMainThreadAsync(()
+				=> GetPlatformControl(handler).Subviews.Length != 0);
+		}
+	}
+}
+
diff --git a/src/Core/src/Platform/Android/MauiSwipeView.cs b/src/Core/src/Platform/Android/MauiSwipeView.cs
index 147c67adb82e..5679a06efeae 100644
--- a/src/Core/src/Platform/Android/MauiSwipeView.cs
+++ b/src/Core/src/Platform/Android/MauiSwipeView.cs
@@ -1314,6 +1314,7 @@ internal void OnOpenRequested(SwipeViewOpenRequest e)
 			var openSwipeItem = e.OpenSwipeItem;
 			var animated = e.Animated;
 
+			UpdateIsOpen(true);
 			ProgrammaticallyOpenSwipeItem(openSwipeItem, animated);
 		}
 
@@ -1387,6 +1388,7 @@ internal void OnCloseRequested(SwipeViewCloseRequest e)
 		{
 			var animated = e.Animated;
 
+			UpdateIsOpen(false);
 			ResetSwipe(animated);
 		}
 
diff --git a/src/Core/src/Platform/iOS/MauiSwipeView.cs b/src/Core/src/Platform/iOS/MauiSwipeView.cs
index 0e254fb0ce51..c883b2e8ca89 100644
--- a/src/Core/src/Platform/iOS/MauiSwipeView.cs
+++ b/src/Core/src/Platform/iOS/MauiSwipeView.cs
@@ -1102,11 +1102,9 @@ void UpdateIsOpen(bool isOpen)
 			if (Element == null)
 				return;
 
-			Element.IsOpen = true;
+			Element.IsOpen = isOpen;
 		}
 
-
-
 		internal void ProgrammaticallyOpenSwipeItem(OpenSwipeItem openSwipeItem, bool animated)
 		{
 			if (_isOpen)
@@ -1137,9 +1135,11 @@ internal void ProgrammaticallyOpenSwipeItem(OpenSwipeItem openSwipeItem, bool an
 
 			var swipeItems = GetSwipeItemsByDirection();
 
-			if (swipeItems == null || swipeItems.Where(s => GetIsVisible(s)).Count() == 0)
+			if (swipeItems is null || !swipeItems.Any(GetIsVisible))
 				return;
 
+			UpdateIsOpen(true);
+
 			var swipeThreshold = GetSwipeThreshold();
 			UpdateOffset(swipeThreshold);
 

From 4aaa10e9cb53bdca68abbb44abf96bfc50fa044a Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 26 Jun 2023 11:54:53 +0200
Subject: [PATCH 036/105] [create-pull-request] automated change (#15845)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 src/Controls/src/Core/SwipeView/SwipeView.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Controls/src/Core/SwipeView/SwipeView.cs b/src/Controls/src/Core/SwipeView/SwipeView.cs
index c21572abe188..f195e88f6edb 100644
--- a/src/Controls/src/Core/SwipeView/SwipeView.cs
+++ b/src/Controls/src/Core/SwipeView/SwipeView.cs
@@ -13,7 +13,7 @@ public partial class SwipeView : ContentView, IElementConfiguration<SwipeView>,
 
 		readonly List<ISwipeItem> _swipeItems = new List<ISwipeItem>();
 
-		private protected override IList<Element> LogicalChildrenInternalBackingStore	
+		private protected override IList<Element> LogicalChildrenInternalBackingStore
 			=> new CastingList<Element, ISwipeItem>(_swipeItems);
 
 		/// <include file="../../docs/Microsoft.Maui.Controls/SwipeView.xml" path="//Member[@MemberName='.ctor']/Docs/*" />

From f5e1e741bec20707f91eefa096fa388e0e164340 Mon Sep 17 00:00:00 2001
From: Gerald Versluis <gerald.versluis@microsoft.com>
Date: Mon, 26 Jun 2023 16:21:15 +0200
Subject: [PATCH 037/105] Split daily code formatting check in 2: .NET 7 branch
 and main branch (#15791)

* Update and rename dotnet-format-daily.yml to dotnet-format-daily-net7.yml

* Create dotnet-format-daily-main.yml

* Update dotnet-format-daily-main.yml

* Update dotnet-format-daily-net7.yml
---
 .../workflows/dotnet-format-daily-main.yml    | 49 +++++++++++++++++++
 ...daily.yml => dotnet-format-daily-net7.yml} |  3 +-
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/dotnet-format-daily-main.yml
 rename .github/workflows/{dotnet-format-daily.yml => dotnet-format-daily-net7.yml} (97%)

diff --git a/.github/workflows/dotnet-format-daily-main.yml b/.github/workflows/dotnet-format-daily-main.yml
new file mode 100644
index 000000000000..70074015c77b
--- /dev/null
+++ b/.github/workflows/dotnet-format-daily-main.yml
@@ -0,0 +1,49 @@
+name: Daily code format check
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: 0 0 * * * # Every day at midnight (UTC)
+
+permissions:
+  pull-requests: write
+  contents: write
+
+jobs:
+  dotnet-format:
+    runs-on: windows-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v2
+        with:
+          ref: main
+
+      - name: Setup .NET Core SDK
+        uses: actions/setup-dotnet@v3.2.0
+        with:
+          dotnet-version: 8.x
+
+      - name: Run dotnet format
+        run: dotnet format .\Microsoft.Maui.sln --no-restore --exclude Templates/src BlazorWebView/src/SharedSource/BlazorWebViewDeveloperTools.cs BlazorWebView/src/SharedSource/BlazorWebViewServiceCollectionExtensions.cs Graphics/src/Graphics.Win2D/W2DCanvas.cs Graphics/src/Graphics.Win2D/W2DExtensions.cs
+    
+      - name: Commit files
+        if: steps.format.outputs.has-changes == 'true'
+        run: |
+          git config --local user.name "github-actions[bot]"
+          git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git commit -a -m 'Automated dotnet-format update'
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v3
+        with:
+          title: '[housekeeping] Automated PR to fix formatting errors'
+          body: |
+            Automated PR to fix formatting errors
+          committer: GitHub <noreply@github.com>
+          author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
+          labels: |
+            t/housekeeping ♻︎
+            area/infrastructure 🏗️
+          assignees: rmarinho, jsuarezruiz
+          reviewers: rmarinho, jsuarezruiz
+          branch: housekeeping/fix-codeformatting
+          base: main
diff --git a/.github/workflows/dotnet-format-daily.yml b/.github/workflows/dotnet-format-daily-net7.yml
similarity index 97%
rename from .github/workflows/dotnet-format-daily.yml
rename to .github/workflows/dotnet-format-daily-net7.yml
index 825a0e43d66d..abf35818ad2d 100644
--- a/.github/workflows/dotnet-format-daily.yml
+++ b/.github/workflows/dotnet-format-daily-net7.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v2
         with:
-          ref: ${{ github.head_ref }}
+          ref: net7.0
 
       - name: Setup .NET Core SDK
         uses: actions/setup-dotnet@v3.2.0
@@ -46,3 +46,4 @@ jobs:
           assignees: rmarinho, jsuarezruiz
           reviewers: rmarinho, jsuarezruiz
           branch: housekeeping/fix-codeformatting
+          base: net7.0

From a0be7fa75fb0921574b4520143766cbc7e34ca28 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 26 Jun 2023 18:19:43 +0100
Subject: [PATCH 038/105] Update dependencies from
 https://github.com/dotnet/xharness build 20230621.2 (#15857)

Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit
 From Version 8.0.0-prerelease.23312.1 -> To Version 8.0.0-prerelease.23321.2

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---
 .config/dotnet-tools.json |  2 +-
 eng/Version.Details.xml   | 12 ++++++------
 eng/Versions.props        |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 41d23caf22bb..ad569dc71932 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -15,7 +15,7 @@
       ]
     },
     "microsoft.dotnet.xharness.cli": {
-      "version": "8.0.0-prerelease.23312.1",
+      "version": "8.0.0-prerelease.23321.2",
       "commands": [
         "xharness"
       ]
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 4862f2ffa0ab..9de10900441d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -51,17 +51,17 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>3f4da9ced34942d83054e647f3b1d9d7dde281e8</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.23312.1">
+    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.23321.2">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>5dabb78620cf157a43de27e8d1b84786eb1baabc</Sha>
+      <Sha>d59c983920609fddd0d378921e36388c3bae8d00</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="8.0.0-prerelease.23312.1">
+    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="8.0.0-prerelease.23321.2">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>5dabb78620cf157a43de27e8d1b84786eb1baabc</Sha>
+      <Sha>d59c983920609fddd0d378921e36388c3bae8d00</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.23312.1">
+    <Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.23321.2">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>5dabb78620cf157a43de27e8d1b84786eb1baabc</Sha>
+      <Sha>d59c983920609fddd0d378921e36388c3bae8d00</Sha>
     </Dependency>
   </ProductDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 669e20d3f87a..5618f02080e8 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -69,9 +69,9 @@
     <_HarfBuzzSharpVersion>2.8.2.2</_HarfBuzzSharpVersion>
     <_SkiaSharpNativeAssetsVersion>0.0.0-commit.193b587552cb0ed39372a049d7e6c692db98c267.483</_SkiaSharpNativeAssetsVersion>
     <MicrosoftTemplateEngineTasksVersion>7.0.100-preview.5.22226.1</MicrosoftTemplateEngineTasksVersion>
-    <MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.23312.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
-    <MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.23312.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
-    <MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.23312.1</MicrosoftDotNetXHarnessCLIVersion>
+    <MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.23321.2</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
+    <MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.23321.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
+    <MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.23321.2</MicrosoftDotNetXHarnessCLIVersion>
     <TizenUIExtensionsVersion>0.9.0</TizenUIExtensionsVersion>
     <SvgSkiaPackageVersion>0.5.13</SvgSkiaPackageVersion>
     <FizzlerPackageVersion>1.2.0</FizzlerPackageVersion>

From 6e539092b0d3006e44a4dfb9751612f43eb678af Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Mon, 26 Jun 2023 21:23:39 +0200
Subject: [PATCH 039/105] Skip the compatibility warning (#15854)

---
 .../Microsoft.Maui.Sdk/Sdk/BundledVersions.in.targets     | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/Workload/Microsoft.Maui.Sdk/Sdk/BundledVersions.in.targets b/src/Workload/Microsoft.Maui.Sdk/Sdk/BundledVersions.in.targets
index fb4d86245019..a23055420e8a 100644
--- a/src/Workload/Microsoft.Maui.Sdk/Sdk/BundledVersions.in.targets
+++ b/src/Workload/Microsoft.Maui.Sdk/Sdk/BundledVersions.in.targets
@@ -69,17 +69,11 @@
       <_MauiValidateRefsInfix> does not automatically include NuGet package references in your project.  Update your project by including this item:  &lt;PackageReference Include=&quot;</_MauiValidateRefsInfix>
       <!-- Microsoft.Maui.Controls -->
       <_MauiValidateRefsSuffix>&quot; Version=&quot;$(MauiVersion)&quot; /&gt;.  You can skip this warning by setting  &lt;SkipValidateMauiImplicitPackageReferences&gt;true&lt;/SkipValidateMauiImplicitPackageReferences&gt;  in your project file.</_MauiValidateRefsSuffix>
-      <_MauiValidateRefsCompatInfix>&quot; Version=&quot;$(MauiVersion)&quot; /&gt;.  If you also want to make use of some of the Xamarin.Forms compatibility types, you can also include this item:  &lt;PackageReference Include=&quot;</_MauiValidateRefsCompatInfix>
     </PropertyGroup>
 
     <Warning
       Code="MA002"
-      Condition="'$(UseMaui)' == 'true' and '$(UseMauiCompat)' != 'false'"
-      Text="$(_MauiValidateRefsPrefix) &lt;UseMaui&gt;true&lt;/UseMaui&gt; $(_MauiValidateRefsInfix)Microsoft.Maui.Controls$(_MauiValidateRefsCompatInfix)Microsoft.Maui.Controls.Compatibility$(_MauiValidateRefsSuffix)" />
-
-    <Warning
-      Code="MA002"
-      Condition="'$(UseMaui)' == 'true' and '$(UseMauiCompat)' == 'false'"
+      Condition="'$(UseMaui)' == 'true'"
       Text="$(_MauiValidateRefsPrefix) &lt;UseMaui&gt;true&lt;/UseMaui&gt; $(_MauiValidateRefsInfix)Microsoft.Maui.Controls$(_MauiValidateRefsSuffix)" />
 
     <Warning

From 3222dc0974ad16e9898fce1729b28bd7375fb254 Mon Sep 17 00:00:00 2001
From: Rui Marinho <me@ruimarinho.net>
Date: Mon, 26 Jun 2023 21:48:28 +0100
Subject: [PATCH 040/105] [uitests] Fix uitests pipelines triggers for
 Compatibility tests (#15830)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [uitests] Option to run Compatibility uitests

* Missing -

* [uitests] Set variable on the correct place

* Increase timeout for UITests

* Ignore a couple of more tests

* Ignore a couple of more tests

* [uitests] Skip TabbedPage tests

* Ignore more TabbedPageTests
---
 eng/pipelines/common/ui-tests.yml             | 142 +++++++++---------
 eng/pipelines/ui-tests.yml                    |  28 +---
 .../src/Issues.Shared/Bugzilla31366.cs        |   2 +
 .../src/Issues.Shared/Issue1975.cs            |   2 +
 .../src/Issues.Shared/Issue4597.cs            |  11 +-
 .../src/Issues.Shared/SwipeBackNavCrash.cs    |   3 +
 .../src/Issues.Shared/TabbedPageTests.cs      |   3 +
 .../src/Issues.Shared/TabbedPageWithList.cs   |   2 +
 8 files changed, 99 insertions(+), 94 deletions(-)

diff --git a/eng/pipelines/common/ui-tests.yml b/eng/pipelines/common/ui-tests.yml
index 6207766dce86..0a206145abd0 100644
--- a/eng/pipelines/common/ui-tests.yml
+++ b/eng/pipelines/common/ui-tests.yml
@@ -9,6 +9,7 @@ parameters:
   iosVersions: [ 'latest' ]
   provisionatorChannel: 'latest'
   agentPoolAccessToken: ''
+  runCompatibilityTests: false
   projects:
     - name: name
       desc: Human Description
@@ -64,6 +65,7 @@ stages:
           - ${{ each version in parameters.iosVersions }}:
             - ${{ if not(containsValue(project.iosVersionsExclude, version)) }}:
               - job: ios_ui_tests_${{ project.name }}_${{ replace(version, '.', '_') }}
+                timeoutInMinutes: 120 # how long to run the job before automatically cancelling
                 workspace:
                   clean: all
                 displayName: ${{ coalesce(project.desc, project.name) }} (v${{ version }})
@@ -94,6 +96,7 @@ stages:
       - ${{ each project in parameters.projects }}:
         - ${{ if ne(project.winui, '') }}:
               - job: winui_ui_tests_${{ project.name }}
+                timeoutInMinutes: 120 # how long to run the job before automatically cancelling
                 workspace:
                   clean: all
                 displayName: ${{ coalesce(project.desc, project.name) }}
@@ -116,6 +119,7 @@ stages:
       - ${{ each project in parameters.projects }}:
         - ${{ if ne(project.mac, '') }}:
               - job: mac_ui_tests_${{ project.name }}
+                timeoutInMinutes: 120 # how long to run the job before automatically cancelling
                 workspace:
                   clean: all
                 displayName: ${{ coalesce(project.desc, project.name) }}
@@ -133,72 +137,74 @@ stages:
                       provisionatorChannel: ${{ parameters.provisionatorChannel }}
                       agentPoolAccessToken: ${{ parameters.agentPoolAccessToken }}
 
-  - stage: android_compatibility_ui_tests
-    displayName: Android Compatibility UITests
-    dependsOn: []
-    jobs:
-      - ${{ each project in parameters.projects }}:
-        - ${{ if ne(project.android, '') }}:
-          - ${{ each api in parameters.androidApiLevels }}:
-            - ${{ if not(containsValue(project.androidApiLevelsExclude, api)) }}:
-              - job: android_compatibility_ui_tests_${{ project.name }}_${{ api }}
-                timeoutInMinutes: 240
-                workspace:
-                  clean: all
-                displayName: ${{ coalesce(project.desc, project.name) }} (API ${{ api }})
-                pool: ${{ parameters.androidCompatibilityPool }}
-                variables:
-                  ${{ if ge(api, 24) }}:
-                    ANDROID_EMULATORS: "system-images;android-${{ api }};google_apis_playstore;x86"
-                  ${{ if lt(api, 24) }}:
-                    ANDROID_EMULATORS: "system-images;android-${{ api }};google_apis;x86"
-                  REQUIRED_XCODE: $(DEVICETESTS_REQUIRED_XCODE)
-                steps:
-                  - template: ui-tests-compatibility-steps.yml
-                    parameters:
-                      platform: android
-                      provisionPlatform: macos
-                      configuration: Debug
-                      version: ${{ api }}
-                      path: ${{ project.compatibilityAndroidTestProject }}
-                      app: ${{ project.compatibilityAndroidApp }}
-                      targetSample: "dotnet-legacy-controlgallery-android"
-                      device: android-emulator-32_${{ api }}
-                      provisionatorChannel: ${{ parameters.provisionatorChannel }}
-                      agentPoolAccessToken: ${{ parameters.agentPoolAccessToken }}
+  - ${{ if eq(parameters.runCompatibilityTests, true) }}:  
+    - stage: android_compatibility_ui_tests
+      displayName: Android Compatibility UITests
+      dependsOn: []
+      jobs:
+        - ${{ each project in parameters.projects }}:
+          - ${{ if ne(project.android, '') }}:
+            - ${{ each api in parameters.androidApiLevels }}:
+              - ${{ if not(containsValue(project.androidApiLevelsExclude, api)) }}:
+                - job: android_compatibility_ui_tests_${{ project.name }}_${{ api }}
+                  timeoutInMinutes: 240
+                  workspace:
+                    clean: all
+                  displayName: ${{ coalesce(project.desc, project.name) }} (API ${{ api }})
+                  pool: ${{ parameters.androidCompatibilityPool }}
+                  variables:
+                    ${{ if ge(api, 24) }}:
+                      ANDROID_EMULATORS: "system-images;android-${{ api }};google_apis_playstore;x86"
+                    ${{ if lt(api, 24) }}:
+                      ANDROID_EMULATORS: "system-images;android-${{ api }};google_apis;x86"
+                    REQUIRED_XCODE: $(DEVICETESTS_REQUIRED_XCODE)
+                  steps:
+                    - template: ui-tests-compatibility-steps.yml
+                      parameters:
+                        platform: android
+                        provisionPlatform: macos
+                        configuration: Debug
+                        version: ${{ api }}
+                        path: ${{ project.compatibilityAndroidTestProject }}
+                        app: ${{ project.compatibilityAndroidApp }}
+                        targetSample: "dotnet-legacy-controlgallery-android"
+                        device: android-emulator-32_${{ api }}
+                        provisionatorChannel: ${{ parameters.provisionatorChannel }}
+                        agentPoolAccessToken: ${{ parameters.agentPoolAccessToken }}
 
-  - stage: ios_compatibility_ui_tests
-    displayName: iOS Compatibility UITests
-    dependsOn: []
-    jobs:
-      - ${{ each project in parameters.projects }}:
-        - ${{ if ne(project.ios, '') }}:
-          - ${{ each version in parameters.iosVersions }}:
-            - ${{ if not(containsValue(project.iosVersionsExclude, version)) }}:
-              - job: ios_compatibility_ui_tests_${{ project.name }}_${{ replace(version, '.', '_') }}
-                timeoutInMinutes: 240
-                workspace:
-                  clean: all
-                displayName: ${{ coalesce(project.desc, project.name) }} (v${{ version }})
-                pool: ${{ parameters.iosCompatibilityPool }}
-                variables:
-                  REQUIRED_XCODE: $(DEVICETESTS_REQUIRED_XCODE)
-                steps:
-                  - template: ui-tests-compatibility-steps.yml
-                    parameters:
-                      platform: ios
-                      provisionPlatform: macos
-                      configuration: Debug
-                      ${{ if eq(version, 'latest') }}:
-                        version: 16.2
-                      ${{ if ne(version, 'latest') }}:
-                        version: ${{ version }}
-                      path: ${{ project.compatibilityiOSTestProject }}
-                      app: ${{ project.compatibilityiOSApp }}
-                      targetSample: "dotnet-legacy-controlgallery-ios"
-                      ${{ if eq(version, 'latest') }}:
-                        device: ios-simulator-64
-                      ${{ if ne(version, 'latest') }}:
-                        device: ios-simulator-64_${{ version }}
-                      provisionatorChannel: ${{ parameters.provisionatorChannel }}
-                      agentPoolAccessToken: ${{ parameters.agentPoolAccessToken }}
+
+    - stage: ios_compatibility_ui_tests
+      displayName: iOS Compatibility UITests
+      dependsOn: []
+      jobs:
+        - ${{ each project in parameters.projects }}:
+          - ${{ if ne(project.ios, '') }}:
+            - ${{ each version in parameters.iosVersions }}:
+              - ${{ if not(containsValue(project.iosVersionsExclude, version)) }}:
+                - job: ios_compatibility_ui_tests_${{ project.name }}_${{ replace(version, '.', '_') }}
+                  timeoutInMinutes: 240
+                  workspace:
+                    clean: all
+                  displayName: ${{ coalesce(project.desc, project.name) }} (v${{ version }})
+                  pool: ${{ parameters.iosCompatibilityPool }}
+                  variables:
+                    REQUIRED_XCODE: $(DEVICETESTS_REQUIRED_XCODE)
+                  steps:
+                    - template: ui-tests-compatibility-steps.yml
+                      parameters:
+                        platform: ios
+                        provisionPlatform: macos
+                        configuration: Debug
+                        ${{ if eq(version, 'latest') }}:
+                          version: 16.2
+                        ${{ if ne(version, 'latest') }}:
+                          version: ${{ version }}
+                        path: ${{ project.compatibilityiOSTestProject }}
+                        app: ${{ project.compatibilityiOSApp }}
+                        targetSample: "dotnet-legacy-controlgallery-ios"
+                        ${{ if eq(version, 'latest') }}:
+                          device: ios-simulator-64
+                        ${{ if ne(version, 'latest') }}:
+                          device: ios-simulator-64_${{ version }}
+                        provisionatorChannel: ${{ parameters.provisionatorChannel }}
+                        agentPoolAccessToken: ${{ parameters.agentPoolAccessToken }}
diff --git a/eng/pipelines/ui-tests.yml b/eng/pipelines/ui-tests.yml
index 7dfe455b79d4..1268d194e616 100644
--- a/eng/pipelines/ui-tests.yml
+++ b/eng/pipelines/ui-tests.yml
@@ -57,6 +57,10 @@ parameters:
     type: boolean
     default: false
 
+  - name: CompatibilityTests
+    type: boolean
+    default: false
+
   - name: androidPool
     type: object
     default:
@@ -135,23 +139,9 @@ stages:
         # androidApiLevels: [ 30, 21 ] # fix the issue of getting the test results off
         iosVersions: [ 'latest' ]
         provisionatorChannel: ${{ parameters.provisionatorChannel }}
+      ${{ if or(parameters.CompatibilityTests, ne(variables['Build.Reason'], 'PullRequest')) }}:
+        runCompatibilityTests: true
       projects:
-        # - name: essentials
-        #   desc: Essentials
-        #   androidApiLevelsExclude: [25] # Ignore for now API25 since the runs's are not stable
-        #   android: $(System.DefaultWorkingDirectory)/src/Essentials/test/DeviceTests/Essentials.DeviceTests.csproj
-        #   ios: $(System.DefaultWorkingDirectory)/src/Essentials/test/DeviceTests/Essentials.DeviceTests.csproj
-        # - name: graphics
-        #   desc: Graphics
-        #   androidApiLevelsExclude: [25] # Ignore for now API25 since the runs's are not stable
-        #   android: $(System.DefaultWorkingDirectory)/src/Graphics/tests/DeviceTests/Graphics.DeviceTests.csproj
-        #   ios: $(System.DefaultWorkingDirectory)/src/Graphics/tests/DeviceTests/Graphics.DeviceTests.csproj
-        # - name: core
-        #   desc: Core
-        #   androidApiLevelsExclude: [25] # Ignore for now API25 since the runs's are not stable
-        #   android: $(System.DefaultWorkingDirectory)/src/Core/tests/DeviceTests/Core.DeviceTests.csproj
-        #   iosVersionsExclude: [ '12.4'] # Ignore iOS 12.4 while we can't make it work on CI
-        #   ios: $(System.DefaultWorkingDirectory)/src/Core/tests/DeviceTests/Core.DeviceTests.csproj
         - name: controls
           desc: Controls
           androidApiLevelsExclude: [25] # Ignore for now API25 since the runs's are not stable
@@ -165,10 +155,4 @@ stages:
           compatibilityAndroidTestProject: $(System.DefaultWorkingDirectory)/src/Compatibility/ControlGallery/test/Android.UITests/Compatibility.ControlGallery.Android.UITests.csproj
           compatibilityiOSApp: $(System.DefaultWorkingDirectory)/src/Compatibility/ControlGallery/src/iOS/Compatibility.ControlGallery.iOS.csproj 
           compatibilityiOSTestProject: $(System.DefaultWorkingDirectory)/src/Compatibility/ControlGallery/test/iOS.UITests/Compatibility.ControlGallery.iOS.UITests.csproj
-        # - name: blazorwebview
-        #   desc: BlazorWebView
-        #   androidApiLevelsExclude: [ 27, 26, 25, 24, 23, 22, 21 ] # BlazorWebView requires a recent version of Chrome
-        #   android: $(System.DefaultWorkingDirectory)/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj
-        #   iosVersionsExclude: [ '12.4'] # Ignore iOS 12.4 while we can't make it work on CI
-        #   ios: $(System.DefaultWorkingDirectory)/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj
 
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla31366.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla31366.cs
index 1902e13f04d3..af27d1d8b71b 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla31366.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla31366.cs
@@ -78,6 +78,7 @@ protected override void Init()
 #if UITEST
 		[Test]
 		[UiTest(typeof(NavigationPage))]
+		[Compatibility.UITests.FailsOnMauiIOS]
 		public void Issue31366PushingAndPoppingModallyCausesArgumentOutOfRangeException()
 		{
 			RunningApp.Tap(q => q.Marked("Start PopOnAppearing Test"));
@@ -86,6 +87,7 @@ public void Issue31366PushingAndPoppingModallyCausesArgumentOutOfRangeException(
 
 		[Test]
 		[UiTest(typeof(NavigationPage))]
+		[Compatibility.UITests.FailsOnMauiIOS]
 		public void Issue31366PushingWithModalStackCausesIncorrectStackOrder()
 		{
 			RunningApp.Tap(q => q.Marked("Start ModalStack Test"));
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1975.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1975.cs
index 69a4e7ba5aae..e453156c99be 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1975.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1975.cs
@@ -142,6 +142,8 @@ public SubItem(string text)
 
 #if UITEST
 		[Test]
+		[Compatibility.UITests.FailsOnMauiIOS]
+		[Compatibility.UITests.FailsOnMauiAndroid]
 		public void UpdatingSourceOfDisposedListViewDoesNotCrash()
 		{
 			RunningApp.Tap(Go);
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue4597.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue4597.cs
index ab8bc9d4c019..d4b4716378b1 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue4597.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue4597.cs
@@ -194,6 +194,7 @@ public void ImageFromUriSourceAppearsAndDisappearsCorrectly()
 
 		[Test]
 		[Compatibility.UITests.FailsOnMauiIOS]
+		[Compatibility.UITests.FailsOnMauiAndroid]
 		public void ButtonFromFileSourceAppearsAndDisappearsCorrectly()
 		{
 			RunTest(nameof(Button), true);
@@ -202,6 +203,7 @@ public void ButtonFromFileSourceAppearsAndDisappearsCorrectly()
 		[Test]
 		[NUnit.Framework.Category(UITestCategories.RequiresInternetConnection)]
 		[Compatibility.UITests.FailsOnMauiIOS]
+		[Compatibility.UITests.FailsOnMauiAndroid]
 		public void ButtonFromUriSourceAppearsAndDisappearsCorrectly()
 		{
 			RunTest(nameof(Button), false);
@@ -210,7 +212,7 @@ public void ButtonFromUriSourceAppearsAndDisappearsCorrectly()
 
 		[Test]
 		[Compatibility.UITests.FailsOnMauiIOS]
-		[FailsOnMauiAndroid]
+		[Compatibility.UITests.FailsOnMauiAndroid]
 		public void ImageButtonFromFileSourceAppearsAndDisappearsCorrectly()
 		{
 			RunTest(nameof(ImageButton), true);
@@ -218,7 +220,7 @@ public void ImageButtonFromFileSourceAppearsAndDisappearsCorrectly()
 
 		[Test]
 		[Compatibility.UITests.FailsOnMauiIOS]
-		[FailsOnMauiAndroid]
+		[Compatibility.UITests.FailsOnMauiAndroid]
 		[NUnit.Framework.Category(UITestCategories.RequiresInternetConnection)]
 		public void ImageButtonFromUriSourceAppearsAndDisappearsCorrectly()
 		{
@@ -227,14 +229,15 @@ public void ImageButtonFromUriSourceAppearsAndDisappearsCorrectly()
 
 		[Test]
 		[Compatibility.UITests.FailsOnMauiIOS]
+		[Compatibility.UITests.FailsOnMauiAndroid]
 		public void ImageCellFromFileSourceAppearsAndDisappearsCorrectly()
 		{
 			ImageCellTest(true);
 		}
 
 		[Test]
-		[Microsoft.Maui.Controls.Compatibility.UITests.FailsOnMauiAndroid]
-		[NUnit.Framework.Category(UITestCategories.RequiresInternetConnection)]
+		[Compatibility.UITests.FailsOnMauiIOS]
+		[Compatibility.UITests.FailsOnMauiAndroid]
 		public void ImageCellFromUriSourceAppearsAndDisappearsCorrectly()
 		{
 			ImageCellTest(false);
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/SwipeBackNavCrash.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/SwipeBackNavCrash.cs
index 485985d30be0..6f006c353846 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/SwipeBackNavCrash.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/SwipeBackNavCrash.cs
@@ -31,6 +31,7 @@ protected override void Init()
 
 #if UITEST
 		[Test]
+		[Compatibility.UITests.FailsOnMauiIOS]
 		public void SwipeBackNavCrashTestsAllElementsPresent ()
 		{
 			RunningApp.WaitForElement (q => q.Marked ("Page One"));
@@ -38,6 +39,7 @@ public void SwipeBackNavCrashTestsAllElementsPresent ()
 		}
 
 		[Test]
+		[Compatibility.UITests.FailsOnMauiIOS]
 		public void SwipeBackNavCrashTestsGoToSecondPage () 
 		{
 			RunningApp.WaitForElement (q => q.Marked ("Page One"));
@@ -47,6 +49,7 @@ public void SwipeBackNavCrashTestsGoToSecondPage ()
 
 #if __IOS__
 		[Test]
+		[Compatibility.UITests.FailsOnMauiIOS]
 		public void SwipeBackNavCrashTestsSwipeBackDoesNotCrash ()
 		{
 			RunningApp.WaitForElement (q => q.Marked ("Page One"));
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/TabbedPageTests.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/TabbedPageTests.cs
index 559380df471d..f53274c11ecb 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/TabbedPageTests.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/TabbedPageTests.cs
@@ -36,6 +36,7 @@ protected override void Init()
 
 #if UITEST
 		[Test]
+		[Compatibility.UITests.FailsOnMauiIOS]
 		public void TabbedPageWithModalIssueTestsAllElementsPresent ()
 		{
 			RunningApp.WaitForElement (q => q.Marked ("Page 1"));
@@ -46,6 +47,7 @@ public void TabbedPageWithModalIssueTestsAllElementsPresent ()
 		}
 
 		[Test]
+		[Compatibility.UITests.FailsOnMauiIOS]
 		public void TabbedPageWithModalIssueTestsPopFromFirstTab ()
 		{
 			RunningApp.Tap (q => q.Button ("Pop"));
@@ -55,6 +57,7 @@ public void TabbedPageWithModalIssueTestsPopFromFirstTab ()
 		}
 
 		[Test]
+		[Compatibility.UITests.FailsOnMauiIOS]
 		public void TabbedPageWithModalIssueTestsPopFromSecondTab ()
 		{
 			RunningApp.Tap (q => q.Marked ("Page 2"));
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/TabbedPageWithList.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/TabbedPageWithList.cs
index 2d9fa94afa2d..31b2c5b5014d 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/TabbedPageWithList.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/TabbedPageWithList.cs
@@ -31,6 +31,7 @@ protected override void Init()
 
 #if UITEST
 		[Test]
+		[Compatibility.UITests.FailsOnMauiIOS]
 		public void TabbedPageWithListViewIssueTestsAllElementsPresent ()
 		{
 			RunningApp.WaitForElement (q => q.Marked ("Tab Two"));
@@ -39,6 +40,7 @@ public void TabbedPageWithListViewIssueTestsAllElementsPresent ()
 		}
 
 		[Test]
+		[Compatibility.UITests.FailsOnMauiIOS]
 		public void TabbedPageWithListViewIssueTestsNavigateToAndVerifyListView ()
 		{
 			RunningApp.Tap (q => q.Marked ("List Page"));

From 05697a6b1fc8a068ad537cbf455d2407e22e7e72 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Mon, 26 Jun 2023 16:11:50 -0500
Subject: [PATCH 041/105] [ios] fix memory leak in CollectionView cells
 (#15831)

Context: https://github.com/dotnet/maui/issues/14664
Context: https://github.com/nacompllo/MemoryLeakEverywhere/tree/bugfix/memoryLeakItemsSource

In reviewing our latest changes in main with the above customer sample,
I found that there appeared to be leaks related to MAUI's
`UITableViewCell` subclasses when using `CollectionView`.

I was able to reproduce the issue in a test, such as:

    // DataTemplate saves WeakReference to the View in a list
    collectionView.ItemTemplate = new DataTemplate(() =>
    {
        var label = new Label();
        labels.Add(new(label));
        return label;
    });

    // Create a cell and bind it to the template:
    cell = new VerticalCell(CGRect.Empty);
    cell.Bind(collectionView.ItemTemplate, bindingContext, collectionView);

    // Check we have no leaks
    foreach (var reference in labels)
    {
        Assert.False(reference.IsAlive, "View should not be alive!");
    }

After isolating the issue, I found the issue was the
`TemplatedCell.PlatformHandler` property:

    internal IPlatformViewHandler PlatformHandler { get; private set; }

This stores a copy of the `LabelHandler` in our test/example.

The problem with `UITableViewCell` is that UIKit holds onto these and
reuses them. This means that UIKit may keep the `LabelHandler` alive
longer than needed.

It also appears to be a somewhat complex circular reference:

* `CollectionView` -> handlers / etc. -> `TemplatedCell` -> `LabelHandler` -> `Label` -> `CollectionView`

I made the `PlatformHandler` use a `WeakReference` as its backing
field and the problem goes away!

I will retest #14664 to verify if it is fully solved.
---
 .../Core/Handlers/Items/iOS/TemplatedCell.cs  |  8 +++-
 .../CollectionView/CollectionViewTests.iOS.cs | 44 ++++++++++++++++++-
 2 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/src/Controls/src/Core/Handlers/Items/iOS/TemplatedCell.cs b/src/Controls/src/Core/Handlers/Items/iOS/TemplatedCell.cs
index 96439b771914..857aa1fb8794 100644
--- a/src/Controls/src/Core/Handlers/Items/iOS/TemplatedCell.cs
+++ b/src/Controls/src/Core/Handlers/Items/iOS/TemplatedCell.cs
@@ -33,7 +33,13 @@ protected TemplatedCell(CGRect frame) : base(frame)
 		{
 		}
 
-		internal IPlatformViewHandler PlatformHandler { get; private set; }
+		WeakReference<IPlatformViewHandler> _handler;
+
+		internal IPlatformViewHandler PlatformHandler
+		{
+			get => _handler is not null && _handler.TryGetTarget(out var h) ? h : null;
+			set => _handler = value == null ? null : new(value);
+		}
 
 		public override void ConstrainTo(CGSize constraint)
 		{
diff --git a/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.iOS.cs b/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.iOS.cs
index 56803d743e14..28bb7715aca6 100644
--- a/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.iOS.cs
+++ b/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.iOS.cs
@@ -1,4 +1,4 @@
-using System.Collections;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Reflection;
@@ -90,5 +90,47 @@ await CreateHandlerAndAddToWindow<CollectionViewHandler>(collectionView, async h
 				Assert.Equal(margin, absPoint.X);
 			});
 		}
+
+		[Fact("Cells Do Not Leak")]
+		public async Task CellsDoNotLeak()
+		{
+			SetupBuilder();
+
+			var labels = new List<WeakReference>();
+			VerticalCell cell = null;
+
+			{
+				var bindingContext = "foo";
+				var collectionView = new CollectionView
+				{
+					ItemTemplate = new DataTemplate(() =>
+					{
+						var label = new Label();
+						labels.Add(new(label));
+						return label;
+					}),
+				};
+
+				var handler = await CreateHandlerAsync(collectionView);
+
+				await InvokeOnMainThreadAsync(() =>
+				{
+					cell = new VerticalCell(CGRect.Empty);
+					cell.Bind(collectionView.ItemTemplate, bindingContext, collectionView);
+				});
+
+				Assert.NotNull(cell);
+				Assert.NotEmpty(labels);
+			}
+
+			await Task.Yield();
+			GC.Collect();
+			GC.WaitForPendingFinalizers();
+
+			foreach (var reference in labels)
+			{
+				Assert.False(reference.IsAlive, "View should not be alive!");
+			}
+		}
 	}
 }
\ No newline at end of file

From ae6a614e138da4cef4861380687e203d998a1780 Mon Sep 17 00:00:00 2001
From: "E.Z. Hart" <hartez@users.noreply.github.com>
Date: Mon, 26 Jun 2023 15:26:14 -0600
Subject: [PATCH 042/105] Correctly identify headers/footers when using
 UngroupedItemsSource (#15688)

Fixes #8934
---
 .../Android/Adapters/EmptyViewAdapter.cs      | 23 ++++++++-----
 .../ItemsSources/UngroupedItemsSource.cs      |  2 +-
 .../CollectionViewTests.Android.cs            | 32 +++++++++++++++++++
 3 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/src/Controls/src/Core/Handlers/Items/Android/Adapters/EmptyViewAdapter.cs b/src/Controls/src/Core/Handlers/Items/Android/Adapters/EmptyViewAdapter.cs
index 9be42c127b27..8820ce1986aa 100644
--- a/src/Controls/src/Core/Handlers/Items/Android/Adapters/EmptyViewAdapter.cs
+++ b/src/Controls/src/Core/Handlers/Items/Android/Adapters/EmptyViewAdapter.cs
@@ -10,12 +10,12 @@ namespace Microsoft.Maui.Controls.Handlers.Items
 {
 	public class EmptyViewAdapter : RecyclerView.Adapter
 	{
-		int _headerHeight;
+		double _headerHeight;
 		int _headerViewType;
 		object _headerView;
 		DataTemplate _headerViewTemplate;
 
-		int _footerHeight;
+		double _footerHeight;
 		int _footerViewType;
 		object _footerView;
 		DataTemplate _footerViewTemplate;
@@ -301,18 +301,25 @@ void UpdateHeaderFooterHeight(object item, bool isHeader)
 			if (item == null)
 				return;
 
-			var sizeRequest = new SizeRequest(new Size(0, 0));
+			var size = Size.Zero;
 
-			if (item is View view)
-				sizeRequest = view.Measure(double.PositiveInfinity, double.PositiveInfinity, MeasureFlags.IncludeMargins);
+			if (item is IView view)
+			{
+				if (view.Handler == null)
+				{
+					TemplateHelpers.GetHandler(view as View, ItemsView.FindMauiContext());
+				}
+
+				size = view.Measure(double.PositiveInfinity, double.PositiveInfinity);
+			}
 
 			if (item is DataTemplate dataTemplate)
 			{
-				var content = dataTemplate.CreateContent() as View;
-				sizeRequest = content.Measure(double.PositiveInfinity, double.PositiveInfinity, MeasureFlags.IncludeMargins);
+				var content = dataTemplate.CreateContent() as IView;
+				size = content.Measure(double.PositiveInfinity, double.PositiveInfinity);
 			}
 
-			var itemHeight = (int)sizeRequest.Request.Height;
+			var itemHeight = size.Height;
 
 			if (isHeader)
 				_headerHeight = itemHeight;
diff --git a/src/Controls/src/Core/Handlers/Items/Android/ItemsSources/UngroupedItemsSource.cs b/src/Controls/src/Core/Handlers/Items/Android/ItemsSources/UngroupedItemsSource.cs
index 829b6beca1a2..ff12b25cda5f 100644
--- a/src/Controls/src/Core/Handlers/Items/Android/ItemsSources/UngroupedItemsSource.cs
+++ b/src/Controls/src/Core/Handlers/Items/Android/ItemsSources/UngroupedItemsSource.cs
@@ -12,7 +12,7 @@ public UngroupedItemsSource(IItemsViewSource source)
 			_source = source;
 		}
 
-		public int Count => _source.Count;
+		public int Count => _source.Count + (HasHeader ? 1 : 0) + (HasFooter ? 1 : 0);
 
 		public bool HasHeader { get => _source.HasHeader; set => _source.HasHeader = value; }
 		public bool HasFooter { get => _source.HasFooter; set => _source.HasFooter = value; }
diff --git a/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.Android.cs b/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.Android.cs
index faf1479a4d5f..1a239eb1622e 100644
--- a/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.Android.cs
+++ b/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.Android.cs
@@ -50,5 +50,37 @@ await CreateHandlerAndAddToWindow<IWindowHandler>(rootPage,
 			// Without Exceptions here, the test has passed.
 			Assert.Equal(0, (rootPage as IPageContainer<Page>).CurrentPage.Navigation.ModalStack.Count);
 		}
+
+		[Fact]
+		public async Task NullItemsSourceDisplaysHeaderFooterAndEmptyView() 
+		{
+			SetupBuilder();
+
+			var emptyView = new Label { Text = "Empty" };
+			var header = new Label { Text = "Header" };
+			var footer = new Label { Text = "Footer" };
+
+			var collectionView = new CollectionView
+			{
+				ItemsSource = null,
+				EmptyView = emptyView,
+				Header = header,
+				Footer = footer
+			};
+
+			ContentPage contentPage = new ContentPage() { Content = collectionView };
+
+			var frame = collectionView.Frame;
+
+			await CreateHandlerAndAddToWindow<IWindowHandler>(contentPage,
+				async (_) =>
+				{
+					await WaitForUIUpdate(frame, collectionView);
+
+					Assert.True(emptyView.Height > 0, "EmptyView is not displayed");
+					Assert.True(header.Height > 0, "Header is not displayed");
+					Assert.True(footer.Height > 0, "Footer is not displayed");
+				});
+		}
 	}
 }
\ No newline at end of file

From 517da936a085156563d392cb9dab94ed8a240a5f Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Mon, 26 Jun 2023 23:27:08 +0200
Subject: [PATCH 043/105] Optimize iOS selection synchronization (#14613)

* Optimize iOS selection synchronization not to use O(n^2) algorithm and to respect GetHashCode/Equals overrides instead of relying on reference equality.

* Fix few more places where reference equality was used instead of object equality.
---
 .../src/Core/Handlers/Items/iOS/ListSource.cs |  2 +-
 .../Items/iOS/ObservableGroupedSource.cs      |  2 +-
 .../Items/iOS/ObservableItemsSource.cs        |  4 ++--
 .../iOS/SelectableItemsViewController.cs      | 22 ++++++-------------
 4 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/src/Controls/src/Core/Handlers/Items/iOS/ListSource.cs b/src/Controls/src/Core/Handlers/Items/iOS/ListSource.cs
index 719b4c0cef50..92715dc81702 100644
--- a/src/Controls/src/Core/Handlers/Items/iOS/ListSource.cs
+++ b/src/Controls/src/Core/Handlers/Items/iOS/ListSource.cs
@@ -76,7 +76,7 @@ public NSIndexPath GetIndexForItem(object item)
 		{
 			for (int n = 0; n < _itemsSource.Count; n++)
 			{
-				if (_itemsSource[n] == item)
+				if (Equals(_itemsSource[n], item))
 				{
 					return NSIndexPath.Create(0, n);
 				}
diff --git a/src/Controls/src/Core/Handlers/Items/iOS/ObservableGroupedSource.cs b/src/Controls/src/Core/Handlers/Items/iOS/ObservableGroupedSource.cs
index ce8b3e249c6c..feba35a2451f 100644
--- a/src/Controls/src/Core/Handlers/Items/iOS/ObservableGroupedSource.cs
+++ b/src/Controls/src/Core/Handlers/Items/iOS/ObservableGroupedSource.cs
@@ -342,7 +342,7 @@ int IndexInGroup(object item, object group)
 					var index = 0;
 					while (enumerator.MoveNext())
 					{
-						if (enumerator.Current == item)
+						if (Equals(enumerator.Current, item))
 						{
 							return index;
 						}
diff --git a/src/Controls/src/Core/Handlers/Items/iOS/ObservableItemsSource.cs b/src/Controls/src/Core/Handlers/Items/iOS/ObservableItemsSource.cs
index fa25e3708c61..6415779de709 100644
--- a/src/Controls/src/Core/Handlers/Items/iOS/ObservableItemsSource.cs
+++ b/src/Controls/src/Core/Handlers/Items/iOS/ObservableItemsSource.cs
@@ -78,7 +78,7 @@ public NSIndexPath GetIndexForItem(object item)
 		{
 			for (int n = 0; n < Count; n++)
 			{
-				if (this[n] == item)
+				if (Equals(this[n], item))
 				{
 					return NSIndexPath.Create(_section, n);
 				}
@@ -281,7 +281,7 @@ internal int IndexOf(object item)
 			int count = 0;
 			foreach (var i in _itemsSource)
 			{
-				if (i == item)
+				if (Equals(i, item))
 					return count;
 				count++;
 			}
diff --git a/src/Controls/src/Core/Handlers/Items/iOS/SelectableItemsViewController.cs b/src/Controls/src/Core/Handlers/Items/iOS/SelectableItemsViewController.cs
index 5bf4f4d89cdb..2a0ff5cdce4f 100644
--- a/src/Controls/src/Core/Handlers/Items/iOS/SelectableItemsViewController.cs
+++ b/src/Controls/src/Core/Handlers/Items/iOS/SelectableItemsViewController.cs
@@ -1,6 +1,7 @@
 #nullable disable
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Foundation;
 using ObjCRuntime;
 using UIKit;
@@ -145,16 +146,20 @@ internal void UpdateSelectionMode()
 
 		void SynchronizePlatformSelectionWithSelectedItems()
 		{
-			var selectedItems = ItemsView.SelectedItems;
+			var selectedItems = ItemsView.SelectedItems.ToHashSet();
 			var selectedIndexPaths = CollectionView.GetIndexPathsForSelectedItems();
 
 			foreach (var path in selectedIndexPaths)
 			{
 				var itemAtPath = GetItemAtIndex(path);
-				if (ShouldNotBeSelected(itemAtPath, selectedItems))
+				if (!selectedItems.Contains(itemAtPath))
 				{
 					CollectionView.DeselectItem(path, true);
 				}
+				else
+				{
+					selectedItems.Remove(itemAtPath);
+				}
 			}
 
 			foreach (var item in selectedItems)
@@ -162,18 +167,5 @@ void SynchronizePlatformSelectionWithSelectedItems()
 				SelectItem(item);
 			}
 		}
-
-		bool ShouldNotBeSelected(object item, IList<object> selectedItems)
-		{
-			for (int n = 0; n < selectedItems.Count; n++)
-			{
-				if (selectedItems[n] == item)
-				{
-					return false;
-				}
-			}
-
-			return true;
-		}
 	}
 }
\ No newline at end of file

From 40194c6cc539a6ed2ac4935257414a02c2f3a0cd Mon Sep 17 00:00:00 2001
From: Mike Corsaro <corsarom@gmail.com>
Date: Mon, 26 Jun 2023 19:27:38 -0700
Subject: [PATCH 044/105] Fixed removing items from the shell causing a crash
 (#15098)

* fix(shell): Fixed removing items from the shell causing a crash

* Auto-format source code

* Use null terminator

* Add device tests

* PR feedback, move test to run on all devices

---------

Co-authored-by: Mike Corsaro <mikecorsaro@microsoft.com>
Co-authored-by: GitHub Actions Autoformatter <autoformat@example.com>
Co-authored-by: Rui Marinho <me@ruimarinho.net>
---
 .../Core/Handlers/Shell/Windows/ShellView.cs  | 11 ++--
 src/Controls/src/Core/Shell/ShellItem.cs      |  6 +-
 .../tests/Core.UnitTests/ShellTests.cs        | 31 ++++++++++
 .../DeviceTests/Elements/Shell/ShellTests.cs  | 58 +++++++++++++++++++
 4 files changed, 101 insertions(+), 5 deletions(-)

diff --git a/src/Controls/src/Core/Handlers/Shell/Windows/ShellView.cs b/src/Controls/src/Core/Handlers/Shell/Windows/ShellView.cs
index 86628e1326e4..11daffc3d896 100644
--- a/src/Controls/src/Core/Handlers/Shell/Windows/ShellView.cs
+++ b/src/Controls/src/Core/Handlers/Shell/Windows/ShellView.cs
@@ -209,10 +209,13 @@ internal void SwitchShellItem(ShellItem newItem, bool animate = true)
 			{
 				if (navItems.TryGetWithData(newItem, out NavigationViewItemViewModel vm1))
 					SelectedItem = vm1;
-				else if (navItems.TryGetWithData(newItem.CurrentItem, out NavigationViewItemViewModel vm2))
-					SelectedItem = vm2;
-				else if (navItems.TryGetWithData(newItem.CurrentItem.CurrentItem, out NavigationViewItemViewModel vm3))
-					SelectedItem = vm3;
+				else if (newItem.CurrentItem is not null)
+				{
+					if (navItems.TryGetWithData(newItem.CurrentItem, out NavigationViewItemViewModel vm2))
+						SelectedItem = vm2;
+					else if (navItems.TryGetWithData(newItem.CurrentItem.CurrentItem, out NavigationViewItemViewModel vm3))
+						SelectedItem = vm3;
+				}
 			}
 
 			var handler = CreateShellItemView();
diff --git a/src/Controls/src/Core/Shell/ShellItem.cs b/src/Controls/src/Core/Shell/ShellItem.cs
index 50b09c912967..0f13e7d41277 100644
--- a/src/Controls/src/Core/Shell/ShellItem.cs
+++ b/src/Controls/src/Core/Shell/ShellItem.cs
@@ -109,10 +109,14 @@ bool IShellItemController.ShowTabs
 				// Windows supports nested tabs so we want the tabs to display
 				// if the current shell section has multiple contents
 				if (ShellItemController.GetItems().Count > 1 ||
-					(CurrentItem as IShellSectionController).GetItems().Count > 1)
+					(CurrentItem as IShellSectionController)?.GetItems()?.Count > 1)
+				{
 					defaultShowTabs = true;
+				}
 				else
+				{
 					defaultShowTabs = false;
+				}
 #else
 
 				if (ShellItemController.GetItems().Count <= 1)
diff --git a/src/Controls/tests/Core.UnitTests/ShellTests.cs b/src/Controls/tests/Core.UnitTests/ShellTests.cs
index d9a3b4b852a7..e110a56a4f83 100644
--- a/src/Controls/tests/Core.UnitTests/ShellTests.cs
+++ b/src/Controls/tests/Core.UnitTests/ShellTests.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Maui.Controls.Internals;
@@ -255,6 +256,36 @@ public void CurrentItemDoesNotChangeOnSecondAdd()
 			Assert.Equal(shellItem, shell.CurrentItem);
 		}
 
+		[Fact]
+		public void AddRemoveItemsDoesNotCrash()
+		{
+			var shell = new Shell();
+
+			var rootItem = new FlyoutItem()
+			{
+				FlyoutDisplayOptions = FlyoutDisplayOptions.AsMultipleItems
+			};
+
+			for (int i = 0; i < 3; i++)
+			{
+				var shellContent = new ShellContent
+				{
+					Content = new ContentPage(),
+					Title = $"Item {i}",
+				};
+				rootItem.Items.Add(shellContent);
+			}
+			shell.Items.Add(rootItem);
+			shell.CurrentItem = rootItem.Items[0];
+
+			shell.Items.ElementAt(0).Items.RemoveAt(1);
+			shell.CurrentItem = rootItem.Items[1];
+
+			Assert.Same(shell.CurrentSection, rootItem.Items[1]);
+			Assert.True(shell.Items.ElementAt(0).Items.Count == 2);
+			Assert.True(shell.CurrentSection.Title == "Item 2");
+		}
+
 		[Fact]
 		public void SimpleGoTo()
 		{
diff --git a/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.cs b/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.cs
index fb8196080344..228783fb896b 100644
--- a/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.cs
@@ -1035,6 +1035,64 @@ await CreateHandlerAndAddToWindow<IWindowHandler>(shell, async (handler) =>
 			});
 		}
 
+		[Fact(DisplayName = "Shell add then remove items from selected item")]
+		public async Task ShellAddRemoveItems()
+		{
+			FlyoutItem rootItem = null;
+			ShellItem homeItem = null;
+			int itemCount = 3;
+
+			SetupBuilder();
+			var shell = await CreateShellAsync((shell) =>
+			{
+				shell.FlyoutBehavior = FlyoutBehavior.Locked;
+				homeItem = new ShellContent()
+				{
+					Title = "Home",
+					Route = "MainPage",
+					Content = new ContentPage()
+				};
+				shell.Items.Add(homeItem);
+
+				rootItem = new FlyoutItem()
+				{
+					Title = "Items",
+					Route = "Items",
+					FlyoutDisplayOptions = FlyoutDisplayOptions.AsMultipleItems
+				};
+
+				for (int i = 0; i < itemCount; i++)
+				{
+					var shellContent = new ShellContent
+					{
+						Content = new ContentPage(),
+						Title = $"Item {i}",
+						Route = $"Item{i}"
+					};
+					rootItem.Items.Add(shellContent);
+				}
+				shell.Items.Add(rootItem);
+			});
+
+			await CreateHandlerAndAddToWindow<ShellHandler>(shell, (handler) =>
+			{
+				rootItem.IsVisible = true;
+
+				shell.CurrentItem = rootItem.Items.Last();
+
+				// Remove all root child items
+				for (int i = 0; i < itemCount; i++)
+				{
+					rootItem.Items.RemoveAt(0);
+				}
+
+				shell.CurrentItem = homeItem;
+				Assert.True(shell.CurrentSection.Title == "Home");
+
+				return Task.CompletedTask;
+			});
+		}
+
 		[Fact(DisplayName = "Can Clear ShellContent")]
 		public async Task CanClearShellContent()
 		{

From 15b10a23e1fdddd4cdafcfbbf73e83c566d3b0d6 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 27 Jun 2023 13:53:03 +0100
Subject: [PATCH 045/105] [create-pull-request] automated change (#15865)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .../Elements/CollectionView/CollectionViewTests.Android.cs      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.Android.cs b/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.Android.cs
index 1a239eb1622e..adb51af978d5 100644
--- a/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.Android.cs
+++ b/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.Android.cs
@@ -52,7 +52,7 @@ await CreateHandlerAndAddToWindow<IWindowHandler>(rootPage,
 		}
 
 		[Fact]
-		public async Task NullItemsSourceDisplaysHeaderFooterAndEmptyView() 
+		public async Task NullItemsSourceDisplaysHeaderFooterAndEmptyView()
 		{
 			SetupBuilder();
 

From f65103378e7d6dec20346c0c1faeb140c3dd2091 Mon Sep 17 00:00:00 2001
From: Gerald Versluis <gerald.versluis@microsoft.com>
Date: Tue, 27 Jun 2023 18:45:48 +0200
Subject: [PATCH 046/105] Update dotnet-format-daily-net7.yml (#15879)

---
 .github/workflows/dotnet-format-daily-net7.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/dotnet-format-daily-net7.yml b/.github/workflows/dotnet-format-daily-net7.yml
index abf35818ad2d..48d6886c66b9 100644
--- a/.github/workflows/dotnet-format-daily-net7.yml
+++ b/.github/workflows/dotnet-format-daily-net7.yml
@@ -1,4 +1,4 @@
-name: Daily code format check
+name: Daily code format check net7.0 branch
 on:
   workflow_dispatch:
   schedule:
@@ -45,5 +45,5 @@ jobs:
             area/infrastructure 🏗️
           assignees: rmarinho, jsuarezruiz
           reviewers: rmarinho, jsuarezruiz
-          branch: housekeeping/fix-codeformatting
+          branch: housekeeping/fix-codeformatting-net7.0
           base: net7.0

From 4bb9541834c649d12a5f5231127249610c4e5f02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Su=C3=A1rez?= <javiersuarezruiz@hotmail.com>
Date: Tue, 27 Jun 2023 21:03:04 +0200
Subject: [PATCH 047/105] [Windows] Fix crash swapping MainPage  (#14262)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix crash swapping MainPage on Windows

* Updated tests

* Fix crash swapping MainPage on Windows

* Updated tests

* Updated Impl

* More changes

* Updated test

* Changes from feedback

---------

Co-authored-by: Javier Suárez <6755973+jsuarezruiz@users.noreply.github.com>
---
 .../Elements/Window/WindowTests.Windows.cs    | 33 +++++++++++++++++--
 .../Elements/Window/WindowTests.cs            |  1 +
 .../ContentView/ContentViewHandler.Windows.cs |  4 ++-
 .../Platform/Windows/NavigationRootManager.cs |  4 +++
 4 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/src/Controls/tests/DeviceTests/Elements/Window/WindowTests.Windows.cs b/src/Controls/tests/DeviceTests/Elements/Window/WindowTests.Windows.cs
index cd0606eaaefd..317dbc1638c0 100644
--- a/src/Controls/tests/DeviceTests/Elements/Window/WindowTests.Windows.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Window/WindowTests.Windows.cs
@@ -3,10 +3,9 @@
 using System.Threading.Tasks;
 using Microsoft.Maui.Controls;
 using Microsoft.Maui.DeviceTests.Stubs;
-using Microsoft.Maui.Graphics.Platform;
+using Microsoft.Maui.Graphics;
 using Microsoft.Maui.Graphics.Win2D;
 using Microsoft.Maui.Handlers;
-using Microsoft.Maui.Hosting;
 using Microsoft.Maui.Platform;
 using Xunit;
 using WPanel = Microsoft.UI.Xaml.Controls.Panel;
@@ -15,6 +14,36 @@ namespace Microsoft.Maui.DeviceTests
 {
 	public partial class WindowTests : ControlsHandlerTestBase
 	{
+		[Fact(DisplayName = "Swapping MainPage doesn't Crash")]
+		public async Task SwappingMainPageDoesntCrash()
+		{
+			SetupBuilder();
+
+			var mainPage = new ContentPage
+			{
+				BackgroundColor = Colors.Red
+			};
+
+			var secondaryPage = new ContentPage
+			{
+				BackgroundColor = Colors.Green
+			};
+
+			await CreateHandlerAndAddToWindow<IWindowHandler>(mainPage, (handler) =>
+			{
+				var mainWindow = handler.VirtualView as Window;
+				
+				mainWindow.Page = secondaryPage;
+				Assert.Equal(mainWindow.Page, secondaryPage);
+
+				mainWindow.Page = mainPage;
+				// Without exceptions, the test has passed.
+				Assert.Equal(mainWindow.Page, mainPage);
+
+				Assert.NotNull(mainWindow.Page);
+			});
+		}
+
 		[Fact]
 		public async Task AdornerLayerAdded()
 		{
diff --git a/src/Controls/tests/DeviceTests/Elements/Window/WindowTests.cs b/src/Controls/tests/DeviceTests/Elements/Window/WindowTests.cs
index 76b384957f77..408db0674023 100644
--- a/src/Controls/tests/DeviceTests/Elements/Window/WindowTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Window/WindowTests.cs
@@ -51,6 +51,7 @@ void SetupBuilder()
 					handlers.AddHandler(typeof(FlyoutPage), typeof(PhoneFlyoutPageRenderer));
 #endif
 
+					handlers.AddHandler<Button, ButtonHandler>();
 					handlers.AddHandler<Entry, EntryHandler>();
 					handlers.AddHandler<Editor, EditorHandler>();
 					handlers.AddHandler<SearchBar, SearchBarHandler>();
diff --git a/src/Core/src/Handlers/ContentView/ContentViewHandler.Windows.cs b/src/Core/src/Handlers/ContentView/ContentViewHandler.Windows.cs
index a5afa833f0e2..d2818df25c43 100644
--- a/src/Core/src/Handlers/ContentView/ContentViewHandler.Windows.cs
+++ b/src/Core/src/Handlers/ContentView/ContentViewHandler.Windows.cs
@@ -49,7 +49,9 @@ public static void MapContent(IContentViewHandler handler, IContentView page)
 		protected override void DisconnectHandler(ContentPanel platformView)
 		{
 			platformView.CrossPlatformLayout = null;
+			platformView.Children?.Clear();
+      
 			base.DisconnectHandler(platformView);
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/src/Core/src/Platform/Windows/NavigationRootManager.cs b/src/Core/src/Platform/Windows/NavigationRootManager.cs
index ff58705b9eb5..bd31b7b58a14 100644
--- a/src/Core/src/Platform/Windows/NavigationRootManager.cs
+++ b/src/Core/src/Platform/Windows/NavigationRootManager.cs
@@ -113,6 +113,10 @@ public virtual void Disconnect()
 			_rootView.OnWindowTitleBarContentSizeChanged -= WindowRootViewOnWindowTitleBarContentSizeChanged;
 			_platformWindow.Activated -= OnWindowActivated;
 			SetToolbar(null);
+
+			if (_rootView.Content is RootNavigationView navView)
+				navView.Content = null;
+			
 			_rootView.Content = null;
 			_disconnected = true;
 		}

From 1cef836d4e0f12104766469f8c278a969c4452e4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 27 Jun 2023 22:52:11 +0100
Subject: [PATCH 048/105] Bump Microsoft.NET.Test.Sdk from 17.6.2 to 17.6.3
 (#15878)

Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.6.2 to 17.6.3.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md)
- [Commits](https://github.com/microsoft/vstest/compare/v17.6.2...v17.6.3)

---
updated-dependencies:
- dependency-name: Microsoft.NET.Test.Sdk
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .../tests/Core.UnitTests/Controls.Core.UnitTests.csproj         | 2 +-
 src/Controls/tests/UITests/Controls.AppiumTests.csproj          | 2 +-
 .../tests/Xaml.UnitTests/Controls.Xaml.UnitTests.csproj         | 2 +-
 src/Core/tests/UnitTests/Core.UnitTests.csproj                  | 2 +-
 src/Essentials/test/UnitTests/Essentials.UnitTests.csproj       | 2 +-
 src/Graphics/tests/Graphics.Tests/Graphics.Tests.csproj         | 2 +-
 .../Resizetizer/test/UnitTests/Resizetizer.UnitTests.csproj     | 2 +-
 .../Microsoft.Maui.IntegrationTests.csproj                      | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Controls/tests/Core.UnitTests/Controls.Core.UnitTests.csproj b/src/Controls/tests/Core.UnitTests/Controls.Core.UnitTests.csproj
index a457d0d2b2d5..fa2897b514a5 100644
--- a/src/Controls/tests/Core.UnitTests/Controls.Core.UnitTests.csproj
+++ b/src/Controls/tests/Core.UnitTests/Controls.Core.UnitTests.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
     <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/src/Controls/tests/UITests/Controls.AppiumTests.csproj b/src/Controls/tests/UITests/Controls.AppiumTests.csproj
index e50892b1973d..9a82c76f822c 100644
--- a/src/Controls/tests/UITests/Controls.AppiumTests.csproj
+++ b/src/Controls/tests/UITests/Controls.AppiumTests.csproj
@@ -34,7 +34,7 @@
 
   <ItemGroup>
     <PackageReference Include="Appium.WebDriver" Version="5.0.0-beta02" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
     <PackageReference Include="Xamarin.UITest" Version="4.1.4" />
diff --git a/src/Controls/tests/Xaml.UnitTests/Controls.Xaml.UnitTests.csproj b/src/Controls/tests/Xaml.UnitTests/Controls.Xaml.UnitTests.csproj
index 00c623e87f22..c7202b2967bb 100644
--- a/src/Controls/tests/Xaml.UnitTests/Controls.Xaml.UnitTests.csproj
+++ b/src/Controls/tests/Xaml.UnitTests/Controls.Xaml.UnitTests.csproj
@@ -18,7 +18,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
     <PackageReference Include="Mono.Cecil" Version="0.11.5" />
diff --git a/src/Core/tests/UnitTests/Core.UnitTests.csproj b/src/Core/tests/UnitTests/Core.UnitTests.csproj
index e55a799f8d27..b86589d737c5 100644
--- a/src/Core/tests/UnitTests/Core.UnitTests.csproj
+++ b/src/Core/tests/UnitTests/Core.UnitTests.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
     <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/src/Essentials/test/UnitTests/Essentials.UnitTests.csproj b/src/Essentials/test/UnitTests/Essentials.UnitTests.csproj
index a97571511d4e..9f1296f54d27 100644
--- a/src/Essentials/test/UnitTests/Essentials.UnitTests.csproj
+++ b/src/Essentials/test/UnitTests/Essentials.UnitTests.csproj
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
   </ItemGroup>
diff --git a/src/Graphics/tests/Graphics.Tests/Graphics.Tests.csproj b/src/Graphics/tests/Graphics.Tests/Graphics.Tests.csproj
index 0eda35cf8617..fea509e9055a 100644
--- a/src/Graphics/tests/Graphics.Tests/Graphics.Tests.csproj
+++ b/src/Graphics/tests/Graphics.Tests/Graphics.Tests.csproj
@@ -10,7 +10,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
 		<PackageReference Include="xunit" Version="2.4.2" />
 		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/src/SingleProject/Resizetizer/test/UnitTests/Resizetizer.UnitTests.csproj b/src/SingleProject/Resizetizer/test/UnitTests/Resizetizer.UnitTests.csproj
index 137b1403ef35..5d31b3ad1229 100644
--- a/src/SingleProject/Resizetizer/test/UnitTests/Resizetizer.UnitTests.csproj
+++ b/src/SingleProject/Resizetizer/test/UnitTests/Resizetizer.UnitTests.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
     <PackageReference Include="Microsoft.Build.Framework" Version="16.7.0" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.7.0" PrivateAssets="all" />
     <PackageReference Include="SkiaSharp" Version="$(_SkiaSharpVersion)" />
diff --git a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/Microsoft.Maui.IntegrationTests.csproj b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/Microsoft.Maui.IntegrationTests.csproj
index cf6b958977fe..e3c14e659b72 100644
--- a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/Microsoft.Maui.IntegrationTests.csproj
+++ b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/Microsoft.Maui.IntegrationTests.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
   </ItemGroup>

From 098a9fa95230414cf782eb0f3ac90c23a15d1239 Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Tue, 27 Jun 2023 20:31:33 -0500
Subject: [PATCH 049/105] Wait for switched item to load (#15891)

* Wait for switched item to load

* - fix edge case where a shell page is removed during load
---
 .../Handlers/Shell/iOS/ShellPageRendererTracker.cs     |  7 +++++++
 .../tests/DeviceTests/Elements/Shell/ShellTests.cs     | 10 +++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellPageRendererTracker.cs b/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellPageRendererTracker.cs
index ec043e077abe..baefb536ca75 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellPageRendererTracker.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellPageRendererTracker.cs
@@ -800,6 +800,13 @@ void OnPageLoaded(object sender, EventArgs e)
 			if (sender is Page page)
 				page.Loaded -= OnPageLoaded;
 
+			// This means the user removed this page during the loaded event
+			if (_page is null)
+			{
+				SetDisappeared();
+				return;
+			}
+
 			UpdateToolbarItemsInternal();
 			CheckAppeared();
 		}
diff --git a/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.cs b/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.cs
index 228783fb896b..5e88f4506d18 100644
--- a/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.cs
@@ -1074,12 +1074,18 @@ public async Task ShellAddRemoveItems()
 				shell.Items.Add(rootItem);
 			});
 
-			await CreateHandlerAndAddToWindow<ShellHandler>(shell, (handler) =>
+			await CreateHandlerAndAddToWindow<ShellHandler>(shell, async (handler) =>
 			{
 				rootItem.IsVisible = true;
 
 				shell.CurrentItem = rootItem.Items.Last();
 
+				// Wait for the rootItem to finish loading before we remove items.
+				// If we just start removing items directly after setting the current item
+				// This can cause the platform to crash since we're pulling the
+				// carpet out from under it while it's trying to load.
+				await OnLoadedAsync(shell.CurrentPage);
+
 				// Remove all root child items
 				for (int i = 0; i < itemCount; i++)
 				{
@@ -1088,8 +1094,6 @@ await CreateHandlerAndAddToWindow<ShellHandler>(shell, (handler) =>
 
 				shell.CurrentItem = homeItem;
 				Assert.True(shell.CurrentSection.Title == "Home");
-
-				return Task.CompletedTask;
 			});
 		}
 

From 9d4be10c63791bb8c2d6b8c697be08f6e1ab4e26 Mon Sep 17 00:00:00 2001
From: Rui Marinho <me@ruimarinho.net>
Date: Wed, 28 Jun 2023 15:26:23 +0100
Subject: [PATCH 050/105] [Revert] Correctly identify headers/footers when
 using UngroupedItemsSource #15688 (#15886)

---
 .../Android/Adapters/EmptyViewAdapter.cs      | 23 +++++--------
 .../ItemsSources/UngroupedItemsSource.cs      |  2 +-
 .../CollectionViewTests.Android.cs            | 32 -------------------
 3 files changed, 9 insertions(+), 48 deletions(-)

diff --git a/src/Controls/src/Core/Handlers/Items/Android/Adapters/EmptyViewAdapter.cs b/src/Controls/src/Core/Handlers/Items/Android/Adapters/EmptyViewAdapter.cs
index 8820ce1986aa..9be42c127b27 100644
--- a/src/Controls/src/Core/Handlers/Items/Android/Adapters/EmptyViewAdapter.cs
+++ b/src/Controls/src/Core/Handlers/Items/Android/Adapters/EmptyViewAdapter.cs
@@ -10,12 +10,12 @@ namespace Microsoft.Maui.Controls.Handlers.Items
 {
 	public class EmptyViewAdapter : RecyclerView.Adapter
 	{
-		double _headerHeight;
+		int _headerHeight;
 		int _headerViewType;
 		object _headerView;
 		DataTemplate _headerViewTemplate;
 
-		double _footerHeight;
+		int _footerHeight;
 		int _footerViewType;
 		object _footerView;
 		DataTemplate _footerViewTemplate;
@@ -301,25 +301,18 @@ void UpdateHeaderFooterHeight(object item, bool isHeader)
 			if (item == null)
 				return;
 
-			var size = Size.Zero;
+			var sizeRequest = new SizeRequest(new Size(0, 0));
 
-			if (item is IView view)
-			{
-				if (view.Handler == null)
-				{
-					TemplateHelpers.GetHandler(view as View, ItemsView.FindMauiContext());
-				}
-
-				size = view.Measure(double.PositiveInfinity, double.PositiveInfinity);
-			}
+			if (item is View view)
+				sizeRequest = view.Measure(double.PositiveInfinity, double.PositiveInfinity, MeasureFlags.IncludeMargins);
 
 			if (item is DataTemplate dataTemplate)
 			{
-				var content = dataTemplate.CreateContent() as IView;
-				size = content.Measure(double.PositiveInfinity, double.PositiveInfinity);
+				var content = dataTemplate.CreateContent() as View;
+				sizeRequest = content.Measure(double.PositiveInfinity, double.PositiveInfinity, MeasureFlags.IncludeMargins);
 			}
 
-			var itemHeight = size.Height;
+			var itemHeight = (int)sizeRequest.Request.Height;
 
 			if (isHeader)
 				_headerHeight = itemHeight;
diff --git a/src/Controls/src/Core/Handlers/Items/Android/ItemsSources/UngroupedItemsSource.cs b/src/Controls/src/Core/Handlers/Items/Android/ItemsSources/UngroupedItemsSource.cs
index ff12b25cda5f..829b6beca1a2 100644
--- a/src/Controls/src/Core/Handlers/Items/Android/ItemsSources/UngroupedItemsSource.cs
+++ b/src/Controls/src/Core/Handlers/Items/Android/ItemsSources/UngroupedItemsSource.cs
@@ -12,7 +12,7 @@ public UngroupedItemsSource(IItemsViewSource source)
 			_source = source;
 		}
 
-		public int Count => _source.Count + (HasHeader ? 1 : 0) + (HasFooter ? 1 : 0);
+		public int Count => _source.Count;
 
 		public bool HasHeader { get => _source.HasHeader; set => _source.HasHeader = value; }
 		public bool HasFooter { get => _source.HasFooter; set => _source.HasFooter = value; }
diff --git a/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.Android.cs b/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.Android.cs
index adb51af978d5..faf1479a4d5f 100644
--- a/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.Android.cs
+++ b/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.Android.cs
@@ -50,37 +50,5 @@ await CreateHandlerAndAddToWindow<IWindowHandler>(rootPage,
 			// Without Exceptions here, the test has passed.
 			Assert.Equal(0, (rootPage as IPageContainer<Page>).CurrentPage.Navigation.ModalStack.Count);
 		}
-
-		[Fact]
-		public async Task NullItemsSourceDisplaysHeaderFooterAndEmptyView()
-		{
-			SetupBuilder();
-
-			var emptyView = new Label { Text = "Empty" };
-			var header = new Label { Text = "Header" };
-			var footer = new Label { Text = "Footer" };
-
-			var collectionView = new CollectionView
-			{
-				ItemsSource = null,
-				EmptyView = emptyView,
-				Header = header,
-				Footer = footer
-			};
-
-			ContentPage contentPage = new ContentPage() { Content = collectionView };
-
-			var frame = collectionView.Frame;
-
-			await CreateHandlerAndAddToWindow<IWindowHandler>(contentPage,
-				async (_) =>
-				{
-					await WaitForUIUpdate(frame, collectionView);
-
-					Assert.True(emptyView.Height > 0, "EmptyView is not displayed");
-					Assert.True(header.Height > 0, "Header is not displayed");
-					Assert.True(footer.Height > 0, "Footer is not displayed");
-				});
-		}
 	}
 }
\ No newline at end of file

From 70cdef5cf6a0ec3ef1f8e656c4bf5728a9eff9ca Mon Sep 17 00:00:00 2001
From: Rachel Kang <rachelkang@microsoft.com>
Date: Thu, 29 Jun 2023 03:10:09 -0400
Subject: [PATCH 051/105] Use default SmallChange value for WinUI slider
 (#14912)

* Use default StepFrequency and SmallChange values

* Only remove SmallChange
---
 src/Core/src/Platform/Windows/SliderExtensions.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Core/src/Platform/Windows/SliderExtensions.cs b/src/Core/src/Platform/Windows/SliderExtensions.cs
index 21677e07e8c0..1bf543c358bb 100644
--- a/src/Core/src/Platform/Windows/SliderExtensions.cs
+++ b/src/Core/src/Platform/Windows/SliderExtensions.cs
@@ -22,7 +22,6 @@ static void UpdateIncrement(this Slider nativeSlider, ISlider slider)
 				stepping = Math.Min((difference) / 1000, 1);
 
 			nativeSlider.StepFrequency = stepping;
-			nativeSlider.SmallChange = stepping;
 		}
 
 		public static void UpdateMinimum(this Slider nativeSlider, ISlider slider)

From 31e43f71815d1968c4d7e13ec4e51c2cd411b39e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Jun 2023 23:06:35 +0800
Subject: [PATCH 052/105] Bump powershell from 7.3.4 to 7.3.5 (#15911)

Bumps [powershell](https://github.com/PowerShell/PowerShell) from 7.3.4 to 7.3.5.
- [Release notes](https://github.com/PowerShell/PowerShell/releases)
- [Commits](https://github.com/PowerShell/PowerShell/compare/v7.3.4...v7.3.5)

---
updated-dependencies:
- dependency-name: powershell
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .config/dotnet-tools.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index ad569dc71932..ca97b7116e2f 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -9,7 +9,7 @@
       ]
     },
     "powershell": {
-      "version": "7.3.4",
+      "version": "7.3.5",
       "commands": [
         "pwsh"
       ]

From efd3a5a24944ad1edc53b297f7f92a48507f2a73 Mon Sep 17 00:00:00 2001
From: Rachel Kang <rachelkang@microsoft.com>
Date: Thu, 29 Jun 2023 11:07:45 -0400
Subject: [PATCH 053/105] Fix PointerGesture CommandParameter properties
 (#15863)

* Fix PointerGesture CommandParameter properties

* Add tests
---
 .../Pages/Core/PointerGestureGalleryPage.xaml |  3 ++
 .../Core/PointerGestureGalleryPage.xaml.cs    | 17 +++++++
 .../src/Core/PointerGestureRecognizer.cs      | 12 ++---
 .../net-android/PublicAPI.Unshipped.txt       |  6 +++
 .../PublicAPI/net-ios/PublicAPI.Unshipped.txt |  6 +++
 .../net-maccatalyst/PublicAPI.Unshipped.txt   |  6 +++
 .../net-tizen/PublicAPI.Unshipped.txt         |  6 +++
 .../net-windows/PublicAPI.Unshipped.txt       |  6 +++
 .../PublicAPI/net/PublicAPI.Unshipped.txt     |  6 +++
 .../netstandard/PublicAPI.Unshipped.txt       |  6 +++
 .../Gestures/PointerGestureRecognizerTests.cs | 45 +++++++++++++++++++
 11 files changed, 113 insertions(+), 6 deletions(-)

diff --git a/src/Controls/samples/Controls.Sample/Pages/Core/PointerGestureGalleryPage.xaml b/src/Controls/samples/Controls.Sample/Pages/Core/PointerGestureGalleryPage.xaml
index a32c8c54bf26..627b155c34eb 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Core/PointerGestureGalleryPage.xaml
+++ b/src/Controls/samples/Controls.Sample/Pages/Core/PointerGestureGalleryPage.xaml
@@ -16,5 +16,8 @@
         <Label x:Name="positionLabel" Text="Hover above label to reveal pointer position"/>
         <Label x:Name="positionToWindow" />
         <Label x:Name="positionToThisLabel" />
+
+        <Label x:Name="colorfulHoverLabel" Text="Hover me green!" FontSize="24" />
+        <Label Text="Hover above label to make it turn green" />
     </StackLayout>
 </views:BasePage>
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample/Pages/Core/PointerGestureGalleryPage.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/Core/PointerGestureGalleryPage.xaml.cs
index 8f90a0880b52..9e2f4d15a21c 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Core/PointerGestureGalleryPage.xaml.cs
+++ b/src/Controls/samples/Controls.Sample/Pages/Core/PointerGestureGalleryPage.xaml.cs
@@ -1,12 +1,24 @@
 using Microsoft.Maui.Controls;
+using Microsoft.Maui.Graphics;
 
 namespace Maui.Controls.Sample.Pages
 {
 	public partial class PointerGestureGalleryPage
 	{
+		Command _hoverEnterCommand;
+
 		public PointerGestureGalleryPage()
 		{
 			InitializeComponent();
+
+			_hoverEnterCommand = new Command<Color>(HandleHoverEnterCommand);
+
+			var colorfulHoverEnterGesture = new PointerGestureRecognizer
+			{
+				PointerEnteredCommand = _hoverEnterCommand,
+				PointerEnteredCommandParameter = Colors.Green
+			};
+			colorfulHoverLabel.GestureRecognizers.Add(colorfulHoverEnterGesture);
 		}
 
 		void HoverBegan(object sender, PointerEventArgs e)
@@ -26,5 +38,10 @@ void HoverMoved(object sender, PointerEventArgs e)
 			positionToWindow.Text = $"Pointer position inside window: {e.GetPosition(null)}";
 			positionToThisLabel.Text = $"Pointer position relative to this label: {e.GetPosition(positionToThisLabel)}";
 		}
+
+		void HandleHoverEnterCommand(Color hoverColor)
+		{
+			colorfulHoverLabel.TextColor = hoverColor;
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/src/Core/PointerGestureRecognizer.cs b/src/Controls/src/Core/PointerGestureRecognizer.cs
index bc194f5b3e36..b8288e8d5144 100644
--- a/src/Controls/src/Core/PointerGestureRecognizer.cs
+++ b/src/Controls/src/Core/PointerGestureRecognizer.cs
@@ -74,9 +74,9 @@ public ICommand PointerEnteredCommand
 		/// <summary>
 		/// Identifies the PointerEnteredCommandParameter bindable property.
 		/// </summary>
-		public ICommand PointerEnteredCommandParameter
+		public object PointerEnteredCommandParameter
 		{
-			get { return (ICommand)GetValue(PointerEnteredCommandParameterProperty); }
+			get { return GetValue(PointerEnteredCommandParameterProperty); }
 			set { SetValue(PointerEnteredCommandParameterProperty, value); }
 		}
 
@@ -92,9 +92,9 @@ public ICommand PointerExitedCommand
 		/// <summary>
 		/// Identifies the PointerExitedCommandParameter bindable property.
 		/// </summary>
-		public ICommand PointerExitedCommandParameter
+		public object PointerExitedCommandParameter
 		{
-			get { return (ICommand)GetValue(PointerExitedCommandParameterProperty); }
+			get { return GetValue(PointerExitedCommandParameterProperty); }
 			set { SetValue(PointerExitedCommandParameterProperty, value); }
 		}
 
@@ -110,9 +110,9 @@ public ICommand PointerMovedCommand
 		/// <summary>
 		/// Identifies the PointerMovedCommandParameter bindable property.
 		/// </summary>
-		public ICommand PointerMovedCommandParameter
+		public object PointerMovedCommandParameter
 		{
-			get { return (ICommand)GetValue(PointerMovedCommandParameterProperty); }
+			get { return GetValue(PointerMovedCommandParameterProperty); }
 			set { SetValue(PointerMovedCommandParameterProperty, value); }
 		}
 
diff --git a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
index c09743196b38..f3850cb322e9 100644
--- a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -12,6 +12,12 @@ override Microsoft.Maui.Controls.Handlers.Items.ItemsViewHandler<TItemsView>.Get
 override Microsoft.Maui.Controls.Handlers.Items.ItemsViewHandler<TItemsView>.PlatformArrange(Microsoft.Maui.Graphics.Rect frame) -> void
 Microsoft.Maui.Controls.LayoutOptions.Equals(Microsoft.Maui.Controls.LayoutOptions other) -> bool
 Microsoft.Maui.Controls.Platform.ShapesExtensions
+Microsoft.Maui.Controls.PointerGestureRecognizer.PointerEnteredCommandParameter.get -> object!
+Microsoft.Maui.Controls.PointerGestureRecognizer.PointerExitedCommandParameter.get -> object!
+Microsoft.Maui.Controls.PointerGestureRecognizer.PointerMovedCommandParameter.get -> object!
+*REMOVED*Microsoft.Maui.Controls.PointerGestureRecognizer.PointerEnteredCommandParameter.get -> System.Windows.Input.ICommand!
+*REMOVED*Microsoft.Maui.Controls.PointerGestureRecognizer.PointerExitedCommandParameter.get -> System.Windows.Input.ICommand!
+*REMOVED*Microsoft.Maui.Controls.PointerGestureRecognizer.PointerMovedCommandParameter.get -> System.Windows.Input.ICommand!
 Microsoft.Maui.Controls.Region.Equals(Microsoft.Maui.Controls.Region other) -> bool
 Microsoft.Maui.Controls.Shapes.Matrix.Equals(Microsoft.Maui.Controls.Shapes.Matrix other) -> bool
 Microsoft.Maui.Controls.Shapes.Shape.~Shape() -> void
diff --git a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index 735b73a38ff3..3d5af1c1cc13 100644
--- a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -7,6 +7,12 @@ Microsoft.Maui.Controls.Handlers.Compatibility.PhoneFlyoutPageRenderer.FlyoutOve
 Microsoft.Maui.Controls.Handlers.Compatibility.PhoneFlyoutPageRenderer.FlyoutOverlapsDetailsInPopoverMode.set -> void
 Microsoft.Maui.Controls.LayoutOptions.Equals(Microsoft.Maui.Controls.LayoutOptions other) -> bool
 Microsoft.Maui.Controls.Platform.ShapesExtensions
+Microsoft.Maui.Controls.PointerGestureRecognizer.PointerEnteredCommandParameter.get -> object!
+Microsoft.Maui.Controls.PointerGestureRecognizer.PointerExitedCommandParameter.get -> object!
+Microsoft.Maui.Controls.PointerGestureRecognizer.PointerMovedCommandParameter.get -> object!
+*REMOVED*Microsoft.Maui.Controls.PointerGestureRecognizer.PointerEnteredCommandParameter.get -> System.Windows.Input.ICommand!
+*REMOVED*Microsoft.Maui.Controls.PointerGestureRecognizer.PointerExitedCommandParameter.get -> System.Windows.Input.ICommand!
+*REMOVED*Microsoft.Maui.Controls.PointerGestureRecognizer.PointerMovedCommandParameter.get -> System.Windows.Input.ICommand!
 Microsoft.Maui.Controls.Region.Equals(Microsoft.Maui.Controls.Region other) -> bool
 Microsoft.Maui.Controls.Shapes.Matrix.Equals(Microsoft.Maui.Controls.Shapes.Matrix other) -> bool
 Microsoft.Maui.Controls.Shapes.Shape.~Shape() -> void
diff --git a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index 735b73a38ff3..3d5af1c1cc13 100644
--- a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -7,6 +7,12 @@ Microsoft.Maui.Controls.Handlers.Compatibility.PhoneFlyoutPageRenderer.FlyoutOve
 Microsoft.Maui.Controls.Handlers.Compatibility.PhoneFlyoutPageRenderer.FlyoutOverlapsDetailsInPopoverMode.set -> void
 Microsoft.Maui.Controls.LayoutOptions.Equals(Microsoft.Maui.Controls.LayoutOptions other) -> bool
 Microsoft.Maui.Controls.Platform.ShapesExtensions
+Microsoft.Maui.Controls.PointerGestureRecognizer.PointerEnteredCommandParameter.get -> object!
+Microsoft.Maui.Controls.PointerGestureRecognizer.PointerExitedCommandParameter.get -> object!
+Microsoft.Maui.Controls.PointerGestureRecognizer.PointerMovedCommandParameter.get -> object!
+*REMOVED*Microsoft.Maui.Controls.PointerGestureRecognizer.PointerEnteredCommandParameter.get -> System.Windows.Input.ICommand!
+*REMOVED*Microsoft.Maui.Controls.PointerGestureRecognizer.PointerExitedCommandParameter.get -> System.Windows.Input.ICommand!
+*REMOVED*Microsoft.Maui.Controls.PointerGestureRecognizer.PointerMovedCommandParameter.get -> System.Windows.Input.ICommand!
 Microsoft.Maui.Controls.Region.Equals(Microsoft.Maui.Controls.Region other) -> bool
 Microsoft.Maui.Controls.Shapes.Matrix.Equals(Microsoft.Maui.Controls.Shapes.Matrix other) -> bool
 Microsoft.Maui.Controls.Shapes.Shape.~Shape() -> void
diff --git a/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
index 59345b33b394..2f089f2bd8f8 100644
--- a/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
@@ -3,6 +3,12 @@ Microsoft.Maui.Controls.Border.~Border() -> void
 Microsoft.Maui.Controls.IWindowCreator
 Microsoft.Maui.Controls.IWindowCreator.CreateWindow(Microsoft.Maui.Controls.Application! app, Microsoft.Maui.IActivationState? activationState) -> Microsoft.Maui.Controls.Window!
 Microsoft.Maui.Controls.LayoutOptions.Equals(Microsoft.Maui.Controls.LayoutOptions other) -> bool
+Microsoft.Maui.Controls.PointerGestureRecognizer.PointerEnteredCommandParameter.get -> object!
+Microsoft.Maui.Controls.PointerGestureRecognizer.PointerExitedCommandParameter.get -> object!
+Microsoft.Maui.Controls.PointerGestureRecognizer.PointerMovedCommandParameter.get -> object!
+*REMOVED*Microsoft.Maui.Controls.PointerGestureRecognizer.PointerEnteredCommandParameter.get -> System.Windows.Input.ICommand!
+*REMOVED*Microsoft.Maui.Controls.PointerGestureRecognizer.PointerExitedCommandParameter.get -> System.Windows.Input.ICommand!
+*REMOVED*Microsoft.Maui.Controls.PointerGestureRecognizer.PointerMovedCommandParameter.get -> System.Windows.Input.ICommand!
 Microsoft.Maui.Controls.Region.Equals(Microsoft.Maui.Controls.Region other) -> bool
 Microsoft.Maui.Controls.Shapes.Matrix.Equals(Microsoft.Maui.Controls.Shapes.Matrix other) -> bool
 Microsoft.Maui.Controls.VisualElement.~VisualElement() -> void
diff --git a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index 4f17f691caa8..f1fff8c5199b 100644
--- a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -5,6 +5,12 @@ Microsoft.Maui.Controls.IWindowCreator
 Microsoft.Maui.Controls.IWindowCreator.CreateWindow(Microsoft.Maui.Controls.Application! app, Microsoft.Maui.IActivationState? activationState) -> Microsoft.Maui.Controls.Window!
 Microsoft.Maui.Controls.Platform.CollectionViewExtensions
 Microsoft.Maui.Controls.Platform.ShapesExtensions
+Microsoft.Maui.Controls.PointerGestureRecognizer.PointerEnteredCommandParameter.get -> object!
+Microsoft.Maui.Controls.PointerGestureRecognizer.PointerExitedCommandParameter.get -> object!
+Microsoft.Maui.Controls.PointerGestureRecognizer.PointerMovedCommandParameter.get -> object!
+*REMOVED*Microsoft.Maui.Controls.PointerGestureRecognizer.PointerEnteredCommandParameter.get -> System.Windows.Input.ICommand!
+*REMOVED*Microsoft.Maui.Controls.PointerGestureRecognizer.PointerExitedCommandParameter.get -> System.Windows.Input.ICommand!
+*REMOVED*Microsoft.Maui.Controls.PointerGestureRecognizer.PointerMovedCommandParameter.get -> System.Windows.Input.ICommand!
 Microsoft.Maui.Controls.Handlers.Items.StructuredItemsViewHandler<TItemsView>.~StructuredItemsViewHandler() -> void
 override Microsoft.Maui.Controls.Handlers.BoxViewHandler.NeedsContainer.get -> bool
 Microsoft.Maui.Controls.Handlers.BoxViewHandler
diff --git a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
index 4d3df32a7b67..4ef8570e7f7a 100644
--- a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -4,6 +4,12 @@ Microsoft.Maui.Controls.Border.~Border() -> void
 Microsoft.Maui.Controls.IWindowCreator
 Microsoft.Maui.Controls.IWindowCreator.CreateWindow(Microsoft.Maui.Controls.Application! app, Microsoft.Maui.IActivationState? activationState) -> Microsoft.Maui.Controls.Window!
 Microsoft.Maui.Controls.LayoutOptions.Equals(Microsoft.Maui.Controls.LayoutOptions other) -> bool
+Microsoft.Maui.Controls.PointerGestureRecognizer.PointerEnteredCommandParameter.get -> object!
+Microsoft.Maui.Controls.PointerGestureRecognizer.PointerExitedCommandParameter.get -> object!
+Microsoft.Maui.Controls.PointerGestureRecognizer.PointerMovedCommandParameter.get -> object!
+*REMOVED*Microsoft.Maui.Controls.PointerGestureRecognizer.PointerEnteredCommandParameter.get -> System.Windows.Input.ICommand!
+*REMOVED*Microsoft.Maui.Controls.PointerGestureRecognizer.PointerExitedCommandParameter.get -> System.Windows.Input.ICommand!
+*REMOVED*Microsoft.Maui.Controls.PointerGestureRecognizer.PointerMovedCommandParameter.get -> System.Windows.Input.ICommand!
 Microsoft.Maui.Controls.Region.Equals(Microsoft.Maui.Controls.Region other) -> bool
 Microsoft.Maui.Controls.Shapes.Matrix.Equals(Microsoft.Maui.Controls.Shapes.Matrix other) -> bool
 Microsoft.Maui.Controls.Shapes.Shape.~Shape() -> void
diff --git a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
index 12b6149e4df5..43e1a5856203 100644
--- a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -4,6 +4,12 @@ Microsoft.Maui.Controls.Border.~Border() -> void
 Microsoft.Maui.Controls.IWindowCreator
 Microsoft.Maui.Controls.IWindowCreator.CreateWindow(Microsoft.Maui.Controls.Application! app, Microsoft.Maui.IActivationState? activationState) -> Microsoft.Maui.Controls.Window!
 Microsoft.Maui.Controls.LayoutOptions.Equals(Microsoft.Maui.Controls.LayoutOptions other) -> bool
+Microsoft.Maui.Controls.PointerGestureRecognizer.PointerEnteredCommandParameter.get -> object!
+Microsoft.Maui.Controls.PointerGestureRecognizer.PointerExitedCommandParameter.get -> object!
+Microsoft.Maui.Controls.PointerGestureRecognizer.PointerMovedCommandParameter.get -> object!
+*REMOVED*Microsoft.Maui.Controls.PointerGestureRecognizer.PointerEnteredCommandParameter.get -> System.Windows.Input.ICommand!
+*REMOVED*Microsoft.Maui.Controls.PointerGestureRecognizer.PointerExitedCommandParameter.get -> System.Windows.Input.ICommand!
+*REMOVED*Microsoft.Maui.Controls.PointerGestureRecognizer.PointerMovedCommandParameter.get -> System.Windows.Input.ICommand!
 Microsoft.Maui.Controls.Region.Equals(Microsoft.Maui.Controls.Region other) -> bool
 Microsoft.Maui.Controls.Shapes.Matrix.Equals(Microsoft.Maui.Controls.Shapes.Matrix other) -> bool
 Microsoft.Maui.Controls.Shapes.Shape.~Shape() -> void
diff --git a/src/Controls/tests/Core.UnitTests/Gestures/PointerGestureRecognizerTests.cs b/src/Controls/tests/Core.UnitTests/Gestures/PointerGestureRecognizerTests.cs
index c1303f24c05f..5019c8e0b9a0 100644
--- a/src/Controls/tests/Core.UnitTests/Gestures/PointerGestureRecognizerTests.cs
+++ b/src/Controls/tests/Core.UnitTests/Gestures/PointerGestureRecognizerTests.cs
@@ -61,6 +61,51 @@ public void ClearingGestureRecognizers()
 			Assert.Null(gestureRecognizer.Parent);
 		}
 
+		[Fact]
+		public void PointerEnteredCommandFires()
+		{
+			var gesture = new PointerGestureRecognizer();
+			var parameter = new object();
+			object commandExecuted = null;
+			Command cmd = new Command(() => commandExecuted = parameter);
+
+			gesture.PointerEnteredCommand = cmd;
+			gesture.PointerEnteredCommandParameter = parameter;
+			cmd?.Execute(parameter);
+
+			Assert.Equal(commandExecuted, parameter);
+		}
+
+		[Fact]
+		public void PointerExitedCommandFires()
+		{
+			var gesture = new PointerGestureRecognizer();
+			var parameter = new object();
+			object commandExecuted = null;
+			Command cmd = new Command(() => commandExecuted = parameter);
+
+			gesture.PointerExitedCommand = cmd;
+			gesture.PointerExitedCommandParameter = parameter;
+			cmd?.Execute(parameter);
+
+			Assert.Equal(commandExecuted, parameter);
+		}
+
+		[Fact]
+		public void PointerMovedCommandFires()
+		{
+			var gesture = new PointerGestureRecognizer();
+			var parameter = new object();
+			object commandExecuted = null;
+			Command cmd = new Command(() => commandExecuted = parameter);
+
+			gesture.PointerMovedCommand = cmd;
+			gesture.PointerMovedCommandParameter = parameter;
+			cmd?.Execute(parameter);
+
+			Assert.Equal(commandExecuted, parameter);
+		}
+
 		VisualStateGroupList AddPointerOverVisualState(VisualElement visualElement)
 		{
 			VisualStateGroupList visualStateGroups = new VisualStateGroupList();

From db60162cc3f8010e008f2ff129e3737f5c33c5fb Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 29 Jun 2023 16:06:22 +0000
Subject: [PATCH 054/105] [create-pull-request] automated change (#15921)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .../tests/DeviceTests/Elements/Window/WindowTests.Windows.cs    | 2 +-
 src/Core/src/Handlers/ContentView/ContentViewHandler.Windows.cs | 2 +-
 src/Core/src/Platform/Windows/NavigationRootManager.cs          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Controls/tests/DeviceTests/Elements/Window/WindowTests.Windows.cs b/src/Controls/tests/DeviceTests/Elements/Window/WindowTests.Windows.cs
index 317dbc1638c0..999a87590255 100644
--- a/src/Controls/tests/DeviceTests/Elements/Window/WindowTests.Windows.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Window/WindowTests.Windows.cs
@@ -32,7 +32,7 @@ public async Task SwappingMainPageDoesntCrash()
 			await CreateHandlerAndAddToWindow<IWindowHandler>(mainPage, (handler) =>
 			{
 				var mainWindow = handler.VirtualView as Window;
-				
+
 				mainWindow.Page = secondaryPage;
 				Assert.Equal(mainWindow.Page, secondaryPage);
 
diff --git a/src/Core/src/Handlers/ContentView/ContentViewHandler.Windows.cs b/src/Core/src/Handlers/ContentView/ContentViewHandler.Windows.cs
index d2818df25c43..46e9fbc71740 100644
--- a/src/Core/src/Handlers/ContentView/ContentViewHandler.Windows.cs
+++ b/src/Core/src/Handlers/ContentView/ContentViewHandler.Windows.cs
@@ -50,7 +50,7 @@ protected override void DisconnectHandler(ContentPanel platformView)
 		{
 			platformView.CrossPlatformLayout = null;
 			platformView.Children?.Clear();
-      
+
 			base.DisconnectHandler(platformView);
 		}
 	}
diff --git a/src/Core/src/Platform/Windows/NavigationRootManager.cs b/src/Core/src/Platform/Windows/NavigationRootManager.cs
index bd31b7b58a14..61598b4e1bb5 100644
--- a/src/Core/src/Platform/Windows/NavigationRootManager.cs
+++ b/src/Core/src/Platform/Windows/NavigationRootManager.cs
@@ -116,7 +116,7 @@ public virtual void Disconnect()
 
 			if (_rootView.Content is RootNavigationView navView)
 				navView.Content = null;
-			
+
 			_rootView.Content = null;
 			_disconnected = true;
 		}

From 01fe19f23763d7784e4ec5154e882766661038de Mon Sep 17 00:00:00 2001
From: Bret Johnson <bret.johnson@microsoft.com>
Date: Fri, 30 Jun 2023 09:19:21 -0400
Subject: [PATCH 055/105] Update DEVELOPMENT.md (#15777)

* Update DEVELOPMENT.md

Make these build doc updates:
- Emphasize the need to build the build tasks first - that you MUST do this
  before opening the solution. We suspect that many externals complaining
  that they can't build MAUI get tripped up on this step, just opening the
  solution. So it's good to make it clearer (for internals too).
- Update the initial build command (building build tasks) so that it doesn't also
  launch VS. This is more convenential for open source projects, and it also
  allows folks to choose the VS version and solution to open.
- Moved text around IntelliSense being slow to update, as a consequence
  of the above changes. Do we still need this text at all? I'm not sure.

* Add both cake and non-cake option, plus tweak the formatting.

* Update Advanced Scenarios text to simplify/correct
---
 .github/DEVELOPMENT.md | 42 ++++++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/.github/DEVELOPMENT.md b/.github/DEVELOPMENT.md
index d6e8fb3bcb22..c701efbd9aa2 100644
--- a/.github/DEVELOPMENT.md
+++ b/.github/DEVELOPMENT.md
@@ -2,45 +2,51 @@
 
 This page contains steps to build and run the .NET MAUI repository from source. If you are looking to build apps with .NET MAUI please head over to the links in the [README](https://github.com/dotnet/maui/blob/main/README.md) to get started.
 
-## Requirements
-
-### Visual Studio
+## Visual Studio
 Follow the instructions here to install .NET MAUI with Visual Studio Stable:
    - [Windows](https://learn.microsoft.com/dotnet/maui/get-started/installation?tabs=vswin)
       - Select the 20348 SDK option inside Individual Components or [install 20348 manually](https://go.microsoft.com/fwlink/?linkid=2164145)
       - If you know you have 20348 installed but are still getting an error around this SDK missing, trying uninstalling and reinstalling the SDK.
    - [macOS](https://learn.microsoft.com/dotnet/maui/get-started/installation?tabs=vsmac)  
    
-### iOS / MacCatalyst
+## iOS / MacCatalyst
 
 iOS and MacCatalyst will require current stable Xcode. You can get this [here](https://developer.apple.com/download/more/?name=Xcode).
 
-### Android
+## Android
 
 If you're missing any of the Android SDKs, Visual Studio should prompt you to install them. If it doesn't prompt you then use the [Android SDK Manager](https://learn.microsoft.com/xamarin/android/get-started/installation/android-sdk) to install the necessary SDKs.
 
-### Opening the Repository
+## Building the Build Tasks
+Before opening the solution in Visual Studio you **MUST** build the build tasks. You have two options:
 
-```dotnetcli
-dotnet tool restore
-dotnet cake --target=VS --workloads=global
-```
+- Do this to build the build tasks and launch Visual Studio, automatically opening the default solution:
 
-*NOTE*: Intellisense takes a decent amount of time to fully process your solution. It will eventually work through all the necessary tasks. If you are having intellisense issues, usually unloading/reloading the `maui.core` and `maui.controls` projects will resolve. 
+   ```dotnetcli
+   dotnet tool restore
+   dotnet cake --target=VS --workloads=global
+   ```
 
-#### MacOS
+   *NOTE*: `--workloads=global` means use the normal (globally installed) .NET workloads.
 
-All of the above cake commands should work fine on `MacOS`.
+- OR do this to just build the build tasks. You can then launch Visual Studio manually and open the solution of your choosing:
 
-#### Solutions
+   ```dotnetcli
+   dotnet tool restore
+   dotnet build ./Microsoft.Maui.BuildTasks.slnf
+   ```
+
+## Available Solutions
 - Microsoft.Maui.sln
   - Kitchen sink solution. This includes all of the `Compatibility` projects and all of the platforms that we compile for. It is very unlikely you will need to use this solution for development. 
 - Microsoft.Maui-dev.sln
   - `Microsoft.Maui.sln` but without the `Compatibility` projects. Because we can't detect solution filters inside `MSBuild` we had to create a separate `sln` without the `Compatibility` projects. 
-- Microsoft.Maui-mac.slnf
-  - `Microsoft.Maui-dev.sln` with all of the `Windows` targets filtered out
 - Microsoft.Maui-windows.slnf
-  - `Microsoft.Maui-dev.sln` with all of the targets you can't build on `Windows` removed (GTK/Catalyst).
+  - `Microsoft.Maui-dev.sln` with all of the targets you can't build on `Windows` removed (GTK/Catalyst). Default solution on Windows.
+- Microsoft.Maui-mac.slnf
+  - `Microsoft.Maui-dev.sln` with all of the `Windows` targets filtered out. Default solution on Mac.
+
+*NOTE*: IntelliSense takes a decent amount of time to fully process your solution. It will eventually work through all the necessary tasks. If you are having IntelliSense issues, usually unloading/reloading the `maui.core` and `maui.controls` projects will resolve. 
 
 ## What branch should I use?
 - main
@@ -174,7 +180,7 @@ public static int foo = 2130771968;
 
 ### Compile using a local `bin\dotnet`
 
-This method ensures that the workloads installed by Visual Studio won't get changed. This is usually the best method to use if you want to preserve the global state of your machine. This method will also use the versions that are specific to the branch you are on which is a good way to ensure compatibility.
+This method will use the .NET and workload versions that are specific to the branch you are on, which is a good way to ensure compatibility.
 
 #### Cake
 

From a33b76f49119cce7c8616d14609bf7e7e5e1aba5 Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <jestedfa@microsoft.com>
Date: Mon, 5 Jun 2023 19:06:57 -0400
Subject: [PATCH 056/105] Various fixes for Border on Android

* Fixed Border.CrossPlatformArrange() logic
* Fixed Android's ShapeExtensions.ToPlatform() to not inset the path
  bounds *unless* innerPath is true.

This is an attempt at fixing issue #15339
---
 src/Controls/src/Core/Border/Border.cs        |  4 +-
 .../Elements/Border/BorderTests.cs            | 43 ++++++++++++++++++-
 .../src/Platform/Android/ShapeExtensions.cs   | 29 +++++++++----
 .../DeviceTests/AssertionExtensions.iOS.cs    |  2 +-
 4 files changed, 64 insertions(+), 14 deletions(-)

diff --git a/src/Controls/src/Core/Border/Border.cs b/src/Controls/src/Core/Border/Border.cs
index 5c1cb706da39..013827e80a05 100644
--- a/src/Controls/src/Core/Border/Border.cs
+++ b/src/Controls/src/Core/Border/Border.cs
@@ -251,8 +251,8 @@ public float[]? StrokeDashPattern
 
 		public Size CrossPlatformArrange(Graphics.Rect bounds)
 		{
-			bounds = bounds.Inset(StrokeThickness);
-			this.ArrangeContent(bounds);
+			var inset = bounds.Inset(StrokeThickness);
+			this.ArrangeContent(inset);
 			return bounds.Size;
 		}
 
diff --git a/src/Controls/tests/DeviceTests/Elements/Border/BorderTests.cs b/src/Controls/tests/DeviceTests/Elements/Border/BorderTests.cs
index 2b4a1c9a08c9..ea360b9c588e 100644
--- a/src/Controls/tests/DeviceTests/Elements/Border/BorderTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Border/BorderTests.cs
@@ -12,7 +12,7 @@ namespace Microsoft.Maui.DeviceTests
 	public partial class BorderTests : ControlsHandlerTestBase
 	{
 		[Fact(DisplayName = "Rounded Rectangle Border occupies correct space")]
-		public async Task RoundedRectangleBorderLayoutIsCorrect()
+		public Task RoundedRectangleBorderLayoutIsCorrect()
 		{
 			var expected = Colors.Red;
 
@@ -29,7 +29,46 @@ public async Task RoundedRectangleBorderLayoutIsCorrect()
 				WidthRequest = 100
 			};
 
-			await AssertColorAtPoint(border, expected, typeof(BorderHandler), 10, 10);
+			return AssertColorAtPoint(border, expected, typeof(BorderHandler), 10, 10);
+		}
+
+		[Fact(DisplayName = "StrokeThickness does not inset stroke path")]
+		public async Task BorderStrokeThicknessDoesNotInsetStrokePath()
+		{
+			var grid = new Grid()
+			{
+				ColumnDefinitions = new ColumnDefinitionCollection()
+				{
+					new ColumnDefinition(GridLength.Star),
+					new ColumnDefinition(GridLength.Star)
+				},
+				RowDefinitions = new RowDefinitionCollection()
+				{
+					new RowDefinition(GridLength.Star),
+					new RowDefinition(GridLength.Star)
+				},
+				BackgroundColor = Colors.White
+			};
+
+			var border = new Border()
+			{
+				Stroke = Colors.Black,
+				StrokeThickness = 10,
+				BackgroundColor = Colors.Red
+			};
+
+			grid.Add(border, 0, 0);
+			grid.WidthRequest = 200;
+			grid.HeightRequest = 200;
+
+			await CreateHandlerAsync<BorderHandler>(border);
+			await CreateHandlerAsync<LayoutHandler>(grid);
+
+#if IOS
+			// FIXME: iOS seems to have a white boarder around the Border stroke
+#else
+			await AssertColorAtPoint(grid, Colors.Black, typeof(LayoutHandler), 1, 1);
+#endif
 		}
 	}
 }
diff --git a/src/Core/src/Platform/Android/ShapeExtensions.cs b/src/Core/src/Platform/Android/ShapeExtensions.cs
index 8c6f1b390ba2..46e8b65031ae 100644
--- a/src/Core/src/Platform/Android/ShapeExtensions.cs
+++ b/src/Core/src/Platform/Android/ShapeExtensions.cs
@@ -8,19 +8,30 @@ public static class ShapeExtensions
 	{
 		public static Path ToPlatform(this IShape shape, Graphics.Rect bounds, float strokeThickness, bool innerPath = false)
 		{
-			float x = (float)bounds.X + strokeThickness / 2;
-			float y = (float)bounds.Y + strokeThickness / 2;
-			float width = (float)bounds.Width - strokeThickness;
-			float height = (float)bounds.Height - strokeThickness;
+			Graphics.Rect pathBounds;
+			PathF path;
 
-			var pathBounds = new Graphics.Rect(x, y, width, height);
+			if (innerPath)
+			{
+				if (shape is IRoundRectangle roundRectangle)
+				{
+					path = roundRectangle.InnerPathForBounds(bounds, strokeThickness);
+					return path.AsAndroidPath();
+				}
 
-			PathF path;
+				float x = (float)bounds.X + strokeThickness / 2;
+				float y = (float)bounds.Y + strokeThickness / 2;
+				float width = (float)bounds.Width - strokeThickness;
+				float height = (float)bounds.Height - strokeThickness;
 
-			if (innerPath && shape is IRoundRectangle roundRectangle)
-				path = roundRectangle.InnerPathForBounds(pathBounds, strokeThickness);
+				pathBounds = new Graphics.Rect(x, y, width, height);
+			}
 			else
-				path = shape.PathForBounds(pathBounds);
+			{
+				pathBounds = bounds;
+			}
+
+			path = shape.PathForBounds(pathBounds);
 
 			return path.AsAndroidPath();
 		}
diff --git a/src/TestUtils/src/DeviceTests/AssertionExtensions.iOS.cs b/src/TestUtils/src/DeviceTests/AssertionExtensions.iOS.cs
index dc64fe9a6aae..1b86de734cba 100644
--- a/src/TestUtils/src/DeviceTests/AssertionExtensions.iOS.cs
+++ b/src/TestUtils/src/DeviceTests/AssertionExtensions.iOS.cs
@@ -259,7 +259,7 @@ public static UIImage AssertColorAtPoint(this UIImage bitmap, UIColor expectedCo
 			var cap = bitmap.ColorAtPoint(x, y);
 
 			if (!ColorComparison.ARGBEquivalent(cap, expectedColor, tolerance))
-				Assert.Equal(cap, expectedColor, new ColorComparison());
+				Assert.Equal(expectedColor, cap, new ColorComparison());
 
 			return bitmap;
 		}

From d211b8548943e25c8d732395b5037bded59072b6 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Fri, 30 Jun 2023 18:45:14 -0500
Subject: [PATCH 057/105] [ios] fix memory leak in Border (#15946)

Context: https://github.com/dotnet/maui/issues/14664
Context: https://github.com/nacompllo/MemoryLeakEverywhere/tree/bugfix/memoryLeakItemsSource

While looking at the customer sample, we found an issue with
`BorderHandler`:

* `ContentView` -> via `LayoutSubviewsChanged`
* `BorderHandler` ->
* `ContentView`

Creating a cycle & memory leak on iOS and Catalyst. We could reproduce
this in a device test.

It appears the event only did this:

    void OnLayoutSubviewsChanged(object? sender, EventArgs e)
    {
        PlatformView?.UpdateMauiCALayer();
    }

And so instead, we can just call the extension method directly:

    this.UpdateMauiCALayer();

And the leak is gone!

Co-authored-by: Haritha Mohan <harithamohan@microsoft.com>
---
 .../Elements/Border/BorderTests.cs            | 53 ++++++++++++++++++-
 .../src/Handlers/Border/BorderHandler.iOS.cs  |  9 ----
 src/Core/src/Platform/iOS/ContentView.cs      |  4 +-
 3 files changed, 53 insertions(+), 13 deletions(-)

diff --git a/src/Controls/tests/DeviceTests/Elements/Border/BorderTests.cs b/src/Controls/tests/DeviceTests/Elements/Border/BorderTests.cs
index 2b4a1c9a08c9..3f5830421eb6 100644
--- a/src/Controls/tests/DeviceTests/Elements/Border/BorderTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Border/BorderTests.cs
@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System;
+using System.Threading.Tasks;
 using Microsoft.Maui.Controls;
 using Microsoft.Maui.Graphics;
 using Microsoft.Maui.Handlers;
@@ -11,6 +12,18 @@ namespace Microsoft.Maui.DeviceTests
 	[Category(TestCategory.Border)]
 	public partial class BorderTests : ControlsHandlerTestBase
 	{
+		void SetupBuilder()
+		{
+			EnsureHandlerCreated(builder =>
+			{
+				builder.ConfigureMauiHandlers(handlers =>
+				{
+					handlers.AddHandler<Label, LabelHandler>();
+					handlers.AddHandler<Border, BorderHandler>();
+				});
+			});
+		}
+
 		[Fact(DisplayName = "Rounded Rectangle Border occupies correct space")]
 		public async Task RoundedRectangleBorderLayoutIsCorrect()
 		{
@@ -31,5 +44,43 @@ public async Task RoundedRectangleBorderLayoutIsCorrect()
 
 			await AssertColorAtPoint(border, expected, typeof(BorderHandler), 10, 10);
 		}
+
+
+		[Fact("Border Does Not Leak")]
+		public async Task DoesNotLeak()
+		{
+			SetupBuilder();
+			WeakReference platformViewReference = null;
+			WeakReference handlerReference = null;
+
+			await InvokeOnMainThreadAsync(() =>
+			{
+				var layout = new Grid();
+				var border = new Border();
+				var label = new Label();
+				border.Content = label;
+				layout.Add(border);
+
+				var handler = CreateHandler<LayoutHandler>(layout);
+				handlerReference = new WeakReference(label.Handler);
+				platformViewReference = new WeakReference(label.Handler.PlatformView);
+			});
+
+			Assert.NotNull(handlerReference);
+			Assert.NotNull(platformViewReference);
+
+			// Several GCs required on iOS
+			for (int i = 0; i < 5; i++)
+			{
+				if (!handlerReference.IsAlive && !platformViewReference.IsAlive)
+					break;
+				await Task.Yield();
+				GC.Collect();
+				GC.WaitForPendingFinalizers();
+			}
+
+			Assert.False(handlerReference.IsAlive, "Handler should not be alive!");
+			Assert.False(platformViewReference.IsAlive, "PlatformView should not be alive!");
+		}
 	}
 }
diff --git a/src/Core/src/Handlers/Border/BorderHandler.iOS.cs b/src/Core/src/Handlers/Border/BorderHandler.iOS.cs
index c92feb112750..3590bed57ae2 100644
--- a/src/Core/src/Handlers/Border/BorderHandler.iOS.cs
+++ b/src/Core/src/Handlers/Border/BorderHandler.iOS.cs
@@ -21,15 +21,11 @@ protected override ContentView CreatePlatformView()
 		protected override void ConnectHandler(ContentView platformView)
 		{
 			base.ConnectHandler(platformView);
-
-			platformView.LayoutSubviewsChanged += OnLayoutSubviewsChanged;
 		}
 
 		protected override void DisconnectHandler(ContentView platformView)
 		{
 			base.DisconnectHandler(platformView);
-
-			platformView.LayoutSubviewsChanged -= OnLayoutSubviewsChanged;
 		}
 
 		public override void SetVirtualView(IView view)
@@ -63,10 +59,5 @@ public static void MapContent(IBorderHandler handler, IBorderView border)
 		{
 			UpdateContent(handler);
 		}
-
-		void OnLayoutSubviewsChanged(object? sender, EventArgs e)
-		{
-			PlatformView?.UpdateMauiCALayer();
-		}
 	}
 }
diff --git a/src/Core/src/Platform/iOS/ContentView.cs b/src/Core/src/Platform/iOS/ContentView.cs
index 331325c111a6..59917e6e420e 100644
--- a/src/Core/src/Platform/iOS/ContentView.cs
+++ b/src/Core/src/Platform/iOS/ContentView.cs
@@ -10,7 +10,6 @@ public class ContentView : MauiView
 	{
 		WeakReference<IBorderStroke>? _clip;
 		CAShapeLayer? _childMaskLayer;
-		internal event EventHandler? LayoutSubviewsChanged;
 
 		public ContentView()
 		{
@@ -27,8 +26,7 @@ public override void LayoutSubviews()
 				ChildMaskLayer.Frame = bounds;
 
 			SetClip();
-
-			LayoutSubviewsChanged?.Invoke(this, EventArgs.Empty);
+			this.UpdateMauiCALayer();
 		}
 
 		internal IBorderStroke? Clip

From 209b5d269822cde18d55ce288312bb1181be6df1 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 3 Jul 2023 16:27:30 +0100
Subject: [PATCH 058/105] Update dependencies from
 https://github.com/dotnet/xharness build 20230626.1 (#15974)

Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit
 From Version 8.0.0-prerelease.23321.2 -> To Version 8.0.0-prerelease.23326.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---
 .config/dotnet-tools.json |  2 +-
 eng/Version.Details.xml   | 12 ++++++------
 eng/Versions.props        |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index ca97b7116e2f..5940215622dc 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -15,7 +15,7 @@
       ]
     },
     "microsoft.dotnet.xharness.cli": {
-      "version": "8.0.0-prerelease.23321.2",
+      "version": "8.0.0-prerelease.23326.1",
       "commands": [
         "xharness"
       ]
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 9de10900441d..fc8569485ed0 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -51,17 +51,17 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>3f4da9ced34942d83054e647f3b1d9d7dde281e8</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.23321.2">
+    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.23326.1">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>d59c983920609fddd0d378921e36388c3bae8d00</Sha>
+      <Sha>747cfb23923a644ee43b012c5bcd7b738a485b8e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="8.0.0-prerelease.23321.2">
+    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="8.0.0-prerelease.23326.1">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>d59c983920609fddd0d378921e36388c3bae8d00</Sha>
+      <Sha>747cfb23923a644ee43b012c5bcd7b738a485b8e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.23321.2">
+    <Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.23326.1">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>d59c983920609fddd0d378921e36388c3bae8d00</Sha>
+      <Sha>747cfb23923a644ee43b012c5bcd7b738a485b8e</Sha>
     </Dependency>
   </ProductDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 5618f02080e8..aa5e58b98f66 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -69,9 +69,9 @@
     <_HarfBuzzSharpVersion>2.8.2.2</_HarfBuzzSharpVersion>
     <_SkiaSharpNativeAssetsVersion>0.0.0-commit.193b587552cb0ed39372a049d7e6c692db98c267.483</_SkiaSharpNativeAssetsVersion>
     <MicrosoftTemplateEngineTasksVersion>7.0.100-preview.5.22226.1</MicrosoftTemplateEngineTasksVersion>
-    <MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.23321.2</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
-    <MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.23321.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
-    <MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.23321.2</MicrosoftDotNetXHarnessCLIVersion>
+    <MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.23326.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
+    <MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.23326.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
+    <MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.23326.1</MicrosoftDotNetXHarnessCLIVersion>
     <TizenUIExtensionsVersion>0.9.0</TizenUIExtensionsVersion>
     <SvgSkiaPackageVersion>0.5.13</SvgSkiaPackageVersion>
     <FizzlerPackageVersion>1.2.0</FizzlerPackageVersion>

From f70f1d01c6b9d269eabcbb60fce60980136b318b Mon Sep 17 00:00:00 2001
From: Gerald Versluis <gerald.versluis@microsoft.com>
Date: Mon, 3 Jul 2023 20:13:50 +0200
Subject: [PATCH 059/105] Update Colors.xaml (#15855)

---
 .../src/templates/maui-mobile/Resources/Styles/Colors.xaml    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Templates/src/templates/maui-mobile/Resources/Styles/Colors.xaml b/src/Templates/src/templates/maui-mobile/Resources/Styles/Colors.xaml
index 245758ba1793..1bde6dd18e42 100644
--- a/src/Templates/src/templates/maui-mobile/Resources/Styles/Colors.xaml
+++ b/src/Templates/src/templates/maui-mobile/Resources/Styles/Colors.xaml
@@ -4,6 +4,8 @@
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
 
+    <!-- Note: For Android please see also Platforms\Android\Resources\values\colors.xml -->
+
     <Color x:Key="Primary">#512BD4</Color>
     <Color x:Key="Secondary">#DFD8F7</Color>
     <Color x:Key="Tertiary">#2B0B98</Color>
@@ -41,4 +43,4 @@
     <Color x:Key="Blue200Accent">#72ACF1</Color>
     <Color x:Key="Blue300Accent">#A7CBF6</Color>
 
-</ResourceDictionary>
\ No newline at end of file
+</ResourceDictionary>

From 752c7249c29eb403fc15c48ce8282a79b85e9cc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Su=C3=A1rez?= <javiersuarezruiz@hotmail.com>
Date: Mon, 3 Jul 2023 20:16:42 +0200
Subject: [PATCH 060/105] [Windows/macOS] Implement menu key accelerators 
 (#14740)

* Implement Meny Accelerators on Windows

* More comments

* Fix build errors

* Updated extension

* More samples

* Small code refactoring

* Updated implementation

* Tweak interface to reflect single key only usage

* Add Mac implementation

* Auto-format source code

* Add samples from XAML and with different key combos

* Small tweaks based on feedback

* Update src/Core/src/Platform/Windows/KeyboardAcceleratorExtensions.cs

Co-authored-by: Matthew Leibowitz <mattleibow@live.com>

* Update src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt

Co-authored-by: Matthew Leibowitz <mattleibow@live.com>

* Update src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt

Co-authored-by: Matthew Leibowitz <mattleibow@live.com>

* Update src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt

Co-authored-by: Matthew Leibowitz <mattleibow@live.com>

* Update src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt

Co-authored-by: Matthew Leibowitz <mattleibow@live.com>

* Update src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt

Co-authored-by: Matthew Leibowitz <mattleibow@live.com>

* Update src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt

Co-authored-by: Matthew Leibowitz <mattleibow@live.com>

* Update src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt

Co-authored-by: Matthew Leibowitz <mattleibow@live.com>

* Update src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt

Co-authored-by: Matthew Leibowitz <mattleibow@live.com>

* Update src/Core/src/Core/IMenuElement.cs

Co-authored-by: Matthew Leibowitz <mattleibow@live.com>

* Add if/defs for netstandard2.1 DIM support

* Allow to use numbers as key on Windows

* Tweak ifdefs

* Tweaks based on my understanding of feedback

* Remove irrelevant sandbox changes

* Undo more sandbox changes

* Added support to  multiple accelerators on Windows

* Updates based on feedback

* More updates based on feedback

* Small refactoring (from for to foreach)

* More refactoring

* Update based on feedback

* Fix build errors

* Add some API doc comments

* Fix broken tests

* Added more docstrings in the public APIs

* Fix typo in tests and add key only case

* Add more doc comments

* Update src/Core/src/Handlers/MenuFlyoutItem/MenuFlyoutItemHandler.Windows.cs

Co-authored-by: Juan Diego Herrera <juherrera@microsoft.com>

* Fix and update api docs some more

* Changes based on feedback

* Avoid to use Linq in Accelerator class

---------

Co-authored-by: Rachel Kang <rachelkang@microsoft.com>
Co-authored-by: GitHub Actions Autoformatter <autoformat@example.com>
Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
Co-authored-by: Juan Diego Herrera <juherrera@microsoft.com>
---
 .../Microsoft.Maui.Controls/Accelerator.xml   |  25 ----
 .../Pages/Core/ContextFlyoutPage.xaml         |   8 +-
 .../Pages/Core/ContextFlyoutPage.xaml.cs      |   4 +
 .../Controls.Sample/Pages/Core/MenuBarPage.cs |   5 +-
 .../Pages/Core/MenuBarPage.xaml               |  14 +-
 src/Controls/src/Core/Accelerator.cs          |  68 +++++----
 src/Controls/src/Core/Menu/MenuItem.cs        |   5 +-
 .../net-android/PublicAPI.Unshipped.txt       |   3 +
 .../PublicAPI/net-ios/PublicAPI.Unshipped.txt |   3 +
 .../net-maccatalyst/PublicAPI.Shipped.txt     |   2 +-
 .../net-maccatalyst/PublicAPI.Unshipped.txt   |   3 +
 .../net-tizen/PublicAPI.Unshipped.txt         |   5 +-
 .../net-windows/PublicAPI.Unshipped.txt       |   3 +
 .../PublicAPI/net/PublicAPI.Unshipped.txt     |   5 +-
 .../netstandard/PublicAPI.Unshipped.txt       |   3 +
 .../Core.UnitTests/AcceleratorUnitTests.cs    |  50 ++++---
 src/Core/src/Core/IAccelerator.cs             |  20 +++
 src/Core/src/Core/IMenuElement.cs             |  11 +-
 .../MenuFlyoutItemHandler.Windows.cs          |  15 +-
 .../MenuFlyoutItem/MenuFlyoutItemHandler.cs   |   1 +
 .../MenuFlyoutItemHandler.iOS.cs              |  32 +----
 .../MenuFlyoutSubItemHandler.Windows.cs       |  10 ++
 .../MenuFlyoutSubItemHandler.cs               |   1 +
 .../Windows/KeyboardAcceleratorExtensions.cs  | 132 ++++++++++++++++++
 .../src/Platform/iOS/AcceleratorExtensions.cs |  97 +++++++++++++
 .../net-android/PublicAPI.Unshipped.txt       |   4 +
 .../PublicAPI/net-ios/PublicAPI.Unshipped.txt |   4 +
 .../net-maccatalyst/PublicAPI.Unshipped.txt   |   4 +
 .../net-tizen/PublicAPI.Unshipped.txt         |   6 +-
 .../net-windows/PublicAPI.Unshipped.txt       |  10 ++
 .../src/PublicAPI/net/PublicAPI.Unshipped.txt |   4 +
 .../netstandard/PublicAPI.Unshipped.txt       |   6 +-
 .../netstandard2.0/PublicAPI.Unshipped.txt    |   4 +
 33 files changed, 446 insertions(+), 121 deletions(-)
 create mode 100644 src/Core/src/Core/IAccelerator.cs
 create mode 100644 src/Core/src/Platform/Windows/KeyboardAcceleratorExtensions.cs
 create mode 100644 src/Core/src/Platform/iOS/AcceleratorExtensions.cs

diff --git a/src/Controls/docs/Microsoft.Maui.Controls/Accelerator.xml b/src/Controls/docs/Microsoft.Maui.Controls/Accelerator.xml
index 20ae073acd4b..abb2228ff3f8 100644
--- a/src/Controls/docs/Microsoft.Maui.Controls/Accelerator.xml
+++ b/src/Controls/docs/Microsoft.Maui.Controls/Accelerator.xml
@@ -120,31 +120,6 @@
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
-    <Member MemberName="Modifiers">
-      <MemberSignature Language="C#" Value="public System.Collections.Generic.IEnumerable&lt;string&gt; Modifiers { get; set; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.Collections.Generic.IEnumerable`1&lt;string&gt; Modifiers" />
-      <MemberSignature Language="DocId" Value="P:Microsoft.Maui.Controls.Accelerator.Modifiers" />
-      <MemberSignature Language="F#" Value="member this.Modifiers : seq&lt;string&gt; with get, set" Usage="Microsoft.Maui.Controls.Accelerator.Modifiers" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.0.0.0</AssemblyVersion>
-        <AssemblyVersion>2.0.0.0</AssemblyVersion>
-        <AssemblyName>Microsoft.Maui.Controls.Core</AssemblyName>
-      </AssemblyInfo>
-      <Attributes>
-        <Attribute>
-          <AttributeName>System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)</AttributeName>
-        </Attribute>
-      </Attributes>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IEnumerable&lt;System.String&gt;</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>For internal use only.</summary>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="op_Implicit">
       <MemberSignature Language="C#" Value="public static implicit operator Microsoft.Maui.Controls.Accelerator (string accelerator);" />
       <MemberSignature Language="ILAsm" Value=".method public static hidebysig specialname class Microsoft.Maui.Controls.Accelerator op_Implicit(string accelerator) cil managed" />
diff --git a/src/Controls/samples/Controls.Sample/Pages/Core/ContextFlyoutPage.xaml b/src/Controls/samples/Controls.Sample/Pages/Core/ContextFlyoutPage.xaml
index 37c516b0f831..08984b1c3150 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Core/ContextFlyoutPage.xaml
+++ b/src/Controls/samples/Controls.Sample/Pages/Core/ContextFlyoutPage.xaml
@@ -10,10 +10,10 @@
                 <Button Text="Increment by 1 (or right-click me)" Clicked="OnIncrementByOneClicked" FontSize="30" BackgroundColor="DarkGray">
                     <FlyoutBase.ContextFlyout>
                         <MenuFlyout>
-                            <MenuFlyoutItem Text="Increment by 10" Clicked="OnIncrementMenuItemClicked" CommandParameter="10"></MenuFlyoutItem>
-                            <MenuFlyoutItem Text="Increment by 20" Clicked="OnIncrementMenuItemClicked" CommandParameter="20"></MenuFlyoutItem>
-                            <MenuFlyoutItem Text="Increment by 30 (disabled)" Clicked="OnIncrementMenuItemClicked" CommandParameter="30" x:Name="bbb"></MenuFlyoutItem>
-                            <MenuFlyoutItem Text="Increment by 40 (dynamic enabled/disabled)" Command="{Binding DynamicEnabledCommand}" CommandParameter="40"></MenuFlyoutItem>
+                            <MenuFlyoutItem x:Name="Increment10MenuFlyoutItem" Text="Increment by 10" Clicked="OnIncrementMenuItemClicked" CommandParameter="10" />
+                            <MenuFlyoutItem x:Name="Increment20MenuFlyoutItem" Text="Increment by 20" Clicked="OnIncrementMenuItemClicked" CommandParameter="20" />
+                            <MenuFlyoutItem Text="Increment by 30 (disabled)" Clicked="OnIncrementMenuItemClicked" CommandParameter="30" x:Name="bbb" />
+                            <MenuFlyoutItem Text="Increment by 40 (dynamic enabled/disabled)" Command="{Binding DynamicEnabledCommand}" CommandParameter="40" />
                             <MenuFlyoutSubItem Text="More options">
                                 <MenuFlyoutItem Text="Increment by 1,000!" Clicked="OnIncrementMenuItemClicked" CommandParameter="1000"></MenuFlyoutItem>
                                 <MenuFlyoutItem Text="Increment by 1,000,000!" Clicked="OnIncrementMenuItemClicked" CommandParameter="1000000"></MenuFlyoutItem>
diff --git a/src/Controls/samples/Controls.Sample/Pages/Core/ContextFlyoutPage.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/Core/ContextFlyoutPage.xaml.cs
index a0918215966a..fd11e41512e4 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Core/ContextFlyoutPage.xaml.cs
+++ b/src/Controls/samples/Controls.Sample/Pages/Core/ContextFlyoutPage.xaml.cs
@@ -42,6 +42,10 @@ await DisplayAlert(
 			bbb.IsEnabled = false;
 
 			ContextMenuWebView.HandlerChanged += OnWebViewHandlerChanged;
+
+			MenuItem.SetAccelerator(Increment10MenuFlyoutItem, Accelerator.FromString("alt+ctrl+a"));
+			MenuItem.SetAccelerator(Increment20MenuFlyoutItem, Accelerator.FromString("ctrl+b"));
+			MenuItem.SetAccelerator(bbb, Accelerator.FromString("c"));
 		}
 
 
diff --git a/src/Controls/samples/Controls.Sample/Pages/Core/MenuBarPage.cs b/src/Controls/samples/Controls.Sample/Pages/Core/MenuBarPage.cs
index c8d7d9f436a9..1fa9a61ec96d 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Core/MenuBarPage.cs
+++ b/src/Controls/samples/Controls.Sample/Pages/Core/MenuBarPage.cs
@@ -1,10 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Microsoft.Maui.Controls;
-using Microsoft.Maui.Graphics;
 
 namespace Maui.Controls.Sample.Pages
 {
@@ -13,6 +10,8 @@ public partial class MenuBarPage
 		public MenuBarPage()
 		{
 			InitializeComponent();
+
+			MenuItem.SetAccelerator(CustomFileMenuFlyoutItem, Accelerator.FromString("ctrl+shift+f"));
 		}
 
 		void ItemClicked(object sender, EventArgs e)
diff --git a/src/Controls/samples/Controls.Sample/Pages/Core/MenuBarPage.xaml b/src/Controls/samples/Controls.Sample/Pages/Core/MenuBarPage.xaml
index cc0562782054..c7848cb36eaa 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Core/MenuBarPage.xaml
+++ b/src/Controls/samples/Controls.Sample/Pages/Core/MenuBarPage.xaml
@@ -6,13 +6,13 @@
     xmlns:views="clr-namespace:Maui.Controls.Sample.Pages.Base">
     <views:BasePage.MenuBarItems>
         <MenuBarItem Text="Before File">
-            <MenuFlyoutItem Clicked="ItemClicked" Text="Before File Action"></MenuFlyoutItem>
+            <MenuFlyoutItem Clicked="ItemClicked" Text="Before File Action" Accelerator="b" />
             <MenuFlyoutItem Text="Cool item 1"></MenuFlyoutItem>
             <MenuFlyoutSeparator />
             <MenuFlyoutItem Text="Cool item 2"></MenuFlyoutItem>
         </MenuBarItem>
         <MenuBarItem Text="File">
-            <MenuFlyoutItem Clicked="ItemClicked" Text="Custom File">
+            <MenuFlyoutItem x:Name="CustomFileMenuFlyoutItem" Clicked="ItemClicked" Text="Custom File" >
                 <MenuFlyoutItem.IconImageSource>
                         <FontImageSource
                             FontAutoScalingEnabled="False"
@@ -23,17 +23,17 @@
             </MenuFlyoutItem>
         </MenuBarItem>
         <MenuBarItem Text="Custom Menu">
-            <MenuFlyoutItem Clicked="ItemClicked" Text="Item 1"></MenuFlyoutItem>
+            <MenuFlyoutItem Clicked="ItemClicked" Text="Item 1" Accelerator="ctrl+5" />
             <MenuFlyoutSubItem Clicked="ItemClicked" Text="Sub Menu 1">
-                <MenuFlyoutItem IconImageSource="mic.png" Clicked="ItemClicked" Text="Flyout item 1"></MenuFlyoutItem>
-                <MenuFlyoutItem IconImageSource="coffee.png" Clicked="ItemClicked" Text="Flyout item 2"></MenuFlyoutItem>
+                <MenuFlyoutItem IconImageSource="mic.png" Clicked="ItemClicked" Text="Flyout item 1" Accelerator="Shift+M" />
+                <MenuFlyoutItem IconImageSource="coffee.png" Clicked="ItemClicked" Text="Flyout item 2" Accelerator="ALT+C" />
             </MenuFlyoutSubItem>
         </MenuBarItem>
     </views:BasePage.MenuBarItems>
     <views:BasePage.Content>
         <VerticalStackLayout Margin="12">
-            <Label x:Name="menuLabel" Text="You clicked on Menu Item:"></Label>
-            <Button Text="Toggle Menu Bar Item" Clicked="ToggleMenuBarItem"></Button>
+            <Label x:Name="menuLabel" Text="You clicked on Menu Item:" />
+            <Button Text="Toggle Menu Bar Item" Clicked="ToggleMenuBarItem" />
         </VerticalStackLayout>
     </views:BasePage.Content>
 </views:BasePage>
\ No newline at end of file
diff --git a/src/Controls/src/Core/Accelerator.cs b/src/Controls/src/Core/Accelerator.cs
index c22618e02811..90aab9aef7d1 100644
--- a/src/Controls/src/Core/Accelerator.cs
+++ b/src/Controls/src/Core/Accelerator.cs
@@ -1,4 +1,4 @@
-#nullable disable
+#nullable disable
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -7,36 +7,56 @@ namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/Accelerator.xml" path="Type[@FullName='Microsoft.Maui.Controls.Accelerator']/Docs/*" />
 	[System.ComponentModel.TypeConverter(typeof(AcceleratorTypeConverter))]
-	public class Accelerator
+	public class Accelerator : IAccelerator
 	{
-		const char Separator = '+';
-		string _text;
+		const string Separator = "+";
+		readonly string _text;
+		readonly List<string> _modifiers;
 
-		internal Accelerator(string text)
+		internal Accelerator(string text, IEnumerable<string> modifiers, string key)
 		{
 			if (string.IsNullOrEmpty(text))
 				throw new ArgumentNullException(nameof(text));
+
 			_text = text;
+			Key = key;
+			_modifiers = new List<string>(modifiers);
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Accelerator.xml" path="//Member[@MemberName='Modifiers']/Docs/*" />
-		[EditorBrowsable(EditorBrowsableState.Never)]
-		public IEnumerable<string> Modifiers { get; set; }
+		/// <summary>
+		/// Gets the modifiers for the accelerator.
+		/// </summary>
+		public IEnumerable<string> Modifiers => _modifiers;
+
+		IReadOnlyList<string> IAccelerator.Modifiers => _modifiers;
 
 		/// <include file="../../docs/Microsoft.Maui.Controls/Accelerator.xml" path="//Member[@MemberName='Keys']/Docs/*" />
 		[EditorBrowsable(EditorBrowsableState.Never)]
-		public IEnumerable<string> Keys { get; set; }
+		[Obsolete("Use Key instead.")]
+		public IEnumerable<string> Keys 
+		{
+			get => Key is null ? null : new[] { Key };
+		}
+
+		/// <summary>
+		/// Gets the key for the accelerator.
+		/// </summary>
+		public string Key { get; }
 
 		/// <include file="../../docs/Microsoft.Maui.Controls/Accelerator.xml" path="//Member[@MemberName='FromString']/Docs/*" />
 		public static Accelerator FromString(string text)
 		{
-			var accelarat = new Accelerator(text);
+			if (string.IsNullOrEmpty(text))
+				throw new ArgumentNullException(nameof(text));
+
+			var str = text;
+			var modifiers = new List<string>();
+			var key = string.Empty;
 
-			var acceleratorParts = text.Split(Separator);
+			var acceleratorParts = text.Split(new[] { Separator }, StringSplitOptions.None);
 
 			if (acceleratorParts.Length > 1)
 			{
-				var modifiers = new List<string>();
 				for (int i = 0; i < acceleratorParts.Length; i++)
 				{
 					var modifierMask = acceleratorParts[i];
@@ -51,27 +71,27 @@ public static Accelerator FromString(string text)
 						case "win":
 							modifiers.Add(modiferMaskLower);
 #if NETSTANDARD2_0
-							text = text.Replace(modifierMask, "");
+							text = text.Replace(modifierMask, string.Empty);
 #else
-							text = text.Replace(modifierMask, "", StringComparison.Ordinal);
+							text = text.Replace(modifierMask, string.Empty, StringComparison.Ordinal);
 #endif
 							break;
 					}
 				}
-				accelarat.Modifiers = modifiers;
-
 			}
 
-			if (text != Separator.ToString())
-			{
-				var keys = text.Split(new char[] { Separator }, StringSplitOptions.RemoveEmptyEntries);
-				accelarat.Keys = keys;
-			}
-			else
+			if (!string.Equals(text, Separator, StringComparison.Ordinal))
 			{
-				accelarat.Keys = new[] { text };
+#if NETSTANDARD2_0
+				text = text.Replace(Separator, string.Empty);
+#else
+				text = text.Replace(Separator, string.Empty, StringComparison.Ordinal);
+#endif
 			}
-			return accelarat;
+
+			key = text;
+
+			return new Accelerator(str, modifiers, key);
 		}
 
 		/// <include file="../../docs/Microsoft.Maui.Controls/Accelerator.xml" path="//Member[@MemberName='ToString']/Docs/*" />
diff --git a/src/Controls/src/Core/Menu/MenuItem.cs b/src/Controls/src/Core/Menu/MenuItem.cs
index 83b24b4489a2..cbd2de0892f4 100644
--- a/src/Controls/src/Core/Menu/MenuItem.cs
+++ b/src/Controls/src/Core/Menu/MenuItem.cs
@@ -1,4 +1,4 @@
-#nullable disable
+#nullable disable
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -145,6 +145,9 @@ static object CoerceIsEnabledProperty(BindableObject bindable, object value)
 			return false;
 		}
 
+		IReadOnlyList<IAccelerator> IMenuElement.Accelerators =>
+			GetAccelerator(this) is Accelerator acc ? new[] { acc } : null;
+
 		IImageSource IImageSourcePart.Source => this.IconImageSource;
 
 		bool IImageSourcePart.IsAnimationPlaying => false;
diff --git a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
index f3850cb322e9..d7b23612e669 100644
--- a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -1,4 +1,7 @@
 #nullable enable
+*REMOVED*~Microsoft.Maui.Controls.Accelerator.Modifiers.set -> void
+*REMOVED*~Microsoft.Maui.Controls.Accelerator.Keys.set -> void
+~Microsoft.Maui.Controls.Accelerator.Key.get -> string
 *REMOVED*override Microsoft.Maui.Controls.RefreshView.MeasureOverride(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
 Microsoft.Maui.Controls.Border.~Border() -> void
 Microsoft.Maui.Controls.IWindowCreator
diff --git a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index 3d5af1c1cc13..153fd69cabc6 100644
--- a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -1,4 +1,7 @@
 #nullable enable
+*REMOVED*~Microsoft.Maui.Controls.Accelerator.Modifiers.set -> void
+*REMOVED*~Microsoft.Maui.Controls.Accelerator.Keys.set -> void
+~Microsoft.Maui.Controls.Accelerator.Key.get -> string
 *REMOVED*override Microsoft.Maui.Controls.RefreshView.MeasureOverride(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
 Microsoft.Maui.Controls.Border.~Border() -> void
 Microsoft.Maui.Controls.IWindowCreator
diff --git a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Shipped.txt b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Shipped.txt
index 55f95f980316..a6b5259090b5 100644
--- a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Shipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Shipped.txt
@@ -97,8 +97,8 @@
 ~Microsoft.Maui.Controls.AbsoluteLayout.SetLayoutFlags(Microsoft.Maui.IView view, Microsoft.Maui.Layouts.AbsoluteLayoutFlags flags) -> void
 ~Microsoft.Maui.Controls.Accelerator.Keys.get -> System.Collections.Generic.IEnumerable<string>
 ~Microsoft.Maui.Controls.Accelerator.Keys.set -> void
-~Microsoft.Maui.Controls.Accelerator.Modifiers.get -> System.Collections.Generic.IEnumerable<string>
 ~Microsoft.Maui.Controls.Accelerator.Modifiers.set -> void
+~Microsoft.Maui.Controls.Accelerator.Modifiers.get -> System.Collections.Generic.IEnumerable<string>
 ~Microsoft.Maui.Controls.ActivityIndicator.Color.get -> Microsoft.Maui.Graphics.Color
 ~Microsoft.Maui.Controls.ActivityIndicator.Color.set -> void
 ~Microsoft.Maui.Controls.ActivityIndicator.On<T>() -> Microsoft.Maui.Controls.IPlatformElementConfiguration<T, Microsoft.Maui.Controls.ActivityIndicator>
diff --git a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index 3d5af1c1cc13..153fd69cabc6 100644
--- a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -1,4 +1,7 @@
 #nullable enable
+*REMOVED*~Microsoft.Maui.Controls.Accelerator.Modifiers.set -> void
+*REMOVED*~Microsoft.Maui.Controls.Accelerator.Keys.set -> void
+~Microsoft.Maui.Controls.Accelerator.Key.get -> string
 *REMOVED*override Microsoft.Maui.Controls.RefreshView.MeasureOverride(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
 Microsoft.Maui.Controls.Border.~Border() -> void
 Microsoft.Maui.Controls.IWindowCreator
diff --git a/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
index 2f089f2bd8f8..dc90a9e9c2a2 100644
--- a/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
@@ -1,4 +1,7 @@
-#nullable enable
+#nullable enable
+*REMOVED*~Microsoft.Maui.Controls.Accelerator.Modifiers.set -> void
+*REMOVED*~Microsoft.Maui.Controls.Accelerator.Keys.set -> void
+~Microsoft.Maui.Controls.Accelerator.Key.get -> string
 Microsoft.Maui.Controls.Border.~Border() -> void
 Microsoft.Maui.Controls.IWindowCreator
 Microsoft.Maui.Controls.IWindowCreator.CreateWindow(Microsoft.Maui.Controls.Application! app, Microsoft.Maui.IActivationState? activationState) -> Microsoft.Maui.Controls.Window!
diff --git a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index f1fff8c5199b..0901b7b64dfd 100644
--- a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -1,4 +1,7 @@
 #nullable enable
+*REMOVED*~Microsoft.Maui.Controls.Accelerator.Modifiers.set -> void
+*REMOVED*~Microsoft.Maui.Controls.Accelerator.Keys.set -> void
+~Microsoft.Maui.Controls.Accelerator.Key.get -> string
 *REMOVED*override Microsoft.Maui.Controls.RefreshView.MeasureOverride(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
 Microsoft.Maui.Controls.Border.~Border() -> void
 Microsoft.Maui.Controls.IWindowCreator
diff --git a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
index 4ef8570e7f7a..9751761c02f5 100644
--- a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -1,4 +1,7 @@
-#nullable enable
+#nullable enable
+*REMOVED*~Microsoft.Maui.Controls.Accelerator.Modifiers.set -> void
+*REMOVED*~Microsoft.Maui.Controls.Accelerator.Keys.set -> void
+~Microsoft.Maui.Controls.Accelerator.Key.get -> string
 *REMOVED*override Microsoft.Maui.Controls.RefreshView.MeasureOverride(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
 Microsoft.Maui.Controls.Border.~Border() -> void
 Microsoft.Maui.Controls.IWindowCreator
diff --git a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
index 43e1a5856203..d625737f00a3 100644
--- a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -1,4 +1,7 @@
 #nullable enable
+*REMOVED*~Microsoft.Maui.Controls.Accelerator.Modifiers.set -> void
+*REMOVED*~Microsoft.Maui.Controls.Accelerator.Keys.set -> void
+~Microsoft.Maui.Controls.Accelerator.Key.get -> string
 *REMOVED*override Microsoft.Maui.Controls.RefreshView.MeasureOverride(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
 Microsoft.Maui.Controls.Border.~Border() -> void
 Microsoft.Maui.Controls.IWindowCreator
diff --git a/src/Controls/tests/Core.UnitTests/AcceleratorUnitTests.cs b/src/Controls/tests/Core.UnitTests/AcceleratorUnitTests.cs
index 5b55e5f6e376..a9ae4d5adb1c 100644
--- a/src/Controls/tests/Core.UnitTests/AcceleratorUnitTests.cs
+++ b/src/Controls/tests/Core.UnitTests/AcceleratorUnitTests.cs
@@ -6,7 +6,6 @@
 
 namespace Microsoft.Maui.Controls.Core.UnitTests
 {
-
 	public class AcceleratorUnitTests : BaseTestFixture
 	{
 
@@ -22,47 +21,58 @@ public void AcceleratorThrowsOnNull()
 			Assert.Throws<ArgumentNullException>(() => Accelerator.FromString(null));
 		}
 
-		[Fact]
-		public void AcceleratorFromString()
+		[Theory]
+		[InlineData("ctrl+A")]
+		[InlineData("cmd+A")]
+		[InlineData("ctrl+1")]
+		[InlineData("cmd+1")]
+		[InlineData("ctrl+alt+A")]
+		[InlineData("cmd+alt+A")]
+		[InlineData("A")]
+		public void AcceleratorFromString(string shortCutKeyBinding)
 		{
-			string shourtCutKeyBinding = "ctrl+A";
-			var accelerator = Accelerator.FromString(shourtCutKeyBinding);
+			var accelerator = Accelerator.FromString(shortCutKeyBinding);
 
-			Assert.Equal(shourtCutKeyBinding, accelerator.ToString());
+			Assert.Equal(shortCutKeyBinding, accelerator.ToString());
 		}
 
-		[Fact]
-		public void AcceleratorFromOnlyLetter()
+		[Theory]
+		[InlineData("A")]
+		[InlineData("B")]
+		[InlineData("1")]
+		[InlineData("2")]
+		public void AcceleratorFromOnlyLetter(string shortCutKeyBinding)
 		{
-			string shourtCutKeyBinding = "A";
-			var accelerator = Accelerator.FromString(shourtCutKeyBinding);
+			var accelerator = Accelerator.FromString(shortCutKeyBinding);
 
 			Assert.Single(accelerator.Keys);
-			Assert.Equal(accelerator.Keys.ElementAt(0), shourtCutKeyBinding);
+			Assert.Equal(accelerator.Keys.ElementAt(0), shortCutKeyBinding);
 		}
 
 		[Theory, MemberData(nameof(ShortcutTestData))]
-		public void AcceleratorFromLetterAndModifier(TestShortcut shourtcut)
+		public void AcceleratorFromLetterAndModifier(TestShortcut shortcut)
 		{
-			string modifier = shourtcut.Modifier;
-			string key = shourtcut.Key;
-			var accelerator = Accelerator.FromString(shourtcut.ToString());
+			string modifier = shortcut.Modifier;
+			Assert.NotNull(modifier);
 
+			string key = shortcut.Key;
+			Assert.NotNull(key);
+
+			var accelerator = Accelerator.FromString(shortcut.ToString());
 			Assert.Single(accelerator.Keys);
 			Assert.Single(accelerator.Modifiers);
-			Assert.Equal(accelerator.Keys.ElementAt(0), shourtcut.Key);
-			Assert.Equal(accelerator.Modifiers.ElementAt(0), shourtcut.Modifier);
+			Assert.Equal(accelerator.Keys.ElementAt(0), shortcut.Key);
+			Assert.Equal(accelerator.Modifiers.ElementAt(0), shortcut.Modifier);
 		}
 
-
 		[Fact]
 		public void AcceleratorFromLetterAnd2Modifier()
 		{
 			string modifier = "ctrl";
 			string modifier1Alt = "alt";
 			string key = "A";
-			string shourtCutKeyBinding = $"{modifier}+{modifier1Alt}+{key}";
-			var accelerator = Accelerator.FromString(shourtCutKeyBinding);
+			string shortCutKeyBinding = $"{modifier}+{modifier1Alt}+{key}";
+			var accelerator = Accelerator.FromString(shortCutKeyBinding);
 
 			Assert.Single(accelerator.Keys);
 			Assert.Equal(2, accelerator.Modifiers.Count());
diff --git a/src/Core/src/Core/IAccelerator.cs b/src/Core/src/Core/IAccelerator.cs
new file mode 100644
index 000000000000..83474fd6d2d1
--- /dev/null
+++ b/src/Core/src/Core/IAccelerator.cs
@@ -0,0 +1,20 @@
+using System.Collections.Generic;
+
+namespace Microsoft.Maui
+{
+	/// <summary>
+	/// Represents a shortcut key for a <see cref="T:Microsoft.Maui.Controls.MenuItem" />.
+	/// </summary>
+	public interface IAccelerator
+	{
+		/// <summary>
+		/// Specifies the virtual key used to modify another keypress. 
+		/// </summary>
+		public IReadOnlyList<string> Modifiers { get; }
+
+		/// <summary>
+		/// Specifies the values for the virtual key.
+		/// </summary>
+		public string Key { get; }
+	}
+}
diff --git a/src/Core/src/Core/IMenuElement.cs b/src/Core/src/Core/IMenuElement.cs
index e9decab982ae..6dcff919322f 100644
--- a/src/Core/src/Core/IMenuElement.cs
+++ b/src/Core/src/Core/IMenuElement.cs
@@ -1,9 +1,18 @@
-using Microsoft.Maui.Graphics;
+using System.Collections.Generic;
 
 namespace Microsoft.Maui
 {
 	public interface IMenuElement : IElement, IImageSourcePart, IText
 	{
+		/// <summary>
+		/// Represents a shortcut key for a MenuItem.
+		/// </summary>
+#if NETSTANDARD2_0
+		IReadOnlyList<IAccelerator>? Accelerators { get; }
+#else
+		IReadOnlyList<IAccelerator>? Accelerators => null;
+#endif
+
 		/// <summary>
 		/// Gets a value indicating whether this View is enabled in the user interface. 
 		/// </summary>
diff --git a/src/Core/src/Handlers/MenuFlyoutItem/MenuFlyoutItemHandler.Windows.cs b/src/Core/src/Handlers/MenuFlyoutItem/MenuFlyoutItemHandler.Windows.cs
index 1bdbbc8fb721..2dde2976c8a6 100644
--- a/src/Core/src/Handlers/MenuFlyoutItem/MenuFlyoutItemHandler.Windows.cs
+++ b/src/Core/src/Handlers/MenuFlyoutItem/MenuFlyoutItemHandler.Windows.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.Maui.Handlers
 {
@@ -40,6 +37,16 @@ public static void MapText(IMenuFlyoutItemHandler handler, IMenuFlyoutItem view)
 			handler.PlatformView.Text = view.Text;
 		}
 
+		/// <summary>
+		///	Maps accelerator to the Windows platform control.
+		/// </summary>
+		/// <param name="handler">The handler, of type <see cref="IMenuFlyoutItemHandler"/>.</param>
+		/// <param name="view">The view, of type <see cref="IMenuFlyoutItem"/>.</param>
+		public static void MapAccelerator(IMenuFlyoutItemHandler handler, IMenuFlyoutItem view)
+		{
+			handler.PlatformView.UpdateAccelerator(view);
+		}
+
 		public static void MapIsEnabled(IMenuFlyoutItemHandler handler, IMenuFlyoutItem view) =>
 			handler.PlatformView.UpdateIsEnabled(view.IsEnabled);
 	}
diff --git a/src/Core/src/Handlers/MenuFlyoutItem/MenuFlyoutItemHandler.cs b/src/Core/src/Handlers/MenuFlyoutItem/MenuFlyoutItemHandler.cs
index 4af861a77f18..327ce7655a7e 100644
--- a/src/Core/src/Handlers/MenuFlyoutItem/MenuFlyoutItemHandler.cs
+++ b/src/Core/src/Handlers/MenuFlyoutItem/MenuFlyoutItemHandler.cs
@@ -22,6 +22,7 @@ public partial class MenuFlyoutItemHandler : ElementHandler<IMenuFlyoutItem, Pla
 		{
 #if WINDOWS
 			[nameof(IMenuFlyoutSubItem.Text)] = MapText,
+			[nameof(IMenuElement.Accelerators)] = MapAccelerator,
 			[nameof(IMenuElement.Source)] = MapSource,
 			[nameof(IMenuElement.IsEnabled)] = MapIsEnabled
 #endif
diff --git a/src/Core/src/Handlers/MenuFlyoutItem/MenuFlyoutItemHandler.iOS.cs b/src/Core/src/Handlers/MenuFlyoutItem/MenuFlyoutItemHandler.iOS.cs
index 7f271911f4af..075a6281dadf 100644
--- a/src/Core/src/Handlers/MenuFlyoutItem/MenuFlyoutItemHandler.iOS.cs
+++ b/src/Core/src/Handlers/MenuFlyoutItem/MenuFlyoutItemHandler.iOS.cs
@@ -1,16 +1,19 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 using Foundation;
+using Microsoft.Maui.Platform;
 using ObjCRuntime;
 using UIKit;
+using static CoreMedia.CMTime;
 
 namespace Microsoft.Maui.Handlers
 {
 	[System.Runtime.Versioning.SupportedOSPlatform("ios13.0")]
 	public partial class MenuFlyoutItemHandler
 	{
-		static Dictionary<int, IMenuElement> menus = new Dictionary<int, IMenuElement>();
+		internal static Dictionary<int, IMenuElement> menus = new Dictionary<int, IMenuElement>();
 
 		bool IsInContextFlyout()
 		{
@@ -44,32 +47,7 @@ protected override UIMenuElement CreatePlatformElement()
 				return uiAction;
 			}
 
-			int index = menus.Count;
-			UIImage? uiImage = VirtualView.Source.GetPlatformMenuImage(MauiContext!);
-			var selector = new Selector($"MenuItem{index}:");
-
-			bool selectorFound =
-				MauiUIApplicationDelegate.Current.RespondsToSelector(selector);
-
-			if (!selectorFound)
-			{
-				throw new InvalidOperationException(
-					$"By default we only support 50 MenuItems. You can add more by adding the following code to {MauiUIApplicationDelegate.Current.GetType()}\n\n" +
-					$"[Export(\"MenuItem{index}: \")]\n" +
-					$"internal void MenuItem{index}(UICommand uICommand)\n" +
-					"{\n" +
-					"	uICommand.SendClicked();\n" +
-					"}");
-			}
-
-			var command = UICommand.Create(
-				title: VirtualView.Text,
-				uiImage,
-				selector,
-				new NSString($"{index}"));
-
-			menus[index] = VirtualView;
-			return command;
+			return VirtualView.CreateMenuItem(MauiContext!);
 		}
 
 		internal static void Execute(UICommand uICommand)
diff --git a/src/Core/src/Handlers/MenuFlyoutSubItem/MenuFlyoutSubItemHandler.Windows.cs b/src/Core/src/Handlers/MenuFlyoutSubItem/MenuFlyoutSubItemHandler.Windows.cs
index 0a514b39801f..9cca1e97ec32 100644
--- a/src/Core/src/Handlers/MenuFlyoutSubItem/MenuFlyoutSubItemHandler.Windows.cs
+++ b/src/Core/src/Handlers/MenuFlyoutSubItem/MenuFlyoutSubItemHandler.Windows.cs
@@ -43,6 +43,16 @@ public static void MapText(IMenuFlyoutSubItemHandler handler, IMenuFlyoutSubItem
 			handler.PlatformView.Text = view.Text;
 		}
 
+		/// <summary>
+		///	Maps accelerator to the Windows platform control.
+		/// </summary>
+		/// <param name="handler">The handler, of type IMenuFlyoutSubItemHandler.</param>
+		/// <param name="view">The view, of type IMenuFlyoutSubItem.</param>
+		public static void MapAccelerator(IMenuFlyoutSubItemHandler handler, IMenuFlyoutSubItem view)
+		{
+			handler.PlatformView.UpdateAccelerator(view);
+		}
+
 		public static void MapIsEnabled(IMenuFlyoutSubItemHandler handler, IMenuFlyoutSubItem view) =>
 			handler.PlatformView.UpdateIsEnabled(view.IsEnabled);
 
diff --git a/src/Core/src/Handlers/MenuFlyoutSubItem/MenuFlyoutSubItemHandler.cs b/src/Core/src/Handlers/MenuFlyoutSubItem/MenuFlyoutSubItemHandler.cs
index 7baf150e9616..8b79ae597442 100644
--- a/src/Core/src/Handlers/MenuFlyoutSubItem/MenuFlyoutSubItemHandler.cs
+++ b/src/Core/src/Handlers/MenuFlyoutSubItem/MenuFlyoutSubItemHandler.cs
@@ -21,6 +21,7 @@ public partial class MenuFlyoutSubItemHandler : ElementHandler<IMenuFlyoutSubIte
 		{
 #if WINDOWS
 			[nameof(IMenuFlyoutSubItem.Text)] = MapText,
+			[nameof(IMenuFlyoutSubItem.Accelerators)] = MapAccelerator,
 			[nameof(IMenuFlyoutSubItem.Source)] = MapSource,
 			[nameof(IMenuFlyoutSubItem.IsEnabled)] = MapIsEnabled,
 #endif
diff --git a/src/Core/src/Platform/Windows/KeyboardAcceleratorExtensions.cs b/src/Core/src/Platform/Windows/KeyboardAcceleratorExtensions.cs
new file mode 100644
index 000000000000..d62978e0ead0
--- /dev/null
+++ b/src/Core/src/Platform/Windows/KeyboardAcceleratorExtensions.cs
@@ -0,0 +1,132 @@
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Input;
+using System;
+using System.Collections.Generic;
+using Windows.System;
+
+namespace Microsoft.Maui.Platform
+{
+	/// <summary>
+	/// Group of helper extension methods related to KeyboardAccelerators.
+	/// </summary>
+	public static class KeyboardAcceleratorExtensions
+	{
+		/// <summary>
+		/// Updates the collection of KeyboardAccelerators used by a MenuFlyoutItemBase.
+		/// </summary>
+		/// <param name="platformView">The platform view, of type <see cref="MenuFlyoutItemBase"/>.</param>
+		/// <param name="menuFlyoutItem">The abstract menu flyout item, of type <see cref="IMenuFlyoutItem"/>, with all the necessary information.</param>
+		public static void UpdateAccelerator(this MenuFlyoutItemBase platformView, IMenuFlyoutItem menuFlyoutItem)
+		{
+			var keyboardAccelerators = menuFlyoutItem.Accelerators?.ToPlatform();
+
+			if (keyboardAccelerators is null)
+				return;
+
+			foreach (var keyboardAccelerator in keyboardAccelerators)
+				platformView.KeyboardAccelerators.Add(keyboardAccelerator);
+		}
+
+		/// <summary>
+		/// Converts a list of IAccelerator to a list of KeyboardAccelerator.
+		/// A KeyboardAccelerator represents a keyboard shortcut (or accelerator) that lets a user perform an action using the keyboard instead
+		/// of navigating the app UI (directly or through access keys). 
+		/// </summary>
+		/// <param name="accelerators">List of <see cref="IAccelerator"/></param>
+		/// <returns>List of <see cref="KeyboardAccelerator"/></returns>
+		public static IList<KeyboardAccelerator>? ToPlatform(this IReadOnlyList<IAccelerator> accelerators)
+		{
+			if (accelerators is null)
+				return null;
+
+			List<KeyboardAccelerator> result = new List<KeyboardAccelerator>();
+
+			foreach (var accelerator in accelerators)
+			{
+				var keyboardAccelerators = accelerator.ToPlatform();
+
+				if (keyboardAccelerators is not null)
+					result.AddRange(keyboardAccelerators);
+			}
+
+			return result;
+		}
+
+		// Single key (A, Delete, F2, Spacebar, Esc, Multimedia Key) accelerators and multi-key
+		// accelerators (Ctrl+Shift+M) are supported.
+		// Gamepad virtual keys are not supported.
+		public static IList<KeyboardAccelerator>? ToPlatform(this IAccelerator accelerator)
+		{
+			if (accelerator is null)
+				return null;
+
+			List<KeyboardAccelerator> result = new List<KeyboardAccelerator>();
+
+			var key = accelerator.Key;
+			var modifiers = accelerator.Modifiers;
+
+			var keyboardAccelerator = new KeyboardAccelerator();
+			keyboardAccelerator.Key = key.ToVirtualKey();
+			if (modifiers is not null)
+			{
+				foreach (var mod in modifiers)
+				{
+					keyboardAccelerator.Modifiers |= mod.ToVirtualKeyModifiers();
+				}
+			}
+			result.Add(keyboardAccelerator);
+
+			return result;
+		}
+
+		internal static VirtualKeyModifiers ToVirtualKeyModifiers(this string modifierMask)
+		{
+			switch (modifierMask.ToLowerInvariant())
+			{
+				case "ctrl":
+					return VirtualKeyModifiers.Control;
+				case "alt":
+					return VirtualKeyModifiers.Menu;
+				case "shift":
+					return VirtualKeyModifiers.Shift;
+				case "win":
+					return VirtualKeyModifiers.Windows;
+				default:
+					return VirtualKeyModifiers.None;
+			}
+		}
+
+		internal static VirtualKey ToVirtualKey(this string key)
+		{
+			if (int.TryParse(key, out int numberKey))
+			{
+				if (numberKey >= 0 && numberKey <= 9)
+				{
+					key = $"Number{key}";
+				}
+			}
+
+			if (Enum.TryParse<VirtualKey>(key.ToVirtualKeyString(), true, out var virtualKey))
+				return virtualKey;
+
+			return VirtualKey.None;
+		}
+
+		internal static string ToVirtualKeyString(this string key)
+		{
+			// VirtualKey is an enum. Each option can be accessed with the constant name or with an integer.
+			// A common possible mistake using accelerators is to directly use digits like 3 to create an accelerator
+			// like Ctrl+3, but we can access enum values using integers, which would give a different result
+			// than desired. Here we try to avoid it.
+			if (int.TryParse(key, out int numberKey))
+			{
+				if (numberKey >= 0 && numberKey <= 9)
+				{
+					key = $"Number{key}";
+				}
+			}
+
+			return key;
+		}
+	}
+}
diff --git a/src/Core/src/Platform/iOS/AcceleratorExtensions.cs b/src/Core/src/Platform/iOS/AcceleratorExtensions.cs
new file mode 100644
index 000000000000..77007d394a02
--- /dev/null
+++ b/src/Core/src/Platform/iOS/AcceleratorExtensions.cs
@@ -0,0 +1,97 @@
+using System;
+using System.Linq;
+using Foundation;
+using ObjCRuntime;
+using UIKit;
+
+namespace Microsoft.Maui.Platform
+{
+	internal static class AcceleratorExtensions
+	{
+		internal static UIMenuElement CreateMenuItem(this IMenuFlyoutItem virtualView, IMauiContext mauiContext)
+		{
+			int index = MenuFlyoutItemHandler.menus.Count;
+			UIImage? uiImage = virtualView.Source.GetPlatformMenuImage(mauiContext);
+			var selector = new Selector($"MenuItem{index}:");
+
+			bool selectorFound =
+				MauiUIApplicationDelegate.Current.RespondsToSelector(selector);
+
+			if (!selectorFound)
+			{
+				throw new InvalidOperationException(
+					$"By default we only support 50 MenuItems. You can add more by adding the following code to {MauiUIApplicationDelegate.Current.GetType()}\n\n" +
+					$"[Export(\"MenuItem{index}: \")]\n" +
+					$"internal void MenuItem{index}(UICommand uICommand)\n" +
+					"{\n" +
+					"	uICommand.SendClicked();\n" +
+					"}");
+			}
+
+			var accelerator = virtualView.Accelerators?[0];
+			if (accelerator is null)
+				return virtualView.CreateMenuItemCommand(index, uiImage, selector);
+
+			var key = accelerator.Key;
+			var modifiers = accelerator.Modifiers;
+
+			UIKeyModifierFlags modifierFlags = 0;
+
+			// Single key accelerators (no modifier, i.e. "A") and multi-key accelerators are supported (>=1 modifier and 1 key only, i.e. Ctrl+F, Ctrl+Shift+F)
+			if (modifiers is not null && modifiers.Count > 0)
+			{
+				foreach (var modifier in modifiers)
+				{
+					var modifierMask = modifier.ToLowerInvariant();
+
+					switch (modifierMask)
+					{
+						case "ctrl":
+							modifierFlags |= UIKeyModifierFlags.Control;
+							break;
+						case "cmd":
+							modifierFlags |= UIKeyModifierFlags.Command;
+							break;
+						case "alt":
+							modifierFlags |= UIKeyModifierFlags.Alternate;
+							break;
+						case "shift":
+							modifierFlags |= UIKeyModifierFlags.Shift;
+							break;
+					}
+				}
+			}
+
+			return virtualView.CreateMenuItemKeyCommand(index, uiImage, selector, modifierFlags, key);
+		}
+
+		static UIMenuElement CreateMenuItemKeyCommand(this IMenuFlyoutItem virtualView, int index, UIImage? uiImage, Selector selector, UIKeyModifierFlags modifierFlags, string key)
+		{
+			var keyCommand = UIKeyCommand.Create(	
+				title: virtualView.Text,
+				uiImage,
+				selector,
+				key,
+				modifierFlags,
+				new NSString(index.ToString()));
+
+			keyCommand.WantsPriorityOverSystemBehavior = true;
+
+			MenuFlyoutItemHandler.menus[index] = virtualView;
+
+			return keyCommand;
+		}
+
+		static UIMenuElement CreateMenuItemCommand(this IMenuFlyoutItem virtualView, int index, UIImage? uiImage, Selector selector)
+		{
+			var command = UICommand.Create(				
+				title: virtualView.Text,
+				uiImage,
+				selector,
+				new NSString(index.ToString()));
+
+			MenuFlyoutItemHandler.menus[index] = virtualView;
+			return command;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
index 26815ca32050..5549a6b61f4e 100644
--- a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -4,6 +4,9 @@ abstract Microsoft.Maui.PlatformWrapperView.DrawShadow(Android.Graphics.Canvas!
 Microsoft.Maui.CommandMapper.Invoke(Microsoft.Maui.IElementHandler! viewHandler, Microsoft.Maui.IElement? virtualView, string! property, object? args) -> void
 Microsoft.Maui.FocusRequest.FocusRequest() -> void
 Microsoft.Maui.FontSize.Equals(Microsoft.Maui.FontSize other) -> bool
+Microsoft.Maui.IAccelerator
+Microsoft.Maui.IAccelerator.Key.get -> string!
+Microsoft.Maui.IAccelerator.Modifiers.get -> System.Collections.Generic.IReadOnlyList<string!>!
 Microsoft.Maui.IApplication.UserAppTheme.get -> Microsoft.Maui.ApplicationModel.AppTheme
 Microsoft.Maui.Hosting.MauiApp.DisposeAsync() -> System.Threading.Tasks.ValueTask
 Microsoft.Maui.ICommandMapper
@@ -12,6 +15,7 @@ Microsoft.Maui.ICommandMapper.Invoke(Microsoft.Maui.IElementHandler! viewHandler
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>.Add(string! key, System.Action<TViewHandler, TVirtualView, object?>! action) -> void
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>.Add(string! key, System.Action<TViewHandler, TVirtualView>! action) -> void
+Microsoft.Maui.IMenuElement.Accelerators.get -> System.Collections.Generic.IReadOnlyList<Microsoft.Maui.IAccelerator!>?
 Microsoft.Maui.Handlers.IImageSourcePartSetter
 Microsoft.Maui.Handlers.IImageSourcePartSetter.SetImageSource(Android.Graphics.Drawables.Drawable? obj) -> void
 Microsoft.Maui.Layouts.FlexBasis.Equals(Microsoft.Maui.Layouts.FlexBasis other) -> bool
diff --git a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index fb3dec4d44f1..7948328f1e78 100644
--- a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -6,6 +6,9 @@ Microsoft.Maui.Handlers.ImageHandler.OnWindowChanged() -> void
 Microsoft.Maui.Handlers.SwipeItemButton
 Microsoft.Maui.Handlers.SwipeItemButton.FrameChanged -> System.EventHandler?
 Microsoft.Maui.Handlers.SwipeItemButton.SwipeItemButton() -> void
+Microsoft.Maui.IAccelerator
+Microsoft.Maui.IAccelerator.Key.get -> string!
+Microsoft.Maui.IAccelerator.Modifiers.get -> System.Collections.Generic.IReadOnlyList<string!>!
 Microsoft.Maui.IApplication.UserAppTheme.get -> Microsoft.Maui.ApplicationModel.AppTheme
 Microsoft.Maui.Hosting.MauiApp.DisposeAsync() -> System.Threading.Tasks.ValueTask
 Microsoft.Maui.ICommandMapper
@@ -14,6 +17,7 @@ Microsoft.Maui.ICommandMapper.Invoke(Microsoft.Maui.IElementHandler! viewHandler
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>.Add(string! key, System.Action<TViewHandler, TVirtualView, object?>! action) -> void
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>.Add(string! key, System.Action<TViewHandler, TVirtualView>! action) -> void
+Microsoft.Maui.IMenuElement.Accelerators.get -> System.Collections.Generic.IReadOnlyList<Microsoft.Maui.IAccelerator!>?
 Microsoft.Maui.Handlers.IImageSourcePartSetter
 Microsoft.Maui.Handlers.IImageSourcePartSetter.SetImageSource(UIKit.UIImage? obj) -> void
 Microsoft.Maui.ICrossPlatformLayout
diff --git a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index acf55c354e5d..cd98412197ba 100644
--- a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -6,6 +6,9 @@ Microsoft.Maui.Handlers.ImageHandler.OnWindowChanged() -> void
 Microsoft.Maui.Handlers.SwipeItemButton
 Microsoft.Maui.Handlers.SwipeItemButton.FrameChanged -> System.EventHandler?
 Microsoft.Maui.Handlers.SwipeItemButton.SwipeItemButton() -> void
+Microsoft.Maui.IAccelerator
+Microsoft.Maui.IAccelerator.Key.get -> string!
+Microsoft.Maui.IAccelerator.Modifiers.get -> System.Collections.Generic.IReadOnlyList<string!>!
 Microsoft.Maui.IApplication.UserAppTheme.get -> Microsoft.Maui.ApplicationModel.AppTheme
 Microsoft.Maui.Hosting.MauiApp.DisposeAsync() -> System.Threading.Tasks.ValueTask
 Microsoft.Maui.ICommandMapper
@@ -14,6 +17,7 @@ Microsoft.Maui.ICommandMapper.Invoke(Microsoft.Maui.IElementHandler! viewHandler
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>.Add(string! key, System.Action<TViewHandler, TVirtualView, object?>! action) -> void
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>.Add(string! key, System.Action<TViewHandler, TVirtualView>! action) -> void
+Microsoft.Maui.IMenuElement.Accelerators.get -> System.Collections.Generic.IReadOnlyList<Microsoft.Maui.IAccelerator!>?
 Microsoft.Maui.Handlers.IImageSourcePartSetter
 Microsoft.Maui.Handlers.IImageSourcePartSetter.SetImageSource(UIKit.UIImage? obj) -> void
 Microsoft.Maui.ICrossPlatformLayout
diff --git a/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
index 50b7567c9dc1..879e114ca66e 100644
--- a/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
@@ -48,7 +48,11 @@ static Microsoft.Maui.PropertyMapperExtensions.PrependToMapping<TVirtualView, TV
 static Microsoft.Maui.PropertyMapperExtensions.ReplaceMapping<TVirtualView, TViewHandler>(this Microsoft.Maui.IPropertyMapper<Microsoft.Maui.IElement!, Microsoft.Maui.IElementHandler!>! propertyMapper, string! key, System.Action<TViewHandler, TVirtualView>! method) -> void
 static Microsoft.Maui.SizeRequest.operator !=(Microsoft.Maui.SizeRequest left, Microsoft.Maui.SizeRequest right) -> bool
 static Microsoft.Maui.SizeRequest.operator ==(Microsoft.Maui.SizeRequest left, Microsoft.Maui.SizeRequest right) -> bool
+Microsoft.Maui.IAccelerator
+Microsoft.Maui.IAccelerator.Key.get -> string!
+Microsoft.Maui.IAccelerator.Modifiers.get -> System.Collections.Generic.IReadOnlyList<string!>!
+Microsoft.Maui.IMenuElement.Accelerators.get -> System.Collections.Generic.IReadOnlyList<Microsoft.Maui.IAccelerator!>?
 *REMOVED*Microsoft.Maui.IContentView.CrossPlatformArrange(Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
 *REMOVED*Microsoft.Maui.IContentView.CrossPlatformMeasure(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
 *REMOVED*Microsoft.Maui.ILayout.CrossPlatformArrange(Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
-*REMOVED*Microsoft.Maui.ILayout.CrossPlatformMeasure(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
\ No newline at end of file
+*REMOVED*Microsoft.Maui.ILayout.CrossPlatformMeasure(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
diff --git a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index 9ca1a2718908..0621a6e24c93 100644
--- a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -1,6 +1,9 @@
 #nullable enable
 Microsoft.Maui.CommandMapper.Invoke(Microsoft.Maui.IElementHandler! viewHandler, Microsoft.Maui.IElement? virtualView, string! property, object? args) -> void
 Microsoft.Maui.FocusRequest.FocusRequest() -> void
+Microsoft.Maui.IAccelerator
+Microsoft.Maui.IAccelerator.Key.get -> string!
+Microsoft.Maui.IAccelerator.Modifiers.get -> System.Collections.Generic.IReadOnlyList<string!>!
 Microsoft.Maui.IApplication.UserAppTheme.get -> Microsoft.Maui.ApplicationModel.AppTheme
 Microsoft.Maui.Hosting.MauiApp.DisposeAsync() -> System.Threading.Tasks.ValueTask
 Microsoft.Maui.Handlers.IImageSourcePartSetter
@@ -18,7 +21,9 @@ Microsoft.Maui.ICommandMapper.Invoke(Microsoft.Maui.IElementHandler! viewHandler
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>.Add(string! key, System.Action<TViewHandler, TVirtualView, object?>! action) -> void
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>.Add(string! key, System.Action<TViewHandler, TVirtualView>! action) -> void
+Microsoft.Maui.IMenuElement.Accelerators.get -> System.Collections.Generic.IReadOnlyList<Microsoft.Maui.IAccelerator!>?
 Microsoft.Maui.Layouts.FlexBasis.Equals(Microsoft.Maui.Layouts.FlexBasis other) -> bool
+Microsoft.Maui.Platform.KeyboardAcceleratorExtensions
 Microsoft.Maui.Platform.ImageSourcePartLoader.ImageSourcePartLoader(Microsoft.Maui.Handlers.IImageSourcePartSetter! handler) -> void
 Microsoft.Maui.Platform.MauiPanel
 Microsoft.Maui.Platform.MauiPanel.CrossPlatformLayout.get -> Microsoft.Maui.ICrossPlatformLayout?
@@ -47,6 +52,9 @@ static Microsoft.Maui.Layouts.FlexBasis.operator !=(Microsoft.Maui.Layouts.FlexB
 static Microsoft.Maui.Layouts.FlexBasis.operator ==(Microsoft.Maui.Layouts.FlexBasis left, Microsoft.Maui.Layouts.FlexBasis right) -> bool
 static Microsoft.Maui.Layouts.LayoutExtensions.ArrangeContentUnbounded(this Microsoft.Maui.IContentView! contentView, Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
 static Microsoft.Maui.Handlers.SearchBarHandler.MapKeyboard(Microsoft.Maui.Handlers.ISearchBarHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
+static Microsoft.Maui.Platform.KeyboardAcceleratorExtensions.ToPlatform(this Microsoft.Maui.IAccelerator! accelerator) -> System.Collections.Generic.IList<Microsoft.UI.Xaml.Input.KeyboardAccelerator!>?
+static Microsoft.Maui.Platform.KeyboardAcceleratorExtensions.ToPlatform(this System.Collections.Generic.IReadOnlyList<Microsoft.Maui.IAccelerator!>! accelerators) -> System.Collections.Generic.IList<Microsoft.UI.Xaml.Input.KeyboardAccelerator!>?
+static Microsoft.Maui.Platform.KeyboardAcceleratorExtensions.UpdateAccelerator(this Microsoft.UI.Xaml.Controls.MenuFlyoutItemBase! platformView, Microsoft.Maui.IMenuFlyoutItem! menuFlyoutItem) -> void
 static Microsoft.Maui.Platform.NavigationViewExtensions.UpdateTopNavigationViewItemSelectedColor(this Microsoft.Maui.Platform.MauiNavigationView! navigationView, Microsoft.Maui.Graphics.Paint? paint) -> void
 static Microsoft.Maui.Platform.NavigationViewExtensions.UpdateTopNavigationViewItemTextSelectedColor(this Microsoft.Maui.Platform.MauiNavigationView! navigationView, Microsoft.Maui.Graphics.Paint? paint) -> void
 static Microsoft.Maui.Platform.NavigationViewExtensions.UpdateTopNavigationViewItemUnselectedColor(this Microsoft.Maui.Platform.MauiNavigationView! navigationView, Microsoft.Maui.Graphics.Paint? paint) -> void
@@ -63,6 +71,8 @@ static Microsoft.Maui.PropertyMapperExtensions.PrependToMapping<TVirtualView, TV
 static Microsoft.Maui.PropertyMapperExtensions.ReplaceMapping<TVirtualView, TViewHandler>(this Microsoft.Maui.IPropertyMapper<Microsoft.Maui.IElement!, Microsoft.Maui.IElementHandler!>! propertyMapper, string! key, System.Action<TViewHandler, TVirtualView>! method) -> void
 static Microsoft.Maui.SizeRequest.operator !=(Microsoft.Maui.SizeRequest left, Microsoft.Maui.SizeRequest right) -> bool
 static Microsoft.Maui.SizeRequest.operator ==(Microsoft.Maui.SizeRequest left, Microsoft.Maui.SizeRequest right) -> bool
+static Microsoft.Maui.Handlers.MenuFlyoutItemHandler.MapAccelerator(Microsoft.Maui.Handlers.IMenuFlyoutItemHandler! handler, Microsoft.Maui.IMenuFlyoutItem! view) -> void
+static Microsoft.Maui.Handlers.MenuFlyoutSubItemHandler.MapAccelerator(Microsoft.Maui.Handlers.IMenuFlyoutSubItemHandler! handler, Microsoft.Maui.IMenuFlyoutSubItem! view) -> void
 *REMOVED*Microsoft.Maui.IContentView.CrossPlatformArrange(Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
 *REMOVED*Microsoft.Maui.IContentView.CrossPlatformMeasure(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
 *REMOVED*Microsoft.Maui.ILayout.CrossPlatformArrange(Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
diff --git a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
index 8cf45a61435b..3e44924facf1 100644
--- a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -1,6 +1,9 @@
 #nullable enable
 Microsoft.Maui.CommandMapper.Invoke(Microsoft.Maui.IElementHandler! viewHandler, Microsoft.Maui.IElement? virtualView, string! property, object? args) -> void
 Microsoft.Maui.FocusRequest.FocusRequest() -> void
+Microsoft.Maui.IAccelerator
+Microsoft.Maui.IAccelerator.Key.get -> string!
+Microsoft.Maui.IAccelerator.Modifiers.get -> System.Collections.Generic.IReadOnlyList<string!>!
 Microsoft.Maui.IApplication.UserAppTheme.get -> Microsoft.Maui.ApplicationModel.AppTheme
 Microsoft.Maui.Hosting.MauiApp.DisposeAsync() -> System.Threading.Tasks.ValueTask
 Microsoft.Maui.ICommandMapper
@@ -9,6 +12,7 @@ Microsoft.Maui.ICommandMapper.Invoke(Microsoft.Maui.IElementHandler! viewHandler
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>.Add(string! key, System.Action<TViewHandler, TVirtualView, object?>! action) -> void
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>.Add(string! key, System.Action<TViewHandler, TVirtualView>! action) -> void
+Microsoft.Maui.IMenuElement.Accelerators.get -> System.Collections.Generic.IReadOnlyList<Microsoft.Maui.IAccelerator!>?
 Microsoft.Maui.Handlers.IImageSourcePartSetter
 Microsoft.Maui.Handlers.IImageSourcePartSetter.SetImageSource(object? obj) -> void
 Microsoft.Maui.ICrossPlatformLayout
diff --git a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
index 8cf45a61435b..5e0a56c1cd69 100644
--- a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -9,6 +9,7 @@ Microsoft.Maui.ICommandMapper.Invoke(Microsoft.Maui.IElementHandler! viewHandler
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>.Add(string! key, System.Action<TViewHandler, TVirtualView, object?>! action) -> void
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>.Add(string! key, System.Action<TViewHandler, TVirtualView>! action) -> void
+Microsoft.Maui.IMenuElement.Accelerators.get -> System.Collections.Generic.IReadOnlyList<Microsoft.Maui.IAccelerator!>?
 Microsoft.Maui.Handlers.IImageSourcePartSetter
 Microsoft.Maui.Handlers.IImageSourcePartSetter.SetImageSource(object? obj) -> void
 Microsoft.Maui.ICrossPlatformLayout
@@ -48,7 +49,10 @@ static Microsoft.Maui.PropertyMapperExtensions.PrependToMapping<TVirtualView, TV
 static Microsoft.Maui.PropertyMapperExtensions.ReplaceMapping<TVirtualView, TViewHandler>(this Microsoft.Maui.IPropertyMapper<Microsoft.Maui.IElement!, Microsoft.Maui.IElementHandler!>! propertyMapper, string! key, System.Action<TViewHandler, TVirtualView>! method) -> void
 static Microsoft.Maui.SizeRequest.operator !=(Microsoft.Maui.SizeRequest left, Microsoft.Maui.SizeRequest right) -> bool
 static Microsoft.Maui.SizeRequest.operator ==(Microsoft.Maui.SizeRequest left, Microsoft.Maui.SizeRequest right) -> bool
+Microsoft.Maui.IAccelerator
+Microsoft.Maui.IAccelerator.Key.get -> string!
+Microsoft.Maui.IAccelerator.Modifiers.get -> System.Collections.Generic.IReadOnlyList<string!>!
 *REMOVED*Microsoft.Maui.IContentView.CrossPlatformArrange(Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
 *REMOVED*Microsoft.Maui.IContentView.CrossPlatformMeasure(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
 *REMOVED*Microsoft.Maui.ILayout.CrossPlatformArrange(Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
-*REMOVED*Microsoft.Maui.ILayout.CrossPlatformMeasure(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
\ No newline at end of file
+*REMOVED*Microsoft.Maui.ILayout.CrossPlatformMeasure(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
diff --git a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
index 8cf45a61435b..3e44924facf1 100644
--- a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
@@ -1,6 +1,9 @@
 #nullable enable
 Microsoft.Maui.CommandMapper.Invoke(Microsoft.Maui.IElementHandler! viewHandler, Microsoft.Maui.IElement? virtualView, string! property, object? args) -> void
 Microsoft.Maui.FocusRequest.FocusRequest() -> void
+Microsoft.Maui.IAccelerator
+Microsoft.Maui.IAccelerator.Key.get -> string!
+Microsoft.Maui.IAccelerator.Modifiers.get -> System.Collections.Generic.IReadOnlyList<string!>!
 Microsoft.Maui.IApplication.UserAppTheme.get -> Microsoft.Maui.ApplicationModel.AppTheme
 Microsoft.Maui.Hosting.MauiApp.DisposeAsync() -> System.Threading.Tasks.ValueTask
 Microsoft.Maui.ICommandMapper
@@ -9,6 +12,7 @@ Microsoft.Maui.ICommandMapper.Invoke(Microsoft.Maui.IElementHandler! viewHandler
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>.Add(string! key, System.Action<TViewHandler, TVirtualView, object?>! action) -> void
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>.Add(string! key, System.Action<TViewHandler, TVirtualView>! action) -> void
+Microsoft.Maui.IMenuElement.Accelerators.get -> System.Collections.Generic.IReadOnlyList<Microsoft.Maui.IAccelerator!>?
 Microsoft.Maui.Handlers.IImageSourcePartSetter
 Microsoft.Maui.Handlers.IImageSourcePartSetter.SetImageSource(object? obj) -> void
 Microsoft.Maui.ICrossPlatformLayout

From b4c8c49e1a042dc08e32e40c85560414a41d9f31 Mon Sep 17 00:00:00 2001
From: Stephane Delcroix <stephane@delcroix.org>
Date: Tue, 4 Jul 2023 01:56:21 +0200
Subject: [PATCH 061/105] [X] Connect event to internal handler (#15881)

- fixes #12566
---
 .../src/Xaml/ApplyPropertiesVisitor.cs        | 10 +++--
 .../Xaml.UnitTests/Issues/Maui12566.xaml      |  9 ++++
 .../Xaml.UnitTests/Issues/Maui12566.xaml.cs   | 42 +++++++++++++++++++
 3 files changed, 58 insertions(+), 3 deletions(-)
 create mode 100644 src/Controls/tests/Xaml.UnitTests/Issues/Maui12566.xaml
 create mode 100644 src/Controls/tests/Xaml.UnitTests/Issues/Maui12566.xaml.cs

diff --git a/src/Controls/src/Xaml/ApplyPropertiesVisitor.cs b/src/Controls/src/Xaml/ApplyPropertiesVisitor.cs
index 89d0b88f5330..0f3ac4d42b54 100644
--- a/src/Controls/src/Xaml/ApplyPropertiesVisitor.cs
+++ b/src/Controls/src/Xaml/ApplyPropertiesVisitor.cs
@@ -368,7 +368,7 @@ static object GetTargetProperty(object xamlelement, XmlName propertyName, object
 		public static void SetPropertyValue(object xamlelement, XmlName propertyName, object value, object rootElement, INode node, HydrationContext context, IXmlLineInfo lineInfo)
 		{
 			var serviceProvider = new XamlServiceProvider(node, context);
-			var xKey = node is IElementNode && ((IElementNode)node).Properties.ContainsKey(XmlName.xKey) ? ((ValueNode)((IElementNode)node).Properties[XmlName.xKey]).Value as string : null;
+			var xKey = node is IElementNode eNode && eNode.Properties.ContainsKey(XmlName.xKey) ? ((ValueNode)eNode.Properties[XmlName.xKey]).Value as string : null;
 
 			if (TrySetPropertyValue(xamlelement, propertyName, xKey, value, rootElement, lineInfo, serviceProvider, out var xpe))
 				return;
@@ -473,19 +473,23 @@ static bool TryConnectEvent(object element, string localName, bool attached, obj
 				return false;
 
 			var elementType = element.GetType();
-			var eventInfo = elementType.GetRuntimeEvent(localName);
+			var eventInfo = elementType.GetRuntimeEvent(localName) ?? elementType.GetRuntimeEvents().FirstOrDefault(ei => ei.Name == localName && !(ei.AddMethod.IsPrivate));
 			var stringValue = value as string;
 
 			if (eventInfo == null || IsNullOrEmpty(stringValue))
 				return false;
 
+			var addMethod = eventInfo.GetAddMethod(nonPublic: true);
+			if (addMethod == null)
+				return false;
+
 			foreach (var mi in rootElement.GetType().GetRuntimeMethods())
 			{
 				if (mi.Name == (string)value)
 				{
 					try
 					{
-						eventInfo.AddEventHandler(element, mi.CreateDelegate(eventInfo.EventHandlerType, mi.IsStatic ? null : rootElement));
+						addMethod.Invoke(element, new[] { mi.CreateDelegate(eventInfo.EventHandlerType, mi.IsStatic ? null : rootElement) });
 						return true;
 					}
 					catch (ArgumentException)
diff --git a/src/Controls/tests/Xaml.UnitTests/Issues/Maui12566.xaml b/src/Controls/tests/Xaml.UnitTests/Issues/Maui12566.xaml
new file mode 100644
index 000000000000..1fb6ec627cc9
--- /dev/null
+++ b/src/Controls/tests/Xaml.UnitTests/Issues/Maui12566.xaml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:d="http://schemas.microsoft.com/dotnet/2021/maui/design"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:local="clr-namespace:Microsoft.Maui.Controls.Xaml.UnitTests"
+             x:Class="Microsoft.Maui.Controls.Xaml.UnitTests.Maui12566">
+           <local:Maui12566View MyEvent="Maui12566View_MyEvent"/>
+</ContentPage>
\ No newline at end of file
diff --git a/src/Controls/tests/Xaml.UnitTests/Issues/Maui12566.xaml.cs b/src/Controls/tests/Xaml.UnitTests/Issues/Maui12566.xaml.cs
new file mode 100644
index 000000000000..bc17440c5d92
--- /dev/null
+++ b/src/Controls/tests/Xaml.UnitTests/Issues/Maui12566.xaml.cs
@@ -0,0 +1,42 @@
+using System;
+using Microsoft.Maui.ApplicationModel;
+using Microsoft.Maui.Controls.Core.UnitTests;
+using Microsoft.Maui.Devices;
+using NUnit.Framework;
+
+#pragma warning disable CS0067 // The event 'event' is never used
+
+namespace Microsoft.Maui.Controls.Xaml.UnitTests
+{
+	public class Maui12566View : ContentView
+	{
+		internal event EventHandler MyEvent;
+	}
+
+	public partial class Maui12566 : ContentPage
+	{
+		public Maui12566() => InitializeComponent();
+		public Maui12566(bool useCompiledXaml)
+		{
+			//this stub will be replaced at compile time
+		}
+
+		void Maui12566View_MyEvent(System.Object sender, System.EventArgs e)
+		{
+		}
+
+		[TestFixture]
+		class Tests
+		{
+			[SetUp] public void Setup() => AppInfo.SetCurrent(new MockAppInfo());
+			[TearDown] public void TearDown() => AppInfo.SetCurrent(null);
+
+			[Test]
+			public void AccessInternalEvent([Values(false, true)] bool useCompiledXaml)
+			{
+				//shouldn't throw
+				new Maui12566(useCompiledXaml);
+			}
+		}
+	}
+}

From 327e1627b5e8b2c267103e3e4690af05f57ca2f4 Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Tue, 4 Jul 2023 02:45:18 -0500
Subject: [PATCH 062/105] [Android] Fix issues setting Shell TabBar appearance.
 (#15734)

* Apply Android shell tab colors

* - add tests for Android
---
 .../ShellBottomNavViewAppearanceTracker.cs    |  26 ++--
 .../Shell/ShellTabBarTests.Android.cs         |  53 ++++++++
 .../Shell/ShellTabBarTests.Windows.cs         | 106 +---------------
 .../Elements/Shell/ShellTabBarTests.cs        | 118 +++++++++++++++++-
 .../Elements/Shell/ShellTests.Android.cs      |   1 +
 5 files changed, 191 insertions(+), 113 deletions(-)
 create mode 100644 src/Controls/tests/DeviceTests/Elements/Shell/ShellTabBarTests.Android.cs

diff --git a/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellBottomNavViewAppearanceTracker.cs b/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellBottomNavViewAppearanceTracker.cs
index 9705803d53e3..680322479bd0 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellBottomNavViewAppearanceTracker.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellBottomNavViewAppearanceTracker.cs
@@ -24,7 +24,8 @@ public class ShellBottomNavViewAppearanceTracker : IShellBottomNavViewAppearance
 		static ColorStateList _defaultListDark;
 
 		bool _disposed;
-		ColorStateList _colorStateList;
+		ColorStateList _itemTextColor;
+		ColorStateList _itemIconTint;
 
 		public ShellBottomNavViewAppearanceTracker(IShellContext shellContext, ShellItem shellItem)
 		{
@@ -48,14 +49,23 @@ public virtual void SetAppearance(BottomNavigationView bottomView, IShellAppeara
 		{
 			IShellAppearanceElement controller = appearance;
 			var backgroundColor = controller.EffectiveTabBarBackgroundColor;
-			var foregroundColor = controller.EffectiveTabBarForegroundColor; // currently unused
+			var foregroundColor = controller.EffectiveTabBarForegroundColor;
 			var disabledColor = controller.EffectiveTabBarDisabledColor;
 			var unselectedColor = controller.EffectiveTabBarUnselectedColor;
 			var titleColor = controller.EffectiveTabBarTitleColor;
 
-			_colorStateList = MakeColorStateList(titleColor, disabledColor, unselectedColor);
-			bottomView.ItemTextColor = _colorStateList;
-			bottomView.ItemIconTintList = _colorStateList;
+			_itemTextColor = MakeColorStateList(
+				titleColor ?? foregroundColor, 
+				disabledColor, 
+				unselectedColor);
+
+			_itemIconTint = MakeColorStateList(
+				foregroundColor ?? titleColor, 
+				disabledColor, 
+				unselectedColor);
+
+			bottomView.ItemTextColor = _itemTextColor;
+			bottomView.ItemIconTintList = _itemIconTint;
 
 			SetBackgroundColor(bottomView, backgroundColor);
 		}
@@ -162,11 +172,13 @@ protected virtual void Dispose(bool disposing)
 
 			if (disposing)
 			{
-				_colorStateList?.Dispose();
+				_itemTextColor?.Dispose();
+				_itemIconTint?.Dispose();
 
+				_itemIconTint = null;
 				_shellItem = null;
 				_shellContext = null;
-				_colorStateList = null;
+				_itemTextColor = null;
 			}
 		}
 
diff --git a/src/Controls/tests/DeviceTests/Elements/Shell/ShellTabBarTests.Android.cs b/src/Controls/tests/DeviceTests/Elements/Shell/ShellTabBarTests.Android.cs
new file mode 100644
index 000000000000..971b44306376
--- /dev/null
+++ b/src/Controls/tests/DeviceTests/Elements/Shell/ShellTabBarTests.Android.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Android.Widget;
+using Google.Android.Material.BottomNavigation;
+using Google.Android.Material.TextView;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Controls.Handlers;
+using Microsoft.Maui.Controls.Handlers.Compatibility;
+using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Platform;
+using Xunit;
+
+
+namespace Microsoft.Maui.DeviceTests
+{
+	[Category(TestCategory.Shell)]
+	public partial class ShellTests
+	{
+		async Task ValidateTabBarItemColor(ShellSection item, Color expectedColor, bool hasColor)
+		{
+			var shell = item.FindParentOfType<Shell>();
+			var renderer = (ShellRenderer)shell.Handler;
+			var bottomView = GetDrawerLayout(renderer).GetFirstChildOfType<BottomNavigationView>();
+			var menu = bottomView.Menu;
+			var index = shell.CurrentItem.Items.IndexOf(item);
+
+			if (index < 0 || index >= menu.Size())
+				Assert.Fail("ShellSection not found in Shell");
+
+			if (index >= menu.Size())
+				Assert.Fail("Menu Item has not been created for this item");
+
+			var navigationMenu = (BottomNavigationMenuView)bottomView.MenuView;
+			var navItems = navigationMenu.GetChildrenOfType<BottomNavigationItemView>();
+
+			var navItemView =
+				navItems.Single(x =>
+				{
+					return x.GetChildrenOfType<TextView>()
+						.Where(tv => String.Equals(tv.Text, item.Title, StringComparison.OrdinalIgnoreCase))
+						.Count() > 0;
+				});
+
+			if (hasColor)
+				await navItemView.AssertContainsColor(expectedColor.ToPlatform(), item.FindMauiContext());
+			else
+				await navItemView.AssertDoesNotContainColor(expectedColor.ToPlatform(), item.FindMauiContext());
+		}
+	}
+}
diff --git a/src/Controls/tests/DeviceTests/Elements/Shell/ShellTabBarTests.Windows.cs b/src/Controls/tests/DeviceTests/Elements/Shell/ShellTabBarTests.Windows.cs
index 727f79275b63..0f8f8d9766cb 100644
--- a/src/Controls/tests/DeviceTests/Elements/Shell/ShellTabBarTests.Windows.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Shell/ShellTabBarTests.Windows.cs
@@ -18,111 +18,6 @@ namespace Microsoft.Maui.DeviceTests
 	[Category(TestCategory.Shell)]
 	public partial class ShellTests
 	{
-		[Fact(DisplayName = "ForegroundColor sets icon and title color sets title")]
-		public async Task ForegroundColorSetsIconAndTitleColorSetsTitle()
-		{
-			SetupBuilder();
-
-			var titleColor = Color.FromArgb("#FFFF0000");
-			var foregroundColor = Color.FromArgb("#FF00FF00");
-			await RunShellTabBarTests(shell =>
-			{
-				Shell.SetTabBarTitleColor(shell, titleColor);
-				Shell.SetTabBarForegroundColor(shell, foregroundColor);
-			},
-			async (shell) =>
-			{
-				await ValidateTabBarItemColor(shell.CurrentSection, titleColor, true);
-				await ValidateTabBarItemColor(shell.CurrentSection, foregroundColor, true);
-				await ValidateTabBarItemColor(shell.Items[0].Items[1], titleColor, false);
-				await ValidateTabBarItemColor(shell.Items[0].Items[1], foregroundColor, false);
-			});
-		}
-
-		[Theory(DisplayName = "Shell TabBar Title Color Initializes Correctly")]
-		[InlineData("#FFFF0000")]
-		[InlineData("#FF00FF00")]
-
-		public async Task ShellTabBarTitleColorInitializesCorrectly(string colorHex)
-		{
-			SetupBuilder();
-
-			var expectedColor = Color.FromArgb(colorHex);
-			await RunShellTabBarTests(shell => Shell.SetTabBarTitleColor(shell, expectedColor),
-				async (shell) =>
-				{
-					await ValidateTabBarItemColor(shell.CurrentSection, expectedColor, true);
-					await ValidateTabBarItemColor(shell.Items[0].Items[1], expectedColor, false);
-				});
-		}
-
-		[Theory(DisplayName = "Shell TabBar Foreground Initializes Correctly")]
-		[InlineData("#FFFF0000")]
-		[InlineData("#FF00FF00")]
-		public async Task ShellTabBarForegroundInitializesCorrectly(string colorHex)
-		{
-			var expectedColor = Color.FromArgb(colorHex);
-			await RunShellTabBarTests(shell => Shell.SetTabBarForegroundColor(shell, expectedColor),
-				async (shell) =>
-				{
-					await ValidateTabBarItemColor(shell.CurrentSection, expectedColor, true);
-					await ValidateTabBarItemColor(shell.Items[0].Items[1], expectedColor, false);
-				});
-		}
-
-		[Theory(DisplayName = "Shell TabBar UnselectedColor Initializes Correctly")]
-		[InlineData("#FF0000")]
-		[InlineData("#0000FF")]
-		public async Task ShellTabBarUnselectedColorInitializesCorrectly(string colorHex)
-		{
-			var expectedColor = Color.FromArgb(colorHex);
-			await RunShellTabBarTests(shell => Shell.SetTabBarUnselectedColor(shell, expectedColor),
-				async (shell) =>
-				{
-					await ValidateTabBarItemColor(shell.CurrentSection, expectedColor, false);
-					await ValidateTabBarItemColor(shell.Items[0].Items[1], expectedColor, true);
-				});
-		}
-
-		async Task RunShellTabBarTests(Action<Shell> setup, Func<Shell, Task> runTest)
-		{
-			SetupBuilder();
-
-			var selectedContent = new ShellContent()
-			{
-				Route = "Tab1",
-				Title = "Tab1",
-				Content = new ContentPage(),
-				Icon = "white.png"
-			};
-
-			var unselectedContent = new ShellContent()
-			{
-				Route = "Tab2",
-				Title = "Tab2",
-				Content = new ContentPage(),
-				Icon = "white.png"
-			};
-
-			var shell = await CreateShellAsync((shell) =>
-			{
-				shell.Items.Add(new TabBar()
-				{
-					Items =
-					{
-						selectedContent,
-						unselectedContent,
-					}
-				});
-			});
-
-			setup.Invoke(shell);
-			await CreateHandlerAndAddToWindow<ShellHandler>(shell, async (handler) =>
-			{
-				await runTest(shell);
-			});
-		}
-
 		List<WNavigationViewItem> GetTabBarItems(Shell shell)
 		{
 			var shellItemHandler = shell.CurrentItem.Handler as ShellItemHandler;
@@ -130,6 +25,7 @@ List<WNavigationViewItem> GetTabBarItems(Shell shell)
 
 			return navView.TopNavArea.GetChildren<WNavigationViewItem>().ToList();
 		}
+
 		async Task ValidateTabBarItemColor(ShellSection item, Color expectedColor, bool hasColor)
 		{
 			var items = GetTabBarItems(item.FindParentOfType<Shell>());
diff --git a/src/Controls/tests/DeviceTests/Elements/Shell/ShellTabBarTests.cs b/src/Controls/tests/DeviceTests/Elements/Shell/ShellTabBarTests.cs
index 40313409c373..fa92eb31a16e 100644
--- a/src/Controls/tests/DeviceTests/Elements/Shell/ShellTabBarTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Shell/ShellTabBarTests.cs
@@ -1,14 +1,130 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Controls.Handlers;
+using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Platform;
+using Xunit;
 
+#if ANDROID || IOS || MACCATALYST
+using ShellHandler = Microsoft.Maui.Controls.Handlers.Compatibility.ShellRenderer;
+#endif
 
 namespace Microsoft.Maui.DeviceTests
 {
 	[Category(TestCategory.Shell)]
 	public partial class ShellTests
 	{
+#if ANDROID || WINDOWS
+
+		[Fact(DisplayName = "ForegroundColor sets icon and title color sets title")]
+		public async Task ForegroundColorSetsIconAndTitleColorSetsTitle()
+		{
+			SetupBuilder();
+
+			var titleColor = Color.FromArgb("#FFFF0000");
+			var foregroundColor = Color.FromArgb("#FF00FF00");
+			await RunShellTabBarTests(shell =>
+			{
+				Shell.SetTabBarTitleColor(shell, titleColor);
+				Shell.SetTabBarForegroundColor(shell, foregroundColor);
+			},
+			async (shell) =>
+			{
+				await ValidateTabBarItemColor(shell.CurrentSection, titleColor, true);
+				await ValidateTabBarItemColor(shell.CurrentSection, foregroundColor, true);
+				await ValidateTabBarItemColor(shell.Items[0].Items[1], titleColor, false);
+				await ValidateTabBarItemColor(shell.Items[0].Items[1], foregroundColor, false);
+
+			});
+		}
+
+		[Theory(DisplayName = "Shell TabBar Title Color Initializes Correctly")]
+		[InlineData("#FFFF0000")]
+		[InlineData("#FF00FF00")]
+
+		public async Task ShellTabBarTitleColorInitializesCorrectly(string colorHex)
+		{
+			SetupBuilder();
+
+			var expectedColor = Color.FromArgb(colorHex);
+			await RunShellTabBarTests(shell => Shell.SetTabBarTitleColor(shell, expectedColor),
+				async (shell) =>
+				{
+					await ValidateTabBarItemColor(shell.CurrentSection, expectedColor, true);
+					await ValidateTabBarItemColor(shell.Items[0].Items[1], expectedColor, false);
+				});
+		}
+
+		[Theory(DisplayName = "Shell TabBar Foreground Initializes Correctly")]
+		[InlineData("#FFFF0000")]
+		[InlineData("#FF00FF00")]
+		public async Task ShellTabBarForegroundInitializesCorrectly(string colorHex)
+		{
+			var expectedColor = Color.FromArgb(colorHex);
+			await RunShellTabBarTests(shell => Shell.SetTabBarForegroundColor(shell, expectedColor),
+				async (shell) =>
+				{
+					await ValidateTabBarItemColor(shell.CurrentSection, expectedColor, true);
+					await ValidateTabBarItemColor(shell.Items[0].Items[1], expectedColor, false);
+				});
+		}
+
+		[Theory(DisplayName = "Shell TabBar UnselectedColor Initializes Correctly")]
+		[InlineData("#FF0000")]
+		[InlineData("#0000FF")]
+		public async Task ShellTabBarUnselectedColorInitializesCorrectly(string colorHex)
+		{
+			var expectedColor = Color.FromArgb(colorHex);
+			await RunShellTabBarTests(shell => Shell.SetTabBarUnselectedColor(shell, expectedColor),
+				async (shell) =>
+				{
+					await ValidateTabBarItemColor(shell.CurrentSection, expectedColor, false);
+					await ValidateTabBarItemColor(shell.Items[0].Items[1], expectedColor, true);
+				});
+		}
+
+		async Task RunShellTabBarTests(Action<Shell> setup, Func<Shell, Task> runTest)
+		{
+			SetupBuilder();
+
+			var selectedContent = new ShellContent()
+			{
+				Route = "Tab1",
+				Title = "Tab1",
+				Content = new ContentPage(),
+				Icon = "white.png"
+			};
+
+			var unselectedContent = new ShellContent()
+			{
+				Route = "Tab2",
+				Title = "Tab2",
+				Content = new ContentPage(),
+				Icon = "white.png"
+			};
+
+			var shell = await CreateShellAsync((shell) =>
+			{
+				shell.Items.Add(new TabBar()
+				{
+					Items =
+					{
+						selectedContent,
+						unselectedContent,
+					}
+				});
+			});
+
+			setup.Invoke(shell);
+			await CreateHandlerAndAddToWindow<ShellHandler>(shell, async (handler) =>
+			{
+				await runTest(shell);
+			});
+		}
+#endif
 	}
 }
diff --git a/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.Android.cs b/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.Android.cs
index 64002bc96789..6bca7f7cad4d 100644
--- a/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.Android.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.Android.cs
@@ -16,6 +16,7 @@
 using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Controls.Platform.Compatibility;
 using Microsoft.Maui.DeviceTests.Stubs;
+using Microsoft.Maui.Graphics;
 using Microsoft.Maui.Handlers;
 using Microsoft.Maui.Platform;
 using Xunit;

From 700944b2ac65c4807c657336b49c72c30e4da1da Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 4 Jul 2023 11:45:17 +0000
Subject: [PATCH 063/105] [create-pull-request] automated change (#15980)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 src/Controls/src/Core/Accelerator.cs                        | 2 +-
 .../src/Platform/Windows/KeyboardAcceleratorExtensions.cs   | 6 +++---
 src/Core/src/Platform/iOS/AcceleratorExtensions.cs          | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Controls/src/Core/Accelerator.cs b/src/Controls/src/Core/Accelerator.cs
index 90aab9aef7d1..20ede7b3e6e0 100644
--- a/src/Controls/src/Core/Accelerator.cs
+++ b/src/Controls/src/Core/Accelerator.cs
@@ -33,7 +33,7 @@ internal Accelerator(string text, IEnumerable<string> modifiers, string key)
 		/// <include file="../../docs/Microsoft.Maui.Controls/Accelerator.xml" path="//Member[@MemberName='Keys']/Docs/*" />
 		[EditorBrowsable(EditorBrowsableState.Never)]
 		[Obsolete("Use Key instead.")]
-		public IEnumerable<string> Keys 
+		public IEnumerable<string> Keys
 		{
 			get => Key is null ? null : new[] { Key };
 		}
diff --git a/src/Core/src/Platform/Windows/KeyboardAcceleratorExtensions.cs b/src/Core/src/Platform/Windows/KeyboardAcceleratorExtensions.cs
index d62978e0ead0..16b83fdc9c64 100644
--- a/src/Core/src/Platform/Windows/KeyboardAcceleratorExtensions.cs
+++ b/src/Core/src/Platform/Windows/KeyboardAcceleratorExtensions.cs
@@ -1,7 +1,7 @@
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Input;
-using System;
+using System;
 using System.Collections.Generic;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Input;
 using Windows.System;
 
 namespace Microsoft.Maui.Platform
diff --git a/src/Core/src/Platform/iOS/AcceleratorExtensions.cs b/src/Core/src/Platform/iOS/AcceleratorExtensions.cs
index 77007d394a02..a86df1d32ea6 100644
--- a/src/Core/src/Platform/iOS/AcceleratorExtensions.cs
+++ b/src/Core/src/Platform/iOS/AcceleratorExtensions.cs
@@ -67,7 +67,7 @@ internal static UIMenuElement CreateMenuItem(this IMenuFlyoutItem virtualView, I
 
 		static UIMenuElement CreateMenuItemKeyCommand(this IMenuFlyoutItem virtualView, int index, UIImage? uiImage, Selector selector, UIKeyModifierFlags modifierFlags, string key)
 		{
-			var keyCommand = UIKeyCommand.Create(	
+			var keyCommand = UIKeyCommand.Create(
 				title: virtualView.Text,
 				uiImage,
 				selector,
@@ -84,7 +84,7 @@ static UIMenuElement CreateMenuItemKeyCommand(this IMenuFlyoutItem virtualView,
 
 		static UIMenuElement CreateMenuItemCommand(this IMenuFlyoutItem virtualView, int index, UIImage? uiImage, Selector selector)
 		{
-			var command = UICommand.Create(				
+			var command = UICommand.Create(
 				title: virtualView.Text,
 				uiImage,
 				selector,

From 39aca1ff58149fa535f0d9ab2af152e31f7809e0 Mon Sep 17 00:00:00 2001
From: Jonathan Dick <jodick@microsoft.com>
Date: Wed, 5 Jul 2023 14:57:39 -0400
Subject: [PATCH 064/105] Move .SFUI font logic sooner to be used (#15990)

For some reason `UIFont.FromName` always returns _some_ font even if you specify an invalid name, but it may not be the _correct_ font.

There was some logic added in MAUI to clean up the font name and try and load by the cleaned up name, however since `UIFont.FromName` always returns a result and not null, it will always be used before we would even get to checking the ".SFUI" magic string.

This also probably means the final attempt to get a font by (non cleaned up) name actually never gets hit, but for now this is still an improvement.
---
 .../Pages/Controls/LabelPage.xaml             |  3 ++-
 src/Core/src/Fonts/FontManager.iOS.cs         | 10 +++----
 .../Services/FontManagerTests.iOS.cs          | 27 +++++++++++++++++++
 3 files changed, 34 insertions(+), 6 deletions(-)
 create mode 100644 src/Core/tests/DeviceTests/Services/FontManagerTests.iOS.cs

diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/LabelPage.xaml b/src/Controls/samples/Controls.Sample/Pages/Controls/LabelPage.xaml
index 0b219e1bbea4..f98559ce3e39 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/LabelPage.xaml
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/LabelPage.xaml
@@ -1,4 +1,4 @@
-<views:BasePage
+<views:BasePage
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     x:Class="Maui.Controls.Sample.Pages.LabelPage"
@@ -16,6 +16,7 @@
                 Text="Defaults"/>
             <Label
                 Text="Label with Tooltip"
+                FontFamily=".SFUI-Bold"
                 ToolTipProperties.Text="This has a tooltip!"/>
             <Label
                 TextColor="Red"
diff --git a/src/Core/src/Fonts/FontManager.iOS.cs b/src/Core/src/Fonts/FontManager.iOS.cs
index 89c77a438c94..0bfd45a3e9f2 100644
--- a/src/Core/src/Fonts/FontManager.iOS.cs
+++ b/src/Core/src/Fonts/FontManager.iOS.cs
@@ -131,11 +131,6 @@ UIFont CreateFont(Font font)
 							return ApplyScaling(font, result);
 					}
 
-					var cleansedFont = CleanseFontName(family);
-					result = UIFont.FromName(cleansedFont, size);
-					if (result != null)
-						return ApplyScaling(font, result);
-
 					if (family.StartsWith(".SFUI", StringComparison.InvariantCultureIgnoreCase))
 					{
 						var weights = family.Split('-');
@@ -155,6 +150,11 @@ UIFont CreateFont(Font font)
 							return ApplyScaling(font, result);
 					}
 
+					var cleansedFont = CleanseFontName(family);
+					result = UIFont.FromName(cleansedFont, size);
+					if (result != null)
+						return ApplyScaling(font, result);
+
 					result = UIFont.FromName(family, size);
 					if (result != null)
 						return ApplyScaling(font, result);
diff --git a/src/Core/tests/DeviceTests/Services/FontManagerTests.iOS.cs b/src/Core/tests/DeviceTests/Services/FontManagerTests.iOS.cs
new file mode 100644
index 000000000000..67c2641417ef
--- /dev/null
+++ b/src/Core/tests/DeviceTests/Services/FontManagerTests.iOS.cs
@@ -0,0 +1,27 @@
+using System;
+using UIKit;
+using Xunit;
+
+namespace Microsoft.Maui.DeviceTests;
+
+[Category(TestCategory.Fonts)]
+public partial class FontManagerTests : TestBase
+{
+	[Theory]
+	[InlineData(".SFUI-Bold", ".AppleSystemUIFont")]
+	[InlineData(".SFUI-SemiBold", ".AppleSystemUIFont")]
+	[InlineData(".SFUI-Black", ".AppleSystemUIFont")]
+	[InlineData(".SFUI-Heavy", ".AppleSystemUIFont")]
+	[InlineData(".SFUI-Light", ".AppleSystemUIFont")]
+	public async System.Threading.Tasks.Task CanLoadSystemFonts(string fontName, string expectedFamilyName)
+	{
+		var registrar = new FontRegistrar(fontLoader: null);
+		var manager = new FontManager(registrar);
+
+		var font = await InvokeOnMainThreadAsync(() =>
+			manager.GetFont(Font.OfSize(fontName, manager.DefaultFontSize)));
+
+		Assert.Equal(expectedFamilyName, font.FamilyName);
+	}
+
+}

From bf1a9c0cc2fd41be5f4ad9a465ac29625991058b Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Wed, 5 Jul 2023 13:59:53 -0500
Subject: [PATCH 065/105] [tests] make Windows memory leak tests consistent
 (#15998)

Fixes part of: https://github.com/dotnet/maui/issues/15530

These would fail randomly for me when I ran them. But after reviewing
memory snapshots, I didn't find an actual issue the tests were just
flaky.

I found I could rework the tests to do:

    await AssertionExtensions.Wait(() =>
    {
        GC.Collect();
        GC.WaitForPendingFinalizers();
        return !pageReference.IsAlive;
    }, timeout: 5000);

And now they pass every time for me locally.

So it waits up to 5 seconds, and quits early if the page is gone.

If this still passes on all platforms -- we should just use this
instead.
---
 .../NavigationPage/NavigationPageTests.cs       | 17 ++++++-----------
 .../DeviceTests/Elements/Shell/ShellTests.cs    | 17 ++++++-----------
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/src/Controls/tests/DeviceTests/Elements/NavigationPage/NavigationPageTests.cs b/src/Controls/tests/DeviceTests/Elements/NavigationPage/NavigationPageTests.cs
index 3371f7bed597..2bb250fa5c6f 100644
--- a/src/Controls/tests/DeviceTests/Elements/NavigationPage/NavigationPageTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/NavigationPage/NavigationPageTests.cs
@@ -294,11 +294,7 @@ await CreateHandlerAndAddToWindow<WindowHandlerStub>(new Window(navPage), async
 			});
 		}
 
-		[Fact(DisplayName = "NavigationPage Does Not Leak"
-#if WINDOWS
-			,Skip = "Failing"
-#endif
-			)]
+		[Fact(DisplayName = "NavigationPage Does Not Leak")]
 		public async Task DoesNotLeak()
 		{
 			SetupBuilder();
@@ -324,15 +320,14 @@ await CreateHandlerAndAddToWindow<WindowHandlerStub>(new Window(navPage), async
 				await navPage.Navigation.PopAsync();
 			});
 
-			// As we add more controls to this test, more GCs will be required
-			for (int i = 0; i < 16; i++)
+			// Windows requires an actual delay
+			// Android/iOS require multiple GCs
+			await AssertionExtensions.Wait(() =>
 			{
-				if (!pageReference.IsAlive)
-					break;
-				await Task.Yield();
 				GC.Collect();
 				GC.WaitForPendingFinalizers();
-			}
+				return !pageReference.IsAlive;
+			}, timeout: 5000);
 
 			Assert.NotNull(pageReference);
 			Assert.False(pageReference.IsAlive, "Page should not be alive!");
diff --git a/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.cs b/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.cs
index 5e88f4506d18..7de5ed9b1e6f 100644
--- a/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.cs
@@ -962,11 +962,7 @@ await CreateHandlerAndAddToWindow<WindowHandlerStub>(new Window(navPage), async
 		}
 #endif
 
-		[Fact(DisplayName = "Pages Do Not Leak"
-#if WINDOWS
-			,Skip = "Failing"
-#endif
-			)]
+		[Fact(DisplayName = "Pages Do Not Leak")]
 		public async Task PagesDoNotLeak()
 		{
 			SetupBuilder();
@@ -999,15 +995,14 @@ await CreateHandlerAndAddToWindow<ShellHandler>(shell, async (handler) =>
 				await shell.Navigation.PopAsync();
 			});
 
-			// As we add more controls to this test, more GCs will be required
-			for (int i = 0; i < 16; i++)
+			// Windows requires an actual delay
+			// Android/iOS require multiple GCs
+			await AssertionExtensions.Wait(() =>
 			{
-				if (!pageReference.IsAlive)
-					break;
-				await Task.Yield();
 				GC.Collect();
 				GC.WaitForPendingFinalizers();
-			}
+				return !pageReference.IsAlive;
+			}, timeout: 5000);
 
 			Assert.NotNull(pageReference);
 			Assert.False(pageReference.IsAlive, "Page should not be alive!");

From 02481e6ef8a9267f810f86daae1e8c2228a26de4 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Wed, 5 Jul 2023 14:09:29 -0500
Subject: [PATCH 066/105] [android] improve performance of `Entry.MaxLength`
 (#15614)

Context: https://github.com/dotnet/maui/issues/10713

When investigating a customer sample:

* Navigate from a Shell flyout

* To a new page with several `Entry` controls

When profiling on a Pixel 5, it seems one hot path is `Entry.MaxLength`:

    18.52ms (0.22%) microsoft.maui!Microsoft.Maui.Platform.EditTextExtensions.UpdateMaxLength(Android.Widget.EditText,Microsoft.Maui.IEntry)
    16.03ms (0.19%) microsoft.maui!Microsoft.Maui.Platform.EditTextExtensions.UpdateMaxLength(Android.Widget.EditText,int)
    12.16ms (0.14%) microsoft.maui!Microsoft.Maui.Platform.EditTextExtensions.SetLengthFilter(Android.Widget.EditText,int)

* `EditTextExtensions.UpdateMaxLength()` calls
    * `EditText.Text` getter and setter
    * `EditTextExtensions.SetLengthFilter()` calls
        * `EditText.Get/SetFilters()`

What happens is we end up marshaling strings and `IInputFilter[]` back
and forth between C# and Java for every `Entry` on the page.

This seems like a prime candidate to move code from C# to Java. I
tried to just port the code as-is without changing logic -- so we
*should* get the exact same behavior as before.

Since all `Entry`s go through this code path (even ones with a default
value for `MaxLength`), this improves the performance of all `Entry`
and `SearchBar` on Android. With these changes in place, the calls to
`EditTextExtensions.UpdateMaxLength()` are now so fast they are
missing from the trace now, saving ~19ms when navigating to this page.

One note, is I found this was the recommended way to create a mutable
`List<T>` from an array in Java:

    List<InputFilter> currentFilters = new ArrayList<>(Arrays.asList(editText.getFilters()));

https://stackoverflow.com/a/11659198

Makes me appreciate C#! :)

Other changes:

* All platform to update empty strings

In 85b56990, it doesn't say why this check was added, but it was causing
test failures when MaxLength is set to 0.
---
 .../DeviceTests/Elements/Entry/EntryTests.cs  |  20 +++++++
 .../com/microsoft/maui/PlatformInterop.java   |  55 ++++++++++++++++++
 .../Core/Extensions/ITextInputExtensions.cs   |   3 -
 .../Platform/Android/EditTextExtensions.cs    |  39 ++-----------
 src/Core/src/maui.aar                         | Bin 72492 -> 73289 bytes
 .../Handlers/Entry/EntryHandlerTests.cs       |   2 +
 6 files changed, 81 insertions(+), 38 deletions(-)

diff --git a/src/Controls/tests/DeviceTests/Elements/Entry/EntryTests.cs b/src/Controls/tests/DeviceTests/Elements/Entry/EntryTests.cs
index c9bad6489962..c4e527bf9788 100644
--- a/src/Controls/tests/DeviceTests/Elements/Entry/EntryTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Entry/EntryTests.cs
@@ -32,6 +32,26 @@ public async Task TextTransformUpdated(string text, TextTransform transform, str
 			Assert.Equal(expected, platformText);
 		}
 
+		[Fact]
+		public async Task MaxLengthTrims()
+		{
+			var entry = new Entry
+			{
+				Text = "This is text",
+			};
+
+			await InvokeOnMainThreadAsync(async () =>
+			{
+				var handler = CreateHandler<EntryHandler>(entry);
+
+				entry.MaxLength = 4;
+				Assert.Equal("This", entry.Text);
+
+				var platformText = await GetPlatformText(handler);
+				Assert.Equal("This", platformText);
+			});
+		}
+
 #if WINDOWS
 		// Only Windows needs the IsReadOnly workaround for MaxLength==0 to prevent text from being entered
 		[Fact]
diff --git a/src/Core/AndroidNative/maui/src/main/java/com/microsoft/maui/PlatformInterop.java b/src/Core/AndroidNative/maui/src/main/java/com/microsoft/maui/PlatformInterop.java
index 0760f90da693..cfd0b013363a 100644
--- a/src/Core/AndroidNative/maui/src/main/java/com/microsoft/maui/PlatformInterop.java
+++ b/src/Core/AndroidNative/maui/src/main/java/com/microsoft/maui/PlatformInterop.java
@@ -12,11 +12,14 @@
 import android.graphics.drawable.PaintDrawable;
 import android.net.Uri;
 import android.os.Build;
+import android.text.Editable;
+import android.text.InputFilter;
 import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewParent;
+import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -47,6 +50,9 @@
 
 import java.io.InputStream;
 import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 public class PlatformInterop {
     public static void requestLayoutIfNeeded(View view) {
@@ -455,6 +461,55 @@ private static boolean isColorType(TypedValue value)
         }
     }
 
+    /**
+     * Sets the maxLength of an EditText
+     * @param editText
+     * @param maxLength
+     */
+    public static void updateMaxLength(@NonNull EditText editText, int maxLength)
+    {
+        setLengthFilter(editText, maxLength);
+
+        if (maxLength < 0)
+            return;
+
+        Editable currentText = editText.getText();
+        if (currentText.length() > maxLength) {
+            editText.setText(currentText.subSequence(0, maxLength));
+        }
+    }
+
+    /**
+     * Updates the InputFilter[] of an EditText. Used for Entry and SearchBar.
+     * @param editText
+     * @param maxLength
+     */
+    public static void setLengthFilter(@NonNull EditText editText, int maxLength)
+    {
+        if (maxLength == -1)
+            maxLength = Integer.MAX_VALUE;
+
+        List<InputFilter> currentFilters = new ArrayList<>(Arrays.asList(editText.getFilters()));
+        boolean changed = false;
+        for (int i = 0; i < currentFilters.size(); i++) {
+            InputFilter filter = currentFilters.get(i);
+            if (filter instanceof InputFilter.LengthFilter) {
+                currentFilters.remove(i);
+                changed = true;
+                break;
+            }
+        }
+
+        if (maxLength >= 0) {
+            currentFilters.add(new InputFilter.LengthFilter(maxLength));
+            changed = true;
+        }
+        if (changed) {
+            InputFilter[] newFilter = new InputFilter[currentFilters.size()];
+            editText.setFilters(currentFilters.toArray(newFilter));
+        }
+    }
+
     private static class ColorStates
     {
         static final int[] EMPTY = new int[] { };
diff --git a/src/Core/src/Core/Extensions/ITextInputExtensions.cs b/src/Core/src/Core/Extensions/ITextInputExtensions.cs
index 853d8b1edeab..d6c1fc125f0e 100644
--- a/src/Core/src/Core/Extensions/ITextInputExtensions.cs
+++ b/src/Core/src/Core/Extensions/ITextInputExtensions.cs
@@ -46,9 +46,6 @@ public static bool TextWithinMaxLength(this ITextInput textInput, string? text,
 #if __ANDROID__
 		public static void UpdateText(this ITextInput textInput, Android.Text.TextChangedEventArgs e)
 		{
-			if (e.BeforeCount == 0 && e.AfterCount == 0)
-				return;
-
 			if (e.Text is Java.Lang.ICharSequence cs)
 				textInput.UpdateText(cs.ToString());
 			else if (e.Text != null)
diff --git a/src/Core/src/Platform/Android/EditTextExtensions.cs b/src/Core/src/Platform/Android/EditTextExtensions.cs
index b5d5dc3aec47..2c61cf105a13 100644
--- a/src/Core/src/Platform/Android/EditTextExtensions.cs
+++ b/src/Core/src/Platform/Android/EditTextExtensions.cs
@@ -82,42 +82,11 @@ public static void UpdateMaxLength(this EditText editText, IEntry entry) =>
 		public static void UpdateMaxLength(this EditText editText, IEditor editor) =>
 			UpdateMaxLength(editText, editor.MaxLength);
 
-		public static void UpdateMaxLength(this EditText editText, int maxLength)
-		{
-			editText.SetLengthFilter(maxLength);
-
-			var newText = editText.Text.TrimToMaxLength(maxLength);
-			if (editText.Text != newText)
-				editText.Text = newText;
-		}
-
-		public static void SetLengthFilter(this EditText editText, int maxLength)
-		{
-			if (maxLength == -1)
-				maxLength = int.MaxValue;
-
-			var currentFilters = new List<IInputFilter>(editText.GetFilters() ?? new IInputFilter[0]);
-			var changed = false;
+		public static void UpdateMaxLength(this EditText editText, int maxLength) =>
+			PlatformInterop.UpdateMaxLength(editText, maxLength);
 
-			for (var i = 0; i < currentFilters.Count; i++)
-			{
-				if (currentFilters[i] is InputFilterLengthFilter)
-				{
-					currentFilters.RemoveAt(i);
-					changed = true;
-					break;
-				}
-			}
-
-			if (maxLength >= 0)
-			{
-				currentFilters.Add(new InputFilterLengthFilter(maxLength));
-				changed = true;
-			}
-
-			if (changed)
-				editText.SetFilters(currentFilters.ToArray());
-		}
+		public static void SetLengthFilter(this EditText editText, int maxLength) =>
+			PlatformInterop.SetLengthFilter(editText, maxLength);
 
 		public static void UpdatePlaceholder(this EditText editText, IPlaceholder textInput)
 		{
diff --git a/src/Core/src/maui.aar b/src/Core/src/maui.aar
index b68ad45329a99750051637a7f5c6261123998c30..4292918a42f0deee117829694155d8ef6bfc316e 100644
GIT binary patch
delta 40644
zcmV(uK<mG(wgkz%1h98~3da0_P#c{90ClO8fqfHyW00mnkTu%2ZQJf?+qP}LZDZO!
zt!dk~ZQHhOyZg?@?iV+9W52lfiKvXq`dOLhROS;W6=gudfc||@K*UhQAivrs>8bwt
z?a)9#Z2wM89PAj4UF`raW+s-57PeNVW{eVM_GV5-E@q}e0D#1QoX9zty4spa*#T@B
zOl*yRoSm!GE|fRak-lRXM@RR~VGhNumFKZ2>!9QunDdAckXk|uf59(&qb~PxRnfK8
z4+`!S-pmqS$;zaf7bDJwS$CXBI`(4WaN|#1wq0GnT&-;t2>iT%Ap*JA6_JM3hl=4t
zCqgoZeqhsCy~>UN5t!D}jfCCTk_?ejtGiTx8p{os;15t;n5rz@wuLfcg;u$FPa$&{
zyj;%i!3}8-*rd_V-FC&apr+E(qM55$r(Uq}<?EPZX`)p_C1X{iStr|kWY<oGo<MBE
zPyWGs3B2EQ4pkj$7<-YFYxN<uwR8SSYoecXVy`jcnxQusb?r=p(GN!$=rpd!Z(av~
zcIXV}s&q{GQ187uGU=?SY8LTn6bBmz+^O=zi9GdM`?T0Mp=XEU1PQI|UJ6)2_B%tr
zf1m9=l9L||DE{JjQR`fHYcx!K)9?*lo0^3ejnvrEn?n{oD?8GmCjj`bxpwvbk&^2<
zZnV(e@^v0?<`kBI$a(NoaTzV&Z(7fPmMI)7{U#(i^R6$;{P>{hZd^BMb!kTojUvpD
zJh$*PZ6)HqNTzl3pv+z6>9?zHW#Qxysb_kDr)Kl4tzQ8MXKW}9)5a{F0sa6gnKV9@
z*PAApkYcn>SO$Vz=Ul3Y9wQE-w;zTq&ou29RP`|;Wsb<}+cz`9Oja1FZSQY?MD`_h
zt0-PHs>FB4Zu!Z=8?2jZu%B)r1_r4aqRVB5w}@=MkhSBIJU7QE5PkaG+XOZUQ-x~0
z^LBPCgqwA~qq1qnDp;6)Q^JL`_+r6D9pKZ%H<e0?8(`*23r^YKc>G~3V<U`^A0SQN
zoF<f*zIoNB{V5*3If8Cq3}KLeI*kux$O_mN-4Y~Vh1ec}2W<i946uS4^qICgUz1_K
z0=Z*LpLj={qWgM-hL)*ttAaMIAN<f>l_!nnF>oganLjSdW5lqDWL<8Vx6$CntkpZq
z6J&3uRVbtPSk?YH`PGU1A{&Z&<9p5(8uBpm+w)!J=(I+{A%l)O-HI)Lr<ZJuTKg-2
z>}x9^ZC|E#pO&oKFXGTa@@O73Y}QYdBW2nQfw}bwmYUr0_aWIlSy)^@ly5;Jr}z>}
zOys#N*8sUL#Ns7PG4wgjltk}0#ZYi4GyDyWysD`wk>}#5XS{gVE3Go81HNEN05o_h
zZHWq2VG`JwM7kalA4FV#gN;XQqlFcJVs6z13`M-^B=ahUqrzNjbgw-j(MBYP+<{t%
zdX#F1<r;%F2KXfP6`j=<nL3I)?^+P9)Or5vIHqOdF?NI>&_M~qW59Y(v0=0%WoXg&
zZz-VpZnTXO1m;KQSi8M&JDTP!4Q_WR&iVH0{@mgy2NU23s0;LeQ0foTE`Ax`SG+s+
z_W&PXln)jY`?Gyuac}%H3A`c&Zjvp9q|UI|B#tli+L%}fh#z3Z|HeEYA$?#JAV5II
z;6Ol}{~yewZ06`{=IkP8WN&0)<|J-p;^N@s`Jd!7rMh8{%8bM}U9=G#oGkdeF;PcE
zs*OIS8=N>#GDO;cN-(c{5Y>sp{@i*6qK4DDC(s~IAxUr_^p$Gx(mYa9O8R3s$l~&D
zGL6;5#_#j<9lw|6T<oy!bk_?RdlLXy=%a^}fm4|&ihl+dY3{Bc`fGEZZJ25$MZT^y
zi*BCa?pv>_y?*eG!O6m3GMu>;M?BDwTmssH3r<*d>$cf{&FJ0lOP<KI`A1*E=Z~l*
zXY0PN(Q>Or)0zX*VMpAfHyq?s-Cmt-R0njZpuLPeti#TO!ZXfPw^gv^1y*WB_FVmm
zm$p`3<wn#~wq0cuC@y$J8>L(5+t?yD%r~+~=+S~&Ka-uxAJp~t*mf*D2Tf=ZSK~N1
z*eppc>~L3q_P=?BBR*w`&70Cyr$U&qBrm$(8`sTE))L(cb4>?x4sCnCYx|>m(RR*8
zJ&fgs@in>MM0nSaK=lKItgO{_-HG@LM7r$C4kf?W*4g-@x>B&SGv6MVCx_Q`b1J$&
ziaTg|FLoIQE>vDRNGs!viDd1B1KXgV=i5ol<#NJ*@^TS;zk9y<;R8x6Zh#3$B^E-=
zp`+8`=)FX_(JfEn%?lr15c&|}FG$A91~rGd;*0V?&seNNA5w)lpuYwE-d1mLS#E9w
zJT#~9Nj{FSB*}rb@VSeL?(8uz=gH7@Wi^u=p`F3-Zx{|>9J|x=Ri$PY%8%y<c36T!
zMD+)M@aKmLS2s%K(Ea{L>RG4rMoR(%0j>O7WdD_Vc2*`%4$cndE{t|Yu2zh~u2#0D
zA`bTERu=!6XTEVV3jKm;Au~mS$U;atmd3i}usEphSg0^bNVF*W(DtK>5O~V#g@`{X
zw5XWhK>mr2+Hmzw&a69G&exe~Z|~o)V1S^11v)gm@?Xl1vXbm@zO!Vrti%TH_yUIV
zOr~z5=w%Q_JGN(A+U{)Ei|2?<#mx3A1n|ORy0sd`Ym;d<UA?H&o#{epf0rQX8<?+S
zxy2zUgCDB^q5ug+28OU;)2%Eg;XX73hp-9gmv>v^2g__5X75p6<U0pe>`tg0fW7vA
zwXzP(gtM<ZhNTP!j2vPJU(#<2WBsI&=grxM*RF8eq3AAYG}bU)Hz<pr*tp>y9zHpY
zO&C*#v$9IQq)`z?K6~e5XI;|Yr&(x;aiY@v8rsSr<%e+1%b7`?U42|_`BaIO;A?Zn
z5Xu@ixh<N?iR}2C3#&=&EhxFcT}wTGgXKYl|2-1PzHU|*|2(;Wk)ZqEBOzt?5A(7P
zMy6&?B1X2h#zrPK{}~axm=1YRAvm!sGE-tSMP(&oFnIe@Wg#TxLN!66Id6+Fv;HXj
zscDGr=s?8X0;Gg+2^d}7H-a}u0sftB;9Wd7*i~x7U?$}>OHGdqy8g?;%!l}Yu?9Am
zvUB>0R@1VA_Vo18NJ<Osa?&2a5xt%-=RtH+hrH>OJRwp{y$r)@8J*q*OV`mT@y{Pj
zlJs9(Nf>*#CnL0Xj3rtpU+>EDo;7-G&+BiQ_l7vFbwy5g2f<x6tGqc?AVhe$@MxJ4
z>*pr<y;%kR#mLV;AUmqgHuFe-z<H1r{lLP65Ni%*Eh`4ZSoW52O^_P~|NYYR+z>9S
z{;?)M91sx2|9)w5|BSkonY)COgDc>_h*C|*9aRl&n{uj4MY<0uuWFN7HVz7=lzs^W
zUQ|a^*$Z?~ip36MJ}p%iB#7w9@9sK7;S*S2Q)WP${}uF8iJ`~WJf4Do8a+jUf|h58
z%VMVG<@=d`EXV)r8xpxoMnJ*}@o4pM?Nn)94%QZflnH#BbyfGci`Mp!ZSrcWEgc6r
zhe17cLs@Ozn(Er(s;-$cy);6@ugQI;$N{?lb>l)Wx+3zJl=~E_RlcrbHdUF}SZ}``
zIM|uH8*YU2T$=lPFxdQmcp^DY;h1hAROJ4bzd=LTi#+T-Vat7c?l$zmqJl<By_cu-
z1V&whQUAErkX4oK?fS;!26zF9<%sCCwlo8FTfJHx#^qtWI(vKq(?Y1<lj&M{awvF+
zlRcJD#>%ANY+TcV4S}j%K`LIuRefC5x|g^+E28D95X;xkF6C)|*Uw<iG0<LT_uo4F
zYMnyj$M|Zsax>q_Nd?OoH8G<&QSI(k?=Lk{2TTgR99gLu=yTfBVdFmg4OB6oRtYno
zdMM*G_-24{w-ClSI-9f74D7n*+|^?_!UyVua$vf8B}rFwB%|}W^yLuIARTM8*92FW
zse;y$u2Cn20;EQNa9N(snA8LZoeBZMgEM~@h2_LLf1npjb8-huSyJboB3%Q!po19a
z!w4IX#xIR=8xBM*k|gPwl1@xaBsy&NiR=)xvSDL+#YS`0s7fU^TS(<oiUpBBf7Rxl
zoEUYRZKG9$U~vG=;6bFCeUIl2@B#Qk=8k{hPnM4|7uP0#A6}cyItxU|+_0|c`e!5z
zJtAnW$28R}b65_utUE|Q7;V_)^12G^xkiuw3Ui(o3mYuZhin%H3ztw;&5~u9wO7sJ
zbGV;n3%{KG7DhZP6plR&7LI+}h0btT^_e*4;n-<-`#lxw!XqjGz5ZN2L2J2CuG|^)
z*BzS48`@oeHAu|CM<inSQJks4qI38iwXB(5ax2Ix%l?e%7;UAZWWM`Cp;cGhtdki?
zsg(`Wh;H~#Q6NPr?yapeNn-Mn?T6E}9N9s%IO@!pm8*k-vmm$I?m~++`g#oEBi}13
z@@uX^?N+ZP^(B&e!Qns#RVhLj(H-8X#D`&l6Q?+T@Sg=8!3<r-bp<Jsi0xv~UBl`i
z0*&<cTMC#mkq`a9H3_z`1UP?9H*{Mlv_?ry9udB8eBz(~O7MvJbw>2(;`<2cWp(P@
zExL_WwEM|z0}?nd?^w8HC6EYvIv=|+jj+u^Z@Yx92ul+T@T1;Lerwjs|4!1pFrDsD
z8X!1-4@$(lN&HY{-G+Dv+7!+=BFYgZWg#di5cG=>{|$oT3xzg#Ex~qd=BzX>Q?&&p
zJx`47vdCu(f$jq5i;fcQAru0)L_SxFsXD3%ynEnctoHKZUtm~L3%TnHh`x@UNcEGR
zlZvIKF8NKB`z_sPfnP?L%=YJEcMj_N%JO-CRjx3F@H+%VZ^nZ_M0R0`<Od2&KpI)K
zK3>g%wL<?rl^=L7*hg9vh|&O=coW+Q4_P@JaK0n{OD?A!d5|g78^Ba>U8y3vrB+g^
zU2@%5lDgT)O|AJj_^IHC_ON1=g@d>lCx>U!tREeAzF0Cm;5uo@t6UOo&8uCqvgqM|
zo@H#UTeeVqG9@b!2RTO<oGDT=Z4%C~o9q{3;|e`c)<+rHeZ;iu`Fei(405ku$f}xa
z#bRpqvZ<PpG`0K4x|WU24SSeCbs#qfcPKMTou23X3to~99xc%lf{JX8PEj+TD>q#9
zK~O1T8q`(B1z0kU`+W@40CFa>beCLzcvx$6C2#9E^si3ssR6Q+APg5(h>r+Nn;J};
z988-YOxwS`3QSvtiX`Nbu0$Xw(V-laC#*1o$SBWk8!YjS(CEjlFAy=I@TkP!bLKz(
z^Av~V@B9A5g}p$xTNB^#|DEs|H}*VeL4kn!A%K9G|98Syv^8=ucW|=%SF*T&nAyAh
z5AM%W)londLi>hjZq&o*{5?8lvs7PI?XHM6v>yTnj~oQ8fUpq~)4XNQBj$VW{>mzg
zhC=A`*hgr_Ytde*SQTNu&|qOP?X$zR!?kcD(Cq^bfJd~2>oswXm@?zgs0RR+D4eH;
zT{jI`r*c>?w+{d6SWOl?>JaIF#Z4)zv4ah!3+~vdX?V#SlJt;W98sy7%^+TIm)g_}
z-n4kRS*!KZgd7R(_Qsb(D(Eyl5qUAJR5UtyP(PZvs)_&UIS`Z4P*vIOk0)I2OusLv
z#kRMsq0kxEsg~|S7H?9{FjE6}AP_UEV3sL+vlIV4S3L$L>psJ_W@)8=_H^77v*;xQ
zNh{P5o>+)JZu80L2*Uak(lZK{=2Tmkzf%Whth9UlLyTSetygLRY-Y;|`sLB$pzaq<
znptnnQTR*?8|Twd^E)HXRyA?wQM$gHJmU&N*;35#@Fmx5J-7bD2enh<Lmuz<Z*=;v
z6$MjL`^Vd5`wxs~@`WCMY)g5!wZAbZWyRHl&(f=ZK6mqsd&le#9Pg4g;}H<{kusDx
zP;KRZVGRO9x-+E=>p{LS-R$ybfc!y_)&u|`xPJEwOy>8_ZP~U7I?N0klG>h&#TS&1
zE2|85c_zCTMw+vsk`2MCnd4I>7L&-p#)39!<#EltMo60YpXMlkSz1qVi)nZU*!Kt`
zYRKq^`pgGj8oj3%JP~-kw1wb@#~wcILTPPOa!byg5#Pr&7cj{ZL~#b11ovqcFfWsM
zodM6==d}i9%hv|Eoc;yoSwoQNooB}KHo+>f49yBR${ENHL!n$9!+&(!N5Cc<cHMA<
zwx{Tu8f?9k+y8Zc$2t&^x<{UrX3T4j)$C^I>VzkfJdVfWUqHdKSBr|kvsY_^@GKv1
zF*m023%`Lcio9j(Zbq_g<Md;Q!%{wrB8GJ^b%XRvU)-K-OD207>%o`Kcls-M5i+VR
z#IEoxWlj89>JGO)WS`>_bMw&8{DR%qWD(i$&!clhnV>6w8nsR=fRWr6hormVmxa?P
zIoBb8z;i#FMRWgGNShSPhk1FA%D5Gceer}Ww&KJ-tfl#LAeZ+Y<$p)s(|gRX(SJ=U
z3Hbl}d+h&$JgI-cb8-NXi8$CgIH|b&Yg?WF6MRX^dI}4QSbp*y&9mrO2RdSL#7v3k
z=t^L6row@LYhYVsTCH^#Flf!mE@ExBEm$|5OO8gyvm4~!<fxB)dTAyR%-8#!HxJL5
zCkL0GzdrtTsJzLlkNfJB#;IzvC4!jP1KxL+ml|=14$iN?2UdKjZ`bg<H;*QGf8OKV
zU(hx+ZUcn0r|gem;rgGsgYI2iuf{55vxPQ~TPJ9L*8H})pPjq+bb_b&CU`X+V@2?)
zx|@8RZ}8A#eRf=h$rv|ct^_E`&kiv}$gYwt*AwdSFW!`jEImC7G>fHp57NawCvI(H
z28;%G8Y%`;-6pCrkx=HB@kj3G%?h-S{_#&cdY5rVwvMa2PnR*?+PnGMt-Eeb{q<||
z34wfnBN83+pc}palQEeU_gc90D(@&xSRQCMyDzgHXS7q*?>ECDcIT0LEd-Scu9s2P
zD)x+or<OJ8D_jRS_!NNF01*Tl9ZK3>BJT>r86zd!&dVu+#~f2IF#Lc|M1jHp)Xn=_
zS{Pi}PY1B{P{>pL-sL&&knhAJHg`rl+`-R(@c>p=w!YUNmNXKHMR;ccRkdvLQV}D3
zgbPVUGbmmbtZJnBGM4iBNzB@rMJOzIjyXlcR_U(g)c_l;lJ(zU6#WAkioO0S>`<;z
zQaeN#gQI2INC)%c)ks#2_u|)JAa-wyg*Ty+RWMrNB*cS&AafGUz*WkO%NyZmOm-@N
zS6&qmH)>Nx(S3Z~d~kP^<U&Q3Plgu5qz}dL%B>NgH!M+gEO;MDLxDJQN)<UuoxFrK
zoP1Z=aeA&J0j{=e)gW;irS;Wn7I_+IvXDd1buueiPIfopXbE<grMleDCk9yMf+NQx
z@r|hj*SS8oDKx8dO*D*Yc1$VOwa<rt6C`N1k0F&OFm19~Te8zVhu`3;G)lrq5j4VE
zvP6!kD`mrFkw(7>3Z!MJ_i^9;$D0JZ(hi<a1O&9H1q4L({|g!aiH0s+PeawEC4rY|
zve-0UNf2maG9!2<Sro{)b|4ZY3{ok<K*8RkfkSfatjQ==RE!t!D`QTZrTpc8CbbP?
zS`0|0Wow(Qay`4ID(#LHb-ShJ^>*JL=bel+&IGAcps&}1Y2TYI@97)5mrduC+eJu3
zUQy8pJk~9jp4E$D=6yegc-_l|K|fCP2++@4AWTqQ-qE3!tws&r!KNF)T`dK{-p-Bn
zzBj{N=_|hg@30-g$vUbo@7R!kitcAXWJ#MxXe6Q29Vvs~<d8z^D>bIT!M;}Uy)%Pf
zUc|{Jn;!4X5F`5?t=#9j9P1G5=Vv~JzEeVqKn!xv-uguPYZYvc|H#nI+f?M{En@m>
zK}HO+|2|09_hgU%-afkA=aL*{_zC+RCnvpOJM3V^=dl=r{=(pez4j!3p7~wN(B{XD
zz4mZnvSY@O>?ff;w-)b>@XC(kl^DbJF2w6|amISur;fcgss8Msz*b{&Q@8kMMo;I|
z(1dR1=n#+Yrv&Pc>jK3c1LjTJ7~{5kB;sHggOu{FlC&K6>&lo|97W{TB02l1Ow4@Y
zgdE@eRWiA<`^20RT>H3x^0)dihK!kK1Rm|kT^I}l4LjGi+{rkNoIF4mq{Z;h(xxYg
zdzs^yw$=%T#i*37?6EOSBYlYzb9CgH*r^!deh$TjUScBarb}6{1Njjh1F!DnasLDw
z?yF6K&SkuuF5XZ`Y$TU1-c_>m5wks)f?u%Bh?8R`MXdV*`)t~OFTL#CF>nN8%PgI2
zDop0S1YMVC-OG5HLuEMz5s|jQoytQ8$_}$g-XhUWat+71@mRZbTX)^c-Rk2Lc6-lq
z-HT!#Gl_^*(iKO?bcz)lCr}NZEtlBM!KNwQ%<71(%?miW?6QB&|C^E!`Ba=D*>c=1
zWmGFs7dak>@f5LtKkszx5Nyz%p>Z5hn8mY~(Dbon3UO&8I~K?K$44_(o$EI}aVPc$
z4)m+Y#aA7XfDU6;#5R%TVhaR`Z+EvL5k`bWJ8Cz-zyE9t#i4?Wgt0IEUNCZ`C?-^S
z6!yt8?wx3bzeJ(H-29e3mY#S@?p?OJe=98pwA))VM6_Lh_Y)Nc71Jk`rEd02ptwkG
zFPGhSX-E;B`J-4f4y|!qH~V)gvb<n(sahF<Y@cm|V1l2}kt1mxMJs#!YAUc=65=9^
zxEh|C9C!qJb9Gi)wRw>IDL7#U>0g0NP4hv}Izu+(s9+6IW0`l<IDP?v#@sGS!iwdF
zFP*RMzXF?o2N#lqfqMi+aq-n~_|0Rv;(ys!F{1}jz5#*Q;2`3>1e+*u;HW$Stzxr-
z1f+9Dk9*!sf9vP&|IU@5C1H+VcD}m{{t{xnceU*6k)xge!D{ukVFE2+E95oQVloGl
zl@fpHgZ+5_kmm^G>msVqnZXUzi_jNJM>Z!F(J)Sb$R+WoT8C{oi%1o~L!{=jpY#j9
zk36{5Ffl0)<Sa0b3*I?AkyhheKeuF|Mq*`>UH{Sv;yd3`_P2Evz*~LP5*o2MgilR=
zqK0))SY2$SUj--s@PK=(%2rIpV8UJBVorf5gj(~0F6V)oOK<vOGR>JoQHMdmmgzT=
z$!x8EdU4AU_}X3}fNpsS6F${TlGr5o2zh01%p4%WDGWwu_Ron6)tS%oL{sJQG1+oK
zjZ*a|gsfh!l(+%>I=`|LveqRKV#gM|)WWxy!t%uzhpM)8X@WTTyA%%XWo`-H2v-4&
z4(m-4m;HB7rfEQv6X};oHvlJq5f&CP<NZ^AF?W8C%07Y&NygSCr5qFcd>Md`s&E<L
zPKHF$+?&UYBW$Imz_*{;$Cw!+sQ7@4Y|>~o>KZ3$8JUxZXi}WK$9@tkF4Vtb&Zk4x
zSFlJ}D=Hg8>duC86<d8FmN@uJzA$x$hwVKQ=B$|vM~^#^b0uB+^pssV?^u#-86EC_
z12xWNQd31RYCT5bEav!^jOPQ<pIuG7dQ1O9B<REqqKtg#_R0Wa4iXOVwT)^`po-gy
zlbFmoCEI2Um&d%>M(D^(GP4x?fx*Q%7Orpy%1@pBZZ;c1YdkII4lwiPMH3=JW033s
zbHOeA%d^<B-w}hL^xkfkDApC4_{YV6Q(cl$QRe<o1cbjN!dVgdGonUkNs-OL>^7pR
ziJZ#_rNwczr`_@^liK+GQv_hVc)gzhI7KX1<i``Ad~|*D=~+5C3J%Y6+`1O46G@}3
zYr%s^r{GQaN@hf8+WD~QJWf-FFffI@!59QF*?&>W5dzK8E9;8F_C4BuYeo)#!|9tq
zwT~C5b`<p>)`NTb^5q$(?CIDrcqBhVis)U!dZugIkWdK>)2);ddO!D|J%sKdGLE(k
zTb~8}szMeBx5$K8Yi=Goq_Xq^u0^_%z0OocheKBJ=_NcJ$~W<(;UY|d<XA=vA(7xn
z?i$@hmZN9WL0}MH5Axw-_HX2W#0vjtH~zNU+-aFCr_%(Zuz^XgGmNi}F+|)f%;DQ>
z1L4gR?3chfHS$_2McOvvB1Cra6S~e$prCDUi`)<a-iIlsGUDQ4!xZZFQI)H-E9H0@
zi8FE9XjIs71FL%JLD?B|Lvq;;w`H>2=HrEf53%H^TGIJ})aL64NuoV}IgafNY9tv|
zvIr_6!qwJcBxNybF;+|-dTi8GoLwV5@bnPoc~2|aFfM&fDOn5a!>z%vtjEpcgQaf8
z{pJ_SK!D-Ex@!t9_=0X23GYn;W5owoJ1*iJwMX6_l7<7VAdf|X<RX~i-TDrwGaQlx
z!UXroLGR(q!=KY1oCp?w6IYyK;%z0yYbEs{z-ezM7Sbu4fPzlvd&D|W??x{xCQ{1j
zKrD1Z1NBs24xKIR#1*#o$NG)$vW%EeMwmPTDIxlLyV?F=*oiPedoVz+{bNzRv^c;s
zR;K5(ZLWnJp~VAZeKtNf*X*Om^4TnT-I9v@VwP}{iR0ku-A;vnb<NUDs#%6#Sj~p{
zL9pqjUnrbiDv-rn0~?A;XS))wIoSiMR49?ql`a}ycE<YYcqlE?uSXjlyuL5S-n7C(
z{1bD3sS;p_+hWJ+?JgP(6zX4dp8Qm8nbBsWyO}`(%{!6%^sN|!QfGLJRvu%Gq_vGM
zTN#AnT;{<GZsV$ds=;JmG$C8pwgQ#ez*f(flD{&LaSA?<XJQviYb@I~>E)>X>#vtu
z`hJGJYPOe&joMHc=tf|KpaVnhT6X`P<hC&*!oOGM`>&L<l|KnG^vS%7XnV($m@4n|
zW|ePMUSp?qt;&g!0hJ{3A-XI=<a_^n3<q8KIXT!`XPX#*D&{>y#qT9zUjHtE;7#!a
z3zKRAauhfllt^8P27z>Rp?M{tCn3qvpS*19!wB+Y38bkV*13+(jtwZX$ua8jXl9I1
z;}~ep>~OJZ=1Nw~mbbyms}ZEPzeejUxU_H9VW8>9^BAfh5Z9JC$4I*K%24II!G9Mf
zRQX2@!0o1g3T9o-OEpU#M*840zV@oVe}TyQZHriK=^_=i-s<X6fkj0H>{|&yj)x3*
zlja#NCe~O(S<W6MOTwuP;Vd*(xB6Gi;R%uCj{U`c;vjO9Xr>=xn@1f8t2Sp9DZ@7p
zYX$GFPwHBUsS!YiD=Vvz;o@jO7)EFIOA}*iIlGj9gW~_1V}MKK_<2?*-5g+9f|s6C
zE+7C+Rm;FJazksQCw4LjHI>R07`A9PuZf!1q+60GGf0r6kYSdcvX^{JBE)dlNs3te
zQcXAHFm^LC(J7ahI^NTcsq0N;G`wJ8<x*U)%MZs;+|bnP<jMGQ+?y@L6as;hbpKZY
zU@%R8x=M>pYkerm%9VgV1~8DalutOfVI%}F`^|2)qs08Cfc6qi`EsgYXc@a|-|TC8
zP%Ow<V07{9?i5VH9FJtOfg{PCh&&>P$`UC7!4DO{I6Z1k@03m9In&b9C$3pMGctc?
z_KaW<m>!~ReI>)x7*jaAUw}Jg)%8h^oN;u2WXH@o*~ek%?uE)JEOGG)%?^|c<w_0W
zKWu96jH&a2;p0YQ<Ll|K*JeJuaD5YNgZ*ZGj4NhvFl65zg`%k+t&VzYfk5SP@kFgS
zmU(Psa444eJB<Gvhb_`EWd1ChyVqASp`*3YGPVIeh5x3NoEsA69A7lSllqaOML2?g
z*Kc1*v;(z9T0`Rls+(e9WXcM&u7uI}3V2BXrzb4q;HmY13aOnnB$A2NPt6|iHrsw_
z?^N+qOEECX^4IedN!dw!AsD=TQvh2nc|N`8N1)k>_h$F(VMt&pAM<VBWJEl@2j(KO
zJQs5Jae2%AY-S*g-{}Lf5XE(k+BMRDlSN%%e!%EN9_k{PJ9Kw_<9jQm=&6Y`IWlSY
z(dEyJ<l48?<EPG<KSXqSYxD{2`T85#rAdm`3TN>yAPk^(Sy4|BNER?+5&$RtSG+Pm
z`xECZ96j8pw0|a@E+5rsjW7ZLo^c{0GWQ@t3kccy=l7iZ!l4iK4F0tKB@;V;&UcUu
z-{HcK;re>tQr}uB{(DsKe?BW1ekcr<j%+?(+dn%fe)1+b4>QtzWKw<-f98*RjyBqT
z!XQPLkXXAIen@wg4!u)9mFbt4KkBqaVI~FAKLt|=xg{|<BXwNDaxK`y7V+i3=~39I
zm#9%*s3FS?dVK68CeEK5(lr==b+&&O@?2o6GBt4hL1r4-+UJ<cJBv|5NVx`xD8-<J
zRr82fywNmJoUAEjp+rwiHd{NEs~%$=P%Yt^wHItMW0X5bE#RZemd`U2v@I$=I8yM#
zy{qPA8J#{$Y$+XK%|Nt^y2}DoFJdBMaJG~#N`pKR{ZbItM8(UObf(pR#~zd*Z!~gT
zk!!7IC(XAb7Vr|ls`&dkg=@Wd0wrPtj|tx$i4AT?xAz;*NGS2A3t=F)_9WYqSjOA8
zH3zk^7va*qSZOJB+L=765*?PCS-!?Q+vp+m-Ebn<n6Vt7OOE-&!kq8sv|5<r7M^e8
zmpUo64#u2UX4<KtjgR4fWga%gTpJjK18-sU{Y<xi@trRlv@4Zdv7R@1?65qti_H$u
z6tdi0NkLd`SOi&_;L|DoGAw1+vh&fLmq$#-OgC{FK6D$Xu0kZiP0=-s=#{$Ay3^dH
zTR?rZrz>6zZZ8nq(zYA(XLe#ks%+VE!<&eV-h_=c^H@vvJ*i`Vd!Xq8<3u?dP%E)W
z(8k)^LV5Tmb=ORB1!p;lE_y<^ATe#<9;*P5)^YgaE4T33P5NEp`8Bm}Z$4<^!|peU
zRfW3`EbCNMR)SIPJk9r=HA*#w4M2$Vv?y)-wblHz<}<I4V&CA9aZc~4n0OpFs<tp^
zR9xst#Sd-TH)Vx?*QU~FuoVGobj>F9Uz$-aN$aVCdh^~d7O1M*5-_O|G_+O0Y+8#c
z15<F8{q1i$-#bZh8}2lZ2K=BIg<iW9o)#{f4cFT~n8#Ht^d+O*A{f);7+i4!6&#hy
z(l}&W^(22r<ccU7y`DNZART^$xJtQpO3=@a!_;cxVRE#8jZJfjF^1eFS5Tcys&Eg<
zbRQX|871eD$+w)w+T}WNWvIbD4vC*<sO!LNb1`+5#pQW=Yn6@|0fRBvZPxe7H5FiD
zTC8XBasGVdvtd!Fhne~@)%FPDi5MDIlBn^m8rZc+$VsPHsr~?dQ<OA311-M6<T>O<
zrHlmB=Q3!2nknS^V&tno`NlW~H$nEoKXtz+uOb1^Y`i3TfrBMuB}RNq(iKMC2;>#O
z&$%fz|Mg<~5axMEhvnvK$v*D*y+|m8cKDgT-mAMc)xZXqb)&AVv`83<dya^8&ossd
zipkc%G)2sP&n02NW_sHv*g?6YWDbmpZ@abp9HxeUkQ)^rQEO!zQf69BIdf;4Z4&hO
zRw&K!_j<^9{BXoW`K3&P#S{bH9sO<BFQ2RUVaF71`E&i<<9tyCpTF=z+sj7UUL1jo
zzn=VeVw=hAnAr+3IZVctg(0NCgXko#i#=@k@??0rE7Bhqq^nBSNe0?C+LkWqqVV<l
zBiiJD%;k23<U8B#&3Y|z2D9cMsSDonQC4r(NCR^oqelK{shrz2{nQcX<;Z%pV{{DL
zNf`pkX|6VD`O6Z~f(6FOr^&=TgqFz!lHrPyj#9DdLt^h+PbF^BdP1DCs8KijMkdCH
z$-5Pyn51$DU;AbR%f$#73V=EH+JOHA+o2<WQX*?bFDa2`%?LNeAjoV2X0|6u2}0_m
zNN$_R=&wuQrBo~k6*BY6$WjyHgt{bg46U99-Zw<q6&y#`L8KZD__s&WuBrmAb32}c
zfk$QkWX#y$=5<C&+51M*Smq6@IST!J?v79B9=io{cL^v^VwDTc=JU#AH@JxU&EwC1
zmxyzhavBS5y=;D+c}>D&>I6CXHA?Z%6~r>qVvnEXMeBqWF+BKC&B#DEUa<{$hO?kt
z?x?9f`IvDhj*?dgwl7Ckm&se(=@di+Zmsg?)omlXut~EL&nLQS1{|(M-yLa%WH1ad
z09(qtWoQvP=fr?p!n+EV&CNgprdGCp`|&+-RkT#LQDPq;R$!4`{Wyx;CM4F<@mD0t
z6tl?e9I5`{t%2%c+R!fi00N0n1FX52iWTG5jQ@pfgVgOF;W#kw+b!*_&f%7XF(OSo
zfv8rcezxF_cv%MgDe*gkpPmncg{!`m>vES=Jm=p~LdXRG6^_ZROk)6>wj{ZKOMY~+
z{7%u$-iy+bdSbxo%YrDp;NMq#NbBk4(2=pWl0Bnc8D+=NXODe>P5me*Xl_PwPWA;&
z?P8B8&JG>kKLH2KUU-9P8&oJaaXJN*vlmic<Hl{%##%5G>yI|>b5u8vWYOd3X5`#i
zQC^YJa%DrIHUhaN^c+ama5w^g2`NFeQ+-(zdFWZ|iVlQ<1BlLCpW%MCj;o==via*B
zInwICqy6$*h@}c_9Do=l;-y(TDf&A_ON7}oa$Bczy}1`%A>?u!&~~UP^4NB)-=V+I
zY&R|6SiLZ!2-x)w`O*V=XTo|h!qt6DKvTR4^Xm0f_q$@p6WH96UbgXngj#xOL5NoD
z9{$|h)=+^Tot%0m)c?XyoVeX{3Fn;FNhpMIu#2bZa+SilsdAwx8`sfFEQH=J-zRfX
zEF!ncZ?RU5x9(J{CR_5V*pw=NP){PWif@rtm^XD;Iwh04Q;%L#Q0Y=D`moX-{?Y(~
zoAW#@eE7W&63~r=(+-t?-kM6WK+YD#Pz2E)6;nKM_G=ybq#FdmgPixkq%oaezGRLv
zcSV6_&z{q<q{)-}3xyl4{F$~$uKEjyJ*>PdAYElizc3{+BS*gH_g19ZmDwVj+6TRL
zf$EieX`AZROKF?h6=G>p={lj(g4&frX|y`~^CENkFu_pzH|rOFxa4Z6MF6EqId1M*
zRyfR46};k2R48!z8ubzXJ(-o;K$n$Tw3?v+C`u0a*o+dqo}KeHw^zt_dA>OKSG0b}
zYK_+1k?Yg*%_CyuRa5RjVhjNhV}qTg&89-Ml(n)C{_e)MYV(!fJ^R_qLgsKW8U9wl
zj598)VllO^E@b_GipYsUaL!F2;|`F`mZW|=bltTKO!|tcsn9_>^pqHZSI{<CQ-rFR
z!(5MHoNen*@sB2;CMbE8!x`c<RlcTlP2%C0ry>i+b`4TmhOo?SoD5&%3T*iRw<2$_
zZD|@#+Zk;eVPg}x$QK*=ot7=~x{#t>CNI-sUZEgU<frL>(>$i1R_#j93z5pTyyWE!
zbTldYMMMZ=o98b2tS^eP*6XANaW+sMdJ`6#6J#(#4$e{OYKpBKTI8azcrrDsP}iOl
zY8#Zt4|KK%dgvN>;e#pbvZ>Eba=;F$KX8Mn(8(E74i#Y!Yzjubh6;p?;DVfNyJQU~
zE7z!gw4d>RPl)-RfraN$FtGOIYf7VVyw*5z3Psu4@n7=*E+99=UT8?$>0iWGQANgy
zfFte#fC&Xl8+obZ+h`)Nwz;;ur+32sNHh2V`eguZhErJI0MaosIv1r;qlJ&1v^Kp;
zuzi`?pMIjb0_7+S6DMD}#6K*sQ%}iP0lTKjT|<q3dR1l}_3SST)Z-o%>4qcA5P~)h
zLabF5(;n!lan?+qCB~~WgP)55K!5A>RdCD`0?Ab6G?yzNcb&|-tS7wI0!IGOz}{};
z4vRQG05!4hE<Hp-T1K-hmpwFD+XXDUT^GcVRaG#E&+=EbYr;Q0Ee$P&Z{Xg78gcAH
z67t}GmLtz;Aj}p|51;QB`!;e(m1tmE3}#g1Z_FUQWEV+Kim5Q;PW4aj4Qx8n8DB+&
z*H0iBC<yWL!6Unp8dF7fE(fP#cs3lN>Sh256_u++MvUihMB*q_*tTgcMo1ye%9Z>X
zGloG^jCk9pXGXVfrX8H(M4}7vf$iCJFUD+t<}yJy<$HjT)qk1Ol6pTKI1Fpmxo!Ak
zaoG!z9hNEGoJLdaZ0ZN@@)LUcMPpvPvO88|Lf{2j-yL!KoIJH){>O`1WQ<j160IST
zmo-FUQvH4s%#D#tRK!ab@G<Q2Q7r4mtc5p3gTW8QB7tWI?G$nJ2OV^AX${B*>mh4@
z+uFip!S8%p&iosG#SeGkn1=(gLUN!2$$5wwMqdm^KLi@_OBaYWHWQ}QzDZe-UX>8I
z++@fxNa=}6wM(SH3v+P?wEX3vK>3;pulyiP$Q49;5)-!4^pwO#yh3msCD>@j-r=76
zWq~VoMVKp%P7*q*fkad~1u*+dbSz4LN=`0~Tc;GI4vm5!i5#YbG<wWu0qUH=F<;Zv
z$P*;dqut7ORlygJji98S0<ss%F`!?5eE`dIQS2B~4bxN0IS-Fhl!^hPKyXV;tv`BF
zp~RXwoq||iR-%4605Ft_ndUQ}iaR8QaXj28j!PenF>r<vNxsX1Z>bfN--vgAoFQ&W
znbo2&JE+`ghcOX43qZqhgUj1<oCScNY6SLsShiY2!82mgis$Yn?VC<O<^;0gDgH&u
z+|XLkJPO7gKE|Z&A_)*1p%|u!UyN0nMpon!c2&ZVM=wFP9}dTnRcwk1utu^jjvPA_
z$sGf$;<D;=7L}o)Mk*1U`DZJCL@Vx}xbop0x67>Q;A=vPBi!n6G)opN$y3Z1UjJE&
z<y|?h45e@t>WA1YZ##k|hbgyfySDNi1nwurFE|20#V@*!^MyP2!|5$%kdy87tIZ9k
ztPR)`d!Q%rU+$=x8;~d2peOt|=Q*$^{KMCqR+B%lC;FVhp?1@Jk^>`u!UH3}zwdGZ
zAZ)z;Q1G#fZ3;Z4&JOs~Z7oOKFA;!iF~D^~fFX0HH*{kM+VqyK`?c)w$Ir#)#Snzd
zlY0<WOX@ND%iJ@LrLP3f$>7P<iSD<L>D@!5YSAeV&2QYusPL3A_VbnI(a?4oB;sL^
zZ;wy)1NVAOGuG+G#@dB{L2;Q?t9%tRU2?#XoH6SuU-={zKbU6;g*>J(ss#~2B<t^Y
zx;rJ<r;y#zhBZ?M_*(s4x%rStMO~N5hU-7|)I2m<8mhBHm<C>mW=EBkjHiWQ<5VN3
z)3SdO7HF5p`W=Ka=$bWWX+#C9G$)Ma7@CY-p+#JDzUz^ekDpC{AW!F~KTcUrg0AI9
z2A4ig?`5}(n^TEg%s~w+>p71Kllbyi^1WcJ#vzAUm%bVsMhn-^D#s+=WOa@O2-<cU
zq?7MRN=?U(9h-lR?9agy*rrNR#L_mx#ZKq1FJ%q6zInK=$#P2t)9ELO<`lI^k=Rx}
zQbvT&>u~&({#x08??L`t>!3{ktf8Ae&Ix;2Yv#*{kmgoyN*(gf52xK;!$TF3`mF0G
zi&-a^w{edz(yM+dA>U4y*tawG_NwKYRJ!!d)MaP?I6HXhZ?=mObB#val4su@Zf|3k
zdKaCdFRS6f->*jep<<a(X}ZSb`J0**)_4ozaTrqjAciG>iJ1WTR4`~})o9k+FtBcu
zMmmjpVj+eTLxh<d);7Q%ntA<FCW(p}QT}5r+d4R8ToUq*(a0<^_(<kE9~t#cGkqm+
zRMpS>aCV+QGJ17%G-1JUINUo!EN=jxnInPM31QR2*ekp;uj<%k7n(*<jijM%v}a;H
z6Kg|=nWKn*lSRQ#U9F5Fi<(n!yvufHb%$-kFZ9fhZYTh&UL4_X8*<|bPfp&Xv8+cO
z|F~uniHyrXviHtRV^!*QKYn37TtyJ@c^)bq{5*3rru2}4EO|4C=8Q=()=?M!g)@a@
zFhX;O>k{=^OdmCasv#n(++;&ksMr*6g!Z613n*QGZ`$W3@8@;o3ufpiu}FR;>Bb<H
z$tg$6qpsT|+kq63yPRhg+WfTeLjPET-xr?{W=1koe*$%ZSI;o84C!2n>B{D8==K0j
zBGFiFiWFzREW&l0*s>y?N^Q*%Cw47GMHH+-T;G@MLa&xks%n+;8S5_Nl`F6@T*?@t
z$M^|<Xu{+^;BT+1yyn0G|29~^+LGZ+S=tsiD`$B_n9p>NTZjYBRj1yE2J%2j_glvx
zu%Jpdwd>{<*I*cSp|?kG(NgdJlPO)m+J!~YvbZTa&1dLoqjLb<E~hw^Qnt8pTFNEZ
z!b2tHe%OBG445zo+^!)Sgau4tGV64KWixJn^iRk-cC?C6dr^D_K*~}dm)7(WP68j0
zocYC4Sno5K5v4R@A77)%Pu82aH#dlHOAnd!)B^&pFTv(Jo)@-0PAjn9Vob7<<a@u<
zb2rNB>gGKIx*5)l)~DV!NL^+aXfzmmh^>O0=kyNO&qO6(m8POq=Y9#kxGY~5I1uE2
zdM~ZC>#17AzjM6vbVV<nwuY5$r4%}t&G)JpdZE+^!up3?8-(cA2!YlNVE!P?d_vNr
zIm|lUQB<Kh%u##vh<D0e4Dz5M{Sb?E$_Tv*3U?}`n53IWXTeoXi(tLeh)W_b1r8&y
z%TeTR)I@HLAGjAkwJpqBpg%=;GbNLM6~8+(W$V`$nIE@!)9a<E+?66)W>P#u%>|#T
zDy397M;wMsIL!I&M-RiK`Z8V({7R2-InAkE-f)8LQn}0rZ;Z;R6JIBz`J<;v+7x*w
zk6D#BbpAzdoYLyz*whNwlfqbCto1kiqo&Ag-{7@NemVvA_bbI3T}p*s|CSSf={p|{
zV^WGrQ)eW`L`N1w+Xl1R_QBy#(u>9YiHCo_kHL4!_z}w5rC|S?|9{sxw4bZ=sQ&Y-
zApfrl_5Y)D&~P#W0L+~JLwon1T8C)0D|K8ov@H>kg<xW^afvv^4QXbue|>)7Q9)5&
zB9$l^I-Q?B1!!9Or0JAw?gVFloxtY_s0%%=ZhJD~F6k@9d%=V+1@NCDhJ+;6mu&Bu
zHSZkn>%-WTo^J$07=?YT!OobFU+cA413=fqR@V_)@n^o+M}u?|%aAPE5eLNT<RpY6
zZ2Tw>b*b!HdMP1+sS2j;#6~&itBXpDNCLH010VKV)NeQtD~T%ix*dssTQ90rwi$kI
z3oJog@OAa~k!EU6i0qa;INZl}BM2Dmh4Ylm#TQ`7sHV>MJ~)%n4p!mEoAE_?-cxRs
z!d>k)p0SJeA=%sPE2>HKM{6t&Tm?dF6w#0AXX*`V8;`m>Td?(NYAp@8=;)Vi`mPz1
z*2yhm>xV@da!l|d4u^SveYaJHPpX1!U8I}F)eZL4J=e%>d|5M*jGmS$fld>8m0A=>
z$Lx=Z^xi#qnRhK2W*y4&fIBcv=`=g!3mS;=PkX&3?fIzqs})tl<P<(vk78TOqG{?A
z!8fBd<9KVG(nfhp_CbrSDZoO7(+_^l0dkOZFxRs8+mxZ)QbC4)D`jnk`ZiasZ-x(N
zVoABWp{GpD0R&C0URWyWh*h@vQiOmGAWOJQIq%qGuFAW($vARX<^*pwn(|x_Thd5W
z<fpBQA~FZNHJBJw2aC0q{+J#P_f;2zz+|MiLlXBD#NhmOytl=0ST7YqdcWCpAUoAJ
zE!oU8vMm}LRI9Up#_00LH6=9SXEoJ^BhA+5wCxGU`>=^)7D-CRvt!M#?T_As)PP5F
z0kP0bvtAk6X6_ndMEV6JT~GNcIeM*+-bYm27uWU_(c~b16rp#@DURgH$jnt&+)8GF
z1$WEC<m4z%%+V3e_zOKjy?l87SJ$TaF{OF1?%6T86-T6hK3_MRl)YUMO;dW)3HplT
z%=24Gx0zeoL4%!#KSBmE{!|Bg*SPxv(avwX)1(JP30@EWjXbHDS^eWnT+vn#I17rH
zTr)qBjRR6qeWLUTw%P0mj@dh2IKK?HfW82sjSw=FQwh!l3P*BX*o9r1YT&(7{3w({
z#1-ac5S=}Lf;IFRxSoJ)tKEL9Yp{rbwRLQ4(!PbvyM)X;MGzZmxsCBRRMLE(X%@Z9
zv_g4&;&0tkcMKK*Qk)359}v<Z15mw$fieh`v@wYGHyMsuQaBRgAe&Y}Z*cCr_Fpo8
zJqg<kDA&R6%$W%4$Jy@WHK*oth;gyy0E@$=N}XYUQpa7$<|`<0dv;bz-wCYLhcIVn
z0*3mU9J3v>KKi<7<O2InRD1GlPjGd_?;V)p+69Nk<|OR%f;pL5KV<<ryf{e8l<J&w
z5RM5Rgo?dr)bb1784cJzqc?n$d%(vcLMo=D${|jPahz}H*g;Y4LrP@4?Ivxslgwh|
zB=iw~qcW!KawCsB;a?#!ma6*jx>-lolu4-NZ&m|Yv(t4)hh*&EWAX<!gWvySl1U5r
zMg{Xf#&_X?fGGcWcKWYTy8p03fd8WhPTtbM6+`R25tN+AT8F{VsYPF3hbY$*>azxd
z%{vR*6A{#|(x%L?V&NOJ-<+g)JuUc&_KjbEfQ+5_RwB6Bq9g0Lggnbm;OS_1`MzG6
zwEh0Nnc4xm<@${O?Y?IOLC|M{q9Exbk}qnUFo+Rhhr&bsnmnwB;!XA}<s-3A1g@ZR
z8ztnVg`-@>f;Bxwz$A$_`Nt5DM+RSK#yQ@<esaV;9hD@TwSw46ezuk+Tbgdm+^RHx
zKNY(Cx81CHGDX@3pkuw%UI}$YJl15+I<sr6R+^PwHVLv~V=ST#XYNdHuS%z)&bGyt
z$dss_d#8A0Ayea#VKcw@r=DS!x5#~msTIX~(9n8?BhfZ|L|mtt45G~(t9V~J9RkAZ
zYV}_6fbwBIS+7Qg-_mcvp?iRS8%bJ!lVEzuFvbcAhWYKbv)yW`O=;;lkv#hROg4f3
z1bpc;k>weBV$_hi+-Whoe#??3Z{__XU>W+HgW@l&M!p%-zARH}l(89y=mHA2Mt-22
zBdt4<;&VhduNQ}8E54=#rV?9~@0{{hrG@<bmC9yA29!+`picQlV!hLTVgCt#gef2?
z+%K5C)qcWDOjDjq`RE#S2)SftH=fCoi*H}OXn?+sK`n@r`A;Lt<~kD(L~|agTC@;x
zb>yD6wZ^Bliqq+hUu=JdoSmFTJ^hkH5YhZ5d%ih%Ki1{3*Or&nopn$@c~<_%El14E
zr0Ff0ynAkNEHqs4L2U`mCkFz5Wgv8R(^_(VP=$dD1Tf|3pFR&D@RrkTE1mY-ppd@P
zJ0qWzW)qBILtgM5i#-_G_|&m}xmPOKmR*jBH#$Fu;f7jCV`x7^z=bVy+_N)^K>TaO
z;0&4m?sdeM{H{g5ySi<P0W?033zzK-vnKv6o=ec?Aw&&#20LM!=YA!BC*&roV<)7A
z?g6Mdd+t-$EjhLw%mV=VCwJDBAk^|VaL~)`87m%k45_m}uy-`42msm)LLxv)vKLKu
zSFgDO>}J3WZ)R>h*a$K=3n<3$bOu#$KCSbbIXe&$(0Sh76?zc%DiinBD3j$_W<VTD
zB00Uq6=)>jHr*%h!mdkyx1|?``?`H&=rZaGxP;(T5xj-&NeKzxEm44s?LeJ4syaiC
zdbMeflBOkaLNL$DJZ(R?7jW~9&YPnAwLQdj#Z`;pbKaWnj;eW8qcVSU0X!c`+@uZY
zhkHQQ<m7c#Oxlzed6C8wI&UhNb8ZjGvy%Yp!4j4FpjL>xrwgoq2Qz3T*925#4O{1Y
zK(c&ubf40?ad$_{01zvVA$w4Psy%xR_S4}nj7uwg1QFJNG~{wBj(*)r19`9k`J4jR
z^shMXegF?~5dwX0LF(gn{<;9>(uD#%g^j2IbL97W#Pb{v{m%j2w?c%mEF>TxUs)g^
z+W${(Q2@ADIoSVym*lxi2igbi2;F}tl#C34Y!6DfH8Fs=l-6T$Jnt_Slv5fJjOB%?
zdpz9bbY(|_=<K?+jgFO_n39#<(zd%zlbm)_SaZ|YQ+EYAn6^%={&qOzl{afcMphbU
z2W!UXdF<y)hJ*R{&&#%ZmxKA|S=~nuERaPwk4>HcFhI}023;jaf21`r2?k20JOH9E
z4a@?$Gi28`umvSkq&C$Mx^EsQ*i4l>WtW#*SH1{c)w)2LCuzDw8M05BTUV?|K5z*P
z6RDC|Q>He?kgpFS5cVvFfyOmq2p5`xWK|Tv+(!<U0o{ybOWvBe%M#dv+?loO1d^5;
zMkJ0zsR-o-{SNgGf2|s52etu?0wx6#El4SetSj`FViXArOe+u{3=~WQ<&tbw41nIZ
z1a?Ez8oHYWc0<ydtlJf{y9IVb+?u`H1$IN~A<zd8)&b2gcq<f$3(YTjYZRCP^^CMB
z3xMt0wsy2>YL)99)L*hxVH1&Zke$#j)=;2SKn2XFr)Eb{e=KQg&zyFNvr$_tSsDmO
z)6OLYU#NtZ+oTPF;FugwWobiHJfOjX%ht;`7CotUdm*b;oN4|)ti4m1W<iiPSk-0Q
zUAAp>*|u%lRbBO!ZQHhO+qP|Mdv@kxXLk4B|6*@WoXm5P`Q#ICWJF|~d<7kpbLesf
z79K*F9C8Txf9D^M(k*ebDRV8u%FBkCfYE3l*r6~Nibv3ZU96O4G*V=qb3q*Cep!)K
z&KWrxCS<CftycdwdaS?#e!_A|sb|YzSX35NnZNJ?YixF&M7Xp$g6E7A;hH1NEu*f$
zvQ#`<bS=d~Q%SZ;w@qEnpNFzCrp;bndQDQ`)Wf&Ae^4{r=tzXs^s{DOwOT$~Z?`7$
zKgrmF#yM=vRAwlLFI%IL5fe;_qSLrginWlo)09*7|H|<T%~Q+z(7rY|)Sj}oOECJ9
zY>7*TE3zX8GqsAqO3t=sGNGvR<t7-#j-k@T7v){Q?zVBb6_1`;eSuU*)fMBnp{hE!
zSYnX5f6|xP($_;8F8@u<D$6Jde4q%$S^Rhr*18n4+<cf$xSo=%^kqqd5>;{peExUN
zwF7ZDadT=F0l)y0I_5@xDfJ9iMVr<4L~Qx{!=pq`Zu-p7Y&fDK$yt+qU^aHGx_FsN
zg12kIn#n5E2C7=?govNGS>Ne`TOL3s+zm#Xe?|Da?6>@Z=$~o)ukiI1yIuWU3I1LO
ztR}gHC~M8T8$nb0PJXC`AgX3+-!Af*;DkiCbu@+^($>jVTcKzhJ?fH6C|f3Ogo9Pn
zVuSLh>3+<2ye0ARAXbcbu^~>K5Xf2g0f!R5UhLL&j+5uCvdzzJ^jM=XH;O8TEZt7n
ze>1CgCmlh4qEd|^iU6^q?Jgk0kR>J6yisXuBpTfYnQcNb6pjtCl^1IzLs7`1wW3i6
zQ0&G^PZrQgT8EqXD4eNY)!iDuZc?0?yLuYxqbv~s;wCv|^&kUpF1%pCM`rS`wdTOg
zvB2H(NYX={4tvuFdwsTpYOQ(6Yr3aXe+8e=ww-e@<9E-W)5Z)w*VL3?f|~kKut}KV
z$ObR^BHU%^Zm!l?^{W;#7fV-DMb6B4aR(p%iP16Ter3haFIj3V-i&BU1*`V(<`X*_
zVgwB)WUNd^ia!etrb<hc*g;qQm6;3=@tIDo(a|lkE~`_Tw9f`Q8QIc#;>82De+Xqt
z3--mu*ZIbiZ7XJm7OvY^{TscBtvu+)JLZ+l4#OJ6847gs$d-z%iS8{}rAg4~^f;be
z4FW4DiOyt)e3@&v<2(s2ruEgNuCA1#nkudoxT)#u)II^^NFv<O_cYj8jzn_-)cDa-
z%qP8i1$q)xOZx@to8ltC7r|eVe`l?q7T`^$jT5$W(hVLup{-MJgJNZ1Wc21HbXtAz
z@mRWw_GELcpH-t2tDA;qv2RWdynk)kPG+W#rgDS<h=$R%$8whmLAV$V@M0KZF_US)
zD<;+))|fu}Ntw|IqZUOnE1oLWpX+-HQ4gWK>h_Fv$!wf+$uqLI>*{?1e?r&c(c1Ze
zb(gqwa*j;u9ti6=PQT$V4j*vmDLG0RgB!A{ldB4Ht`|8MaDT5pfK))5BY4`}4U%E4
zHq4Eg7O!)!$V^VVOA26ICwrky9v?d6Z>eM;py{e^RPP3&4rma_dhFct4m?G`v`Yxg
zuOH}KiS=mU@KSg3D$7A(f17{2UwneIPT+_04B8S!FK7xt#uOM?%@=z}$rd4VtkWBq
zr8hc?sE%RIp*e!P1(<S*{oeGmtiY|?Dj;O_&c=V;F(@+kmeu*J-o1{LIBgVO8r2Z8
zYasgydOoI$G)qarxMe`z5am+u54C}B%Yq%~BE3AsEsr?L&J1j$f8>Oww8rd;5VAq*
zZ|iBV9EMNo3EtD)YsrHVLZ<f8!WA{qiG`3dfRvm0^98*UsMWvINGXkn8~mD&h#)0~
zXT1`zt8h+CiU$a>%8b5cm+1!!@*q+2`c7gTYA@B?^dDJ1t`sVQ?aZ^!;!3(s=7*3D
zI04sOBXLJ{6}Jbfe@@Y7-z4Zmu_x}sgMwE$Lri+^yF%sxb3@$STd;2d{mPZJN9Cgp
zqlB!Dg4ZjVccsG3Qv^ubDV||^D*#CF!tb14X*S9G{_X-p;RT0~xC8r=^hw<^L+O&e
zpFm{?{1MNc!*y{UDKPX0jS2HW=8>(<+4VCQ$r$oxQENn;e~jHFNP<`VH|)Q$YdN5F
za=EjSouF#3E#_$YnD^ZqMJ5Hb2E!;QW%(VrJ^-mv#bFxAo#H8-B&PWm&iiOwJc74W
zeF}gTNL_OGfL$4YQGS?yJ4rdD<t?HC_L9s1<}PV|bgr&+k}z>nF(Qj1$At)pj+&Gk
zqW-Bc+Gh$NfAkhy<bV~R2Bk~r9=D4H7`P>Am%HN@k7~(Tzj6SK?7D6ip`OJ|cT?ya
z?ioj}!AEUd-Z26{0IGnN_78p?gQi-7vUC(KpNYD$CCx9i;*Y*~ZyLWs!lWuFgQE+A
zdIG<!%Y!v7+5z9XWqfsPeao!&NPMU<|E(GPuxBCEfAtqr_(XfvTH^xUzfce5$F3W%
z%!J1h9%~1JeR#$m?T0UAu;YWNDR!C%L0sbjMI(prPxaFNJ@*S93S1sfzr;co)OGJh
z<<*V#n>7~qrgz+GeJ{)2hFd#C@y7qcr%)3jZ=TkrS?Ij$mJh$oGQNHM@#xDwpoc$6
zOTSG>f1lkux3L#uPxP<9WlOJRNN>pQz!0cyJ=pUrq%=-oovpuZNbi)r6r+Dvac|WS
zPpJcpHuiRaR)mNA1-g8{mp#sAG`SCGv=fXuyuZ&al4veCAGF(Q=EU49<ahLh0~;LR
zkPMeW0;dXQ&!~7w`JE#fRH|oW=g`6S*^N`We>)*c0&Ww`?SuW$o&5w3ep;@VT<YaX
zuCK(VKrKD`mvjflxi2h=O`1R{eqiuNF1%I95m_(hV1~joI_#(}?7Yn_R%IEGHczLn
zcQQ(vJO$GnYMNh@ZCr=^p)KkgXt;NI>gWkaoJ0^&f=rx*`UUzMQ@A&nNOw5V3o6PR
ze-HV*It9}Zs>PsY%V>+jp)aZjkVv<Z^dZcxNT<KBst3;3tJfq>2+kLhSixT?AK=HL
z+T)7X57vcLFG-h>8mDg=+DE(evmND1myZ`}meZBf9lP0{9khoV-PW1s8>STwYaIqi
z8C!@K?%}<zTR5-Zz9`^#pK8BPg6~hde}hhFN_wWac<Btevz)$stuc2><=k+d*u@s{
z2f<xLzXV=w`ObH!(VlJwguV;BgS`@eHVD5MK64)_eh5D)==DW-$QhgvP20huTa$mp
zyg^BjUm3r38nAr<RDXhU-Z~g3iU2>E)IT#)9d{9i71P!&{81BdJt`wt!}Jklf0?_g
zX^8SgeTre~R4diPdx`-<M+o0Y+;g-`hnBB@lA~91TJLyD?0MKT4m{wO+lL#>gQ*xX
zhQmB&DKtMv8gi>Lu7(sV$<xx8IfWQrJ`f!`5NR<dSY2Hui-4JjrW8=F=x(PN!LEp{
zTY}Ltg7xtV+>>MWa~LIVsi4<Of9w~@85gC56mL$-v@p+~V;3RrC0-bw0EDSC@_M^M
zGHvWTpl{zK=62I(jZ9oRd|ZiultmAsoL(+xbOx>rA7_df+I**ks)mt*02xQ70;jf^
z>8WVv*@A|ZMb6O=C+LC&cI3bC_urZ0r{=_WCx|z4iF0GogE>N-e@Ym+f7D_IbN*rd
zWJXZ*WQ&h0gpr)$Y=+MlT7B^J@_Fv9V+QqB+1ITBTBj`cp-N^UWY;;^D`t#$qn&C-
z$I8|*P$OSPHc(}4fYTnFxPE5DpL-1)>5(VKDu5a5yu-WHVnWH$)`P5vjPBQk!1(Gi
zAxA{qn{*$5dpUW{BB#mPf0r$1eE2~?&;A~<bI6oh9BU}W2Ox`8h4%PYUlfOO)ckDo
z&%?=gkc+C|o87XAnke<@T(QmOd%s`y)T(Qa96x0p8d#W3RN5-EoZ$t^`N{oTRDs0K
z_~5%QJ`BYa<yzs)!@?kE<g`#XR_G2(pRp|f5B&tKD!9fXixo5ie`_e`m5Oh_;B-<P
zj5qtZzcmo)Bgqc)uRK>IeLb-eCGmq;PTbz_Ir<}ZQ234%#y|+~hWMP6<`0wZw;2=X
zY}l>O>tXjGxOtDr<v+i`&LAgRGWWa)5qBzRcA$fA%n7;+X!J5t=zsaY>KeVRV|AbN
zd)G90pD=qLfZTQUf8Dz<cqjaO8N07Cel3RB=T831b(p%O=3(|U`a5S@79lLNfs2;}
zIXgu7(tbn8&M$Y~N`Ty`Z>$q+lr$54*MP*#zZB7k23%n*u-5{vE3sdSce&EE@@@_0
zU4yuM>LG}2?q@HUEv&BS68UjB(y9aov*VL3p4gIHfc|>*f6y4tsQ-;`EG!8~J}lCK
zj2t2S!0{w7QA&2ORex-Z5&vMBX}Id^4~|$(NE%~DG*$ynK%|DJ$K-95*=sZSegy`c
z_Rf0mVD(7Jj2t40j*l-OH4)!GLF%bWbh!WqE9O0dWDb1=HMt^UZ$8{<iM|A5m2Kr#
zYhJ+I{?9&*e|Mtl7&2?U@YY_~`H(U<C+C!H1(oMyR~@EOlH3Fa+b_kHIyN?lraC{Y
zvEc^eg>j++1X$}5jP-&JY_S&tZRN=7_Ry7S!tmqeR|;!vksz|_JvzLg;0ol0tGkQb
zZW17uQj<|@C{;@*`7(lvTFL?Ni`O`a2tE@7uH(def39O3nziKnQC+h!vShJmY^mlZ
zp85hB4IdBVntJ1uWHHx3(hP09HENnQlcTsU8dLXn`-GP+#a+6~RSu#bDMK=L;Z6GC
zaV#SGdIxtc4+nSk$^Fa6&Jdb`X^g>3o+efcwWevqZT@7O{gXE`=blEG$s3=?0HT>N
zl-Ac)f4!9?l$@VX6wdRr0{*Yc)Pd?0nSv(WdACSua&NEH$gy)jxd>A_=<FGt@z8#y
zRRN-H`29C7a-gO$wiQ#HXp05sW2Jl`Mv-<OLp-z06RQ&aVO(@_2Zc^=VTI1ILcT!+
z<{3A=ywaETMcT}zY`f+0+IIrGCLU;2{KKkie=M+yoZYHtZ&LN(CAnKwuWoyqf%7dx
zKC!Deu7*fLZ~jKd#cX=1iQMfOgkE(IkXwgrT3x&iBc2RJyp4ZO40)(iD!soDZDMo{
z%Ou#Iu@=cCfIznI9&^(p^W1$09Z3O2E?@`5rwG}9Cwybi?L;Q1Cp4y4FK_REobN1v
ze}b9YpaKCAdi?KXIsWS+vj5C-3~B#omcz~|t`-rQVDkkHS-<U2l3zlQ1Q8h)7_6LQ
zO*-CxN_I6sibqRpL({I23XiuDP3vMVn97p2sqx7iOiPQl>RH)Ky=i^9pm`@FYwPmP
z)QpTf;@kJz&GqDC`{!rdt?MQOO3vqTfAj#TcDAV%vbwhes$11hkG|I{oB-m64%I%i
z`nrgFhv1d0&j)mes5NI77yto<NA$|p=LYEs1&`vLvTFbkgN#Pxk-Ww1I{@7wb_eW!
zfQmu+^52s5AwWeVeTMFifc_zL58t%_m_cTfzEbwhKxPwj$l3#TJpef<pMYI3e}EqH
zXZWrNAO+G_#y)<R9khqkJ#7~au!HoOy^8?)m*f?tF9%AO)IDm~1<-@|nFM%c2lSwH
z3fv+9*rB$G+%tA_KyMH`rEci~e^EX|c6k9WP<#ZhvAaE>_(-2}elU=+y&|zfu~M;O
zv2ybK41T$>xuN<5{u%m+efj`He*hsUDQFR>5L7S{EI9=+rT{~{K5CyifDzOPY8WY!
zJe8jzP9M3?7(fZC1XYYAO`a+sFUydS3&^eSWv%FC#Ubp`yra%TgN&HKX_4w6iIKZ^
z^R)C)WKdr^Rq5ch*}Kk;y}Y`2eou5=TOhiDo#>O7QNL@N@GnoxKy<WPe{#jjYgM?L
zklDLt<D8{xdK;uKiYiyTw~7A+?X&WC63&HEAP_74&UOe#KEP6Jbb&SqEo)y|FslUG
zz@CEOEkL&~uS}3a0x3MUB)I($s2>$39cdgn=;|sgT+2{K#l^}>8AYX9lh9gLR&@w1
z-IlJV9RQ7PE6??%Nbwsne}B2SQM%m1%C)SixH<5Put>}H_C^s9e(TwV8ryyp`&<3&
zrGk*Mu+$gn&><?mhc}n%%8N(w(oHVm+z$G~TX6T;F<KEuk&E$yq-T+GouH}a%o(rd
z9AWG`wj`PFC6HyxBONYqZa6bP2NaoN{w1gsKJb@aAf!QJ9(W*3f2K={MX&RBipzK&
zmrKh|iR9Ik?~d*kSO4UFTJp%8VueWsu_fA)Qq3#Tm#eg6iNq;&!fLnT2C0`@<7i*4
z9L|t{NlvG%HZ?C_kY-7K=XU#Zr%pUQ4HwWdv9d<>XjE@l<+3NzntX&g-nn=iE^re!
z{^Jj#HX-ZJBYVLPe_3$Ay=afznW~`U2RQ5R+i|mTUrvIcMSlCP^7qju+GU-It6Pbz
z{s!8^v?b3>GoirRB;O*f2MQwN)^e9*dHy)Jv8VnD&9M#Ae)aikP&e}xoWVovc<vV>
zYZEVyCytoQ8&su^61q0UBo}%JP$S`os|SMD`jY5~Bfo6Fe|+%7*jTL@rka(T4amOM
zMpwjX*TB#RQ~iHBG_FHM3j%pDZsa6m#(#dM*eM|A#lJ2?om(Q?Q@hYOH*RQCXNa}O
zLyl$-A9I31U*~uRO*M{F$$hH0KJ;pxduP#vP9B~^T5ug67H_yl_~vaB?-r7Jf5^{|
zHkCw<oMGG6e|v<KQso@BYkM03C8i~A%=pEYR6>IX%t?`)o6E)xR${qi-FV6(^^Dle
zDLFY*$<Zowra|sj;otSXm?YH`%3szY?A=(HTi@9yYIJ<1x-O(cbaNG-G)-3*sH#;n
zO*vWQB6Dcf*X<pZ!`RqnS!HcDJi11B!<x!&xEy&5f7juhX~!wRndoX@ex1knJ7<ff
z#U`bT5Qp!$A{|aMRYrXfb5qJI9F^(3_UuBn#WtFQgb(Ri*-kgv(j+J?1Bv(-Q>eLb
z$K?{6)P$m&7TbI63i;JW2m=ji)#5X}OxXw6_}53xI_<}qR~I(on25hs_UN(Y(ls9A
zazNY;f8w-Z@gp|rBJGp342@-pmGkK^?S`nilO_a4j6j@wCR(z$W_T|>JDe|X!DK{n
z{2WYO=Ap}MaRhok>oN$y${em<(_d-ZdUNdJu$!%UPW&>OZHb`&ZCcT3J1MMDwKC`Y
zdPy<Yrv){32(Mh|tZ**be<|O!?g3hIi#Ks^e{@(E^wDHyq4<eiPN!1y&;8N4v^k<{
z7Id0+Ewp(`Y4A`kZItw7e2wZM7?BoKso@&k{jd*ZSaPYFV4R>K?$v1rUb1;!AO7O9
zR}1@|6@Coz?fW5x+-8d46;K!%icK~Xw6s-YBAd5O<I=9YpiFuVjU&OLCXJ>IOO=H}
zf6pwH5f?L7qo>rH>dAm+CZ=lK>2%{HK;Ep$`h8T_c&&jZsF?yC49PE_OM}Khmr-&E
znMv|b!rEZwXyT9wkdI6G{;;;yPO5o>>wSiXRdNxYzldY~n(9GCO3yZhm(kS*Q?`WU
zEFBxa10$~Z4si)%qs3iWV-a;?KVj2yf64ohoQI-ZjNBpoNv)9DpYg{<@jePG5~!vG
zGIZf}O=pN08TbGp>;vq$!Gu4B5_;4Jd3nOe+I$TbQAxG<d~6L8tf94wihbwdYmo>7
zR`qS;X}|5>67@sjX_459ZJ4)23v@R{A5GU7BWgEA9i|JmTsOs8W5@Q=7q_=De__ms
zD~R9n(w+!6(aQj}v;8P|qFFltJh1@<mFzJKpmI&f4=aBZWz2JEx0W~3Au+L>OUvz>
zW2{{Em{h|O&ALeY^dQ4bjB>Q2Xtu-9R@GGkm(h$uKh)F3W9}~he!`)XylOjQ!#0)&
z0$7P=Klz+TlnxN4hm=6Qc$%7=e`F?3)IwB{yy07h{%J~a;~exKccwMW{@}<o>5=+X
zT&izb?*0JHs6k@xEy;O`7PE|m_DXsnU(UldO!>>qhF}orF4b6T0k6kxxrWTqQ)=`%
z@(NcxWGd%(297$u{_}5*!$Fl1cJY8!1Gn{b=n$r+CNr5Yw(+pv6WNVTf8rg)F>?99
z%j@MubGjI}L;E;Y+ZcKo;GAbkM_N|azwer_;N}`|SC+9Yu_shGk9q8jCm3b^fH7+o
zm=2y!O48{M7^zx?Ih52&rmpTxS<*6L51FE2;K(YPvf^0t?6Wj9^;<i(9El2wny5N?
zKI*_MbPf}cGsGl3MNUpGe_LL(wWLvgr!st1k4_$IYH=$wTUC8=voqM)S648^Y>qcd
z0NNNiO=R_<r*=#HSdQOCd0swaaCW8J&Mw_eq3P;4ywl1X7NS&(KY4srWxcot{z%nr
zyjoB;n|V^0hgdgEDS2==x2*DJG`mQn`w$Px7TH4JO|R}rJph0ne-5XzKdj!DR-5tW
z*6VbP9@V#^k?eZ(+-nEsjgOk(xWO?7b&cy*0<|vH){Rew@VSH8pa0mLi`6D<S2>l&
zq;|%b*EqaBQri?699?oLHCo1~MWa&LPl>H6WYsF|W|uvlY?2s!hS`LC_v<Je%B*?X
z;AkQD7^MlJZQgRefAaL%7&5jr&I#C$oPgP`{8|xYpC0nC<p^|Z&BL&B7(fDuLE#N-
zY}upQISnxKh}&1;L@z8kv~vllk)NJ>bS}ZsD?}x@GyA_@y}XLBcZRdK?a6e`!QJcw
zvwKt6=EB(74|utE;lSKUvcnHvY^qDM2hXk`0~7&ypaYP>e<+Dakp!4wYAD(V!<3-R
zrx&oD;l3yg5#f_$sY1JisSzn{4oJG^!&IGvQD%^c{q$t5y-^iINq!NKbR?@c!>a9b
z;UAFC$d`nxGPMx|(uhQm?GEJNoAwx+wAGNBbs7AGu}~xcCnz=;Km55RQGf~n?wWMm
z6aWrLDzrrFf0I<ylu56U_%hssP0JBt$k0dc6Q?16VZ{_7#FFc=An1<HB{BgW_z!1{
zl!BCk5K~Ydc1B*QRiq%aCg0<}EYDFmAq?l1?o*6~xRVqcRTo7D<}YHDG`noSo$$bb
z!5r9biXiiss~`vD$k{oE4sJn(k+Tb`FF`vh4;>fAe-ek_tdu?EwMeQlmo;KA(?DUb
z3-&*k3B}6aDsI%IiZ&loDWNodaW>dqE(RNN?5d6v*uY)qVNE7#iu$6Nm7Udgd%3f_
zDX+}}M6f6*OMd5&nXbw^5DC280Qs;N&F@wNs8#fn{utzLB57X|Er)ZzAvfP~*`OC<
z&;;IFe?T9p6?8hlI~74KtRgJV(7wskuev(uB2c2e9nTiA2!SNAol*6?SiOusT#-G(
z3S;wEOZbccox?@$^Zt)ORcmU#v(5*hoL51G_-Q&X)eA#wd=V``P`y$@3zHHnK^3%R
z02kW=X%k9sUJ}E?(W$Y5en5>tEkUbzCt{p-fBx|Jl&GgX>~~TI0TZ5+1<M6sMW9+#
z!x7YxE#+ACcW@^JVGjoMb<ElH3N+0MO9yd~%M=8%FCi@wm|j55#rHNbAMv0eDkN3D
zHF{6NcYio#h(Rw(Y=X2(je<xfO=M6BVmI&(>dS{X42t+oL>w|9k`kt*JnC2S>)kh(
ze>)Ifd4OHSjiLJa^@|0T6DBkk?G(6XHw;3_+`V`>dLfiQF|DEaj6>w3Lbfx35EZ8=
z6<J?maWxODZLo6(@Y&057)#-fSw=gMQJ41QP$obi5|HZ;D7ZDo2K&RJM34+B+ovzu
z=L-V%Cpf22;Wn`jP~rkMQ%Hd*qc=&>f4a%v*KoVQ0_|&Bxyvcj=fDRpgbAi*LJmIi
zhMC9!Z96UtD|^dGVS>7umW7$QYs8SKU@zxtNDxm>2R?uahJa1sj^~>s+81HU=pL2>
z9>NSAjY;v^bY&rL9K&^n&Z|XPj>-JYkjPjmH%v->ht+4-G`g@fu|JMBqL<kFe*-=7
z1AFoa8T_pQQu5cVVJ|M;th!2!sgNEs_8aLtG5B%Dl(}Yf&jsvTeU(z;_mH^z8o_1F
zfZij)588KfEb%b8PR+oMQPFnjQRt687}-&z_y?TM@$oBvl&NyJDPn0$lk_uxe;1C?
z%Qxk<2x^xRI#V6+KDG^P!4WM8f9*}*hXwW(2s0S|eZr!;Xx~ThTHcq0<OKYW)Y=~Q
zD<qyK@j0OltdS-WZfUJyzX4`Sxd<xDETC;zlObklKia%66unS}YK7te3(K}Zv=6|-
z1fI$QeU<bCRR}N7%)oz%K*sPZc*F)CywDmRoMaZgXd1hb^~5`CR6dG*e;m_69$OD0
z<4tqYtydxvfCcZ`TPRwx08Mt7fQ9D74C?_k!4hPknNFxgIl+=-P(BuGK{3G+WuTcs
zxWJHX!8Nd$PPky7Yym#tY#S_XLZievuoy?U0GVt-Hc)6f%7QHBP+<)w)D(ih%z-_E
zSyjKky?RO&aWF5(m@;2Se_B!$KWA7=H~_^lCqDt2iMqhFCOv_gNBT!)f<|=W>1zp~
z)MVFAl!;y!x-e8SX3P^{*R&Sd9<XM^I<GigoZy7X=!R36V0R%FEs{=C;CyeBiAAk~
zBtu>|ugE2Fa#$&iK>Y9>BX>;WdN^Yu%$K=0nlr^TWt1BIZ*Czbf9W#}ye1ixf6zG*
zChGkRIOBjPv@=JdI)h-RBEX65_~;mZdptN8SRZDYvfZQa8OlyrL?)}jHql5Fm{>?p
zFfr4rs83mF44Qi^@k^o6u`enHQ5$N?vU5)6mY8NH4@D-k*H;GN9XMzvGiYuz&MJbi
zV_KH=t*0ip2Ue%&e;cWcYlO_!CC=UX`$v1$EwFF%XO6*sE_FUkC`#ziiDj}|hgzN8
zQ5_apmKip}vdq?t8V`wTF6$dfPqeQpZi8AR-<LdLvN|!An>r_9pK8XKVV!Hn&@$@a
zNH_I%c}61R3DBA~MzXCQ;O^rK43%)%>#Zw8ob_?Etm*WPf2JPF>&ZY1Q`;V*W=>O3
zu*=s%&Bzw){#F9}tb4_Z{3WLvJ#=ORCfg?|+D8<CY28<4VR#GW1a{&GZHWms0f(9y
zvN2D=v7_xjNLgxvx`;(#E@X!dc6AJGEGvLppkFmN09A*}syaJHMIk!cN9Q1bK#?zr
z>LZqzYm8P<e>g;dzTptEcIelgIOcC%A9r?4q%?E7W}Q1i-#jxMcgARyk!3yXK}M{v
z)x#t!z*z`?-R~F6PebjJ+!?N`p5=Y6g(Vi3A{bYqMAGHTU`*Q8Ihbm9+VfU=pY-UM
zh?j%i6?9Kc<z*nlwed#T{E$%S6qOej^mrZ1-`uQcf1LcDD~f&0W9>XWaOhtecfBvZ
zVnSKj!C7BS6L+;Yn%*GXoI<RXLt5|idrd=wsKbxgY7BbKax+Jetq6mSgZX+tl(ia$
zb40V@a8+b8u%3~5WYQHB`)(*RC8K_iv<tXG?gz@)j9ajH%`A(v<mb5!t~zub%N<Ir
zk(1h|e;}NEBOa|@#GO*CdC8z&oQna2{$Nyb+toR+677%2Ia#^t=VIBUDBTZ7eVp9i
z-)p00vL<YfL;t$?yr>%DX0pbu4<CMOxYi>f=#E)4@Wrix6EpptG?2-;2s~?h4N_u9
zm^S_5pl_hn)mvwYVC|Wrd?3D~;#F>%eG!A`f3o-G0sv3}0G2vQZ)q|PGfaC)jib)=
z3uGIOGi0S(Y+K+vu549ulo-^($doIMJ4X_HMNVpC;#Gs$y+sBJqbWBo6JHLi?g`3=
z0riJ)rQ?wL;}&j{?nKs}0m=u`N{^g>UA4y@SxkD7E5)$&j9t5Kwy~t0h2)qJ`!1Wc
zf2s{kl`w0kPaLSc?@}t$DOnnKLqY6=qeK&$zC(e!kj7PIr*e*M(@4(Ij8ABW0v~jE
zyZPATqRM9ov7Ghxs-wC?8LN}VYUs=fS(k|R`>;9Rkr@$N*Oi0Ug{P5YAqx4-*AC|l
z=Oo*e8#h)Nj7DAtHN-Z=kh=X^91zc(e@DF!?$j&T7{+Jjv02#9+|tjPvaYcYm;IIQ
zu9+{F`Tr^Q|B1+#%lQ8k^Zx{@-N7i`#JKPy=Js@)4->U<%zeUeNoG1r^zAdf+qf^i
z-OqyT+Mhr-d%0A;1N-p!TlU-ae9scujJN!7y<hKYV2C}L_P!NA0idsFpXJXUe;Azv
zd{RNNIUUEn^tqtlN9iy>d`64^vo_0aD=?uE5(wy<^8d9e{r{e|{IBAyCiRHFs7q*k
z>@i!$I-!GXE=Yaqcm^P_;YUr3K_p;tQvslc?&4{evhh$2%oCF|h*uNMtNDsrO;q{j
zS0Gk45mlsBjp!fMK0P~MO79oEe+>--eAC9JY-@)vAIC1&FIi64T_@WeH=j3CEkL_;
zuXdnp{S^kUn#_TFtbsLRx$xcoH9c6t6Yf5^ds>h?qV6Dj+>mOBrbyipx4ePuNYzB%
z_<InLc7&gZd)WOO2CqoEe}DU9euD0mAklp?2j&oe{@P1{ydn66-dlm}e-U`4?Y}|v
zjk$#g{6q8!wKoI#SKyVpe+Tg!FZeG5q{~>jwJWoGCvn<5Q@=Z10&CG?B174zg~V!9
zYHqi&uu5j4Ga;p%cv)H^Q_E7VGZ8tK>ECaM9y$pSY~%<_&6UH(*m-3oMVUN|nv$u(
zbp>#^uFXIJDMi&He{Ivue-@MxwC`fpvLay<<wX<kW<9o4rTRVsd=XLEv-CWf)J^|P
z?cWhsp>g`N=3S<>i@f&WQ<8*y;1yp-{sIXW5Tp7^Xc`8HvPTcS1jp$_;M5^b<&<WH
zyyp^Yu^#Bb!a9@U#f3M@DpRO38cH6LwzTq@=)xym47p_>oFaQHe=bDq>)Uae=yKrz
zqVfd68X{~_!>S%-$6%3mV{=YkQVlpPnzCKPS=Dt5<~6~QrW72vEBxlOS*p3HE(RjG
z^8B=gwyyx4p_~?sCcNJ{$%>}=9Yl%HqB(g;*_(>l5An(^31!z=@romyO0s>%v}g?)
zCdG2;h;I$FEU8UUfAFyl@-tdcMa#Ygy_X?P06{Y#U~qPv__KXWY3UNFKcprBG4c{-
z4CmyL0FPLXbW|}T9YiQ_?q8{HNCDwW(hy<chmgo+=8vPMqLWPO8+(7Lp5L0T9HA!)
z=}b!w6A2HWD&=uRj9Pg5c71=Gg)LEKq+x>A38cqSevw}-e+(&cJkVx^nxkf8!A=jn
zG)@sE&a&r1z<P3N2R!Ah&9-jgGO96wD?O;*<8C;%S3acMrZJq7dzTg7=lB&jE+|od
zF)%Zr&x7oQNuaL$AStCRjS*~FtJB)2DD?I7S7vXt{A|>i$s|ed`O!hx_wbcWv;w6t
zGjOP~R@u$8f2^*>u^OcOHn(P#9_6S;PiY=`S3)bWi|Gjea6;HomwDHVvA-aBICn%5
z=+pPco9y1w6J7Q*xI^8sA=zvu1`F<#$(yNUWXyzRTSP6HfS&S@xJjsQPehiX^y&Kf
zRsSK&Ke-(pg`82>oDbi6jbgXB=FmFwH#O>jxp?sGe;odWVfCcP!sTgvo9fjq#-gZb
zoQ#56rO(`_15d`PL|NMiLd7JwkL?G>eXR1jSrsEAyl?x>U02{Ya+Hp$gGT>L{ZYm$
zod5I2r~JCPB{A}!6k2S?p~X92Mynh{wvMcv@lu=d?99r-Dz3Wnft)S$l|uI>?Sn`S
z`U#msf9og9rlqd=H#8dB8{I0ljw)k+NA-G7ucl2Dee#2$rK={fN1|1=p|kMg#=joB
znL>RC*}91pV@OiU<!n}d$oRH3m@$EK*q*Ob0&YHyNTL;`eIlz>WFyE1txG4fgz42e
zR)vVqaYz@1N%U@2q~zmp=6FHeyRvxsHHz3le^s@#&|9~@*3UB(Bzr^%8#};k&_ec%
z&>y=&6q^uoqI-z_NPz{nJpEvSCy3L;JQ26B{R@yeV(wJXW_3da?r!kekB^&pISQ|^
zJkhd0)X+b{Kf-wso^krHWzz&_nDaRT?vQ)HpeTe9xdhULg-Cp%(J=;)MwpYB!K{(M
zf6qp;?{91qPHe4TuDjn4mTT7K>e|PjM~&SBn&p-F>6npIoK0TBLPRAkX6Y!i@CK`p
zuWk?wzqRBcGF}%L%@2Qo;@nT#pX!1&^lKhUxLRR$?x=fhW+%0JX5O2&>I0{0hYZ7a
zYY(j5TX2z+T|nD+ZA)9OU)=-2SNm>^f8aK)$$Ro*-8k8W%!Ub!;~I5?+5_&`bNRN%
z;<%UG(|W2}GNCm9Rx}~&_sh{jRkINIyE|@oAEhQCcCHT{UX{7ey<M*AUT<hib8QR_
zIu;|0{U)<X9c@VQ>?7P}gwAmNDOrt&yy|*~0u2WO%&@%#KfX0KV&<@O*fN2`f5qo4
zn9-hEMz!h%Ys(bVhin*8NUM7B65dX|V~6HpTmx;UFxya*^>*Pif`{0PNh6H|^Z(Xr
z&C_E#K=y{<L^t9Eam)*(uVW+Wg`v+Y@GuIw6QsKH1*NkSbj_%(&<O)+5JDUIFRU>6
z)Bzf@tXPS47fVq~>MZwuK6zhYe*ybh6}!k;6QU<21}|1IZr8!KCv=e;aUT0sehTo?
z+(PG5ed0E<;7wq}Hq<OG?|{}!;iD#0*8-g<C&$@o7SWUDE7L#*$fWvK{ECm?g6iqE
z@Tu>j$cw-$;?K9i1!c`Ql5K|F6QeIJDkRf+NNMSgNa>%;{BMWXK$Iu)f361a;CV0h
zJhy3)8-v%xf)@+=t_EWl3*y6U$11uQ#HAwzuILxUK@9J~yHvH`C!-v;WQV%&h+-hu
zZ<kjglW%iFXjyhbmpq$(do*33Rd*GL+#E11&bt04pK#X__YtbpcJTILH>SG&=<aCA
z16Cq&)%HX>z&TCmV>226e;3*aspL@{w|kut6jy7UEA8NY?W^Vc(PT6c^!l@tbrE~Z
z?w_Usl*>le;hNt2wp5&n)GKWVrtX5`Pi>?@xpFVgCyn`;jq-;FiYv2^U$0{`n5a)z
zFoIu=yake_I~O7Aa&-+P*?FCM8dWbxOPlfT$?@t<1W;UZ3N^Zjf9EF@=d3V-KK}XF
z>i-&)=S?vDK7pArcjw0kgz=RPT=gH~^)5?sR{<E-_3^OPFByHYO6DQEL`xVrznGF%
zZb)RPClj72I@LR%-xRN?4lykC2=%Icf<6uZHBv0q2z#{ueMwqZ8I@u!i~X%vN74QM
zKhA8gRv_h2!GVBEe-VIy=>J#V&wtRM2)Q^p+u0}^IGUOK*ST$znwJua8tTs$NjoAs
zl(@WR6JLHXP_<%C5CF4$p3K}ofA&PCo`gDMt932++2ZQs3HY5cvn*ykP4?&dk=e!b
zddmcb(A>WG@8R{D(+uy4TejQ7OOM<)s6BFzFw#ho>*IdCe|quIy(xl?P8hOF6NI#U
zL#h%3z6kd=(u5#_U~9F$!YGZ%9o=@szK=KJP{?a3gn{-AKfDJR7#LSTd<(5w&lS_7
zS*wb@bwRE~@{y&5omFBU?Tifb$OAR(nDjQCl?n09s*2az(s-w-`GSe=A~PHPsqA`6
zq0$wJ2BV7_e?3DjY4DX%uu1CytkRf_O;fp#zCU4nGt8l&+Hmb-nkHun_XCd^atXN+
z$}ZS7=KhwM=w`fv38uAao;fy{&IEE=wTey$&rDW6-ETD;Da`IsI3;(7M)=OtTgkCe
zwI;xT9Td!ZqMW#OR{O!~G<F2x+_(T2+ey5ehVGpJf4QkuvQ^@fh1F6i_F(%su5NKG
zS3<H$$0n<FMCN)+@mKRONH?1jvy7fyip|uyO2_fxlSUTCH3LoaVK}U6wQ6;%XZK;q
z*qq(+V|hgzd`o$7BMW}){2SXy%MfCf6l0{d4zAG7!dR!0hScePa#Ivs%l<<v#TI9Q
zxkJlwe{5FAk6fW981b+677t$=sY3O{D79h>rIYB=h3N3H2hTCKGLzDKYS$!eZ#5>T
zfEvfCLsf->_IiM!jngN4@U|(_VtcWTT3~e+uz5$h2}we860(C#-Ofhq-?fAI-sVof
zVMJMIuN3S!?Xj)dhie$sb@+r7C$Q|;a};9Oe-5AFc2BuX{ZI(4r)1gRX6o+67MxIx
z!*vYHmPjHeBz_UWkk;N`&YWa|xrPX2%AJ8JDvt&!;ajI>p*poTEt0xw_3c{qFiX`}
z>d^-IQUVGhP{H8~971;NsFkG*3dLzHjMsu~q{24HRiOdwSnz!Ko#Ck9XtQrr+F-0`
ze+TL+_EJMOn}jO()UU!rC9jbNxkm=$_SRMg(fdx`gmiTs%52KHu$~JYW(jLs^SQRF
zm;Hw+uv<9ind_0LW^D#lT_Xt~G8=jHYk{=mE(z$`$ZR)^(zZi=#k*y|>B4XE>K5>u
zOq<99ug5Jn{0*w9PmYO4=sE-aT_7`Pe}<T{&9f?2+49Ei7t`{0O6*GANh-F>kJJ-H
zxl&Qr@5oFldW^p<t}^_w=bPuh$)N_M>%)eV$$S<l%Xh8Nc6K4qEJ&2K5hn^yuN<W1
zSC(clm&?2It*|&FOMBj!W;&XM)EvdyzKeIs)7zD~sGFdDf~B?4ISubERZ1?te{)1n
zyZP)C-Lv#$+#zuCrrV+o(8SoeDXy0=HXfz<J}!HQb>fmZ2bRRpJ}2#4N&lV-ovb->
z@S`D>&>u2*4)Tzei$yAX1`oy-nI(3ozv$CfeVo#YeKPQRDaG_E{)<eC!0`z(u|54p
zeLT+5G(T!(s*&bbW#3(6hqDUpfBrbUc%6*h3-BxU(<LO<{w8`yM1DklPL|*jp7~z1
zgZz?YQ$#XgW_=Y-bq~CHA$@J1^N~NTikftePv0su@7YX{{8jM95lL)(TFNuE9!nya
zS7Qr{*f+>S-VJ0Qlf8EglnBIM2+SY<3Ia+X0u&6@TL)f)0}Lwx1i&Use?w%+U-EOx
z<N$6(VX7rYHZBRBsX#7-crr$;P*RL^e-gG%ffmCy?EM892@eS=*M^6TQIvCmtPvC1
z$s?-ujL=9A&nxI`>V8YeRlOwhD4wR&m`xTlBcDAZ=|p*BEtEa8|Jx#(Ab5pAvV@yb
z(a2rLG&Oy@#Zy)lXf{rge>cysGH8_<J&7-J{-Kj)AFOhK899Tb;N(j`^YH;)2JSm(
zIxl3kj*n^!4m+Q3G72d=Xi)jSPUp6+Oc{1><W!PZ*xH9=*xV=U{*P=e8MbsO-)JnR
zOLw<LJR1CvgdWK~=2pNV^OwOFE;q4yj9V*V#2rDULrtu>4VOIke^EsgRFgqoGV79i
zselp9Earn3@&3vd>UQi*#OpRb#Lm8$x0uO$a?UZV2v-EwyT{@NunTQ2NB#c{uWd)0
z7<IsafN0@?fSCXHHkkkT>-)cNGB#=`VyM1kP&9#2ofMGGnv!+@!a0Qs)l%B~{6=6}
z`O3v^>3G6QYuEj2fAEWz?C*$g*qO5R`@E4E-Y*&6E@lljEm#(JSp;%!x9e%1mo|DQ
zv$uzvtv^88BD_()o9CkVd@3<Bi$=q}S1eo%-2774#S#r1K*fdd-Uhk3EK(LU2iri%
zuk{er>a4Y<yVSwe$ZnZL^ft`KFr*qy<*s81-J7tLR5csRe}+kF!UFg8x26M0O0Zjv
z^~a(7iCC-PLMM$^>wUDrZ`S@DCUWa07iButp}D}dwh<*tSN(F8%!Q^V8Vrx<)@n2>
z6(W08clko;{s5BUi_L~59_3;H?S@&crba1;tA@H1$@KCUzbaZ1>opSVJ#mu|bFdOb
zf+?n6S%<$4e_F(K^woy(4d07<lJ|?Lwi-B3ZIRTl+>ODf`JK2Ot(05aH3#Sd{TABZ
zM7tVtL-cMo^j4c`BNbka%^K+rmDgw4{dhVI7;a2<`hb+76c;K*{^B%SFmn|pQjWbp
zr4HH$m@Rj>tf+hT<1>(XH?}-qvO6uTliflPTHnMBe<oh@k)Nzooo*Faej^&$Ad1|1
zKSE{iLA9Ngp;cU|&h@>Z7VOzERq%vZh!N(y+Zs>BRnqhTae<7U`N)aZd1B={S_*_q
z%;o3fk8rsT)4TLiAwEOqBs$&$t}W+gmAdkVt+KI>E{74voF$x)m_!nt5L3nSP8jhP
zH6MD>e=e;P@8zv!-Q>s%+UhIGfc|5-M)^SsCP0Yx48->8&)q@@O9`7(y6)1yl}0Oy
zQ?)tD4-X3?tjyr>7eE2wu-#|Di_L&YW4~h^#(cMx!g@t5UXO=tHeS2A8XVx$zG1C3
z*vH{va==nEf38CAHp2X{TP7omWxnkS!|%1Qe^LNWf=!fxv}V%gP@E||aC@v>xU*92
zId4sdZ<GAIL-!01p#O!N!Am}0sxPHu#I}T|LK(1i-^^9G*0N-wrP9Up@!D%7l%n@n
zN$#xxMDQ^Z_j+-tOXlcZ^f#M!o<hr$j|U68rlRp{ZC6LqxmtU}-quuYrcGaE72i^Q
ze*mVvwDR5HpiE@it2%G>9#@iuQ`^<`sEq;IV_q@UNk%8Cc+7QtwxyG)pY7r_AaUaf
zTSqCPT8fWj^9AheC%ggv4*TSYPQfkk&-N;&SsS){vsN0Hc|kkk_O;2t;hq=yws!?`
zy(NU<I1p}3gUy=|#{1sIEgzc7A0H61f6^2Al{w@l0_=`6FMCLG3qI)vIP3(L=cD_Y
zUdJ&E@x$pJ{`<CVM!^~2!c$IR{MZ5Ugkp@6Qv^(#%K>h8jM;gMOhRi?$_S{=l1fr>
z)^d!(&_#7~*XUu;DAQ}TLfr!5ALJ~V1dFe0SWn3PM7HV`(PC+DKZkx5aM<_De?bl8
z(tF}pnf>DCNJQ^_jKb^_#qm0AUkvbDXq|CY#SO)1|65qWOQKxZdQe8B25#gv+&)el
z_6oO#>MzjJu6SLf*R)|{t6y74{>qWPU_|zDkm|zv@dUPmhQG;US3nb;v!6-KW1vT}
zhlyl_uj8Xn3dz#eq=W)21$FR9f2hkJ45*l<lne1MXNFL*(xQh*P!z^z{}SONDGO%Z
zATrg!&DB6Hl%Y9c=l7+s61<yIShM$c>c9;oPao+OoP0{9ejvRYL7v49X23s_Do;SI
z@#OPUPZ!i_5;LZ~!=-uKVvP9h%w-5JEHcXMLoe;H{_4Sd@M5|5YK()fe|KiCZ^YEZ
zR=ynr*~7^;HmVIky3|)UEMxFdLUm>J1*AWx_60#ma5x$GOfJ{~yPdAY^2HQ>sJ}w|
zcWaF}al|wH>z|eW7ZT9@e_8AQ3xoB48tNit9l1q*RNe*{)QS7OdrE4G(pqnHG=+v?
z$O^>xAxs8LpNuQ`34Lyxe|5UJoc+JILm1+lgZR5KOxtIwBCBA?9}G@6S8XTTUR(?K
ze|mf%Y9mX?s*Tq9w|gVQSc+vP4X1lM{lQQ~2lQC<vDBI7it=9Ico^mirb57zvAD7&
zNDEG2&ps#VgtX==AcME#mG@nyXd`xM>A6wIl6f+?J9uK(<p4Hwf8DTHrc%u(n$?XU
z^pDR(6GyBTD!3X*%jju1>+APatYWC46o@KVqC^y))i;!RM24$lDXrz8*_G<eB}CAg
zB3*yOp&8xUj^E>IUr?4)>&`N+Qh7M2P7Po?`ugk(NO^_4GRGL!+mVILViB1mb<|S~
zgoCxT$9R!M?c5P1e^q>n8nu(u4-jCFqt#%n>*$&SLCjD!d3HlG30riO;+%(yxf1gV
zFI9><L&fHmNLI8P&|mQbT{Q1t>rc&6ZQsJ4#i6XS&?OP!2kz10NMqE5Yp1V9VWMGq
z#`VEsu!8?m>%g`4&|l4JCd5tn1Se4=+eI*-pBB}Q!Li(+e+2u|Mw0ScDZMqBlS6~L
zVJ&Mq1~cXp4wWT7R544l60SLWsIb_JTyvP%{xx1T=M?~0B(GE&f0wh9`Dec^+kQ@K
zK7IYoZG({|(}DPd*e&l2Kj2NNy0BMniH3_89Q5E%rVS65X9Y9D^+(y@I6lJR_K(WU
z?{KMbgI_+6e|C#<*wQ;dnh>K6=4Op8GueJVq{Kl2n%w)l1i|K0EI^pUkXMg4z2@<s
zY56vdHFU;GYs$E1FXZOjq95E>Zi@!7J06i%hZ!0T(RBCBQ7>C-*Ib^XH%s3;{X)V}
zRC8h?w!|T%k$Ygn2co7pL-C@GNdr@@Z7PCMC;`p3e+t>z4!;s4G9Jbv%N|phL1eSB
z8Io>`?a6g-_H_Xnzy2q|t(Z`<V8K5`BtrlJiT<w;VftT;s{c<ctN%b^V*Q_8|5fk&
zUo3LLwi=q66FPAbM4_}4R*9z|fuWcQWN49yc-|S;@K?RMqplb}PZ+O4j{<rOcYUvy
zF-+NOe>$*qDk+FY3Da$pnK#}}(`#?fUk?~S6Rldp^yOTZB8PRk$s)KdE}L_8gR>n}
zI#`vAhviK=;5Gvdph882I(1lFGJ7|-#WLA>!DfzLDIbb!VM;LT^#ix92A<J-;tMZa
z+q(K3Jc*(c$;k}Qtv2j!9{P*8+sJS+TKzlXf8H|`Nw^)VnB!CO>&Z+xw|*B4nD4SQ
z!HQchl=H_~(YcX!<y(rbV|9u(V&oZlPMDAlS+n(Lv2`w(;xkv3i@sj{3b0X1JSVc4
zNP7kzY`8+EhOlpH^U&+Cm9jSGFl&|&u<aNPhN*AV4#EA+)@?kHK9<8BKRO9Zm2WGd
ze{X{kvv7sP=htzU;_1aMD^I_&H+|asbS7R3pVoK(d<~nLZ&=<^c+=s2XMSuV`QQHS
zOFNG~XoC*de`LGbu*^qiR;ziAH)vd6JrUciZQEdKPXFkKCHfJ-`02^$Z81wQff(Pc
zdT?%Py$b54%$9uOn*4st&{I5=Iu-Iaf8f)KMmDuC2!syC!qa)2GQbp1iOEZD^M!qx
z-eK9#DOpJckI6pfk!a_w5~+ucm-fKm^Y<Ysg7|8D7M=D@G^ZVckRK+EmtF$aMC}w(
z)g7uuC>xbTZTo#g7AJ|*XWqCIz^GlUVxcBJA+pX<jeIX$C}&6|kU{1V^&NnXf3<@2
zV;EI7J!>Fx46K2a`^+a|N<ze(Tqu>GFv}GI46zJl&j#Enrx=8aj^2}hg4xD$eRhwE
zyoss_=H$#C^c-uMSFR8}OI9-6WMqC;pCw8|9*Q*{D`n}5@(|Y<L>Mo!j+>i|kbevE
z-(lc;!OwdO3<M<c&y|<?{{aU7e~oy&OIge6KhR*B;Jkn-Q}v{I0p@K^&A|uBM}k@;
z4`p4TPWj5w!7WoVJw0mNe2#zTb{YW&_Sf%^Bu|G%`LN&Jcz-6RS<g)-^Nu#3kM9ps
zFRr##p8pYIiWVev2lBpTXa%ejuSw#LerZ+p71JWS4HXtw9Ft?LS)H?-e{dybJ?5J5
zsm`AAo?2h~jv8^WZ{ljC8I^;p@e9w4aP_Nvh4MXbo(oO90e~KV;aO)+SYBkMc+p0s
z;fAtgjF1-5-E!AC6U)B#St6khZNjj}^X7zck7NndR0Ck7#p!A(5!LF?flrZqo2zPJ
zSu3pD-v)|-&uDDyJtwjH&JTpHmw#dlK9R%g%2qhd!TW<v_oT6IPGw>dE$<!7iy*b-
zS+*MC{=(_<M^cOt2fkX<SSy)JoP<lU{xE6Jvu>${N5$5~ZU)$z0uTp^R&>)*{9y>D
zyR9{}QsEDB!A4i>Yvi_~aHVd(g|#jfnxZH~nP9KKp7@w}pGDL|wG3s91AkX~Xjm%>
zB@ltxFrG4&#ujNT(+MMEO!ZMu#I-FfP_y|C)v(#Q2<9=s#&Yo{96|6!)T6wD5XKq!
zh&;T4S5u%pO7}BSjA%Wnw7V={dNgxpwaR-l$?62gNdxxZtuq-#G5B8E@5N%OOOWN8
z81{9IDcwN-UA6fCB<4Va{C|rO|M?uW|4Y@fvvsBy{rC7k_2|Fu1yi>9XGjr!o4cM1
zGa=DX4@Hz?pFyY9<ONX6mqbyC2M1#&Tr5(wZ_b}22j#vAj98Eu;{St#d3dcu5tVMx
zH#Kc5%PiZ>?D_rTB_;>R_CN!CEA_e;OMP5h?Kqf;-DPv$fg1#O0e@?=FEZSexi!KI
z+EI^otdOz9NOuGzIPr=zd!|<sRW0+%Gl{UHbF8KH$iBs}3cTBy+6lJg*BzgF5<ch=
z`jTS@9b2o+M4!oZvX5MHRrt(>iUoUR(=y@S{KI@w->-ow?KAhSeW=w>9Pp~$q_F+T
zdgq}DQyZOEEAK5N$$tVfrxUpUqqXY{hjZQ9BSQ4vd#}-nPNMhTTcV6^^b$c3Mi<ed
zMfB*R4Td1f=!_ObZwV2-lknMR?{oPw-@eXw_Bngznjg>e<G!zX-)BAVTF<)IyG{#D
z8XnZ=a8P2M182*Og&Zy|I%m<!DO^>`R(fmRKadc9A8liyWq%&A7WV-J4JnUGY-XlR
zENxkls)~Ae7E`%}B9V}-%B+av)!N|qY>}gQA!Y7i{X2$GnTdWI?#Iy&vK4-QA6j1(
z`>agvv|U6{I{n$n*C#EQ_1FMN+GtKZ(*58?dJK2#Lir@JrJ<=Is5g4xMG;SV%CWlT
zy<}DRVCmG6i+^@<sjK;Ryc*{lRMhuRa_$);+l@Nq;C{u*Qk3qTyk>kN^8BbnRedu#
zylOQ!MA1m_eOPFG4{CN!u@8)ROBWn<okcBsN-r-*_23na`p7a8wxV8G)j}ER=97(q
z6sxbVz8pi{2C#ISR(pEzD=>$CGOh*7F0N?kmOHaStbgvCE-o^?3i97?lzZ$h9JoeN
z;|L%EPGZSuTBAv-hXzo@iuoX+V~u@dJSRHG{6do^+V~<&wCP2GXe;s%72GG`;>LKf
zN~k(QjRdVWa{SG^azs!gEk%C3K<Bi)OB%wfqhdr>(jrI3F4V`X<1ZMi6JU~Grz&#B
zX9gp#QGdyiw@6V+Uracg_>_nvd?{<esA9iA))2K%=5{cEzo&KojDy9h{qtAGrBNd{
zoO3d_Z)}G~_out+NzSP2_MClaHybYDi#yB7&?{fB?+p1n1ftvGV)<<Km@o3ovle8h
z=;xc<7@qo5van|}iHDP$(2k8jHd$pSCJ?&8Z-4t6MEtmMTa?fM0Fi&+sN^iYEERxW
z*7pB&RO<ErurDsji;kFed3^1KO-#3FI*ydEiG&0_x+i=2GZrsv{N|l14H@44lywwT
zkpA7gwzO3qIVh{uKCAT<7#Wlhn7=%}?9l`a_~D0xyU{w})?{6>*e@B3I;^n=C=3K8
zEPppRX647Nl-9AE%U_2tPwQX8CkI+sjuM%pi-PP`4HpZxQ~1rT(d@#BcEmaZYFw%&
zkYw2u8Dt+@D0wy;aHkDBS-e+D>YYVxz-eThm@x#;F=_*iK*C+BI|u6HLh))59<fx}
zo8(ZgOwvgw>@qBO=JiG(apQh`ys1ux#((h2WU2D<!h|ZvL_hJAVEhlI=J@y2%h{FY
z$2z%N@^>aPb<#lbEBcG(`;W+ASL83$;uQSLgkyVo171yx_mfw{hUjWBU4);R3q5(9
z%;f8YBmZMhT4|e&b~1SLLxz|9%v>UC9!F%f`OaR=X2vi$88TpQIZ*0|^IE=#q<{NV
z%yr|~#S}DkU+8CsWxClX4y=y_q1cpW6pn){%;U!ddbM4=32N&v&(Wv2xK*L=n0Ai`
zK07P6#6t|+>Cb7TBLbVhkahiV=07&{8QDgIOe9ZgEKdv0oy?9IBaQkGs^{9eua&m#
z=BY5plNGH*(oyv2N?4~k2}FXwx__6`54@i^ANmMi>_?WZF=rq%015VE@tJaTXZOW;
zNn<hd_{zq8UOTQRpp<M&n(ZBLY#8@bgZDf_HW#fUh<3Sf3v=kkV^zmh&P0RbMi#Y&
z6bd}XKa+b0@ORjihtJAxFfImt4q1i@y#XO*C+Bo;2nWyFRPin*#vQ~Cy?<+?+oS#n
zAhL%e$N2+fkEl)nJzGWC?PNPo!j_V~Nb_w1U#|Jd3Mgb;T14aal5U{G%g_miPn6Zp
z>wzr-6^Dr(*;W%VW<54RHhD+>J^P&0cD!4LtxJ553Rz@mP0j2w%wDuQeTWxj3M}(S
zVlPlGTOtW;gxh)5uK+XlWPhYA1T^4^BTp8dapNuSnFuMZ@)E`WKnMixS$}-|^Twir
z(Egu;%wH|)7q36%A6|dY^*E-gDko`7v>B27CW;Zt-TJVwCrYKnv19}RnUHZGw`NsH
zb8%G=a$5w;#hoZ7n4NU;{-DoC6M7JBth(5gXVBqW0Xw_a>$3ymc7Fzgm5t6=@QjGy
zpaXn0a!G@Ver}SNR*?#`)M&y@vojG41ZNXFsMw{@XAOVnmHSi?{bYkjMb{Y`m-zni
zUg9H0S^2WTIBJmU<mo*|4f6-&M^-bA8`#E>iXwgQBUIl)3jrJX4gCSHBW#Xrf+;qW
z7KZN<vNdZe`FYTnjeniw{?CO7QO1c*pdT~UAAR@T%-IXbT}n@#gS9gDdoT9V)wI^{
zDh)V)5%_8%NF?K`E9%V<wFWC?jp4Pqvt=3Cno9g`xE+IN1Da3|?aVRe;=@XMKB=ne
zI*`#vJyqoP{Ksy!5&HcnDRnQUeAN{n$bFPZP**0ewarNF{C_#GNz`Oq&1L*F|8U$r
za9jv0#cWM#a`P&7wuPR`@)|}iooStpAx~DJaR}}&Okdg`Xt5#FAU!=pn!*NsI;t4U
zW)ojHD-(cSo9}$M_N-pYS^7FT`4QH@HN_o+UBVrr*Yj2K-4RPd7Yg`%ry;97P-0IK
zc|)6<vV(mpyno_TKrx1n2sK<X#I*6vLyXttw$0FPGE^~KFn2`zC2*q*-R@1&9_tF1
z?1MntAVJO6py%i{L%y$jy-K7t-e&Se`|j9;Ta`7Sq&-Os^S9o}D7we0B1A2a@^fOm
z#MV*p+1-<L3VJN9nN@5UuM#j17))<gkWun}9Jw&7%zuWoP|Q0P4%)$6wwCkpRE(s_
z{i=J9bF-Sn^h8RvzVb;|rsgt-LZ56steE)3WHl|PzVd1LR$Uy)HtMACrZidZFp)`{
zK}^X6oi(#-ls^Vpbif9lz*<z(M1~|W;XyZB9n7RXMCgvjWjjh~it7E$OVn+=4{zp9
zg1ZAi_kXy;1-I2lQ`t#4D3o75cpya}DpxMxyxmoxiG>G#Pg{#sWAP?`C^YdQ3R8$>
zSJ0hbtts6+>S4}JJP~m-C-zsZ>DS;v_oK!fFJ55MJhLjaUB*-;gr@OP*(WMIDxdDc
zvFtlk#R(!}QO2=}jTjpE&pYhkgv2Rl!9jYH?thU0Z6=a}6Mk3ck<6zwLq9G8pQ1d$
z-n~=D`*qa?FtXh85`{J<th#l$ex6A%)$jyuXoN*OtVHXpWAh+`e!wg3eqn*!C?J#-
zb9?w0I8O7;y2GC=Q_V(<d$3ycJws9<Nv9sG3RT)%G*Twla3)xRrIf69I%B0y(O$k#
zgMUz_#tazQ|Gi9q-*QM@)Wjy971BTP?Ve7#1gyExtx4m{*o0XJOdy5;=6lTh8gjq!
zp7hm=ldEFvoj9t-zD0Xe=9sRmwXoVfrJy8+lyj}`a*7;~52Ndo(ie&xFU)mGswwP+
z-7#@T##rCABGbBb^sr(xT5gMWs%|W}l7Cqqmr!>SWVF0)32!ODR=5Jpx=W!eSUG=a
z0|eUj$hP~GLyz`DUA~G1yNABwjbe}YSd+@{nZ81Iy}lE7`0Pi{%7{hJM8H>XzM)+K
z{Ug;Ai}~JjE&cXI9jI@C)|>t^-Igx|IE#q8=+DmtiD);D{uT}ZAo1_tcO9UotADqL
zHBb&{?RvYN8gBhVeBeTJf98HPn+(zYIz42g2HY4lwmTGR>&#jKN4c3c$_B#Co3@>u
zQg!w9xR+y)6VX*^IPNEh&bmRbixS!k>H2X`*VJU0JENOweQu|7o+F388pA_Z`%^q^
zcSIt0nd+A6B9+l;vT&C0)uPf;mw$R3(AE92wFR6-J0W)D-rT{5ej(aC{0pkF{^{DJ
zWZt7wnqcz68fKD*R8e$-gV9PV_79`EppmKsKFc*|vJCGWAZZNu@yYS4&=RbmNd^Lh
zsX(+1@+eaW=2TTXDz0puL~u5os8fe9+LpyzR~Ms$)S0W5Ojr>3zIc{1r+-va*!ycS
zz_l?@A=tH7#r_T?K4HO#n|l1agODxWJ5X1287$Uu%XybSP(x(|W8(`_!EvJtu)<hT
zxlD8(+xinfHM7hB+l&xPeR)dl>SuQ@4b#lI81_juG755XY(vMw2ItmQa>a&0XV=T8
zNLPYM#Bhsh<7gNM86F&3f`5zTk|a7lI&LzNHC`)*#Gm`w(Zo~mS-T*YqPM!xORZ=~
zAu9<{eXk+xzUO_rJq#uhiaTF873nDEsa_00tqRGALZ4e`im)TeBzGt~`17yh3FLoc
zk)$+SF-(MHC~xkU^MBM(8d)90nEr4T;Ln#oR61AJRguL$T@_zqJby&@b&Z38u6INO
zdeu_xrSQ=HL%mEJf5A$r=sR0g4D5YIg3@%4iL-TWq0VP|VO(^)g{<n6eKTvPC)dax
zk7w%Qbq1TKe8$=+>@_!0^L8xB6EC{=dYQd7^sy$@I997wP3F$4#O1`Q@uo2R8Q6*{
z3Ai~gOe_KcAB0x(s(%iUs`01Ch=eIdXYM+23uofI=LOa+yCeO?6@Pq>fMau-pQhXT
zj!)_pO`lsr5?{nqa!jLSca*ArKkTX)KUr9&pDN6|g=>|1E@7X0A!%PqD#4wQw*M^B
zAt*L0QWH1_vty8Yy^pekX3utrZOI<UzRDS(E`R^^>usxL+kY>%b)k3y`*Fd6#0Ii3
z0TH%*!b|g)xIx-z#pbg@mDd=b!7%w5B<3gL!sVtaUM<rrg6WAF0u@{$x);Q8kK>$8
zfQE+w%V^C!Kr0-$uWvhi=E*_$hyX~a1lJf0^fad^ot$ClB#q~PRWvpPR{$px1uq8n
zYmZNSr<WbFoqu88q!h(Zw-CZtaXcmIu&Ra{m~>Kdz7O{6mp97j+@_58#!=9QHi!Mp
z+k=70^g3ZyU{D10+TmM%O;HGlCB3Y!$kxH9HsJ0=#MHq1Z+ay&jj&2izFc>eu7<mM
z>5t$KY|?A}6DJHJ+uPUnmcl_7gm4{DP@^M}-f3t2-G6Ur{YLGtc-1%5=aL^*`jI|J
z37(T&qfUE2d49)A1-*;mmB(u_-E4N(%jM^e{GD47I*$MqN0$(kiQ=QjJw?nvl}-rN
zS6_enP)8Z|nk@%njV{x}FYz^X=_h(CZRFRFQYH-vcQ<-!apR_=@jB{~FvaW@?@6LO
z2vf?K5r0<@XW88kd|ap1U6|QqtGYZfX){46(mo=owZ~MUiEqA2|7m>A%d${g5h($A
znSz;)aCe9Q2a%KhOX;=ULD|84v9;56{3TQNmrr`1(|XVd)y<FT5|>`Qsg}`y>MYp_
zbUd6kFeGiBVFv$r>ipLFC~oH)*by?1zp5A#Pk*~yM!JQ3s(mfsa{*`M%3n59GLf;?
z<R!AP4MmBA^ZSe<=^AzHJR{0`ZTCD`3z?plZek1VR6!*_MdR~kJ|4zB^k%6%4eb*<
z_DkcH`#CY(?_?XpJE`h9!;@o*=ehEHNJkROBXlDo4?LpjHyL00!qrKB)Q#la`=A%4
zn}5dQYL3@8#T&2XHMzFWdl5xS*LGPPihRW2{br#Yl`o7gKB=27OnQ{HgJ<O~LyJ+T
z$Y$yT6-|RW7pVp_BX+ZG0P#+f%rcvpbYL-r`b}GINr|Xjw_|HVk@7c#dc(NP9rg>m
zB1MkF=_qX(OP=Q=M;;PPJMPbEo_#u5bAR+56Z2&j8{M*%2D@KnwF`k@vOMpC%p^(j
zPKPz!wv0Ahe|^Fbgkoh5Bi}^57yy9mzk0%WdU*gXU4EDKD}&s;y>$OE@xS~GCcZy{
z;1pNSSvfq|+gfu@2(gvUSX+Tmw+oeU+}M~-yMu~b(n?-eF8GAmGd0{(Uh1h0`+s;4
z!-5XDqa9NUKpSnjTOd+N`8omX#K_lV`=`%o)8u(o+w~b?yGy_uSsdE3fq998vx4Bm
zGeKPBx8%j-MnlUqpRneH_nJby!ReAaDdFE0Ejh8w7Oc~1-|kC-&=(!4(wwkn+zhe$
zIk8Tidv=W_m+xM+UrW{bOAr`L5r0xoQP|sU<wD7gKdk$jjhsB~!6vfTSHiF43osSM
z--Jt$zU8&~wkBUVBLkh)uG&Uj+=D2l8qfMRo`&6%nP-K?md1Q^R@y}Meu<09J-;BW
z?6{t(_a#~J@SemPYAan!#$?mi`ldtV&hf@0pNXxA%G%5X-#g3q7y`7#zkla;7*ppN
zVbpJehq>h`y1%WwyFd@KysF^qoh1L_d76e#KHO5d8FSTIIkZY|=t>2xaw6iGA~5gk
zWTS&#KSvYcgAhP|h$QB2jHd2Jh2#+U`n5j;ZJ=)HT+ri&^W0PM;ua6#5gXx>sxzH!
zor{-v8O=*Ivd;fapnwxYe19H;{eWbbwFXGdO+A$#zX{FN(5PqX-0Zi?%IX15jVa{m
zFV<CROzf`sp;R$Tz3Fl~*Iv?Mm_n0O?najGfGF_WL*6!N_<5bPvSz+K&y<PM@gEp~
zl%pL%T$Oqb@5%Ty%(+eNk`-tA1xK(fe2hgW9A}9(;@xMaV4<-LVSl2Afj|<zbFBnc
z6aIL^?S?GQ&ZEn|dDbDhB9+9l>%~@lbD{>O0uveuLf#7E1QtCsG<ND@Vkf&~HtTRn
zXF-++k90XDi`93kvN2raR2pbsisdh<3O)ONfJ5!!nIb%^`N8m=p0L)I+4(6Ai(Rwv
z<AzOYX_X$zY0JjrMSop8BZ&is<PBO0Tn>^FD{XI{hm7_7KL_kK4ZE6;yi#qw3lfUl
zi~N5Q8+mUM>r5^t1SuC0X*l^ROr36EX3<kNS>f0rN$M&oEP6I7k)izHMj}ZqZKFFD
z=Vxa#GU+^^a7%@GQW!;>N3`Er=xM<*YG*cM*(Den%3VjUF@GB^35?{A8)x_TN@2O2
zaxzlFc&3t%VOuH~)LlaRs`{~G!lUI{WtrMuxOcYm>puUe&}1(wcO?Pk@;t*r8gdnh
z&yki1TViZKVaHH08B6r=VN(;lGB4ROg_=PM={T;6`1|Uts;e2V?Tx<^lQv_;lw&kx
zE%8fRJ7zWTcYh2pwP<Uw<W?;e(YP)%x_pQeuUl?M>1T*I^US^rO&GF7o}HH4K{zPm
zbFC7?yxA^vZo>LU|J`=+M?9kcdup$UG&PlBog*bChj=!x-0W`sLmA#QM-)btP}gyv
zLgZ)kv*r`DOKtm)9@D+*`aQA7t+i#qCzt6poG#$mx_>(;YG>OPc>M#Voho%jX$ca_
zj^apVIj7A_tw<!`9>!btggYK*E~T?26b0p!XwFWFNKLoa(A%QSK?n?yx5ThZr_bsG
z@yQufM8n|vL`9Gt3g)4pkE&wE{?P{MTc&d)9y^qb8v1xJooZ+DQu=;~eyxRg=|}V2
zosGP_5`UqdPmQ@!iAkYNyJDHy%k0$~@-c>j;v;Zlk8q1u;}LVqSlf1`>FhfP$dwqX
zE^Z^F7&O2>p%dx~v*SK54_)CCYRmNc0LVIyY+@NUeSzi~TPlvbLMNQIcNi~_kwYUT
zgqZDxzWR4PYSivhU4htZJ~8lg(KKJv>gVL1(|_yZ<d_hf0itoZ=ag62qZBbbp-0RX
zeCh+sS0xHDbLG>i#Vz{hCFbV7-sV2YP46=2-@0c~X5`OEFUQ_pH7W{YAS+baf;ta>
zTxzj-tPT9Z{3cWUn}UNOr+9WCPy5v_RQ`vGPf*U1SlxY%fN_uQ8VJkU5as1iTt*@q
zx_=jaAMfF5k5w9)Tj?9GvggCBpT(8;gF)9Q+|T_@Lf6*c_rfXNj_$I!34|bF@vrf;
zcO^J;6U&~=%{Yv@9a*&wnr$3og4{X+vm9oWlP^EH7~~R^*2Fty=vETQ`e3deVJijG
zm|TG5ly#io)9L~#Oi7>S@TXaIWHxfEhkpcEMpdozT9E=bSo>_)@%FP$a}ubPs2S@5
zWA{$h@ELj{L0^>|#6u6N(ch0CXO)Sc2kWRVM>k}5;DP&O9T^M4C0&RNqud5NDSCux
zx5fGde>O7;HicYNRr1XU)EUD>GzHLa!hL%T+mD#GIj#N_YQ4A$GMwc&X=e28v46NC
zsyfgvkEF+=L6JrRAnQ+7QXs<5fEq6dh$pi6b({vSiysrQs9cMvOI+j|sTI*Nyc5sV
z&H`4~Wr9AMvAnBRypQGz-x0JWN$U^wwr@iIt(!Te|IX474gh8yi5}reet11-Yd%jF
z*FeTYm&P_Ng(mf#U{6Lat$anLy?-Y=-Dlhq`fPJM{(>|pS_*~e2S8e-Je}Ig44Dtr
zCP&jy{f+MA<mBS>fOFI(Bv9RGmq%Ec%LIm5lp9xvH@K;lzrRXg!f*;gMxp7<LJqCw
z_rUXFn0I=$wq_jb!g0X0tY>LB3|=%K1iy246q@4j_OV*@uawscNG?-5h=20cvA-(k
z&CYb+>l~|AHa?h+R)b={^52p=BFj+LdJ0RZNcC5STl0)>tFXVbuf(KT#A-5(P%5YH
zzLd}PqBif<GXqClrzKkk6)Py5Efq7;UdwL(^i%wfQF&h)KDv-Q?9JhNuFq@X;CNk`
z!3J$mgc<R))PQ$D%p@$H27kcars>ne5TO?dU%Og`27=hL;A5(%nQ8;7%lwzays__6
z);eO(Vr&$PT2D{y%09afGD0FAH0ptht=L>?C7n+(a&Z{y$oyH;%)vdZZv(*LGhn_s
zX;6<FA-4a@QO@RvDfCUZy5Xd5baKnXVVY^X&lB(>?@F)iJlqX6WPdbGLjJ5ruh%d<
z-sU-lRa6y!n34TCj@4#*z@ui(5mas3ZhX;Zr0}-$oFk|t7KOop9E<dHtHt#5SuLy(
zS*V6Xv0|(>Y=GI~99>Hl=?(z-c2S8m4RW#l*0lp201yP+ejp)$KbDx4w~Lz>(Axf=
zRh&Q&(8JOTX!FR;?SFp>n3P@I{>UgIGF*m#yvuS20I)&<0EB;G@W1=78UCmhRks9L
z+99l2L=wjgi8!Sj+nBofG5tbvjQXdRBIE7gY$NLmvURZgbHvm@ABU}*kvh`vWv#b}
z&(Z!A@lW#ge~xVKgY&)O=3+=;0RSw&AlIS)De`YxvEMYkihmxi-fn-6$uqm`$9XgE
zxcRqyzhD;P{>w&DH<!Q*2=e-W;EyljMS5@UAp;8HDxoF(m+;Cr=pL?aOtP-dt{%Ex
zH+R+Z&lxbMpeT8C0Kl9v0KoPOgDA<r!|>;*h#j+TQR#*MTK_CWWW;Vax5#bc|90;i
zL{P*w7q_644}bqs(+fmk#5YUc0wZbvrT0uC0wWfG-vT!P|5_<HA~IrO)h%*8=r5O9
zA%Y`{>TkhGy#FJKJt6_34)m6w%m1&cLJ_eM6?M1Rp923beH|hvqI~I=b3XWQ7BeAI
zBg$KDsYPD=MX}5OSz`!E{#)oc@PD52M`S@veBQDwMpgYsX;4H0#9YuV0ax6AlNmzf
zLCihe@-V;r?=lgHOo(Stw@eW!f6Iv!A|YZFdrJsO{~KajL^?!Q{+5pJ&EMzPYpJ53
z{)S3%^ZkC~T6n(wZS+64kQV_H0t&|bflwQr004EVm#rBANeHbP0RVDkb1#?S8UY-a
z8X5r(0?`_mDjESd0{j}6V;TWL1Be>|mxvevI+x)Z0V)C&9G49n0T~879033T0B@{6
AO8@`>

delta 39867
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
DuzMb^

diff --git a/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.cs b/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.cs
index 9bcb06a16110..4aa67276dac1 100644
--- a/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.cs
+++ b/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.cs
@@ -311,6 +311,7 @@ public async Task ValidateChatKeyboard(string keyboardName, bool expected)
 			, Skip = "https://github.com/dotnet/maui/issues/7939"
 #endif
 			)]
+		[InlineData(0)]
 		[InlineData(2)]
 		[InlineData(5)]
 		[InlineData(8)]
@@ -358,6 +359,7 @@ public async Task NegativeMaxLengthDoesNotClip()
 			, Skip = "https://github.com/dotnet/maui/issues/7939"
 #endif
 		)]
+		[InlineData(0)]
 		[InlineData(2)]
 		[InlineData(5)]
 		[InlineData(8)]

From dccfaf072e6155cc48eb087a63b7fcb3fb56e851 Mon Sep 17 00:00:00 2001
From: Scott Banning <scoban@microsoft.com>
Date: Wed, 5 Jul 2023 12:54:04 -0700
Subject: [PATCH 067/105] Add product names to cspell word list and add csharp
 to markdown code section

---
 cSpell.json              | 5 ++++-
 docs/design/UITesting.md | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/cSpell.json b/cSpell.json
index 026be1843be9..644233b66eec 100644
--- a/cSpell.json
+++ b/cSpell.json
@@ -6,7 +6,10 @@
         "Skia",
         "Resizetizer",
         "nugets",
-        "netstandard"
+        "netstandard",
+        "Appium",
+        "XCUI",
+        "Automator"
     ],
     "ignoreWords": [],
     "patterns": [
diff --git a/docs/design/UITesting.md b/docs/design/UITesting.md
index 721edc1a56b5..1cb41162ef01 100644
--- a/docs/design/UITesting.md
+++ b/docs/design/UITesting.md
@@ -32,7 +32,7 @@ This project is using [NUnit](https://nunit.org/)
 
 All tests should derive from `UITestBase` and should override `FixtureSetup/FixtureTeardown` to navigate to the specific UI you want to test and navigate back when finished.
 
-```
+```csharp
 protected override void FixtureSetup()
 {
     base.FixtureSetup();
@@ -40,7 +40,7 @@ protected override void FixtureSetup()
 }
 ```
 
-```
+```csharp
 protected override void FixtureTeardown()
 {
     base.FixtureTeardown();
@@ -50,7 +50,7 @@ protected override void FixtureTeardown()
 
 The test will have access to gestures/interactions through the `App` property.
 
-```
+```csharp
 App.WaitForElement("btnLogin");
 App.EnterText("entryUsername", "user@email.com");
 App.EnterText("entryPassword", "Password");

From 095a94ea532e358c275743cff071ea779f1c1221 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 5 Jul 2023 15:49:39 -0500
Subject: [PATCH 068/105] Bump Xamarin.UITest from 4.1.4 to 4.2.0 (#15987)

Bumps Xamarin.UITest from 4.1.4 to 4.2.0.

---
updated-dependencies:
- dependency-name: Xamarin.UITest
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .../Compatibility.ControlGallery.Android.UITests.csproj         | 2 +-
 .../ControlGallery/test/WinUI.UITests/WinUI.UITests.csproj      | 2 +-
 .../iOS.UITests/Compatibility.ControlGallery.iOS.UITests.csproj | 2 +-
 src/Controls/tests/UITests/Controls.AppiumTests.csproj          | 2 +-
 .../TestUtils.Appium.UITests/TestUtils.Appium.UITests.csproj    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Compatibility/ControlGallery/test/Android.UITests/Compatibility.ControlGallery.Android.UITests.csproj b/src/Compatibility/ControlGallery/test/Android.UITests/Compatibility.ControlGallery.Android.UITests.csproj
index 4141ef7210ff..396083714384 100644
--- a/src/Compatibility/ControlGallery/test/Android.UITests/Compatibility.ControlGallery.Android.UITests.csproj
+++ b/src/Compatibility/ControlGallery/test/Android.UITests/Compatibility.ControlGallery.Android.UITests.csproj
@@ -18,7 +18,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="Xam.Plugin.DeviceInfo" Version="4.1.1" />
-    <PackageReference Include="Xamarin.UITest" Version="4.1.4" />
+    <PackageReference Include="Xamarin.UITest" Version="4.2.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
   </ItemGroup>
 
diff --git a/src/Compatibility/ControlGallery/test/WinUI.UITests/WinUI.UITests.csproj b/src/Compatibility/ControlGallery/test/WinUI.UITests/WinUI.UITests.csproj
index b50ebe15c332..270969045a8f 100644
--- a/src/Compatibility/ControlGallery/test/WinUI.UITests/WinUI.UITests.csproj
+++ b/src/Compatibility/ControlGallery/test/WinUI.UITests/WinUI.UITests.csproj
@@ -23,7 +23,7 @@
     <PackageReference Include="Selenium.Support" Version="4.1.1" />
     <PackageReference Include="Selenium.WebDriver" Version="4.1.1" />
     <PackageReference Include="Xam.Plugin.DeviceInfo" Version="4.1.1" />
-    <PackageReference Include="Xamarin.UITest" Version="4.1.4" />
+    <PackageReference Include="Xamarin.UITest" Version="4.2.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
   </ItemGroup>
 
diff --git a/src/Compatibility/ControlGallery/test/iOS.UITests/Compatibility.ControlGallery.iOS.UITests.csproj b/src/Compatibility/ControlGallery/test/iOS.UITests/Compatibility.ControlGallery.iOS.UITests.csproj
index 054a9bef3812..f45b7848f070 100644
--- a/src/Compatibility/ControlGallery/test/iOS.UITests/Compatibility.ControlGallery.iOS.UITests.csproj
+++ b/src/Compatibility/ControlGallery/test/iOS.UITests/Compatibility.ControlGallery.iOS.UITests.csproj
@@ -18,7 +18,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="Xam.Plugin.DeviceInfo" Version="4.1.1" />
-    <PackageReference Include="Xamarin.UITest" Version="4.1.4" />
+    <PackageReference Include="Xamarin.UITest" Version="4.2.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
   </ItemGroup>
 
diff --git a/src/Controls/tests/UITests/Controls.AppiumTests.csproj b/src/Controls/tests/UITests/Controls.AppiumTests.csproj
index 9a82c76f822c..d7668c7ee2e2 100644
--- a/src/Controls/tests/UITests/Controls.AppiumTests.csproj
+++ b/src/Controls/tests/UITests/Controls.AppiumTests.csproj
@@ -37,7 +37,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
-    <PackageReference Include="Xamarin.UITest" Version="4.1.4" />
+    <PackageReference Include="Xamarin.UITest" Version="4.2.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/TestUtils/src/TestUtils.Appium.UITests/TestUtils.Appium.UITests.csproj b/src/TestUtils/src/TestUtils.Appium.UITests/TestUtils.Appium.UITests.csproj
index d6855a5ac4c5..6a21dadc2bc9 100644
--- a/src/TestUtils/src/TestUtils.Appium.UITests/TestUtils.Appium.UITests.csproj
+++ b/src/TestUtils/src/TestUtils.Appium.UITests/TestUtils.Appium.UITests.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.UITest" Version="4.1.4" />
+    <PackageReference Include="Xamarin.UITest" Version="4.2.0" />
   </ItemGroup>
 
   <ItemGroup>

From a154990ba665656ee0dddf2f19d13841139c4b08 Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Wed, 5 Jul 2023 16:38:14 -0500
Subject: [PATCH 069/105] Streamline ModalNavigation lifecycle events (#15799)

* Streamline ModalNavigation lifecycle events

* - fix target pages

* - fix locating backbutton

* - fix up test location

* - add additional extension

* - fix navbar searching for shell

* - additional fix

* Update NavigationPage.cs

* - add additional tests
---
 .../src/Core/NavigationPage/NavigationPage.cs | 23 +++++++-
 .../ModalNavigationManager.cs                 | 44 +++++++++++++-
 src/Controls/src/Core/Shell/Shell.cs          | 22 -------
 .../Core.UnitTests/NavigationModelTests.cs    | 14 +++++
 .../tests/Core.UnitTests/ShellModalTests.cs   | 14 +++++
 .../ControlsHandlerTestBase.Android.cs        |  5 ++
 .../ControlsHandlerTestBase.iOS.cs            | 57 +++++++++---------
 .../DeviceTests/Elements/Modal/ModalTests.cs  | 58 ++++++++++++++-----
 .../NavigationPage/NavigationPageTests.cs     |  8 ++-
 .../DeviceTests/AssertionExtensions.iOS.cs    | 12 +++-
 10 files changed, 187 insertions(+), 70 deletions(-)

diff --git a/src/Controls/src/Core/NavigationPage/NavigationPage.cs b/src/Controls/src/Core/NavigationPage/NavigationPage.cs
index 5363b584e704..fd6708e4465e 100644
--- a/src/Controls/src/Core/NavigationPage/NavigationPage.cs
+++ b/src/Controls/src/Core/NavigationPage/NavigationPage.cs
@@ -575,14 +575,31 @@ void OnWindowChanged(object sender, EventArgs e)
 				else
 				{
 					// Is the root the window or is this part of a modal stack
-					var rootPage = this.FindParentWith(x => (x is IWindow te || Window.Navigation.ModalStack.Contains(x)), true);
+					Element toolbarRoot;
 
-					if (rootPage is Window w)
+					var parentPages = this.GetParentPages();
+					parentPages.Insert(0, this);
+	 				var topLevelPage = parentPages[parentPages.Count - 1];
+
+					// Is my top parent page the root page on the window?
+					// If so then we set the toolbar on the window
+					if (Window.Page == topLevelPage)
+					{
+						toolbarRoot = Window;
+					}
+					else
+					{
+						// This means the page is a modal page so we set the toolbar on the top level page
+						// of the modal
+						toolbarRoot = topLevelPage;
+					}
+
+					if (toolbarRoot is Window w)
 					{
 						_toolbar = new NavigationPageToolbar(w, w.Page);
 						w.Toolbar = _toolbar;
 					}
-					else if (rootPage is Page p)
+					else if (toolbarRoot is Page p)
 					{
 						_toolbar = new NavigationPageToolbar(p, p);
 						p.Toolbar = _toolbar;
diff --git a/src/Controls/src/Core/Platform/ModalNavigationManager/ModalNavigationManager.cs b/src/Controls/src/Core/Platform/ModalNavigationManager/ModalNavigationManager.cs
index 7e0ab5baac37..4c9fc490b87f 100644
--- a/src/Controls/src/Core/Platform/ModalNavigationManager/ModalNavigationManager.cs
+++ b/src/Controls/src/Core/Platform/ModalNavigationManager/ModalNavigationManager.cs
@@ -24,8 +24,18 @@ internal partial class ModalNavigationManager
 		Page CurrentPlatformModalPage =>
 			_platformModalPages.Count > 0 ? _platformModalPages[_platformModalPages.Count - 1] : throw new InvalidOperationException("Modal Stack is Empty");
 
-		Page? CurrentPage =>
-			_modalPages.Count > 0 ? _modalPages[_modalPages.Count - 1].Page : _window.Page;
+		Page? CurrentPage
+		{
+			get
+			{
+				var currentPage = _modalPages.Count > 0 ? _modalPages[_modalPages.Count - 1].Page : _window.Page;
+
+				if (currentPage is Shell shell)
+					currentPage = shell.CurrentPage;
+
+				return currentPage;
+			}
+		}
 
 		// Shell takes care of firing its own Modal life cycle events
 		// With shell you cam remove / add multiple modals at once
@@ -201,7 +211,21 @@ async Task SyncPlatformModalStackAsync()
 			if (FireLifeCycleEvents)
 			{
 				modal.SendNavigatingFrom(new NavigatingFromEventArgs());
-				modal.SendDisappearing();
+			}
+
+			modal.SendDisappearing();
+
+			// With shell we want to make sure to only fire the appearing event
+			// on the final page that will be visible after the pop has completed
+			if (_window.Page is Shell shell)
+			{
+				if (!shell.CurrentItem.CurrentItem.IsPoppingModalStack)
+				{
+					CurrentPage?.SendAppearing();
+				}
+			}
+			else
+			{
 				CurrentPage?.SendAppearing();
 			}
 
@@ -236,6 +260,20 @@ public async Task PushModalAsync(Page modal, bool animated)
 			if (FireLifeCycleEvents)
 			{
 				previousPage?.SendNavigatingFrom(new NavigatingFromEventArgs());
+			}
+
+			if (_window.Page is Shell shell)
+			{
+				// With shell we want to make sure to only fire the appearing event
+				// on the final page that will be visible after the pop has completed
+				if (!shell.CurrentItem.CurrentItem.IsPushingModalStack)
+				{
+					previousPage?.SendDisappearing();
+					CurrentPage?.SendAppearing();
+				}
+			}
+			else
+			{
 				previousPage?.SendDisappearing();
 				CurrentPage?.SendAppearing();
 			}
diff --git a/src/Controls/src/Core/Shell/Shell.cs b/src/Controls/src/Core/Shell/Shell.cs
index 179de869928a..8f6510bcbc60 100644
--- a/src/Controls/src/Core/Shell/Shell.cs
+++ b/src/Controls/src/Core/Shell/Shell.cs
@@ -1697,21 +1697,11 @@ protected override async Task<Page> OnPopModal(bool animated)
 					return page;
 				}
 
-				if (ModalStack.Count > 0)
-					ModalStack[ModalStack.Count - 1].SendDisappearing();
-
-				if (!_shell.CurrentItem.CurrentItem.IsPoppingModalStack)
-				{
-					if (ModalStack.Count > 1)
-						ModalStack[ModalStack.Count - 2].SendAppearing();
-				}
-
 				var modalPopped = await base.OnPopModal(animated);
 
 				if (ModalStack.Count == 0 && !_shell.CurrentItem.CurrentItem.IsPoppingModalStack)
 					_shell.CurrentItem.SendAppearing();
 
-				modalPopped.Parent = null;
 				return modalPopped;
 			}
 
@@ -1734,18 +1724,6 @@ protected override async Task OnPushModal(Page modal, bool animated)
 				if (ModalStack.Count == 0)
 					_shell.CurrentItem.SendDisappearing();
 
-				modal.Parent = (Element)_shell.FindParentOfType<IWindow>();
-
-				if (!_shell.CurrentItem.CurrentItem.IsPushingModalStack)
-				{
-					if (ModalStack.Count > 0)
-					{
-						ModalStack[ModalStack.Count - 1].SendDisappearing();
-					}
-
-					modal.SendAppearing();
-				}
-
 				await base.OnPushModal(modal, animated);
 
 				modal.NavigationProxy.Inner = new NavigationImplWrapper(modal.NavigationProxy.Inner, this);
diff --git a/src/Controls/tests/Core.UnitTests/NavigationModelTests.cs b/src/Controls/tests/Core.UnitTests/NavigationModelTests.cs
index 45a70e119052..79449e055e3f 100644
--- a/src/Controls/tests/Core.UnitTests/NavigationModelTests.cs
+++ b/src/Controls/tests/Core.UnitTests/NavigationModelTests.cs
@@ -11,6 +11,20 @@ namespace Microsoft.Maui.Controls.Core.UnitTests
 
 	public class NavigationModelTests : BaseTestFixture
 	{
+		[Fact]
+		public async Task ParentSetsWhenPushingAndUnsetsWhenPopping()
+		{
+			var mainPage = new ContentPage() { Title = "Main Page" };
+			var modal1 = new ContentPage() { Title = "Modal 1" };
+			TestWindow testWindow = new TestWindow(mainPage);
+
+			await mainPage.Navigation.PushModalAsync(modal1);
+
+			Assert.Equal(testWindow, modal1.Parent);
+			await mainPage.Navigation.PopModalAsync();
+			Assert.Null(modal1.Parent);
+		}
+
 		[Fact]
 		public async Task ModalsWireUpInCorrectOrderWhenPushedBeforeWindowHasBeenCreated()
 		{
diff --git a/src/Controls/tests/Core.UnitTests/ShellModalTests.cs b/src/Controls/tests/Core.UnitTests/ShellModalTests.cs
index 60f3c443abc8..76b02eaeedc8 100644
--- a/src/Controls/tests/Core.UnitTests/ShellModalTests.cs
+++ b/src/Controls/tests/Core.UnitTests/ShellModalTests.cs
@@ -349,6 +349,20 @@ public async Task IsAppearingFiredOnLastModalPageOnly()
 			Assert.True(page2.Appearing);
 		}
 
+		[Fact]
+		public async Task ParentSetsWhenPushingAndUnsetsWhenPopping()
+		{
+			var shell = new TestShell();
+
+			var item = CreateShellItem(shellSectionRoute: "section2");
+			shell.Items.Add(item);
+			await shell.GoToAsync($"ModalTestPage");
+			var modal1 = (shell.CurrentItem.CurrentItem as IShellSectionController).PresentedPage as ModalTestPageBase;
+			Assert.Equal(shell.Window, modal1.Parent);
+			await shell.GoToAsync("..");
+			Assert.Null(modal1.Parent);
+		}
+
 		[Fact]
 		public async Task BasicQueryStringTest()
 		{
diff --git a/src/Controls/tests/DeviceTests/ControlsHandlerTestBase.Android.cs b/src/Controls/tests/DeviceTests/ControlsHandlerTestBase.Android.cs
index 2387049db6f9..0d282c622887 100644
--- a/src/Controls/tests/DeviceTests/ControlsHandlerTestBase.Android.cs
+++ b/src/Controls/tests/DeviceTests/ControlsHandlerTestBase.Android.cs
@@ -123,6 +123,11 @@ protected AView GetTitleView(IElementHandler handler)
 
 		protected MaterialToolbar GetPlatformToolbar(IElementHandler handler)
 		{
+			if (handler.VirtualView is VisualElement e)
+			{
+				handler = e.Window?.Handler ?? handler;
+			}
+
 			if (handler is IWindowHandler wh)
 			{
 				handler = wh.VirtualView.Content.Handler;
diff --git a/src/Controls/tests/DeviceTests/ControlsHandlerTestBase.iOS.cs b/src/Controls/tests/DeviceTests/ControlsHandlerTestBase.iOS.cs
index 9c1a79b9d7ed..3d9b95fd8634 100644
--- a/src/Controls/tests/DeviceTests/ControlsHandlerTestBase.iOS.cs
+++ b/src/Controls/tests/DeviceTests/ControlsHandlerTestBase.iOS.cs
@@ -95,12 +95,8 @@ internal ControlsModalWrapper GetModalWrapper(Page modalPage)
 
 		protected bool IsBackButtonVisible(IElementHandler handler)
 		{
-			var vcs = GetActiveChildViewControllers(handler);
-
-			if (vcs.Length <= 1)
-				return false;
-
-			return !vcs[vcs.Length - 1].NavigationItem.HidesBackButton;
+			var toolbar = GetPlatformToolbar(handler);
+			return toolbar?.HasBackButton() ?? false;
 		}
 
 		protected bool IsNavigationBarVisible(IElementHandler handler)
@@ -112,7 +108,7 @@ protected bool IsNavigationBarVisible(IElementHandler handler)
 		protected object GetTitleView(IElementHandler handler)
 		{
 			var activeVC = GetVisibleViewController(handler);
-			if (activeVC.NavigationItem.TitleView is
+			if (activeVC?.NavigationItem?.TitleView is
 				ShellPageRendererTracker.TitleViewContainer tvc)
 			{
 				return tvc.Subviews[0];
@@ -123,48 +119,55 @@ protected object GetTitleView(IElementHandler handler)
 
 		UIViewController[] GetActiveChildViewControllers(IElementHandler handler)
 		{
-			if (handler is IWindowHandler wh)
+			if (handler.VirtualView is IWindow window)
 			{
-				handler = wh.VirtualView.Content.Handler;
+				handler = window.Content.Handler;
 			}
 
-			if (handler is ShellRenderer renderer)
-			{
-				if (renderer.ChildViewControllers[0] is ShellItemRenderer sir)
-				{
-					return sir.SelectedViewController.ChildViewControllers;
-				}
-			}
+			if (handler.VirtualView is Page page)
+				handler = page.GetCurrentPage()?.Handler;
 
-			var containerVC = (handler as IPlatformViewHandler).ViewController;
-			var view = handler.VirtualView.Parent;
+			if (handler is null)
+				return new UIViewController[0];
 
-			while (containerVC is null && view is not null)
-			{
-				containerVC = (view?.Handler as IPlatformViewHandler).ViewController;
-				view = view?.Parent;
-			}
+			var navControllerResponder = (handler.PlatformView as UIView).FindResponder<UINavigationController>();
 
-			if (containerVC is null)
-				return new UIViewController[0];
+			if (navControllerResponder?.ChildViewControllers is not null)
+				return navControllerResponder.ChildViewControllers;
+
+			var contentResponder = (handler.PlatformView as UIView).FindResponder<ContainerViewController>();
 
-			return new[] { containerVC };
+			if (contentResponder?.NavigationController is not null)
+				return contentResponder.NavigationController.ChildViewControllers;
+
+			return new UIViewController[0];
 		}
 
 		UIViewController GetVisibleViewController(IElementHandler handler)
 		{
 			var vcs = GetActiveChildViewControllers(handler);
+			if (vcs.Length == 0)
+				return null;
+
 			return vcs[vcs.Length - 1];
 		}
 
 		protected UINavigationBar GetPlatformToolbar(IElementHandler handler)
 		{
 			var visibleController = GetVisibleViewController(handler);
+
+			if (visibleController is null)
+				return null;
+
 			if (visibleController is UINavigationController nc)
 				return nc.NavigationBar;
 
 			var navController = visibleController.NavigationController;
-			return navController?.NavigationBar;
+
+			if (navController?.NavigationBar is UINavigationBar bar)
+				return bar;
+
+			return null;
 		}
 
 		protected Size GetTitleViewExpectedSize(IElementHandler handler)
diff --git a/src/Controls/tests/DeviceTests/Elements/Modal/ModalTests.cs b/src/Controls/tests/DeviceTests/Elements/Modal/ModalTests.cs
index 6ec4a3ab78c7..3e9479f334ad 100644
--- a/src/Controls/tests/DeviceTests/Elements/Modal/ModalTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Modal/ModalTests.cs
@@ -36,24 +36,12 @@ void SetupBuilder()
 			{
 				builder.ConfigureMauiHandlers(handlers =>
 				{
-					handlers.AddHandler(typeof(Toolbar), typeof(ToolbarHandler));
 					handlers.AddHandler(typeof(NavigationPage), typeof(NavigationViewHandler));
 					handlers.AddHandler(typeof(FlyoutPage), typeof(FlyoutViewHandler));
 					handlers.AddHandler(typeof(TabbedPage), typeof(TabbedViewHandler));
-					handlers.AddHandler<Page, PageHandler>();
 					handlers.AddHandler<Window, WindowHandlerStub>();
-
-					handlers.AddHandler(typeof(Controls.Shell), typeof(ShellHandler));
-					handlers.AddHandler<Layout, LayoutHandler>();
 					handlers.AddHandler<Entry, EntryHandler>();
-					handlers.AddHandler<Image, ImageHandler>();
-					handlers.AddHandler<Label, LabelHandler>();
-					handlers.AddHandler<Toolbar, ToolbarHandler>();
-#if WINDOWS
-					handlers.AddHandler<ShellItem, ShellItemHandler>();
-					handlers.AddHandler<ShellSection, ShellSectionHandler>();
-					handlers.AddHandler<ShellContent, ShellContentHandler>();
-#endif
+					SetupShellHandlers(handlers);
 				});
 			});
 		}
@@ -171,6 +159,50 @@ await CreateHandlerAndAddToWindow<IWindowHandler>(window,
 			Assert.Equal(2, windowDisappearing);
 		}
 
+		[Fact]
+		public async Task PushingNavigationPageModallyWithShellShowsToolbarCorrectly()
+		{
+			SetupBuilder();
+			var windowPage = new LifeCycleTrackingPage()
+			{
+				Title = "Window Page Title"
+			};
+
+			var modalPage = new NavigationPage(new LifeCycleTrackingPage()
+			{
+				Content = new Label() { Text = "Modal page with navigation" }
+			})
+			{ Title = "modal page" };
+
+			Window window = new Window(new Shell() { CurrentItem = windowPage })
+			{
+				Title = "PushingNavigationPageModallyWithShellShowsToolbarCorrectly Window Title"
+			};
+
+			await CreateHandlerAndAddToWindow<IWindowHandler>(window,
+				async (_) =>
+				{
+					await windowPage.Navigation.PushAsync(new ContentPage() { Title = "Second Page on PushingNavigationPageModallyWithShellShowsToolbarCorrectly" });
+					await windowPage.Navigation.PushModalAsync(modalPage);
+
+					// Navigation Bar is visible
+					Assert.True(await AssertionExtensions.Wait(() => IsNavigationBarVisible(modalPage.Handler)));
+					Assert.False(IsBackButtonVisible(modalPage.Handler));
+
+					// Verify that new navigation bar can gain a back button
+					var secondModalPage = new ContentPage();
+					await modalPage.Navigation.PushAsync(secondModalPage);
+					Assert.True(await AssertionExtensions.Wait(() => IsBackButtonVisible(secondModalPage.Handler)));
+					await secondModalPage.Navigation.PopAsync();
+
+					// Remove the modal page and validate the root window pages toolbar is still setup correctly
+					await modalPage.Navigation.PopModalAsync();
+
+					Assert.True(await AssertionExtensions.Wait(() => IsNavigationBarVisible(windowPage.Handler)));
+					Assert.True(await AssertionExtensions.Wait(() => IsBackButtonVisible(windowPage.Handler)));
+				});
+		}
+
 		[Theory]
 		[InlineData(true)]
 		[InlineData(false)]
diff --git a/src/Controls/tests/DeviceTests/Elements/NavigationPage/NavigationPageTests.cs b/src/Controls/tests/DeviceTests/Elements/NavigationPage/NavigationPageTests.cs
index 2bb250fa5c6f..27282799fbae 100644
--- a/src/Controls/tests/DeviceTests/Elements/NavigationPage/NavigationPageTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/NavigationPage/NavigationPageTests.cs
@@ -130,7 +130,7 @@ await CreateHandlerAndAddToWindow<WindowHandlerStub>(new Window(navPage), async
 
 				// Wait for back button to reveal itself
 				Assert.True(await AssertionExtensions.Wait(() => IsBackButtonVisible(handler)));
-			}, timeOut: TimeSpan.FromMinutes(2));
+			});
 		}
 
 		[Fact(DisplayName = "Back Button Visibility Changes with push/pop")]
@@ -297,6 +297,12 @@ await CreateHandlerAndAddToWindow<WindowHandlerStub>(new Window(navPage), async
 		[Fact(DisplayName = "NavigationPage Does Not Leak")]
 		public async Task DoesNotLeak()
 		{
+
+#if ANDROID
+			if (!OperatingSystem.IsAndroidVersionAtLeast(30))
+				return;
+#endif
+
 			SetupBuilder();
 			WeakReference pageReference = null;
 			var navPage = new NavigationPage(new ContentPage { Title = "Page 1" });
diff --git a/src/TestUtils/src/DeviceTests/AssertionExtensions.iOS.cs b/src/TestUtils/src/DeviceTests/AssertionExtensions.iOS.cs
index dc64fe9a6aae..d14422a72d5d 100644
--- a/src/TestUtils/src/DeviceTests/AssertionExtensions.iOS.cs
+++ b/src/TestUtils/src/DeviceTests/AssertionExtensions.iOS.cs
@@ -613,7 +613,17 @@ public static UIView GetAccessiblePlatformView(this UIView platformView)
 			return platformView;
 		}
 
-		static UIView GetBackButton(this UINavigationBar uINavigationBar)
+		public static bool HasBackButton(this UINavigationBar uINavigationBar)
+		{
+			var item = uINavigationBar.FindDescendantView<UIView>(result =>
+			{
+				return result.Class.Name?.Contains("UIButtonBarButton", StringComparison.OrdinalIgnoreCase) == true;
+			});
+
+			return item is not null;
+		}
+
+		public static UIView GetBackButton(this UINavigationBar uINavigationBar)
 		{
 			var item = uINavigationBar.FindDescendantView<UIView>(result =>
 			{

From 4c096c1f17e9a23bf3961ba5778d3936039ad881 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 6 Jul 2023 10:16:02 +0000
Subject: [PATCH 070/105] [create-pull-request] automated change (#15988)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .../Shell/Android/ShellBottomNavViewAppearanceTracker.cs  | 8 ++++----
 src/Controls/src/Core/NavigationPage/NavigationPage.cs    | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellBottomNavViewAppearanceTracker.cs b/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellBottomNavViewAppearanceTracker.cs
index 680322479bd0..fdf0fdadd90f 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellBottomNavViewAppearanceTracker.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellBottomNavViewAppearanceTracker.cs
@@ -55,13 +55,13 @@ public virtual void SetAppearance(BottomNavigationView bottomView, IShellAppeara
 			var titleColor = controller.EffectiveTabBarTitleColor;
 
 			_itemTextColor = MakeColorStateList(
-				titleColor ?? foregroundColor, 
-				disabledColor, 
+				titleColor ?? foregroundColor,
+				disabledColor,
 				unselectedColor);
 
 			_itemIconTint = MakeColorStateList(
-				foregroundColor ?? titleColor, 
-				disabledColor, 
+				foregroundColor ?? titleColor,
+				disabledColor,
 				unselectedColor);
 
 			bottomView.ItemTextColor = _itemTextColor;
diff --git a/src/Controls/src/Core/NavigationPage/NavigationPage.cs b/src/Controls/src/Core/NavigationPage/NavigationPage.cs
index fd6708e4465e..8550e3cba743 100644
--- a/src/Controls/src/Core/NavigationPage/NavigationPage.cs
+++ b/src/Controls/src/Core/NavigationPage/NavigationPage.cs
@@ -579,7 +579,7 @@ void OnWindowChanged(object sender, EventArgs e)
 
 					var parentPages = this.GetParentPages();
 					parentPages.Insert(0, this);
-	 				var topLevelPage = parentPages[parentPages.Count - 1];
+					var topLevelPage = parentPages[parentPages.Count - 1];
 
 					// Is my top parent page the root page on the window?
 					// If so then we set the toolbar on the window

From 0504ca2d4b4ce0c91d48bcb5c564093ec0d3d380 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Thu, 6 Jul 2023 20:30:35 +0200
Subject: [PATCH 071/105] Ensure "text boxes" preserve cursor location (#15099)

* Ensure iOS "text boxes" preserve cursor location

* Fix the Windows tests

* Attach the controls to the UI for focus tests

* Adding some more "text box" tests

* todo

* tests

* Revert "todo"

This reverts commit 328c6ba789cc40cf28e57b7606037055dbe4c115.

# Conflicts:
#	src/Controls/tests/DeviceTests/Elements/TextInput/TextInputTests.cs

* this

* move

* Revert "this"

This reverts commit d62b12af5cc999a126d1d333d493999b47891305.

* moar tests

* Revert "Revert "todo""

This reverts commit 6065a41d8a58bfdfdf4990680e0d51fe9936a7e3.

* all working on windows

* Merge the methods

* Update src/Controls/tests/DeviceTests/ControlsHandlerTestBase.cs

Co-authored-by: Rachel Kang <rachelkang@microsoft.com>

* fix the variable names

* fix

* feedback

---------

Co-authored-by: Rachel Kang <rachelkang@microsoft.com>
---
 .../Windows/Extensions/TextBoxExtensions.cs   |  13 +-
 .../Platform/iOS/Extensions/TextExtensions.cs |  49 +--
 .../DeviceTests/ControlsHandlerTestBase.cs    |  47 +++
 .../Elements/Editor/EditorTests.Android.cs    |  10 +-
 .../Elements/Editor/EditorTests.Windows.cs    |  10 +-
 .../Elements/Editor/EditorTests.cs            | 221 +-----------
 .../Elements/Editor/EditorTests.iOS.cs        |  10 +-
 .../Elements/Entry/EntryTests.Android.cs      |  10 +-
 .../Elements/Entry/EntryTests.Windows.cs      |  10 +-
 .../DeviceTests/Elements/Entry/EntryTests.cs  | 220 +-----------
 .../Elements/Entry/EntryTests.iOS.cs          |  10 +-
 .../SearchBar/SearchBarTests.Android.cs       |  25 +-
 .../SearchBar/SearchBarTests.Windows.cs       |  33 +-
 .../Elements/SearchBar/SearchBarTests.cs      |  31 +-
 .../Elements/SearchBar/SearchBarTests.iOS.cs  |  16 +-
 ...roid.cs => TextInputFocusTests.Android.cs} |  32 +-
 .../Elements/TextInput/TextInputFocusTests.cs |  12 +
 .../Elements/TextInput/TextInputTests.cs      | 340 +++++++++++++++++-
 .../HandlerTests/HandlerTestBasement.cs       |  14 +
 .../HandlerTests/TestBase.cs                  |  10 +-
 20 files changed, 597 insertions(+), 526 deletions(-)
 rename src/Controls/tests/DeviceTests/Elements/TextInput/{TextInputTests.Android.cs => TextInputFocusTests.Android.cs} (52%)
 create mode 100644 src/Controls/tests/DeviceTests/Elements/TextInput/TextInputFocusTests.cs

diff --git a/src/Controls/src/Core/Platform/Windows/Extensions/TextBoxExtensions.cs b/src/Controls/src/Core/Platform/Windows/Extensions/TextBoxExtensions.cs
index eac0381aeba5..c28eacde0d38 100644
--- a/src/Controls/src/Core/Platform/Windows/Extensions/TextBoxExtensions.cs
+++ b/src/Controls/src/Core/Platform/Windows/Extensions/TextBoxExtensions.cs
@@ -27,12 +27,15 @@ public static void UpdateText(this TextBox platformControl, InputView inputView)
 			var cursorOffset = newText.Length - oldText.Length;
 			int cursorPosition = hasFocus ? platformControl.GetCursorPosition(cursorOffset) : newText.Length;
 
-			if (oldText != newText && passwordBox is not null)
-				passwordBox.Password = newText;
-			else if (oldText != newText)
-				platformControl.Text = newText;
+			if (oldText != newText)
+			{
+				if (passwordBox is not null)
+					passwordBox.Password = newText;
+				else
+					platformControl.Text = newText;
 
-			platformControl.Select(cursorPosition, 0);
+				platformControl.Select(cursorPosition, 0);
+			}
 		}
 	}
 
diff --git a/src/Controls/src/Core/Platform/iOS/Extensions/TextExtensions.cs b/src/Controls/src/Core/Platform/iOS/Extensions/TextExtensions.cs
index 5a38647b190e..948c18531e89 100644
--- a/src/Controls/src/Core/Platform/iOS/Extensions/TextExtensions.cs
+++ b/src/Controls/src/Core/Platform/iOS/Extensions/TextExtensions.cs
@@ -28,48 +28,35 @@ public static void UpdateAdjustsFontSizeToFitWidth(this UITextField textField, E
 			textField.AdjustsFontSizeToFitWidth = entry.OnThisPlatform().AdjustsFontSizeToFitWidth();
 		}
 
-		public static void UpdateText(this UITextView textView, InputView inputView)
-		{
-			// Setting the text causes the cursor to be reset to the end of the UITextView.
-			// So, let's set back the cursor to the last known position and calculate a new
-			// position if needed when the text was modified by a Converter.
-			var oldText = textView.Text ?? string.Empty;
-			var newText = TextTransformUtilites.GetTransformedText(
-				inputView?.Text,
-				textView.SecureTextEntry ? TextTransform.Default : inputView.TextTransform
-				);
-
-			// Re-calculate the cursor offset position if the text was modified by a Converter.
-			// but if the text is being set by code, let's just move the cursor to the end.
-			var cursorOffset = newText.Length - oldText.Length;
-			var cursorPosition = textView.IsFirstResponder ? textView.GetCursorPosition(cursorOffset) : newText.Length;
+		public static void UpdateText(this UITextView textView, InputView inputView) =>
+			UpdateText(textView, inputView, textView.IsFirstResponder);
 
-			if (oldText != newText)
-				textView.Text = newText;
-
-			textView.SetTextRange(cursorPosition, 0);
-		}
+		public static void UpdateText(this UITextField textField, InputView inputView) =>
+			UpdateText(textField, inputView, textField.IsEditing);
 
-		public static void UpdateText(this UITextField textField, InputView inputView)
+		static void UpdateText(this IUITextInput textInput, InputView inputView, bool isEditing)
 		{
-			// Setting the text causes the cursor to be reset to the end of the UITextView.
+			// Setting the text causes the cursor to be reset to the end of the IUITextInput.
 			// So, let's set back the cursor to the last known position and calculate a new
 			// position if needed when the text was modified by a Converter.
-			var oldText = textField.Text ?? string.Empty;
+			var textRange = textInput.GetTextRange(textInput.BeginningOfDocument, textInput.EndOfDocument);
+			var oldText = textInput.TextInRange(textRange) ?? string.Empty;
 			var newText = TextTransformUtilites.GetTransformedText(
 				inputView?.Text,
-				textField.SecureTextEntry ? TextTransform.Default : inputView.TextTransform
+				textInput.GetSecureTextEntry() ? TextTransform.Default : inputView.TextTransform
 				);
 
-			// Re-calculate the cursor offset position if the text was modified by a Converter.
-			// but if the text is being set by code, let's just move the cursor to the end.
-			var cursorOffset = newText.Length - oldText.Length;
-			var cursorPosition = textField.IsEditing ? textField.GetCursorPosition(cursorOffset) : newText.Length;
-
 			if (oldText != newText)
-				textField.Text = newText;
+			{
+				// Re-calculate the cursor offset position if the text was modified by a Converter.
+				// but if the text is being set by code, let's just move the cursor to the end.
+				var cursorOffset = newText.Length - oldText.Length;
+				var cursorPosition = isEditing ? textInput.GetCursorPosition(cursorOffset) : newText.Length;
+
+				textInput.ReplaceText(textRange, newText);
 
-			textField.SetTextRange(cursorPosition, 0);
+				textInput.SetTextRange(cursorPosition, 0);
+			}
 		}
 
 		public static void UpdateLineBreakMode(this UILabel platformLabel, Label label)
diff --git a/src/Controls/tests/DeviceTests/ControlsHandlerTestBase.cs b/src/Controls/tests/DeviceTests/ControlsHandlerTestBase.cs
index 44b3954398f4..726705ba3777 100644
--- a/src/Controls/tests/DeviceTests/ControlsHandlerTestBase.cs
+++ b/src/Controls/tests/DeviceTests/ControlsHandlerTestBase.cs
@@ -231,6 +231,53 @@ await SetupWindowForTests<THandler>(window, async () =>
 			});
 		}
 
+		/// <summary>
+		/// This is more complicated as we have different logic depending on the view being focused or not.
+		/// When we attach to the UI, there is only a single control so sometimes it cannot unfocus.
+		/// </summary>
+		public async Task AttachAndRunFocusAffectedControl<TType, THandler>(TType control, Action<THandler> action)
+			where TType : IView, new()
+			where THandler : class, IPlatformViewHandler, IElementHandler, new()
+		{
+			Func<THandler, Task> boop = (handler) =>
+			{
+				action.Invoke(handler);
+				return Task.CompletedTask;
+			};
+
+			await AttachAndRunFocusAffectedControl<TType, THandler>(control, boop);
+		}
+
+		/// <summary>
+		/// This is more complicated as we have different logic depending on the view being focused or not.
+		/// When we attach to the UI, there is only a single control so sometimes it cannot unfocus.
+		/// </summary>
+		public async Task AttachAndRunFocusAffectedControl<TType, THandler>(TType control, Func<THandler, Task> action)
+			where TType : IView, new()
+			where THandler : class, IPlatformViewHandler, IElementHandler, new()
+		{
+			EnsureHandlerCreated(builder =>
+			{
+				builder.ConfigureMauiHandlers(handler =>
+				{
+					handler.AddHandler<VerticalStackLayout, LayoutHandler>();
+					handler.AddHandler<TType, THandler>();
+				});
+			});
+
+			var layout = new VerticalStackLayout
+			{
+				WidthRequest = 200,
+				HeightRequest = 200,
+			};
+
+			var placeholder = new TType();
+			layout.Add(placeholder);
+			layout.Add(control);
+
+			await AttachAndRun(layout, handler => action(control.Handler as THandler));
+		}
+
 		async protected Task ValidatePropertyInitValue<TValue, THandler>(
 			IView view,
 			Func<TValue> GetValue,
diff --git a/src/Controls/tests/DeviceTests/Elements/Editor/EditorTests.Android.cs b/src/Controls/tests/DeviceTests/Elements/Editor/EditorTests.Android.cs
index 18457f0e71b9..0be22351a23d 100644
--- a/src/Controls/tests/DeviceTests/Elements/Editor/EditorTests.Android.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Editor/EditorTests.Android.cs
@@ -9,18 +9,18 @@ namespace Microsoft.Maui.DeviceTests
 	[Collection(ControlsHandlerTestBase.RunInNewWindowCollection)]
 	public partial class EditorTests
 	{
-		AppCompatEditText GetPlatformControl(EditorHandler handler) =>
+		static AppCompatEditText GetPlatformControl(EditorHandler handler) =>
 			handler.PlatformView;
 
-		Task<string> GetPlatformText(EditorHandler handler)
+		static Task<string> GetPlatformText(EditorHandler handler)
 		{
 			return InvokeOnMainThreadAsync(() => GetPlatformControl(handler).Text);
 		}
 
-		void SetPlatformText(EditorHandler editorHandler, string text) =>
+		static void SetPlatformText(EditorHandler editorHandler, string text) =>
 			GetPlatformControl(editorHandler).SetTextKeepState(text);
 
-		int GetPlatformCursorPosition(EditorHandler editorHandler)
+		static int GetPlatformCursorPosition(EditorHandler editorHandler)
 		{
 			var textView = GetPlatformControl(editorHandler);
 
@@ -30,7 +30,7 @@ int GetPlatformCursorPosition(EditorHandler editorHandler)
 			return -1;
 		}
 
-		int GetPlatformSelectionLength(EditorHandler editorHandler)
+		static int GetPlatformSelectionLength(EditorHandler editorHandler)
 		{
 			var textView = GetPlatformControl(editorHandler);
 
diff --git a/src/Controls/tests/DeviceTests/Elements/Editor/EditorTests.Windows.cs b/src/Controls/tests/DeviceTests/Elements/Editor/EditorTests.Windows.cs
index 9198c624d00c..6d0340628605 100644
--- a/src/Controls/tests/DeviceTests/Elements/Editor/EditorTests.Windows.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Editor/EditorTests.Windows.cs
@@ -7,21 +7,21 @@ namespace Microsoft.Maui.DeviceTests
 {
 	public partial class EditorTests
 	{
-		TextBox GetPlatformControl(EditorHandler handler) =>
+		static TextBox GetPlatformControl(EditorHandler handler) =>
 			handler.PlatformView;
 
-		Task<string> GetPlatformText(EditorHandler handler)
+		static Task<string> GetPlatformText(EditorHandler handler)
 		{
 			return InvokeOnMainThreadAsync(() => GetPlatformControl(handler).Text);
 		}
 
-		void SetPlatformText(EditorHandler editorHandler, string text) =>
+		static void SetPlatformText(EditorHandler editorHandler, string text) =>
 			GetPlatformControl(editorHandler).Text = text;
 
-		int GetPlatformCursorPosition(EditorHandler editorHandler) =>
+		static int GetPlatformCursorPosition(EditorHandler editorHandler) =>
 			GetPlatformControl(editorHandler).SelectionStart;
 
-		int GetPlatformSelectionLength(EditorHandler editorHandler) =>
+		static int GetPlatformSelectionLength(EditorHandler editorHandler) =>
 			GetPlatformControl(editorHandler).SelectionLength;
 	}
 }
diff --git a/src/Controls/tests/DeviceTests/Elements/Editor/EditorTests.cs b/src/Controls/tests/DeviceTests/Elements/Editor/EditorTests.cs
index 87e1943a286b..08e0be5b1f76 100644
--- a/src/Controls/tests/DeviceTests/Elements/Editor/EditorTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Editor/EditorTests.cs
@@ -10,7 +10,6 @@ namespace Microsoft.Maui.DeviceTests
 	[Category(TestCategory.Editor)]
 	public partial class EditorTests : ControlsHandlerTestBase
 	{
-
 #if !IOS && !MACCATALYST
 		// iOS is broken until this point
 		// https://github.com/dotnet/maui/issues/3425
@@ -51,26 +50,6 @@ await CreateHandlerAndAddToWindow<LayoutHandler>(layout, (_) =>
 		}
 #endif
 
-		[Theory(DisplayName = "Text is Transformed Correctly at Initialization")]
-		[ClassData(typeof(TextTransformCases))]
-		public async Task InitialTextTransformApplied(string text, TextTransform transform, string expected)
-		{
-			var control = new Editor() { Text = text, TextTransform = transform };
-			var platformText = await GetPlatformText(await CreateHandlerAsync<EditorHandler>(control));
-			Assert.Equal(expected, platformText);
-		}
-
-		[Theory(DisplayName = "Text is Transformed Correctly after Initialization")]
-		[ClassData(typeof(TextTransformCases))]
-		public async Task TextTransformUpdated(string text, TextTransform transform, string expected)
-		{
-			var control = new Editor() { Text = text };
-			var handler = await CreateHandlerAsync<EditorHandler>(control);
-			await InvokeOnMainThreadAsync(() => control.TextTransform = transform);
-			var platformText = await GetPlatformText(handler);
-			Assert.Equal(expected, platformText);
-		}
-
 #if WINDOWS
 		// Only Windows needs the IsReadOnly workaround for MaxLength==0 to prevent text from being entered
 		[Fact]
@@ -96,198 +75,26 @@ await InvokeOnMainThreadAsync(() =>
 		}
 #endif
 
-		[Theory(DisplayName = "CursorPosition Initializes Correctly")]
-		[InlineData(2)]
-		public async Task CursorPositionInitializesCorrectly(int initialPosition)
+		[Category(TestCategory.Editor)]
+		[Category(TestCategory.TextInput)]
+		[Collection(RunInNewWindowCollection)]
+		public class EditorTextInputTests : TextInputTests<EditorHandler, Editor>
 		{
-			var editor = new Editor
-			{
-				Text = "This is TEXT!",
-				CursorPosition = initialPosition
-			};
+			protected override int GetPlatformSelectionLength(EditorHandler handler) =>
+				EditorTests.GetPlatformSelectionLength(handler);
 
-			await ValidatePropertyInitValue<int, EditorHandler>(
-				editor,
-				() => editor.CursorPosition,
-				GetPlatformCursorPosition,
-				initialPosition);
-		}
+			protected override int GetPlatformCursorPosition(EditorHandler handler) =>
+				EditorTests.GetPlatformCursorPosition(handler);
 
-		[Theory(DisplayName = "CursorPosition Updates Correctly")]
-		[InlineData(2, 5)]
-		public async Task CursorPositionUpdatesCorrectly(int setValue, int unsetValue)
-		{
-			string text = "This is TEXT!";
-
-			var editor = new Editor
-			{
-				Text = text
-			};
-
-			await ValidatePropertyUpdatesValue<int, EditorHandler>(
-				editor,
-				nameof(ITextInput.CursorPosition),
-				GetPlatformCursorPosition,
-				setValue,
-				unsetValue
-			);
+			protected override Task<string> GetPlatformText(EditorHandler handler) =>
+				EditorTests.GetPlatformText(handler);
 		}
 
-		[Theory(DisplayName = "CursorPosition is Capped to Text's Length")]
-		[InlineData(30)]
-		public async Task CursorPositionIsCapped(int initialPosition)
+		[Category(TestCategory.Editor)]
+		[Category(TestCategory.TextInput)]
+		[Collection(RunInNewWindowCollection)]
+		public class EditorTextInputFocusTests : TextInputFocusTests<EditorHandler, Editor>
 		{
-			string text = "This is TEXT!";
-
-			var editor = new Editor
-			{
-				Text = text,
-				CursorPosition = initialPosition
-			};
-
-			await ValidatePropertyInitValue<int, EditorHandler>(
-				editor,
-				() => editor.CursorPosition,
-				GetPlatformCursorPosition,
-				text.Length);
-		}
-
-		[Theory(DisplayName = "Unset CursorPosition is kept at zero at initialization")]
-		[InlineData("This is a test!!!")]
-		[InlineData("a")]
-		[InlineData("")]
-		[InlineData(" ")]
-		public async Task UnsetCursorPositionKeepsToZeroOnInitialization(string text)
-		{
-			var editor = new Editor
-			{
-				Text = text
-			};
-
-			await ValidatePropertyInitValue<int, EditorHandler>(
-				editor,
-				() => editor.CursorPosition,
-				GetPlatformCursorPosition,
-				0);
-		}
-
-		[Theory(DisplayName = "CursorPosition moves to the end on text change after initialization"
-#if WINDOWS
-			, Skip = "For some reason, the PlatformView events are not being fired on tests after the handler is created, something is swallowing them. " +
-					 "This was tested on a real app and it's working correctly."
-#endif
-			)]
-		[InlineData("This is a test!!!")]
-		[InlineData("a")]
-		[InlineData("")]
-		[InlineData(" ")]
-		public async Task CursorPositionMovesToTheEndOnTextChangeAfterInitialization(string text)
-		{
-			var editor = new Editor
-			{
-				Text = "Test"
-			};
-
-			await SetValueAsync<string, EditorHandler>(editor, text, (h, s) => h.VirtualView.Text = s);
-
-			Assert.Equal(text.Length, editor.CursorPosition);
-		}
-
-		[Theory(DisplayName = "SelectionLength Initializes Correctly")]
-		[InlineData(2)]
-		public async Task SelectionLengthInitializesCorrectly(int initialLength)
-		{
-			var editor = new Editor
-			{
-				Text = "This is TEXT!",
-				SelectionLength = initialLength
-			};
-
-			await ValidatePropertyInitValue<int, EditorHandler>(
-				editor,
-				() => editor.SelectionLength,
-				GetPlatformSelectionLength,
-				initialLength);
-		}
-
-		[Theory(DisplayName = "SelectionLength Updates Correctly")]
-		[InlineData(2, 5)]
-		public async Task SelectionLengthUpdatesCorrectly(int setValue, int unsetValue)
-		{
-			string text = "This is TEXT!";
-
-			var editor = new Editor
-			{
-				Text = text,
-			};
-
-			await ValidatePropertyUpdatesValue<int, EditorHandler>(
-				editor,
-				nameof(IEditor.SelectionLength),
-				GetPlatformSelectionLength,
-				setValue,
-				unsetValue
-			);
-		}
-
-		[Theory(DisplayName = "SelectionLength is Capped to Text Length")]
-		[InlineData(30)]
-		public async Task SelectionLengthIsCapped(int selectionLength)
-		{
-			string text = "This is TEXT!";
-
-			var editor = new Editor
-			{
-				Text = text,
-				SelectionLength = selectionLength
-			};
-
-			await ValidatePropertyInitValue<int, EditorHandler>(
-				editor,
-				() => editor.SelectionLength,
-				GetPlatformSelectionLength,
-				text.Length);
-		}
-
-		[Theory(DisplayName = "Unset SelectionLength is kept at zero at initialization")]
-		[InlineData("This is a test!!!")]
-		[InlineData("a")]
-		[InlineData("")]
-		[InlineData(" ")]
-		public async Task UnsetSelectionLengthKeepsToZeroOnInitialization(string text)
-		{
-			var editor = new Editor
-			{
-				Text = text
-			};
-
-			await ValidatePropertyInitValue<int, EditorHandler>(
-				editor,
-				() => editor.SelectionLength,
-				GetPlatformSelectionLength,
-				0);
-		}
-
-		[Theory(DisplayName = "SelectionLength is kept at zero on text change after initialization"
-#if WINDOWS
-			, Skip = "For some reason, the PlatformView events are not being fired on tests after the handler is created, something is swallowing them. " +
-					 "This was tested on a real app and it's working correctly."
-#endif
-			)]
-		[InlineData("This is a test!!!")]
-		[InlineData("a")]
-		[InlineData("")]
-		[InlineData(" ")]
-		public async Task SelectionLengthMovesToTheEndOnTextChangeAfterInitialization(string text)
-		{
-			var editor = new Editor
-			{
-				Text = "Test"
-			};
-
-			await SetValueAsync<string, EditorHandler>(editor, text, (h, s) => h.VirtualView.Text = s);
-
-			Assert.Equal(0, editor.SelectionLength);
 		}
 	}
 }
diff --git a/src/Controls/tests/DeviceTests/Elements/Editor/EditorTests.iOS.cs b/src/Controls/tests/DeviceTests/Elements/Editor/EditorTests.iOS.cs
index 49b678f948e1..346689122fad 100644
--- a/src/Controls/tests/DeviceTests/Elements/Editor/EditorTests.iOS.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Editor/EditorTests.iOS.cs
@@ -8,18 +8,18 @@ namespace Microsoft.Maui.DeviceTests
 	[Collection(ControlsHandlerTestBase.RunInNewWindowCollection)]
 	public partial class EditorTests
 	{
-		MauiTextView GetPlatformControl(EditorHandler handler) =>
+		static MauiTextView GetPlatformControl(EditorHandler handler) =>
 			handler.PlatformView;
 
-		Task<string> GetPlatformText(EditorHandler handler)
+		static Task<string> GetPlatformText(EditorHandler handler)
 		{
 			return InvokeOnMainThreadAsync(() => GetPlatformControl(handler).Text);
 		}
 
-		void SetPlatformText(EditorHandler editorHandler, string text) =>
+		static void SetPlatformText(EditorHandler editorHandler, string text) =>
 			GetPlatformControl(editorHandler).Text = text;
 
-		int GetPlatformCursorPosition(EditorHandler editorHandler)
+		static int GetPlatformCursorPosition(EditorHandler editorHandler)
 		{
 			var nativeEditor = GetPlatformControl(editorHandler);
 
@@ -29,7 +29,7 @@ int GetPlatformCursorPosition(EditorHandler editorHandler)
 			return -1;
 		}
 
-		int GetPlatformSelectionLength(EditorHandler editorHandler)
+		static int GetPlatformSelectionLength(EditorHandler editorHandler)
 		{
 			var nativeEditor = GetPlatformControl(editorHandler);
 
diff --git a/src/Controls/tests/DeviceTests/Elements/Entry/EntryTests.Android.cs b/src/Controls/tests/DeviceTests/Elements/Entry/EntryTests.Android.cs
index 0c65b004c3ec..8d94ce5cc3a8 100644
--- a/src/Controls/tests/DeviceTests/Elements/Entry/EntryTests.Android.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Entry/EntryTests.Android.cs
@@ -9,18 +9,18 @@ namespace Microsoft.Maui.DeviceTests
 {
 	public partial class EntryTests
 	{
-		AppCompatEditText GetPlatformControl(EntryHandler handler) =>
+		static AppCompatEditText GetPlatformControl(EntryHandler handler) =>
 			handler.PlatformView;
 
-		Task<string> GetPlatformText(EntryHandler handler)
+		static Task<string> GetPlatformText(EntryHandler handler)
 		{
 			return InvokeOnMainThreadAsync(() => GetPlatformControl(handler).Text);
 		}
 
-		void SetPlatformText(EntryHandler entryHandler, string text) =>
+		static void SetPlatformText(EntryHandler entryHandler, string text) =>
 			GetPlatformControl(entryHandler).SetTextKeepState(text);
 
-		int GetPlatformCursorPosition(EntryHandler entryHandler)
+		static int GetPlatformCursorPosition(EntryHandler entryHandler)
 		{
 			var editText = GetPlatformControl(entryHandler);
 
@@ -30,7 +30,7 @@ int GetPlatformCursorPosition(EntryHandler entryHandler)
 			return -1;
 		}
 
-		int GetPlatformSelectionLength(EntryHandler entryHandler)
+		static int GetPlatformSelectionLength(EntryHandler entryHandler)
 		{
 			var editText = GetPlatformControl(entryHandler);
 
diff --git a/src/Controls/tests/DeviceTests/Elements/Entry/EntryTests.Windows.cs b/src/Controls/tests/DeviceTests/Elements/Entry/EntryTests.Windows.cs
index 5116daaf0162..341b96eb0ae5 100644
--- a/src/Controls/tests/DeviceTests/Elements/Entry/EntryTests.Windows.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Entry/EntryTests.Windows.cs
@@ -7,21 +7,21 @@ namespace Microsoft.Maui.DeviceTests
 {
 	public partial class EntryTests
 	{
-		TextBox GetPlatformControl(EntryHandler handler) =>
+		static TextBox GetPlatformControl(EntryHandler handler) =>
 			handler.PlatformView;
 
-		Task<string> GetPlatformText(EntryHandler handler)
+		static Task<string> GetPlatformText(EntryHandler handler)
 		{
 			return InvokeOnMainThreadAsync(() => GetPlatformControl(handler).Text);
 		}
 
-		void SetPlatformText(EntryHandler entryHandler, string text) =>
+		static void SetPlatformText(EntryHandler entryHandler, string text) =>
 			GetPlatformControl(entryHandler).Text = text;
 
-		int GetPlatformCursorPosition(EntryHandler entryHandler) =>
+		static int GetPlatformCursorPosition(EntryHandler entryHandler) =>
 			GetPlatformControl(entryHandler).SelectionStart;
 
-		int GetPlatformSelectionLength(EntryHandler entryHandler) =>
+		static int GetPlatformSelectionLength(EntryHandler entryHandler) =>
 			GetPlatformControl(entryHandler).SelectionLength;
 	}
 }
diff --git a/src/Controls/tests/DeviceTests/Elements/Entry/EntryTests.cs b/src/Controls/tests/DeviceTests/Elements/Entry/EntryTests.cs
index c4e527bf9788..e1fccc7f356b 100644
--- a/src/Controls/tests/DeviceTests/Elements/Entry/EntryTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Entry/EntryTests.cs
@@ -12,26 +12,6 @@ namespace Microsoft.Maui.DeviceTests
 	[Category(TestCategory.Entry)]
 	public partial class EntryTests : ControlsHandlerTestBase
 	{
-		[Theory(DisplayName = "Text is Transformed Correctly at Initialization")]
-		[ClassData(typeof(TextTransformCases))]
-		public async Task InitialTextTransformApplied(string text, TextTransform transform, string expected)
-		{
-			var control = new Entry() { Text = text, TextTransform = transform };
-			var platformText = await GetPlatformText(await CreateHandlerAsync<EntryHandler>(control));
-			Assert.Equal(expected, platformText);
-		}
-
-		[Theory(DisplayName = "Text is Transformed Correctly after Initialization")]
-		[ClassData(typeof(TextTransformCases))]
-		public async Task TextTransformUpdated(string text, TextTransform transform, string expected)
-		{
-			var control = new Entry() { Text = text };
-			var handler = await CreateHandlerAsync<EntryHandler>(control);
-			await InvokeOnMainThreadAsync(() => control.TextTransform = transform);
-			var platformText = await GetPlatformText(handler);
-			Assert.Equal(expected, platformText);
-		}
-
 		[Fact]
 		public async Task MaxLengthTrims()
 		{
@@ -138,198 +118,26 @@ await Task.Run(() =>
 		}
 #endif
 
-		[Theory(DisplayName = "CursorPosition Initializes Correctly")]
-		[InlineData(2)]
-		public async Task CursorPositionInitializesCorrectly(int initialPosition)
-		{
-			var entry = new Entry
-			{
-				Text = "This is TEXT!",
-				CursorPosition = initialPosition
-			};
-
-			await ValidatePropertyInitValue<int, EntryHandler>(
-				entry,
-				() => entry.CursorPosition,
-				GetPlatformCursorPosition,
-				initialPosition);
-		}
-
-		[Theory(DisplayName = "CursorPosition Updates Correctly")]
-		[InlineData(2, 5)]
-		public async Task CursorPositionUpdatesCorrectly(int setValue, int unsetValue)
-		{
-			string text = "This is TEXT!";
-
-			var entry = new Entry
-			{
-				Text = text
-			};
-
-			await ValidatePropertyUpdatesValue<int, EntryHandler>(
-				entry,
-				nameof(ITextInput.CursorPosition),
-				GetPlatformCursorPosition,
-				setValue,
-				unsetValue
-			);
-		}
-
-		[Theory(DisplayName = "CursorPosition is Capped to Text's Length")]
-		[InlineData(30)]
-		public async Task CursorPositionIsCapped(int initialPosition)
-		{
-			string text = "This is TEXT!";
-
-			var entry = new Entry
-			{
-				Text = text,
-				CursorPosition = initialPosition
-			};
-
-			await ValidatePropertyInitValue<int, EntryHandler>(
-				entry,
-				() => entry.CursorPosition,
-				GetPlatformCursorPosition,
-				text.Length);
-		}
-
-		[Theory(DisplayName = "Unset CursorPosition is kept at zero at initialization")]
-		[InlineData("This is a test!!!")]
-		[InlineData("a")]
-		[InlineData("")]
-		[InlineData(" ")]
-		public async Task UnsetCursorPositionIsKeptAtZeroAtInitialization(string text)
-		{
-			var entry = new Entry
-			{
-				Text = text
-			};
-
-			await ValidatePropertyInitValue<int, EntryHandler>(
-				entry,
-				() => entry.CursorPosition,
-				GetPlatformCursorPosition,
-				0);
-		}
-
-		[Theory(DisplayName = "CursorPosition moves to the end on text change by code after initialization"
-#if WINDOWS
-			, Skip = "For some reason, the PlatformView events are not being fired on tests after the handler is created, something is swallowing them. " +
-					 "This was tested on a real app and it's working correctly."
-#endif
-			)]
-		[InlineData("This is a test!!!")]
-		[InlineData("a")]
-		[InlineData("")]
-		[InlineData(" ")]
-		public async Task CursorPositionMovesToTheEndOnTextChangeAfterInitialization(string text)
-		{
-			var entry = new Entry
-			{
-				Text = "Test"
-			};
-
-			await SetValueAsync<string, EntryHandler>(entry, text, (h, s) => h.VirtualView.Text = s);
-
-			Assert.Equal(text.Length, entry.CursorPosition);
-		}
-
-		[Theory(DisplayName = "SelectionLength Initializes Correctly")]
-		[InlineData(2)]
-		public async Task SelectionLengthInitializesCorrectly(int initialLength)
-		{
-			var entry = new Entry
-			{
-				Text = "This is TEXT!",
-				SelectionLength = initialLength
-			};
-
-			await ValidatePropertyInitValue<int, EntryHandler>(
-				entry,
-				() => entry.SelectionLength,
-				GetPlatformSelectionLength,
-				initialLength);
-		}
-
-		[Theory(DisplayName = "SelectionLength Updates Correctly")]
-		[InlineData(2, 5)]
-		public async Task SelectionLengthUpdatesCorrectly(int setValue, int unsetValue)
+		[Category(TestCategory.Entry)]
+		[Category(TestCategory.TextInput)]
+		[Collection(RunInNewWindowCollection)]
+		public class EntryTextInputTests : TextInputTests<EntryHandler, Entry>
 		{
-			string text = "This is TEXT!";
+			protected override int GetPlatformSelectionLength(EntryHandler handler) =>
+				EntryTests.GetPlatformSelectionLength(handler);
 
-			var entry = new Entry
-			{
-				Text = text,
-			};
+			protected override int GetPlatformCursorPosition(EntryHandler handler) =>
+				EntryTests.GetPlatformCursorPosition(handler);
 
-			await ValidatePropertyUpdatesValue<int, EntryHandler>(
-				entry,
-				nameof(IEntry.SelectionLength),
-				GetPlatformSelectionLength,
-				setValue,
-				unsetValue
-			);
+			protected override Task<string> GetPlatformText(EntryHandler handler) =>
+				EntryTests.GetPlatformText(handler);
 		}
 
-		[Theory(DisplayName = "SelectionLength is Capped to Text Length")]
-		[InlineData(30)]
-		public async Task SelectionLengthIsCapped(int selectionLength)
+		[Category(TestCategory.Entry)]
+		[Category(TestCategory.TextInput)]
+		[Collection(RunInNewWindowCollection)]
+		public class EntryTextInputFocusTests : TextInputFocusTests<EntryHandler, Entry>
 		{
-			string text = "This is TEXT!";
-
-			var entry = new Entry
-			{
-				Text = text,
-				SelectionLength = selectionLength
-			};
-
-			await ValidatePropertyInitValue<int, EntryHandler>(
-				entry,
-				() => entry.SelectionLength,
-				GetPlatformSelectionLength,
-				text.Length);
-		}
-
-		[Theory(DisplayName = "Unset SelectionLength is kept at zero at initialization")]
-		[InlineData("This is a test!!!")]
-		[InlineData("a")]
-		[InlineData("")]
-		[InlineData(" ")]
-		public async Task UnsetSelectionLengthIsKeptAtZeroAtInitialization(string text)
-		{
-			var entry = new Entry
-			{
-				Text = text
-			};
-
-			await ValidatePropertyInitValue<int, EntryHandler>(
-				entry,
-				() => entry.SelectionLength,
-				GetPlatformSelectionLength,
-				0);
-		}
-
-		[Theory(DisplayName = "SelectionLength is kept at zero on text change by code after initialization"
-#if WINDOWS
-			, Skip = "For some reason, the PlatformView events are not being fired on tests after the handler is created, something is swallowing them. " +
-					 "This was tested on a real app and it's working correctly."
-#endif
-			)]
-		[InlineData("This is a test!!!")]
-		[InlineData("a")]
-		[InlineData("")]
-		[InlineData(" ")]
-		public async Task SelectionLengthMovesToTheEndOnTextChangeAfterInitialization(string text)
-		{
-			var entry = new Entry
-			{
-				Text = "Test"
-			};
-
-			await SetValueAsync<string, EntryHandler>(entry, text, (h, s) => h.VirtualView.Text = s);
-
-			Assert.Equal(0, entry.SelectionLength);
 		}
 	}
 }
diff --git a/src/Controls/tests/DeviceTests/Elements/Entry/EntryTests.iOS.cs b/src/Controls/tests/DeviceTests/Elements/Entry/EntryTests.iOS.cs
index c2d15602591c..5888410ca35e 100644
--- a/src/Controls/tests/DeviceTests/Elements/Entry/EntryTests.iOS.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Entry/EntryTests.iOS.cs
@@ -13,18 +13,18 @@ namespace Microsoft.Maui.DeviceTests
 {
 	public partial class EntryTests
 	{
-		UITextField GetPlatformControl(EntryHandler handler) =>
+		static UITextField GetPlatformControl(EntryHandler handler) =>
 			(UITextField)handler.PlatformView;
 
-		Task<string> GetPlatformText(EntryHandler handler)
+		static Task<string> GetPlatformText(EntryHandler handler)
 		{
 			return InvokeOnMainThreadAsync(() => GetPlatformControl(handler).Text);
 		}
 
-		void SetPlatformText(EntryHandler entryHandler, string text) =>
+		static void SetPlatformText(EntryHandler entryHandler, string text) =>
 			GetPlatformControl(entryHandler).Text = text;
 
-		int GetPlatformCursorPosition(EntryHandler entryHandler)
+		static int GetPlatformCursorPosition(EntryHandler entryHandler)
 		{
 			var textField = GetPlatformControl(entryHandler);
 
@@ -34,7 +34,7 @@ int GetPlatformCursorPosition(EntryHandler entryHandler)
 			return -1;
 		}
 
-		int GetPlatformSelectionLength(EntryHandler entryHandler)
+		static int GetPlatformSelectionLength(EntryHandler entryHandler)
 		{
 			var textField = GetPlatformControl(entryHandler);
 
diff --git a/src/Controls/tests/DeviceTests/Elements/SearchBar/SearchBarTests.Android.cs b/src/Controls/tests/DeviceTests/Elements/SearchBar/SearchBarTests.Android.cs
index 2c65ba89a1cf..b60d23b13962 100644
--- a/src/Controls/tests/DeviceTests/Elements/SearchBar/SearchBarTests.Android.cs
+++ b/src/Controls/tests/DeviceTests/Elements/SearchBar/SearchBarTests.Android.cs
@@ -1,21 +1,34 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Linq;
 using System.Threading.Tasks;
+using Android.Widget;
 using Microsoft.Maui.Handlers;
+using Microsoft.Maui.Platform;
 using SearchView = AndroidX.AppCompat.Widget.SearchView;
 
 namespace Microsoft.Maui.DeviceTests
 {
 	public partial class SearchBarTests
 	{
-		SearchView GetPlatformControl(SearchBarHandler handler) =>
+		static SearchView GetPlatformControl(SearchBarHandler handler) =>
 			handler.PlatformView;
 
-		Task<string> GetPlatformText(SearchBarHandler handler)
+		static Task<string> GetPlatformText(SearchBarHandler handler)
 		{
 			return InvokeOnMainThreadAsync(() => GetPlatformControl(handler).Query);
 		}
+
+		static int GetPlatformSelectionLength(SearchBarHandler searchBarHandler)
+		{
+			var control = GetPlatformControl(searchBarHandler);
+			var editText = control.GetChildrenOfType<EditText>().FirstOrDefault();
+			return editText.SelectionEnd - editText.SelectionStart;
+		}
+
+		static int GetPlatformCursorPosition(SearchBarHandler searchBarHandler)
+		{
+			var control = GetPlatformControl(searchBarHandler);
+			var editText = control.GetChildrenOfType<EditText>().FirstOrDefault();
+			return editText.SelectionStart;
+		}
 	}
 }
diff --git a/src/Controls/tests/DeviceTests/Elements/SearchBar/SearchBarTests.Windows.cs b/src/Controls/tests/DeviceTests/Elements/SearchBar/SearchBarTests.Windows.cs
index 69347773eb37..1dc922d50c61 100644
--- a/src/Controls/tests/DeviceTests/Elements/SearchBar/SearchBarTests.Windows.cs
+++ b/src/Controls/tests/DeviceTests/Elements/SearchBar/SearchBarTests.Windows.cs
@@ -1,18 +1,47 @@
 #nullable enable
 using System.Threading.Tasks;
 using Microsoft.Maui.Handlers;
+using Microsoft.Maui.Platform;
 using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.Maui.DeviceTests
 {
 	public partial class SearchBarTests
 	{
-		AutoSuggestBox GetPlatformControl(SearchBarHandler handler) =>
+		static AutoSuggestBox GetPlatformControl(SearchBarHandler handler) =>
 			handler.PlatformView;
 
-		Task<string> GetPlatformText(SearchBarHandler handler)
+		static Task<string> GetPlatformText(SearchBarHandler handler)
 		{
 			return InvokeOnMainThreadAsync(() => GetPlatformControl(handler).Text);
 		}
+
+		static int GetPlatformSelectionLength(SearchBarHandler searchBarHandler)
+		{
+			var platformSearchBar = GetPlatformControl(searchBarHandler);
+
+			var textBox = platformSearchBar.GetFirstDescendant<TextBox>();
+
+			if (textBox is not null)
+			{
+				return textBox.SelectionLength;
+			}
+
+			return -1;
+		}
+
+		static int GetPlatformCursorPosition(SearchBarHandler searchBarHandler)
+		{
+			var platformSearchBar = GetPlatformControl(searchBarHandler);
+
+			var textBox = platformSearchBar.GetFirstDescendant<TextBox>();
+
+			if (textBox is not null)
+			{
+				return textBox.SelectionStart;
+			}
+
+			return -1;
+		}
 	}
 }
diff --git a/src/Controls/tests/DeviceTests/Elements/SearchBar/SearchBarTests.cs b/src/Controls/tests/DeviceTests/Elements/SearchBar/SearchBarTests.cs
index 697f8732c6ad..7982a2220c8f 100644
--- a/src/Controls/tests/DeviceTests/Elements/SearchBar/SearchBarTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/SearchBar/SearchBarTests.cs
@@ -10,7 +10,9 @@ namespace Microsoft.Maui.DeviceTests
 	[Category(TestCategory.SearchBar)]
 	public partial class SearchBarTests : ControlsHandlerTestBase
 	{
-		[Theory]
+		// TODO: remove these 2 tests and use SearchBarTextInputTests below
+
+		[Theory(DisplayName = "Text is Transformed Correctly at Initialization")]
 		[ClassData(typeof(TextTransformCases))]
 		public async Task InitialTextTransformApplied(string text, TextTransform transform, string expected)
 		{
@@ -19,7 +21,7 @@ public async Task InitialTextTransformApplied(string text, TextTransform transfo
 			Assert.Equal(expected, platformText);
 		}
 
-		[Theory]
+		[Theory(DisplayName = "Text is Transformed Correctly after Initialization")]
 		[ClassData(typeof(TextTransformCases))]
 		public async Task TextTransformUpdated(string text, TextTransform transform, string expected)
 		{
@@ -54,5 +56,30 @@ await InvokeOnMainThreadAsync(() =>
 			});
 		}
 #endif
+
+#if false
+		// TODO: The search bar controls are composite controls and need to be attached to the UI to run
+		[Category(TestCategory.SearchBar)]
+		[Category(TestCategory.TextInput)]
+		[Collection(RunInNewWindowCollection)]
+		public class SearchBarTextInputTests : TextInputTests<SearchBarHandler, SearchBar>
+		{
+			protected override int GetPlatformSelectionLength(SearchBarHandler handler) =>
+				SearchBarTests.GetPlatformSelectionLength(handler);
+
+			protected override int GetPlatformCursorPosition(SearchBarHandler handler) =>
+				SearchBarTests.GetPlatformCursorPosition(handler);
+
+			protected override Task<string> GetPlatformText(SearchBarHandler handler) =>
+				SearchBarTests.GetPlatformText(handler);
+		}
+#endif
+
+		[Category(TestCategory.SearchBar)]
+		[Category(TestCategory.TextInput)]
+		[Collection(RunInNewWindowCollection)]
+		public class SearchBarTextInputFocusTests : TextInputFocusTests<SearchBarHandler, SearchBar>
+		{
+		}
 	}
 }
diff --git a/src/Controls/tests/DeviceTests/Elements/SearchBar/SearchBarTests.iOS.cs b/src/Controls/tests/DeviceTests/Elements/SearchBar/SearchBarTests.iOS.cs
index 1635bb2c8334..d8ff640be26d 100644
--- a/src/Controls/tests/DeviceTests/Elements/SearchBar/SearchBarTests.iOS.cs
+++ b/src/Controls/tests/DeviceTests/Elements/SearchBar/SearchBarTests.iOS.cs
@@ -6,12 +6,24 @@ namespace Microsoft.Maui.DeviceTests
 {
 	public partial class SearchBarTests
 	{
-		MauiSearchBar GetPlatformControl(SearchBarHandler handler) =>
+		static MauiSearchBar GetPlatformControl(SearchBarHandler handler) =>
 			handler.PlatformView;
 
-		Task<string> GetPlatformText(SearchBarHandler handler)
+		static Task<string> GetPlatformText(SearchBarHandler handler)
 		{
 			return InvokeOnMainThreadAsync(() => GetPlatformControl(handler).Text);
 		}
+
+		static int GetPlatformSelectionLength(SearchBarHandler searchBarHandler)
+		{
+			var control = searchBarHandler.QueryEditor;
+			return control.GetSelectedTextLength();
+		}
+
+		static int GetPlatformCursorPosition(SearchBarHandler searchBarHandler)
+		{
+			var control = searchBarHandler.QueryEditor;
+			return control.GetCursorPosition();
+		}
 	}
 }
diff --git a/src/Controls/tests/DeviceTests/Elements/TextInput/TextInputTests.Android.cs b/src/Controls/tests/DeviceTests/Elements/TextInput/TextInputFocusTests.Android.cs
similarity index 52%
rename from src/Controls/tests/DeviceTests/Elements/TextInput/TextInputTests.Android.cs
rename to src/Controls/tests/DeviceTests/Elements/TextInput/TextInputFocusTests.Android.cs
index ba8b71ef935f..cb526e7f6e1a 100644
--- a/src/Controls/tests/DeviceTests/Elements/TextInput/TextInputTests.Android.cs
+++ b/src/Controls/tests/DeviceTests/Elements/TextInput/TextInputFocusTests.Android.cs
@@ -6,39 +6,37 @@
 
 namespace Microsoft.Maui.DeviceTests
 {
-	[Category(TestCategory.TextInput)]
 	[Collection(RunInNewWindowCollection)]
-	public partial class TextInputTests
+	public abstract partial class TextInputFocusTests<THandler, TView> : ControlsHandlerTestBase
+		where THandler : class, IViewHandler, IPlatformViewHandler, new()
+		where TView : VisualElement, ITextInput, new()
 	{
-		[Theory]
-		[InlineData(typeof(Editor))]
-		[InlineData(typeof(Entry))]
-		[InlineData(typeof(SearchBar))]
-		public async Task ShowsKeyboardOnFocus(Type controlType)
+		[Fact]
+		public async Task ShowsKeyboardOnFocus()
 		{
-			SetupBuilder();
-			var textInput = (View)Activator.CreateInstance(controlType);
+			var textInput = new TView() as VisualElement;
 			textInput.HeightRequest = 100;
 			textInput.WidthRequest = 100;
-			await AttachAndRun(textInput, async (handler) =>
+
+			await AttachAndRun<THandler>(textInput, async (handler) =>
 			{
 				try
 				{
 					var platformView = handler.PlatformView;
-					await AssertionExtensions.HideKeyboardForView(textInput, message: $"Make sure keyboard starts out closed {controlType}");
+					await AssertionExtensions.HideKeyboardForView(textInput, message: $"Make sure keyboard starts out closed");
 					textInput.Focus();
-					await AssertionExtensions.WaitForFocused(platformView, message: $"WaitForFocused failed after first focus on {controlType}");
-					await AssertionExtensions.WaitForKeyboardToShow(platformView, message: $"WaitForKeyboardToShow failed after first focus on {controlType}");
+					await AssertionExtensions.WaitForFocused(platformView, message: $"WaitForFocused failed after first focus");
+					await AssertionExtensions.WaitForKeyboardToShow(platformView, message: $"WaitForKeyboardToShow failed after first focus");
 
 					// Test that keyboard reappears when refocusing on an already focused TextInput control
-					await AssertionExtensions.HideKeyboardForView(textInput, message: $"HideKeyboardForView failed after first keyboard show on {controlType}");
+					await AssertionExtensions.HideKeyboardForView(textInput, message: $"HideKeyboardForView failed after first keyboard show");
 					textInput.Focus();
-					await AssertionExtensions.WaitForFocused(platformView, message: $"WaitForFocused failed after second focus on {controlType}");
-					await AssertionExtensions.WaitForKeyboardToShow(platformView, message: $"WaitForKeyboardToShow failed after second focus on {controlType}");
+					await AssertionExtensions.WaitForFocused(platformView, message: $"WaitForFocused failed after second focus");
+					await AssertionExtensions.WaitForKeyboardToShow(platformView, message: $"WaitForKeyboardToShow failed after second focus");
 				}
 				finally
 				{
-					await AssertionExtensions.HideKeyboardForView(textInput, message: $"HideKeyboardForView after test has finished {controlType}");
+					await AssertionExtensions.HideKeyboardForView(textInput, message: $"HideKeyboardForView after test has finished");
 				}
 			});
 		}
diff --git a/src/Controls/tests/DeviceTests/Elements/TextInput/TextInputFocusTests.cs b/src/Controls/tests/DeviceTests/Elements/TextInput/TextInputFocusTests.cs
new file mode 100644
index 000000000000..6db30c303ca8
--- /dev/null
+++ b/src/Controls/tests/DeviceTests/Elements/TextInput/TextInputFocusTests.cs
@@ -0,0 +1,12 @@
+using Microsoft.Maui.Controls;
+using Xunit;
+
+namespace Microsoft.Maui.DeviceTests
+{
+	[Category(TestCategory.TextInput)]
+	public abstract partial class TextInputFocusTests<THandler, TView> : ControlsHandlerTestBase
+		where THandler : class, IViewHandler, IPlatformViewHandler, new()
+		where TView : VisualElement, ITextInput, new()
+	{
+	}
+}
diff --git a/src/Controls/tests/DeviceTests/Elements/TextInput/TextInputTests.cs b/src/Controls/tests/DeviceTests/Elements/TextInput/TextInputTests.cs
index 53833aeec51c..23e1fb262b7a 100644
--- a/src/Controls/tests/DeviceTests/Elements/TextInput/TextInputTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/TextInput/TextInputTests.cs
@@ -1,24 +1,338 @@
-using Microsoft.Maui.Controls;
-using Microsoft.Maui.Handlers;
-using Microsoft.Maui.Hosting;
+using System.Threading.Tasks;
+using Microsoft.Maui.Controls;
+using Xunit;
 
 namespace Microsoft.Maui.DeviceTests
 {
-
 	[Category(TestCategory.TextInput)]
-	public partial class TextInputTests : ControlsHandlerTestBase
+	public abstract partial class TextInputTests<THandler, TView> : ControlsHandlerTestBase
+		where THandler : class, IViewHandler, IPlatformViewHandler, new()
+		where TView : InputView, IView, ITextInput, new()
 	{
-		void SetupBuilder()
+		protected abstract int GetPlatformCursorPosition(THandler handler);
+
+		protected abstract int GetPlatformSelectionLength(THandler handler);
+
+		protected abstract Task<string> GetPlatformText(THandler handler);
+
+		[Theory(DisplayName = "Text is Transformed Correctly at Initialization")]
+		[ClassData(typeof(TextTransformCases))]
+		public async Task InitialTextTransformApplied(string text, TextTransform transform, string expected)
+		{
+			var control = new TView() { Text = text, TextTransform = transform };
+			var platformText = await GetPlatformText(await CreateHandlerAsync<THandler>(control));
+			Assert.Equal(expected, platformText);
+		}
+
+		[Theory(DisplayName = "Text is Transformed Correctly after Initialization")]
+		[ClassData(typeof(TextTransformCases))]
+		public async Task TextTransformUpdated(string text, TextTransform transform, string expected)
+		{
+			var control = new TView() { Text = text };
+			var handler = await CreateHandlerAsync<THandler>(control);
+			await InvokeOnMainThreadAsync(() => control.TextTransform = transform);
+			var platformText = await GetPlatformText(handler);
+			Assert.Equal(expected, platformText);
+		}
+
+		[Theory(DisplayName = "Unset CursorPosition is kept at zero at initialization with TextTransform")]
+		[InlineData("This is a test!!!")]
+		[InlineData("a")]
+		[InlineData("")]
+		[InlineData(" ")]
+		public async Task UnsetCursorPositionKeepsToZeroOnInitializationWithTextTransform(string text)
+		{
+			var control = new TView
+			{
+				Text = text,
+				TextTransform = TextTransform.Uppercase
+			};
+
+			await ValidatePropertyInitValue<int, THandler>(
+				control,
+				() => control.CursorPosition,
+				GetPlatformCursorPosition,
+				0);
+		}
+
+		[Theory(DisplayName = "Unset SelectionLength is kept at zero at initialization with TextTransform")]
+		[InlineData("This is a test!!!")]
+		[InlineData("a")]
+		[InlineData("")]
+		[InlineData(" ")]
+		public async Task UnsetSelectionLengthKeepsToZeroOnInitializationWithTextTransform(string text)
+		{
+			var control = new TView
+			{
+				Text = text,
+				TextTransform = TextTransform.Uppercase
+			};
+
+			await ValidatePropertyInitValue<int, THandler>(
+				control,
+				() => control.SelectionLength,
+				GetPlatformSelectionLength,
+				0);
+		}
+
+		[Theory(DisplayName = "CursorPosition Initializes Correctly")]
+		[InlineData(2)]
+		public async Task CursorPositionInitializesCorrectly(int initialPosition)
+		{
+			var control = new TView
+			{
+				Text = "This is TEXT!",
+				CursorPosition = initialPosition
+			};
+
+			await ValidatePropertyInitValue<int, THandler>(
+				control,
+				() => control.CursorPosition,
+				GetPlatformCursorPosition,
+				initialPosition);
+		}
+
+		[Theory]
+		[InlineData(2)]
+		public async Task CursorPositionInitializesCorrectlyWithUpdateCursorPositionLast(int initialPosition)
+		{
+			var control = new TView
+			{
+				Text = "This is TEXT!",
+				CursorPosition = initialPosition
+			};
+
+			var value = await GetValueAsync<int, THandler>(control, handler =>
+			{
+				handler.UpdateValue(nameof(ITextInput.CursorPosition));
+				return GetPlatformCursorPosition(handler);
+			});
+
+			Assert.Equal(initialPosition, value);
+		}
+
+		[Theory]
+		[InlineData(2)]
+		public async Task CursorPositionInitializesCorrectlyWithUpdateTextLast(int initialPosition)
+		{
+			var control = new TView
+			{
+				Text = "This is TEXT!",
+				CursorPosition = initialPosition
+			};
+
+			var value = await GetValueAsync<int, THandler>(control, handler =>
+			{
+				handler.UpdateValue(nameof(ITextInput.Text));
+				return GetPlatformCursorPosition(handler);
+			});
+
+			Assert.Equal(initialPosition, value);
+		}
+
+		[Theory(DisplayName = "SelectionLength Initializes Correctly")]
+		[InlineData(2)]
+		public async Task SelectionLengthInitializesCorrectly(int initialLength)
+		{
+			var control = new TView
+			{
+				Text = "This is TEXT!",
+				SelectionLength = initialLength
+			};
+
+			await ValidatePropertyInitValue<int, THandler>(
+				control,
+				() => control.SelectionLength,
+				GetPlatformSelectionLength,
+				initialLength);
+		}
+
+		[Theory]
+		[InlineData(2)]
+		public async Task SelectionLengthInitializesCorrectlyWithUpdateCursorPositionLast(int initialLength)
 		{
-			EnsureHandlerCreated(builder =>
+			var control = new TView
 			{
-				builder.ConfigureMauiHandlers(handlers =>
-				{
-					handlers.AddHandler<Entry, EntryHandler>();
-					handlers.AddHandler<Editor, EditorHandler>();
-					handlers.AddHandler<SearchBar, SearchBarHandler>();
-				});
+				Text = "This is TEXT!",
+				SelectionLength = initialLength
+			};
+
+			var value = await GetValueAsync<int, THandler>(control, handler =>
+			{
+				handler.UpdateValue(nameof(ITextInput.CursorPosition));
+				return GetPlatformSelectionLength(handler);
 			});
+
+			Assert.Equal(initialLength, value);
+		}
+
+		[Theory]
+		[InlineData(2)]
+		public async Task SelectionLengthInitializesCorrectlyWithUpdateTextLast(int initialLength)
+		{
+			var control = new TView
+			{
+				Text = "This is TEXT!",
+				SelectionLength = initialLength
+			};
+
+			var value = await GetValueAsync<int, THandler>(control, handler =>
+			{
+				handler.UpdateValue(nameof(ITextInput.Text));
+				return GetPlatformSelectionLength(handler);
+			});
+
+			Assert.Equal(initialLength, value);
+		}
+
+		[Theory(DisplayName = "CursorPosition Updates Correctly")]
+		[InlineData(2, 5)]
+		public async Task CursorPositionUpdatesCorrectly(int setValue, int unsetValue)
+		{
+			string text = "This is TEXT!";
+
+			var control = new TView
+			{
+				Text = text
+			};
+
+			await ValidatePropertyUpdatesValue<int, THandler>(
+				control,
+				nameof(ITextInput.CursorPosition),
+				GetPlatformCursorPosition,
+				setValue,
+				unsetValue
+			);
+		}
+
+		[Theory(DisplayName = "CursorPosition is Capped to Text's Length")]
+		[InlineData(30)]
+		public async Task CursorPositionIsCapped(int initialPosition)
+		{
+			string text = "This is TEXT!";
+
+			var control = new TView
+			{
+				Text = text,
+				CursorPosition = initialPosition
+			};
+
+			await ValidatePropertyInitValue<int, THandler>(
+				control,
+				() => control.CursorPosition,
+				GetPlatformCursorPosition,
+				text.Length);
+		}
+
+		[Theory(DisplayName = "Unset CursorPosition is kept at zero at initialization")]
+		[InlineData("This is a test!!!")]
+		[InlineData("a")]
+		[InlineData("")]
+		[InlineData(" ")]
+		public async Task UnsetCursorPositionKeepsToZeroOnInitialization(string text)
+		{
+			var control = new TView
+			{
+				Text = text
+			};
+
+			await ValidatePropertyInitValue<int, THandler>(
+				control,
+				() => control.CursorPosition,
+				GetPlatformCursorPosition,
+				0);
+		}
+
+		[Theory(DisplayName = "CursorPosition moves to the end on text change after initialization")]
+		[InlineData("This is a test!!!")]
+		[InlineData("a")]
+		[InlineData("")]
+		[InlineData(" ")]
+		public async Task CursorPositionMovesToTheEndOnTextChangeAfterInitialization(string text)
+		{
+			var control = new TView
+			{
+				Text = "Test"
+			};
+
+			await AttachAndRunFocusAffectedControl<TView, THandler>(control, handler => control.Text = text);
+
+			Assert.Equal(text.Length, control.CursorPosition);
+		}
+
+		[Theory(DisplayName = "SelectionLength Updates Correctly")]
+		[InlineData(2, 5)]
+		public async Task SelectionLengthUpdatesCorrectly(int setValue, int unsetValue)
+		{
+			string text = "This is TEXT!";
+
+			var control = new TView
+			{
+				Text = text,
+			};
+
+			await ValidatePropertyUpdatesValue<int, THandler>(
+				control,
+				nameof(ITextInput.SelectionLength),
+				GetPlatformSelectionLength,
+				setValue,
+				unsetValue
+			);
+		}
+
+		[Theory(DisplayName = "SelectionLength is Capped to Text Length")]
+		[InlineData(30)]
+		public async Task SelectionLengthIsCapped(int selectionLength)
+		{
+			string text = "This is TEXT!";
+
+			var control = new TView
+			{
+				Text = text,
+				SelectionLength = selectionLength
+			};
+
+			await ValidatePropertyInitValue<int, THandler>(
+				control,
+				() => control.SelectionLength,
+				GetPlatformSelectionLength,
+				text.Length);
+		}
+
+		[Theory(DisplayName = "Unset SelectionLength is kept at zero at initialization")]
+		[InlineData("This is a test!!!")]
+		[InlineData("a")]
+		[InlineData("")]
+		[InlineData(" ")]
+		public async Task UnsetSelectionLengthKeepsToZeroOnInitialization(string text)
+		{
+			var control = new TView
+			{
+				Text = text
+			};
+
+			await ValidatePropertyInitValue<int, THandler>(
+				control,
+				() => control.SelectionLength,
+				GetPlatformSelectionLength,
+				0);
+		}
+
+		[Theory(DisplayName = "SelectionLength is kept at zero on text change after initialization")]
+		[InlineData("This is a test!!!")]
+		[InlineData("a")]
+		[InlineData("")]
+		[InlineData(" ")]
+		public async Task SelectionLengthKeepsToZeroOnTextChangeAfterInitialization(string text)
+		{
+			var control = new TView
+			{
+				Text = "Test"
+			};
+
+			await AttachAndRunFocusAffectedControl<TView, THandler>(control, handler => control.Text = text);
+
+			Assert.Equal(0, control.SelectionLength);
 		}
 	}
 }
diff --git a/src/Core/tests/DeviceTests.Shared/HandlerTests/HandlerTestBasement.cs b/src/Core/tests/DeviceTests.Shared/HandlerTests/HandlerTestBasement.cs
index 150e1b5431c2..992b7f0babae 100644
--- a/src/Core/tests/DeviceTests.Shared/HandlerTests/HandlerTestBasement.cs
+++ b/src/Core/tests/DeviceTests.Shared/HandlerTests/HandlerTestBasement.cs
@@ -210,6 +210,7 @@ public Task<T> AttachAndRun<T>(IView view, Func<IPlatformViewHandler, Task<T>> a
 				return Task.FromResult(handler);
 			});
 		}
+
 		public Task AttachAndRun<TPlatformHandler>(IView view, Func<TPlatformHandler, Task> action)
 			where TPlatformHandler : IPlatformViewHandler, IElementHandler, new()
 			=>
@@ -223,6 +224,19 @@ public Task AttachAndRun<TPlatformHandler>(IView view, Func<TPlatformHandler, Ta
 				return result;
 			});
 
+		public Task AttachAndRun<TPlatformHandler>(IView view, Action<TPlatformHandler> action)
+			where TPlatformHandler : IPlatformViewHandler, IElementHandler, new()
+			=>
+			view.AttachAndRun<bool, TPlatformHandler>((handler) =>
+			{
+				action(handler);
+				return true;
+			}, MauiContext, async (view) =>
+			{
+				var result = await InvokeOnMainThreadAsync(() => CreateHandler<TPlatformHandler>(view));
+				return result;
+			});
+
 		protected Task AssertColorAtPoint(IView view, Color color, Type handlerType, int x, int y)
 		{
 			return InvokeOnMainThreadAsync(async () =>
diff --git a/src/Core/tests/DeviceTests.Shared/HandlerTests/TestBase.cs b/src/Core/tests/DeviceTests.Shared/HandlerTests/TestBase.cs
index 772653d57a2b..d5eaf4fe5b59 100644
--- a/src/Core/tests/DeviceTests.Shared/HandlerTests/TestBase.cs
+++ b/src/Core/tests/DeviceTests.Shared/HandlerTests/TestBase.cs
@@ -9,19 +9,19 @@ public partial class TestBase
 	{
 		public const int EmCoefficientPrecision = 4;
 
-		protected Task<T> InvokeOnMainThreadAsync<T>(Func<T> func) =>
+		protected static Task<T> InvokeOnMainThreadAsync<T>(Func<T> func) =>
 			TestDispatcher.Current.DispatchAsync(func);
 
-		protected Task InvokeOnMainThreadAsync(Action action) =>
+		protected static Task InvokeOnMainThreadAsync(Action action) =>
 			TestDispatcher.Current.DispatchAsync(action);
 
-		protected Task InvokeOnMainThreadAsync(Func<Task> action) =>
+		protected static Task InvokeOnMainThreadAsync(Func<Task> action) =>
 			TestDispatcher.Current.DispatchAsync(action);
 
-		public Task<T> InvokeOnMainThreadAsync<T>(Func<Task<T>> func) =>
+		protected static Task<T> InvokeOnMainThreadAsync<T>(Func<Task<T>> func) =>
 			TestDispatcher.Current.DispatchAsync(func);
 
-		protected async Task WaitForGC()
+		protected static async Task WaitForGC()
 		{
 			GC.Collect();
 			GC.WaitForPendingFinalizers();

From 462ca409a0e924719c840901df753d0dc9a42926 Mon Sep 17 00:00:00 2001
From: Juan Diego Herrera <juherrera@microsoft.com>
Date: Thu, 6 Jul 2023 17:41:00 -0400
Subject: [PATCH 072/105] Fix IsSpellCheckEnabled  (#15459)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Change API docs

* Tentative changes

* Add MapIsSpellCheckEnabled mapper

This at the xplat layer. Implementations will come later

* Add iOS IsSpellCheckEnabled mapper

* Add Windows IsSpellCheckEnabled mapper

* Add Android IsSpellCheckEnabled mapper

* Add Windows searchbar mapper

* Add iOS searchbar mapper

* Add Android searchbar mapper

* Add Windows editor mapper

* Add iOS editor mapper

* Add Android editor mapper

* Add API changes to Unshipped.txt

* Remove unecessary usings

* More RS0016

* More RS0016

* Revise Android inputs &  other small errors

* Add IsSpellCheckEnabled to test stubs

* Add Tizen mappers

* Add xml comment

* More tizen build fixes

* More tizen RS0016

* More tizen RS0016

* Start work tests (missing Keyboard-related tests)

* Fix iOS typo

* Windows and Android test checkin

* Fix iOS typo

* Checkin iOS tests

* Finish Tests!

* Clear up documentation

* Fix isLoaded typo

* Undo binary breaks

* Undo more binary breaks

* Address PR comments

Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com>

* Add Mapper documentation

Adding only docs for the standard implementation. A brief search into the handler folder showed that no mapper was documented 🥲

I'm hoping that documenting the standard implementation will be what's displayed in the MSLearn page

* Updated samples

---------

Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com>
Co-authored-by: Javier Suárez <javiersuarezruiz@hotmail.com>
---
 .../Microsoft.Maui.Controls/InputView.xml     |  40 -----
 .../Pages/Controls/EditorPage.xaml            |  28 ++++
 .../Pages/Controls/EntryPage.xaml             |  28 ++++
 .../Pages/Controls/SearchBarPage.xaml         |  30 +++-
 src/Controls/src/Core/Editor/Editor.cs        |  13 +-
 src/Controls/src/Core/Entry/Entry.cs          |  17 +--
 src/Controls/src/Core/InputView.cs            |  16 +-
 .../Extensions/AutoSuggestBoxExtensions.cs    |  10 --
 .../net-android/PublicAPI.Shipped.txt         |   6 -
 .../net-android/PublicAPI.Unshipped.txt       |   3 +
 .../PublicAPI/net-ios/PublicAPI.Shipped.txt   |   8 +-
 .../PublicAPI/net-ios/PublicAPI.Unshipped.txt |   3 +
 .../net-maccatalyst/PublicAPI.Shipped.txt     |   6 -
 .../net-maccatalyst/PublicAPI.Unshipped.txt   |   3 +
 .../PublicAPI/net-tizen/PublicAPI.Shipped.txt |   6 -
 .../net-tizen/PublicAPI.Unshipped.txt         |   3 +
 .../net-windows/PublicAPI.Shipped.txt         |   6 -
 .../net-windows/PublicAPI.Unshipped.txt       |   3 +
 .../Core/PublicAPI/net/PublicAPI.Shipped.txt  |   6 -
 .../PublicAPI/net/PublicAPI.Unshipped.txt     |   3 +
 .../netstandard/PublicAPI.Shipped.txt         |   6 -
 .../netstandard/PublicAPI.Unshipped.txt       |   3 +
 .../src/Core/SearchBar/SearchBar.Mapper.cs    |   4 +-
 .../src/Core/SearchBar/SearchBar.Windows.cs   |  15 +-
 src/Controls/src/Core/SearchBar/SearchBar.cs  |  12 +-
 src/Core/src/Core/ITextInput.cs               |   5 +
 .../Handlers/Editor/EditorHandler.Android.cs  |   3 +
 .../Handlers/Editor/EditorHandler.Standard.cs |  13 ++
 .../Handlers/Editor/EditorHandler.Tizen.cs    |   3 +
 .../Handlers/Editor/EditorHandler.Windows.cs  |   3 +
 src/Core/src/Handlers/Editor/EditorHandler.cs |   1 +
 .../src/Handlers/Editor/EditorHandler.iOS.cs  |   3 +
 .../Handlers/Entry/EntryHandler.Android.cs    |   3 +
 .../Handlers/Entry/EntryHandler.Standard.cs   |  13 ++
 .../src/Handlers/Entry/EntryHandler.Tizen.cs  |   3 +
 .../Handlers/Entry/EntryHandler.Windows.cs    |   3 +
 src/Core/src/Handlers/Entry/EntryHandler.cs   |   1 +
 .../src/Handlers/Entry/EntryHandler.iOS.cs    |   3 +
 .../SearchBar/SearchBarHandler.Android.cs     |   5 +
 .../SearchBar/SearchBarHandler.Standard.cs    |  13 ++
 .../SearchBar/SearchBarHandler.Tizen.cs       |   3 +
 .../SearchBar/SearchBarHandler.Windows.cs     |   6 +
 .../Handlers/SearchBar/SearchBarHandler.cs    |   1 +
 .../SearchBar/SearchBarHandler.iOS.cs         |   5 +
 .../Platform/Android/EditTextExtensions.cs    |  44 ++++--
 .../Platform/Android/KeyboardExtensions.cs    |  46 ++----
 .../Platform/Android/SearchViewExtensions.cs  |  15 +-
 .../Platform/Windows/SearchBarExtensions.cs   |  10 ++
 .../src/Platform/Windows/TextBoxExtensions.cs |   7 +-
 .../src/Platform/iOS/KeyboardExtensions.cs    |  18 +--
 .../src/Platform/iOS/SearchBarExtensions.cs   |  16 ++
 .../src/Platform/iOS/TextFieldExtensions.cs   |  11 ++
 .../src/Platform/iOS/TextViewExtensions.cs    |  11 ++
 .../net-android/PublicAPI.Unshipped.txt       |   7 +
 .../PublicAPI/net-ios/PublicAPI.Unshipped.txt |   7 +
 .../net-maccatalyst/PublicAPI.Unshipped.txt   |   7 +
 .../net-tizen/PublicAPI.Unshipped.txt         |   4 +
 .../net-windows/PublicAPI.Unshipped.txt       |   8 +-
 .../src/PublicAPI/net/PublicAPI.Unshipped.txt |   4 +
 .../netstandard/PublicAPI.Unshipped.txt       |   4 +
 .../netstandard2.0/PublicAPI.Unshipped.txt    |   4 +
 .../Editor/EditorHandlerTests.Android.cs      |   7 +-
 .../Editor/EditorHandlerTests.Windows.cs      |   3 +
 .../Handlers/Editor/EditorHandlerTests.cs     | 111 +++++++++++++-
 .../Handlers/Editor/EditorHandlerTests.iOS.cs |   5 +-
 .../Entry/EntryHandlerTests.Android.cs        |   7 +-
 .../Entry/EntryHandlerTests.Windows.cs        |   3 +
 .../Handlers/Entry/EntryHandlerTests.cs       | 140 +++++++++++++++---
 .../Handlers/Entry/EntryHandlerTests.iOS.cs   |   5 +-
 .../SearchBarHandlerTests.Android.cs          |  30 +++-
 .../SearchBarHandlerTests.Windows.cs          |  33 ++---
 .../SearchBar/SearchBarHandlerTests.cs        | 134 ++++++++++++++++-
 .../SearchBar/SearchBarHandlerTests.iOS.cs    |  23 ++-
 .../tests/DeviceTests/Stubs/EditorStub.cs     |   2 +
 src/Core/tests/DeviceTests/Stubs/EntryStub.cs |   2 +
 .../tests/DeviceTests/Stubs/SearchBarStub.cs  |   2 +
 76 files changed, 843 insertions(+), 255 deletions(-)

diff --git a/src/Controls/docs/Microsoft.Maui.Controls/InputView.xml b/src/Controls/docs/Microsoft.Maui.Controls/InputView.xml
index b31b24db6aba..393586bfebfd 100644
--- a/src/Controls/docs/Microsoft.Maui.Controls/InputView.xml
+++ b/src/Controls/docs/Microsoft.Maui.Controls/InputView.xml
@@ -97,46 +97,6 @@
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
-    <Member MemberName="IsSpellCheckEnabled">
-      <MemberSignature Language="C#" Value="public bool IsSpellCheckEnabled { get; set; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance bool IsSpellCheckEnabled" />
-      <MemberSignature Language="DocId" Value="P:Microsoft.Maui.Controls.InputView.IsSpellCheckEnabled" />
-      <MemberSignature Language="F#" Value="member this.IsSpellCheckEnabled : bool with get, set" Usage="Microsoft.Maui.Controls.InputView.IsSpellCheckEnabled" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyName>Microsoft.Maui.Controls.Core</AssemblyName>
-        <AssemblyVersion>0.0.0.0</AssemblyVersion>
-        <AssemblyVersion>2.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>Gets or sets a value that controls whether spell checking is enabled.</summary>
-        <value>
-          <see langword="true" /> if spell checking is enabled. Otherwise <see langword="false" />.</value>
-        <remarks>To be added.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="IsSpellCheckEnabledProperty">
-      <MemberSignature Language="C#" Value="public static readonly Microsoft.Maui.Controls.BindableProperty IsSpellCheckEnabledProperty;" />
-      <MemberSignature Language="ILAsm" Value=".field public static initonly class Microsoft.Maui.Controls.BindableProperty IsSpellCheckEnabledProperty" />
-      <MemberSignature Language="DocId" Value="F:Microsoft.Maui.Controls.InputView.IsSpellCheckEnabledProperty" />
-      <MemberSignature Language="F#" Value=" staticval mutable IsSpellCheckEnabledProperty : Microsoft.Maui.Controls.BindableProperty" Usage="Microsoft.Maui.Controls.InputView.IsSpellCheckEnabledProperty" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyName>Microsoft.Maui.Controls.Core</AssemblyName>
-        <AssemblyVersion>0.0.0.0</AssemblyVersion>
-        <AssemblyVersion>2.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>Microsoft.Maui.Controls.BindableProperty</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>Backing store for the <see cref="P:Microsoft.Maui.Controls.InputView.IsSpellCheckEnabled" /> property.</summary>
-        <remarks>To be added.</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="Keyboard">
       <MemberSignature Language="C#" Value="public Microsoft.Maui.Keyboard Keyboard { get; set; }" />
       <MemberSignature Language="ILAsm" Value=".property instance class Microsoft.Maui.Keyboard Keyboard" />
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/EditorPage.xaml b/src/Controls/samples/Controls.Sample/Pages/Controls/EditorPage.xaml
index fb276e602201..1a9a97560863 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/EditorPage.xaml
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/EditorPage.xaml
@@ -54,6 +54,34 @@
                 <Editor 
                     IsReadOnly="True" 
                     Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam eget tempus lorem. Sed vitae elit nisi. Donec quis quam sed mi lobortis suscipit vel quis augue. Phasellus risus enim, venenatis id blandit non, vehicula nec dui. Quisque luctus nisi vel ex imperdiet, eget molestie nisl cursus. Cras posuere vulputate lectus, ut sodales augue consequat vel." />
+                <Label
+                    Text="SpellCheck (True), TextPrediction (True)" 
+                    Style="{StaticResource Headline}" />
+                <Editor 
+                    Text="Whats new" 
+                    IsSpellCheckEnabled="True"
+                    IsTextPredictionEnabled="True"/>
+                <Label
+                    Text="SpellCheck (False), TextPrediction (True)" 
+                    Style="{StaticResource Headline}" />
+                <Editor 
+                    Text="Whats new" 
+                    IsSpellCheckEnabled="False"
+                    IsTextPredictionEnabled="True"/>
+                <Label
+                    Text="SpellCheck (True), TextPrediction (False)" 
+                    Style="{StaticResource Headline}" />
+                <Editor 
+                    Text="Whats new" 
+                    IsSpellCheckEnabled="True"
+                    IsTextPredictionEnabled="False"/>
+                <Label
+                    Text="SpellCheck (False), TextPrediction (False)" 
+                    Style="{StaticResource Headline}" />
+                <Editor 
+                    Text="Whats new" 
+                    IsSpellCheckEnabled="False"
+                    IsTextPredictionEnabled="False"/>
                 <Label
                     Text="Focus"
                     Style="{StaticResource Headline}" />
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/EntryPage.xaml b/src/Controls/samples/Controls.Sample/Pages/Controls/EntryPage.xaml
index 75b4b570c70d..18250ca75912 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/EntryPage.xaml
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/EntryPage.xaml
@@ -114,6 +114,34 @@
                 <Entry 
                     Text="I am read only" 
                     IsReadOnly="True"/>
+                <Label
+                    Text="SpellCheck (True), TextPrediction (True)" 
+                    Style="{StaticResource Headline}" />
+                <Entry 
+                    Text="Whats new" 
+                    IsSpellCheckEnabled="True"
+                    IsTextPredictionEnabled="True"/>
+                <Label
+                    Text="SpellCheck (False), TextPrediction (True)" 
+                    Style="{StaticResource Headline}" />
+                <Entry 
+                    Text="Whats new" 
+                    IsSpellCheckEnabled="False"
+                    IsTextPredictionEnabled="True"/>
+                <Label
+                    Text="SpellCheck (True), TextPrediction (False)" 
+                    Style="{StaticResource Headline}" />
+                <Entry 
+                    Text="Whats new" 
+                    IsSpellCheckEnabled="True"
+                    IsTextPredictionEnabled="False"/>
+                <Label
+                    Text="SpellCheck (False), TextPrediction (False)" 
+                    Style="{StaticResource Headline}" />
+                <Entry 
+                    Text="Whats new" 
+                    IsSpellCheckEnabled="False"
+                    IsTextPredictionEnabled="False"/>
                 <Label
                     Text="Return Command"
                     Style="{StaticResource Headline}" />
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/SearchBarPage.xaml b/src/Controls/samples/Controls.Sample/Pages/Controls/SearchBarPage.xaml
index 3696b039d6f8..c102df8cac0c 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/SearchBarPage.xaml
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/SearchBarPage.xaml
@@ -64,14 +64,32 @@
                     Text="at the bottom"
                     HeightRequest="100"/>
                 <Label
-                    Text="IsTextPredictionEnabled=True"
-                    Style="{StaticResource Headline}"/>
-                <SearchBar
+                    Text="SpellCheck (True), TextPrediction (True)" 
+                    Style="{StaticResource Headline}" />
+                <SearchBar 
+                    Text="Whats new" 
+                    IsSpellCheckEnabled="True"
                     IsTextPredictionEnabled="True"/>
                 <Label
-                    Text="IsTextPredictionEnabled=False"
-                    Style="{StaticResource Headline}"/>
-                <SearchBar
+                    Text="SpellCheck (False), TextPrediction (True)" 
+                    Style="{StaticResource Headline}" />
+                <SearchBar 
+                    Text="Whats new" 
+                    IsSpellCheckEnabled="False"
+                    IsTextPredictionEnabled="True"/>
+                <Label
+                    Text="SpellCheck (True), TextPrediction (False)" 
+                    Style="{StaticResource Headline}" />
+                <SearchBar 
+                    Text="Whats new" 
+                    IsSpellCheckEnabled="True"
+                    IsTextPredictionEnabled="False"/>
+                <Label
+                    Text="SpellCheck (False), TextPrediction (False)" 
+                    Style="{StaticResource Headline}" />
+                <SearchBar 
+                    Text="Whats new" 
+                    IsSpellCheckEnabled="False"
                     IsTextPredictionEnabled="False"/>
                 <Label
                     Text="Focus"
diff --git a/src/Controls/src/Core/Editor/Editor.cs b/src/Controls/src/Core/Editor/Editor.cs
index b41ea89bcba3..0d324609e375 100644
--- a/src/Controls/src/Core/Editor/Editor.cs
+++ b/src/Controls/src/Core/Editor/Editor.cs
@@ -36,8 +36,10 @@ public partial class Editor : InputView, IEditorController, IFontElement, ITextA
 		/// <include file="../../docs/Microsoft.Maui.Controls/Editor.xml" path="//Member[@MemberName='PlaceholderColorProperty']/Docs/*" />
 		public new static readonly BindableProperty PlaceholderColorProperty = InputView.PlaceholderColorProperty;
 
-		/// <summary>Bindable property for <see cref="IsTextPredictionEnabled"/>.</summary>
-		public static readonly BindableProperty IsTextPredictionEnabledProperty = BindableProperty.Create(nameof(IsTextPredictionEnabled), typeof(bool), typeof(Editor), true, BindingMode.Default);
+		/// <summary>
+		/// Backing store for the <see cref="InputView.IsTextPredictionEnabled"/> property.
+		/// </summary>
+		public static new readonly BindableProperty IsTextPredictionEnabledProperty = InputView.IsTextPredictionEnabledProperty;
 
 		/// <summary>Bindable property for <see cref="CursorPosition"/>.</summary>
 		public static readonly BindableProperty CursorPositionProperty = BindableProperty.Create(nameof(CursorPosition), typeof(int), typeof(Editor), 0, validateValue: (b, v) => (int)v >= 0);
@@ -71,13 +73,6 @@ public FontAttributes FontAttributes
 			set { SetValue(FontAttributesProperty, value); }
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Editor.xml" path="//Member[@MemberName='IsTextPredictionEnabled']/Docs/*" />
-		public bool IsTextPredictionEnabled
-		{
-			get { return (bool)GetValue(IsTextPredictionEnabledProperty); }
-			set { SetValue(IsTextPredictionEnabledProperty, value); }
-		}
-
 		public int CursorPosition
 		{
 			get { return (int)GetValue(CursorPositionProperty); }
diff --git a/src/Controls/src/Core/Entry/Entry.cs b/src/Controls/src/Core/Entry/Entry.cs
index 180056c93547..ddeacad747ac 100644
--- a/src/Controls/src/Core/Entry/Entry.cs
+++ b/src/Controls/src/Core/Entry/Entry.cs
@@ -75,14 +75,14 @@ public partial class Entry : InputView, IFontElement, ITextAlignmentElement, IEn
 		public static readonly BindableProperty FontAttributesProperty = FontElement.FontAttributesProperty;
 
 		/// <summary>
-		/// Backing store for the <see cref="ReturnType"/> property.
+		/// Backing store for the <see cref="InputView.IsTextPredictionEnabled"/> property.
 		/// </summary>
-		public static readonly BindableProperty FontAutoScalingEnabledProperty = FontElement.FontAutoScalingEnabledProperty;
+		public static new readonly BindableProperty IsTextPredictionEnabledProperty = InputView.IsTextPredictionEnabledProperty;
 
 		/// <summary>
-		/// Backing store for the <see cref="IsTextPredictionEnabled"/> property.
+		/// Backing store for the <see cref="ReturnType"/> property.
 		/// </summary>
-		public static readonly BindableProperty IsTextPredictionEnabledProperty = BindableProperty.Create(nameof(IsTextPredictionEnabled), typeof(bool), typeof(Entry), true, BindingMode.OneTime);
+		public static readonly BindableProperty FontAutoScalingEnabledProperty = FontElement.FontAutoScalingEnabledProperty;
 
 		/// <summary>
 		/// Backing store for the <see cref="CursorPosition"/> property.
@@ -179,15 +179,6 @@ public bool FontAutoScalingEnabled
 			set => SetValue(FontAutoScalingEnabledProperty, value);
 		}
 
-		/// <summary>
-		/// Determines whether text prediction and automatic text correction is enabled. Default value is <see langword="true"/>.
-		/// </summary>
-		public bool IsTextPredictionEnabled
-		{
-			get { return (bool)GetValue(IsTextPredictionEnabledProperty); }
-			set { SetValue(IsTextPredictionEnabledProperty, value); }
-		}
-
 		/// <summary>
 		/// Determines what the return key on the on-screen keyboard should look like. This is a bindable property.
 		/// </summary>
diff --git a/src/Controls/src/Core/InputView.cs b/src/Controls/src/Core/InputView.cs
index ae08ac63e4e9..5528908f4163 100644
--- a/src/Controls/src/Core/InputView.cs
+++ b/src/Controls/src/Core/InputView.cs
@@ -19,6 +19,9 @@ public class InputView : View, IPlaceholderElement, ITextElement
 		/// <summary>Bindable property for <see cref="IsSpellCheckEnabled"/>.</summary>
 		public static readonly BindableProperty IsSpellCheckEnabledProperty = BindableProperty.Create(nameof(IsSpellCheckEnabled), typeof(bool), typeof(InputView), true);
 
+		/// <summary>Bindable property for <see cref="IsTextPredictionEnabled"/>.</summary>
+		public static readonly BindableProperty IsTextPredictionEnabledProperty = BindableProperty.Create(nameof(IsTextPredictionEnabled), typeof(bool), typeof(InputView), true);
+
 		/// <summary>Bindable property for <see cref="MaxLength"/>.</summary>
 		public static readonly BindableProperty MaxLengthProperty = BindableProperty.Create(nameof(MaxLength), typeof(int), typeof(int), int.MaxValue);
 
@@ -66,13 +69,24 @@ public Keyboard Keyboard
 			set => SetValue(KeyboardProperty, value);
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/InputView.xml" path="//Member[@MemberName='IsSpellCheckEnabled']/Docs/*" />
+		/// <summary>Gets or sets a value that controls whether spell checking is enabled.</summary>
+		/// <value><see langword = "true" /> if spell checking is enabled. Otherwise <see langword="false" />.</value>
+		/// <remarks>On Windows, spellchecking also turns on auto correction</remarks>
 		public bool IsSpellCheckEnabled
 		{
 			get => (bool)GetValue(IsSpellCheckEnabledProperty);
 			set => SetValue(IsSpellCheckEnabledProperty, value);
 		}
 
+		/// <summary>Gets or sets a value that controls whether text prediction and automatic text correction are enabled.</summary>
+		/// <value><see langword="true" /> if text prediction (auto correction) is enabled. Otherwise <see langword="false" />.</value>
+		/// <remarks>On Windows, text prediction only affects touch keyboards and only affects keyboard word suggestions.</remarks>
+		public bool IsTextPredictionEnabled
+		{
+			get => (bool)GetValue(IsTextPredictionEnabledProperty);
+			set => SetValue(IsTextPredictionEnabledProperty, value);
+		}
+
 		/// <include file="../../docs/Microsoft.Maui.Controls/InputView.xml" path="//Member[@MemberName='IsReadOnly']/Docs/*" />
 		public bool IsReadOnly
 		{
diff --git a/src/Controls/src/Core/Platform/Windows/Extensions/AutoSuggestBoxExtensions.cs b/src/Controls/src/Core/Platform/Windows/Extensions/AutoSuggestBoxExtensions.cs
index 4267d95e5cd9..a7b9db9d5b6f 100644
--- a/src/Controls/src/Core/Platform/Windows/Extensions/AutoSuggestBoxExtensions.cs
+++ b/src/Controls/src/Core/Platform/Windows/Extensions/AutoSuggestBoxExtensions.cs
@@ -6,16 +6,6 @@ namespace Microsoft.Maui.Controls.Platform
 {
 	internal static class AutoSuggestBoxExtensions
 	{
-		public static void UpdateIsSpellCheckEnabled(this AutoSuggestBox platformControl, SearchBar searchBar)
-		{
-			var queryTextBox = platformControl.GetFirstDescendant<TextBox>();
-
-			if (queryTextBox == null)
-				return;
-
-			queryTextBox.IsSpellCheckEnabled = searchBar.OnThisPlatform().GetIsSpellCheckEnabled();
-		}
-
 		public static void UpdateText(this AutoSuggestBox platformControl, InputView inputView)
 		{
 			platformControl.Text = TextTransformUtilites.GetTransformedText(inputView.Text, inputView.TextTransform);
diff --git a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Shipped.txt b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Shipped.txt
index 882898f18662..199d8650f422 100644
--- a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Shipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Shipped.txt
@@ -4881,8 +4881,6 @@ Microsoft.Maui.Controls.Editor.FontSize.get -> double
 Microsoft.Maui.Controls.Editor.FontSize.set -> void
 Microsoft.Maui.Controls.Editor.HorizontalTextAlignment.get -> Microsoft.Maui.TextAlignment
 Microsoft.Maui.Controls.Editor.HorizontalTextAlignment.set -> void
-Microsoft.Maui.Controls.Editor.IsTextPredictionEnabled.get -> bool
-Microsoft.Maui.Controls.Editor.IsTextPredictionEnabled.set -> void
 Microsoft.Maui.Controls.Editor.OnHorizontalTextAlignmentPropertyChanged(Microsoft.Maui.TextAlignment oldValue, Microsoft.Maui.TextAlignment newValue) -> void
 Microsoft.Maui.Controls.Editor.SelectionLength.get -> int
 Microsoft.Maui.Controls.Editor.SelectionLength.set -> void
@@ -4928,8 +4926,6 @@ Microsoft.Maui.Controls.Entry.HorizontalTextAlignment.get -> Microsoft.Maui.Text
 Microsoft.Maui.Controls.Entry.HorizontalTextAlignment.set -> void
 Microsoft.Maui.Controls.Entry.IsPassword.get -> bool
 Microsoft.Maui.Controls.Entry.IsPassword.set -> void
-Microsoft.Maui.Controls.Entry.IsTextPredictionEnabled.get -> bool
-Microsoft.Maui.Controls.Entry.IsTextPredictionEnabled.set -> void
 Microsoft.Maui.Controls.Entry.ReturnType.get -> Microsoft.Maui.ReturnType
 Microsoft.Maui.Controls.Entry.ReturnType.set -> void
 Microsoft.Maui.Controls.Entry.SelectionLength.get -> int
@@ -6513,8 +6509,6 @@ Microsoft.Maui.Controls.SearchBar.FontSize.get -> double
 Microsoft.Maui.Controls.SearchBar.FontSize.set -> void
 Microsoft.Maui.Controls.SearchBar.HorizontalTextAlignment.get -> Microsoft.Maui.TextAlignment
 Microsoft.Maui.Controls.SearchBar.HorizontalTextAlignment.set -> void
-Microsoft.Maui.Controls.SearchBar.IsTextPredictionEnabled.get -> bool
-Microsoft.Maui.Controls.SearchBar.IsTextPredictionEnabled.set -> void
 Microsoft.Maui.Controls.SearchBar.OnSearchButtonPressed() -> void
 Microsoft.Maui.Controls.SearchBar.SearchBar() -> void
 Microsoft.Maui.Controls.SearchBar.SearchButtonPressed -> System.EventHandler
diff --git a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
index d7b23612e669..0616af2e2268 100644
--- a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -8,6 +8,8 @@ Microsoft.Maui.Controls.IWindowCreator
 Microsoft.Maui.Controls.IWindowCreator.CreateWindow(Microsoft.Maui.Controls.Application! app, Microsoft.Maui.IActivationState? activationState) -> Microsoft.Maui.Controls.Window!
 Microsoft.Maui.Controls.Handlers.Compatibility.FrameRenderer.FrameRenderer(Android.Content.Context! context, Microsoft.Maui.IPropertyMapper! mapper) -> void
 Microsoft.Maui.Controls.Handlers.Compatibility.FrameRenderer.FrameRenderer(Android.Content.Context! context, Microsoft.Maui.IPropertyMapper! mapper, Microsoft.Maui.CommandMapper! commandMapper) -> void
+Microsoft.Maui.Controls.InputView.IsTextPredictionEnabled.get -> bool
+Microsoft.Maui.Controls.InputView.IsTextPredictionEnabled.set -> void
 override Microsoft.Maui.Controls.Handlers.Items.CarouselViewAdapter<TItemsView, TItemsViewSource>.GetItemViewType(int position) -> int
 override Microsoft.Maui.Controls.Handlers.Items.ItemsViewAdapter<TItemsView, TItemsViewSource>.GetItemId(int position) -> long
 Microsoft.Maui.Controls.Handlers.Items.MauiRecyclerView<TItemsView, TAdapter, TItemsViewSource>.~MauiRecyclerView() -> void
@@ -52,6 +54,7 @@ override Microsoft.Maui.Controls.SearchBar.IsEnabledCore.get -> bool
 ~override Microsoft.Maui.Controls.Region.Equals(object obj) -> bool
 ~override Microsoft.Maui.Controls.Shapes.Matrix.Equals(object obj) -> bool
 ~static Microsoft.Maui.Controls.Region.FromRectangles(System.Collections.Generic.IEnumerable<Microsoft.Maui.Graphics.Rect> rectangles) -> Microsoft.Maui.Controls.Region
+~static readonly Microsoft.Maui.Controls.InputView.IsTextPredictionEnabledProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.WebView.UserAgentProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~Microsoft.Maui.Controls.IMessagingCenter.Send<TSender, TArgs>(TSender sender, string message, TArgs args) -> void
 *REMOVED*~Microsoft.Maui.Controls.IMessagingCenter.Send<TSender>(TSender sender, string message) -> void
diff --git a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Shipped.txt b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Shipped.txt
index 55f95f980316..409acff2f82e 100644
--- a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Shipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Shipped.txt
@@ -3575,8 +3575,8 @@
 ~static readonly Microsoft.Maui.Controls.Entry.FontFamilyProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.Entry.FontSizeProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.Entry.HorizontalTextAlignmentProperty -> Microsoft.Maui.Controls.BindableProperty
-~static readonly Microsoft.Maui.Controls.Entry.IsPasswordProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.Entry.IsTextPredictionEnabledProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.Entry.IsPasswordProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.Entry.KeyboardProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.Entry.PlaceholderColorProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.Entry.PlaceholderProperty -> Microsoft.Maui.Controls.BindableProperty
@@ -4903,8 +4903,6 @@ Microsoft.Maui.Controls.Editor.FontSize.get -> double
 Microsoft.Maui.Controls.Editor.FontSize.set -> void
 Microsoft.Maui.Controls.Editor.HorizontalTextAlignment.get -> Microsoft.Maui.TextAlignment
 Microsoft.Maui.Controls.Editor.HorizontalTextAlignment.set -> void
-Microsoft.Maui.Controls.Editor.IsTextPredictionEnabled.get -> bool
-Microsoft.Maui.Controls.Editor.IsTextPredictionEnabled.set -> void
 Microsoft.Maui.Controls.Editor.OnHorizontalTextAlignmentPropertyChanged(Microsoft.Maui.TextAlignment oldValue, Microsoft.Maui.TextAlignment newValue) -> void
 Microsoft.Maui.Controls.Editor.SelectionLength.get -> int
 Microsoft.Maui.Controls.Editor.SelectionLength.set -> void
@@ -4950,8 +4948,6 @@ Microsoft.Maui.Controls.Entry.HorizontalTextAlignment.get -> Microsoft.Maui.Text
 Microsoft.Maui.Controls.Entry.HorizontalTextAlignment.set -> void
 Microsoft.Maui.Controls.Entry.IsPassword.get -> bool
 Microsoft.Maui.Controls.Entry.IsPassword.set -> void
-Microsoft.Maui.Controls.Entry.IsTextPredictionEnabled.get -> bool
-Microsoft.Maui.Controls.Entry.IsTextPredictionEnabled.set -> void
 Microsoft.Maui.Controls.Entry.ReturnType.get -> Microsoft.Maui.ReturnType
 Microsoft.Maui.Controls.Entry.ReturnType.set -> void
 Microsoft.Maui.Controls.Entry.SelectionLength.get -> int
@@ -6525,8 +6521,6 @@ Microsoft.Maui.Controls.SearchBar.FontSize.get -> double
 Microsoft.Maui.Controls.SearchBar.FontSize.set -> void
 Microsoft.Maui.Controls.SearchBar.HorizontalTextAlignment.get -> Microsoft.Maui.TextAlignment
 Microsoft.Maui.Controls.SearchBar.HorizontalTextAlignment.set -> void
-Microsoft.Maui.Controls.SearchBar.IsTextPredictionEnabled.get -> bool
-Microsoft.Maui.Controls.SearchBar.IsTextPredictionEnabled.set -> void
 Microsoft.Maui.Controls.SearchBar.OnSearchButtonPressed() -> void
 Microsoft.Maui.Controls.SearchBar.SearchBar() -> void
 Microsoft.Maui.Controls.SearchBar.SearchButtonPressed -> System.EventHandler
diff --git a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index 153fd69cabc6..cee4b8a1b18c 100644
--- a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -8,6 +8,8 @@ Microsoft.Maui.Controls.IWindowCreator
 Microsoft.Maui.Controls.IWindowCreator.CreateWindow(Microsoft.Maui.Controls.Application! app, Microsoft.Maui.IActivationState? activationState) -> Microsoft.Maui.Controls.Window!
 Microsoft.Maui.Controls.Handlers.Compatibility.PhoneFlyoutPageRenderer.FlyoutOverlapsDetailsInPopoverMode.get -> bool
 Microsoft.Maui.Controls.Handlers.Compatibility.PhoneFlyoutPageRenderer.FlyoutOverlapsDetailsInPopoverMode.set -> void
+Microsoft.Maui.Controls.InputView.IsTextPredictionEnabled.get -> bool
+Microsoft.Maui.Controls.InputView.IsTextPredictionEnabled.set -> void
 Microsoft.Maui.Controls.LayoutOptions.Equals(Microsoft.Maui.Controls.LayoutOptions other) -> bool
 Microsoft.Maui.Controls.Platform.ShapesExtensions
 Microsoft.Maui.Controls.PointerGestureRecognizer.PointerEnteredCommandParameter.get -> object!
@@ -67,6 +69,7 @@ override Microsoft.Maui.Controls.SearchBar.IsEnabledCore.get -> bool
 ~override Microsoft.Maui.Controls.Region.Equals(object obj) -> bool
 ~override Microsoft.Maui.Controls.Shapes.Matrix.Equals(object obj) -> bool
 ~static Microsoft.Maui.Controls.Region.FromRectangles(System.Collections.Generic.IEnumerable<Microsoft.Maui.Graphics.Rect> rectangles) -> Microsoft.Maui.Controls.Region
+~static readonly Microsoft.Maui.Controls.InputView.IsTextPredictionEnabledProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.WebView.UserAgentProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static Microsoft.Maui.Controls.MessagingCenter.Send<TSender, TArgs>(TSender sender, string message, TArgs args) -> void
 *REMOVED*~static Microsoft.Maui.Controls.MessagingCenter.Send<TSender>(TSender sender, string message) -> void
diff --git a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Shipped.txt b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Shipped.txt
index a6b5259090b5..12395532e67f 100644
--- a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Shipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Shipped.txt
@@ -4903,8 +4903,6 @@ Microsoft.Maui.Controls.Editor.FontSize.get -> double
 Microsoft.Maui.Controls.Editor.FontSize.set -> void
 Microsoft.Maui.Controls.Editor.HorizontalTextAlignment.get -> Microsoft.Maui.TextAlignment
 Microsoft.Maui.Controls.Editor.HorizontalTextAlignment.set -> void
-Microsoft.Maui.Controls.Editor.IsTextPredictionEnabled.get -> bool
-Microsoft.Maui.Controls.Editor.IsTextPredictionEnabled.set -> void
 Microsoft.Maui.Controls.Editor.OnHorizontalTextAlignmentPropertyChanged(Microsoft.Maui.TextAlignment oldValue, Microsoft.Maui.TextAlignment newValue) -> void
 Microsoft.Maui.Controls.Editor.SelectionLength.get -> int
 Microsoft.Maui.Controls.Editor.SelectionLength.set -> void
@@ -4950,8 +4948,6 @@ Microsoft.Maui.Controls.Entry.HorizontalTextAlignment.get -> Microsoft.Maui.Text
 Microsoft.Maui.Controls.Entry.HorizontalTextAlignment.set -> void
 Microsoft.Maui.Controls.Entry.IsPassword.get -> bool
 Microsoft.Maui.Controls.Entry.IsPassword.set -> void
-Microsoft.Maui.Controls.Entry.IsTextPredictionEnabled.get -> bool
-Microsoft.Maui.Controls.Entry.IsTextPredictionEnabled.set -> void
 Microsoft.Maui.Controls.Entry.ReturnType.get -> Microsoft.Maui.ReturnType
 Microsoft.Maui.Controls.Entry.ReturnType.set -> void
 Microsoft.Maui.Controls.Entry.SelectionLength.get -> int
@@ -6525,8 +6521,6 @@ Microsoft.Maui.Controls.SearchBar.FontSize.get -> double
 Microsoft.Maui.Controls.SearchBar.FontSize.set -> void
 Microsoft.Maui.Controls.SearchBar.HorizontalTextAlignment.get -> Microsoft.Maui.TextAlignment
 Microsoft.Maui.Controls.SearchBar.HorizontalTextAlignment.set -> void
-Microsoft.Maui.Controls.SearchBar.IsTextPredictionEnabled.get -> bool
-Microsoft.Maui.Controls.SearchBar.IsTextPredictionEnabled.set -> void
 Microsoft.Maui.Controls.SearchBar.OnSearchButtonPressed() -> void
 Microsoft.Maui.Controls.SearchBar.SearchBar() -> void
 Microsoft.Maui.Controls.SearchBar.SearchButtonPressed -> System.EventHandler
diff --git a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index 153fd69cabc6..cee4b8a1b18c 100644
--- a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -8,6 +8,8 @@ Microsoft.Maui.Controls.IWindowCreator
 Microsoft.Maui.Controls.IWindowCreator.CreateWindow(Microsoft.Maui.Controls.Application! app, Microsoft.Maui.IActivationState? activationState) -> Microsoft.Maui.Controls.Window!
 Microsoft.Maui.Controls.Handlers.Compatibility.PhoneFlyoutPageRenderer.FlyoutOverlapsDetailsInPopoverMode.get -> bool
 Microsoft.Maui.Controls.Handlers.Compatibility.PhoneFlyoutPageRenderer.FlyoutOverlapsDetailsInPopoverMode.set -> void
+Microsoft.Maui.Controls.InputView.IsTextPredictionEnabled.get -> bool
+Microsoft.Maui.Controls.InputView.IsTextPredictionEnabled.set -> void
 Microsoft.Maui.Controls.LayoutOptions.Equals(Microsoft.Maui.Controls.LayoutOptions other) -> bool
 Microsoft.Maui.Controls.Platform.ShapesExtensions
 Microsoft.Maui.Controls.PointerGestureRecognizer.PointerEnteredCommandParameter.get -> object!
@@ -67,6 +69,7 @@ override Microsoft.Maui.Controls.SearchBar.IsEnabledCore.get -> bool
 ~override Microsoft.Maui.Controls.Region.Equals(object obj) -> bool
 ~override Microsoft.Maui.Controls.Shapes.Matrix.Equals(object obj) -> bool
 ~static Microsoft.Maui.Controls.Region.FromRectangles(System.Collections.Generic.IEnumerable<Microsoft.Maui.Graphics.Rect> rectangles) -> Microsoft.Maui.Controls.Region
+~static readonly Microsoft.Maui.Controls.InputView.IsTextPredictionEnabledProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.WebView.UserAgentProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static Microsoft.Maui.Controls.MessagingCenter.Send<TSender, TArgs>(TSender sender, string message, TArgs args) -> void
 *REMOVED*~static Microsoft.Maui.Controls.MessagingCenter.Send<TSender>(TSender sender, string message) -> void
diff --git a/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Shipped.txt b/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Shipped.txt
index 2924415bce3b..77fcf7d7c6ec 100644
--- a/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Shipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Shipped.txt
@@ -4444,8 +4444,6 @@ Microsoft.Maui.Controls.Editor.FontSize.get -> double
 Microsoft.Maui.Controls.Editor.FontSize.set -> void
 Microsoft.Maui.Controls.Editor.HorizontalTextAlignment.get -> Microsoft.Maui.TextAlignment
 Microsoft.Maui.Controls.Editor.HorizontalTextAlignment.set -> void
-Microsoft.Maui.Controls.Editor.IsTextPredictionEnabled.get -> bool
-Microsoft.Maui.Controls.Editor.IsTextPredictionEnabled.set -> void
 Microsoft.Maui.Controls.Editor.OnHorizontalTextAlignmentPropertyChanged(Microsoft.Maui.TextAlignment oldValue, Microsoft.Maui.TextAlignment newValue) -> void
 Microsoft.Maui.Controls.Editor.SelectionLength.get -> int
 Microsoft.Maui.Controls.Editor.SelectionLength.set -> void
@@ -4491,8 +4489,6 @@ Microsoft.Maui.Controls.Entry.HorizontalTextAlignment.get -> Microsoft.Maui.Text
 Microsoft.Maui.Controls.Entry.HorizontalTextAlignment.set -> void
 Microsoft.Maui.Controls.Entry.IsPassword.get -> bool
 Microsoft.Maui.Controls.Entry.IsPassword.set -> void
-Microsoft.Maui.Controls.Entry.IsTextPredictionEnabled.get -> bool
-Microsoft.Maui.Controls.Entry.IsTextPredictionEnabled.set -> void
 Microsoft.Maui.Controls.Entry.ReturnType.get -> Microsoft.Maui.ReturnType
 Microsoft.Maui.Controls.Entry.ReturnType.set -> void
 Microsoft.Maui.Controls.Entry.SelectionLength.get -> int
@@ -6075,8 +6071,6 @@ Microsoft.Maui.Controls.SearchBar.FontSize.get -> double
 Microsoft.Maui.Controls.SearchBar.FontSize.set -> void
 Microsoft.Maui.Controls.SearchBar.HorizontalTextAlignment.get -> Microsoft.Maui.TextAlignment
 Microsoft.Maui.Controls.SearchBar.HorizontalTextAlignment.set -> void
-Microsoft.Maui.Controls.SearchBar.IsTextPredictionEnabled.get -> bool
-Microsoft.Maui.Controls.SearchBar.IsTextPredictionEnabled.set -> void
 Microsoft.Maui.Controls.SearchBar.OnSearchButtonPressed() -> void
 Microsoft.Maui.Controls.SearchBar.SearchBar() -> void
 Microsoft.Maui.Controls.SearchBar.SearchButtonPressed -> System.EventHandler
diff --git a/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
index dc90a9e9c2a2..372b793ed721 100644
--- a/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
@@ -34,6 +34,8 @@ Microsoft.Maui.Controls.Platform.FormattedStringExtensions
 override Microsoft.Maui.Controls.View.ChangeVisualState() -> void
 Microsoft.Maui.Controls.Handlers.BoxViewHandler
 Microsoft.Maui.Controls.Handlers.BoxViewHandler.BoxViewHandler() -> void
+Microsoft.Maui.Controls.InputView.IsTextPredictionEnabled.get -> bool
+Microsoft.Maui.Controls.InputView.IsTextPredictionEnabled.set -> void
 *REMOVED*~Microsoft.Maui.Controls.IMessagingCenter.Send<TSender, TArgs>(TSender sender, string message, TArgs args) -> void
 *REMOVED*~Microsoft.Maui.Controls.IMessagingCenter.Send<TSender>(TSender sender, string message) -> void
 *REMOVED*~Microsoft.Maui.Controls.IMessagingCenter.Subscribe<TSender, TArgs>(object subscriber, string message, System.Action<TSender, TArgs> callback, TSender source = null) -> void
@@ -88,3 +90,4 @@ Microsoft.Maui.Controls.Shapes.Shape.~Shape() -> void
 override Microsoft.Maui.Controls.Shapes.Shape.OnBindingContextChanged() -> void
 ~override Microsoft.Maui.Controls.ImageButton.OnPropertyChanged(string propertyName = null) -> void
 ~static Microsoft.Maui.Controls.Region.FromRectangles(System.Collections.Generic.IEnumerable<Microsoft.Maui.Graphics.Rect> rectangles) -> Microsoft.Maui.Controls.Region
+~static readonly Microsoft.Maui.Controls.InputView.IsTextPredictionEnabledProperty -> Microsoft.Maui.Controls.BindableProperty
diff --git a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Shipped.txt b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Shipped.txt
index 99bb3ec26933..e4f0fbc6f265 100644
--- a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Shipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Shipped.txt
@@ -4610,8 +4610,6 @@ Microsoft.Maui.Controls.Editor.FontSize.get -> double
 Microsoft.Maui.Controls.Editor.FontSize.set -> void
 Microsoft.Maui.Controls.Editor.HorizontalTextAlignment.get -> Microsoft.Maui.TextAlignment
 Microsoft.Maui.Controls.Editor.HorizontalTextAlignment.set -> void
-Microsoft.Maui.Controls.Editor.IsTextPredictionEnabled.get -> bool
-Microsoft.Maui.Controls.Editor.IsTextPredictionEnabled.set -> void
 Microsoft.Maui.Controls.Editor.OnHorizontalTextAlignmentPropertyChanged(Microsoft.Maui.TextAlignment oldValue, Microsoft.Maui.TextAlignment newValue) -> void
 Microsoft.Maui.Controls.Editor.SelectionLength.get -> int
 Microsoft.Maui.Controls.Editor.SelectionLength.set -> void
@@ -4657,8 +4655,6 @@ Microsoft.Maui.Controls.Entry.HorizontalTextAlignment.get -> Microsoft.Maui.Text
 Microsoft.Maui.Controls.Entry.HorizontalTextAlignment.set -> void
 Microsoft.Maui.Controls.Entry.IsPassword.get -> bool
 Microsoft.Maui.Controls.Entry.IsPassword.set -> void
-Microsoft.Maui.Controls.Entry.IsTextPredictionEnabled.get -> bool
-Microsoft.Maui.Controls.Entry.IsTextPredictionEnabled.set -> void
 Microsoft.Maui.Controls.Entry.ReturnType.get -> Microsoft.Maui.ReturnType
 Microsoft.Maui.Controls.Entry.ReturnType.set -> void
 Microsoft.Maui.Controls.Entry.SelectionLength.get -> int
@@ -6177,8 +6173,6 @@ Microsoft.Maui.Controls.SearchBar.FontSize.get -> double
 Microsoft.Maui.Controls.SearchBar.FontSize.set -> void
 Microsoft.Maui.Controls.SearchBar.HorizontalTextAlignment.get -> Microsoft.Maui.TextAlignment
 Microsoft.Maui.Controls.SearchBar.HorizontalTextAlignment.set -> void
-Microsoft.Maui.Controls.SearchBar.IsTextPredictionEnabled.get -> bool
-Microsoft.Maui.Controls.SearchBar.IsTextPredictionEnabled.set -> void
 Microsoft.Maui.Controls.SearchBar.OnSearchButtonPressed() -> void
 Microsoft.Maui.Controls.SearchBar.SearchBar() -> void
 Microsoft.Maui.Controls.SearchBar.SearchButtonPressed -> System.EventHandler
diff --git a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index 0901b7b64dfd..e4fb9de02d08 100644
--- a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -4,6 +4,8 @@
 ~Microsoft.Maui.Controls.Accelerator.Key.get -> string
 *REMOVED*override Microsoft.Maui.Controls.RefreshView.MeasureOverride(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
 Microsoft.Maui.Controls.Border.~Border() -> void
+Microsoft.Maui.Controls.InputView.IsTextPredictionEnabled.get -> bool
+Microsoft.Maui.Controls.InputView.IsTextPredictionEnabled.set -> void
 Microsoft.Maui.Controls.IWindowCreator
 Microsoft.Maui.Controls.IWindowCreator.CreateWindow(Microsoft.Maui.Controls.Application! app, Microsoft.Maui.IActivationState? activationState) -> Microsoft.Maui.Controls.Window!
 Microsoft.Maui.Controls.Platform.CollectionViewExtensions
@@ -68,6 +70,7 @@ override Microsoft.Maui.Controls.SearchBar.IsEnabledCore.get -> bool
 ~override Microsoft.Maui.Controls.Region.Equals(object obj) -> bool
 ~override Microsoft.Maui.Controls.Shapes.Matrix.Equals(object obj) -> bool
 ~static Microsoft.Maui.Controls.Region.FromRectangles(System.Collections.Generic.IEnumerable<Microsoft.Maui.Graphics.Rect> rectangles) -> Microsoft.Maui.Controls.Region
+~static readonly Microsoft.Maui.Controls.InputView.IsTextPredictionEnabledProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.WebView.UserAgentProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static Microsoft.Maui.Controls.MessagingCenter.Send<TSender, TArgs>(TSender sender, string message, TArgs args) -> void
 *REMOVED*~static Microsoft.Maui.Controls.MessagingCenter.Send<TSender>(TSender sender, string message) -> void
diff --git a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Shipped.txt b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Shipped.txt
index 7b5250b2d7f1..7b80e9da63ea 100644
--- a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Shipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Shipped.txt
@@ -4412,8 +4412,6 @@ Microsoft.Maui.Controls.Editor.FontSize.get -> double
 Microsoft.Maui.Controls.Editor.FontSize.set -> void
 Microsoft.Maui.Controls.Editor.HorizontalTextAlignment.get -> Microsoft.Maui.TextAlignment
 Microsoft.Maui.Controls.Editor.HorizontalTextAlignment.set -> void
-Microsoft.Maui.Controls.Editor.IsTextPredictionEnabled.get -> bool
-Microsoft.Maui.Controls.Editor.IsTextPredictionEnabled.set -> void
 Microsoft.Maui.Controls.Editor.OnHorizontalTextAlignmentPropertyChanged(Microsoft.Maui.TextAlignment oldValue, Microsoft.Maui.TextAlignment newValue) -> void
 Microsoft.Maui.Controls.Editor.SelectionLength.get -> int
 Microsoft.Maui.Controls.Editor.SelectionLength.set -> void
@@ -4459,8 +4457,6 @@ Microsoft.Maui.Controls.Entry.HorizontalTextAlignment.get -> Microsoft.Maui.Text
 Microsoft.Maui.Controls.Entry.HorizontalTextAlignment.set -> void
 Microsoft.Maui.Controls.Entry.IsPassword.get -> bool
 Microsoft.Maui.Controls.Entry.IsPassword.set -> void
-Microsoft.Maui.Controls.Entry.IsTextPredictionEnabled.get -> bool
-Microsoft.Maui.Controls.Entry.IsTextPredictionEnabled.set -> void
 Microsoft.Maui.Controls.Entry.ReturnType.get -> Microsoft.Maui.ReturnType
 Microsoft.Maui.Controls.Entry.ReturnType.set -> void
 Microsoft.Maui.Controls.Entry.SelectionLength.get -> int
@@ -5821,8 +5817,6 @@ Microsoft.Maui.Controls.SearchBar.FontSize.get -> double
 Microsoft.Maui.Controls.SearchBar.FontSize.set -> void
 Microsoft.Maui.Controls.SearchBar.HorizontalTextAlignment.get -> Microsoft.Maui.TextAlignment
 Microsoft.Maui.Controls.SearchBar.HorizontalTextAlignment.set -> void
-Microsoft.Maui.Controls.SearchBar.IsTextPredictionEnabled.get -> bool
-Microsoft.Maui.Controls.SearchBar.IsTextPredictionEnabled.set -> void
 Microsoft.Maui.Controls.SearchBar.OnSearchButtonPressed() -> void
 Microsoft.Maui.Controls.SearchBar.SearchBar() -> void
 Microsoft.Maui.Controls.SearchBar.SearchButtonPressed -> System.EventHandler
diff --git a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
index 9751761c02f5..d45f74eb2f3f 100644
--- a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -4,6 +4,8 @@
 ~Microsoft.Maui.Controls.Accelerator.Key.get -> string
 *REMOVED*override Microsoft.Maui.Controls.RefreshView.MeasureOverride(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
 Microsoft.Maui.Controls.Border.~Border() -> void
+Microsoft.Maui.Controls.InputView.IsTextPredictionEnabled.get -> bool
+Microsoft.Maui.Controls.InputView.IsTextPredictionEnabled.set -> void
 Microsoft.Maui.Controls.IWindowCreator
 Microsoft.Maui.Controls.IWindowCreator.CreateWindow(Microsoft.Maui.Controls.Application! app, Microsoft.Maui.IActivationState? activationState) -> Microsoft.Maui.Controls.Window!
 Microsoft.Maui.Controls.LayoutOptions.Equals(Microsoft.Maui.Controls.LayoutOptions other) -> bool
@@ -42,6 +44,7 @@ override Microsoft.Maui.Controls.SearchBar.IsEnabledCore.get -> bool
 ~override Microsoft.Maui.Controls.Region.Equals(object obj) -> bool
 ~override Microsoft.Maui.Controls.Shapes.Matrix.Equals(object obj) -> bool
 ~static Microsoft.Maui.Controls.Region.FromRectangles(System.Collections.Generic.IEnumerable<Microsoft.Maui.Graphics.Rect> rectangles) -> Microsoft.Maui.Controls.Region
+~static readonly Microsoft.Maui.Controls.InputView.IsTextPredictionEnabledProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.WebView.UserAgentProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~Microsoft.Maui.Controls.IMessagingCenter.Send<TSender, TArgs>(TSender sender, string message, TArgs args) -> void
 *REMOVED*~Microsoft.Maui.Controls.IMessagingCenter.Send<TSender>(TSender sender, string message) -> void
diff --git a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Shipped.txt b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Shipped.txt
index 7b5250b2d7f1..7b80e9da63ea 100644
--- a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Shipped.txt
+++ b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Shipped.txt
@@ -4412,8 +4412,6 @@ Microsoft.Maui.Controls.Editor.FontSize.get -> double
 Microsoft.Maui.Controls.Editor.FontSize.set -> void
 Microsoft.Maui.Controls.Editor.HorizontalTextAlignment.get -> Microsoft.Maui.TextAlignment
 Microsoft.Maui.Controls.Editor.HorizontalTextAlignment.set -> void
-Microsoft.Maui.Controls.Editor.IsTextPredictionEnabled.get -> bool
-Microsoft.Maui.Controls.Editor.IsTextPredictionEnabled.set -> void
 Microsoft.Maui.Controls.Editor.OnHorizontalTextAlignmentPropertyChanged(Microsoft.Maui.TextAlignment oldValue, Microsoft.Maui.TextAlignment newValue) -> void
 Microsoft.Maui.Controls.Editor.SelectionLength.get -> int
 Microsoft.Maui.Controls.Editor.SelectionLength.set -> void
@@ -4459,8 +4457,6 @@ Microsoft.Maui.Controls.Entry.HorizontalTextAlignment.get -> Microsoft.Maui.Text
 Microsoft.Maui.Controls.Entry.HorizontalTextAlignment.set -> void
 Microsoft.Maui.Controls.Entry.IsPassword.get -> bool
 Microsoft.Maui.Controls.Entry.IsPassword.set -> void
-Microsoft.Maui.Controls.Entry.IsTextPredictionEnabled.get -> bool
-Microsoft.Maui.Controls.Entry.IsTextPredictionEnabled.set -> void
 Microsoft.Maui.Controls.Entry.ReturnType.get -> Microsoft.Maui.ReturnType
 Microsoft.Maui.Controls.Entry.ReturnType.set -> void
 Microsoft.Maui.Controls.Entry.SelectionLength.get -> int
@@ -5821,8 +5817,6 @@ Microsoft.Maui.Controls.SearchBar.FontSize.get -> double
 Microsoft.Maui.Controls.SearchBar.FontSize.set -> void
 Microsoft.Maui.Controls.SearchBar.HorizontalTextAlignment.get -> Microsoft.Maui.TextAlignment
 Microsoft.Maui.Controls.SearchBar.HorizontalTextAlignment.set -> void
-Microsoft.Maui.Controls.SearchBar.IsTextPredictionEnabled.get -> bool
-Microsoft.Maui.Controls.SearchBar.IsTextPredictionEnabled.set -> void
 Microsoft.Maui.Controls.SearchBar.OnSearchButtonPressed() -> void
 Microsoft.Maui.Controls.SearchBar.SearchBar() -> void
 Microsoft.Maui.Controls.SearchBar.SearchButtonPressed -> System.EventHandler
diff --git a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
index d625737f00a3..42db94feb726 100644
--- a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -4,6 +4,8 @@
 ~Microsoft.Maui.Controls.Accelerator.Key.get -> string
 *REMOVED*override Microsoft.Maui.Controls.RefreshView.MeasureOverride(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
 Microsoft.Maui.Controls.Border.~Border() -> void
+Microsoft.Maui.Controls.InputView.IsTextPredictionEnabled.get -> bool
+Microsoft.Maui.Controls.InputView.IsTextPredictionEnabled.set -> void
 Microsoft.Maui.Controls.IWindowCreator
 Microsoft.Maui.Controls.IWindowCreator.CreateWindow(Microsoft.Maui.Controls.Application! app, Microsoft.Maui.IActivationState? activationState) -> Microsoft.Maui.Controls.Window!
 Microsoft.Maui.Controls.LayoutOptions.Equals(Microsoft.Maui.Controls.LayoutOptions other) -> bool
@@ -50,6 +52,7 @@ override Microsoft.Maui.Controls.SearchBar.IsEnabledCore.get -> bool
 ~override Microsoft.Maui.Controls.Region.Equals(object obj) -> bool
 ~override Microsoft.Maui.Controls.Shapes.Matrix.Equals(object obj) -> bool
 ~static Microsoft.Maui.Controls.Region.FromRectangles(System.Collections.Generic.IEnumerable<Microsoft.Maui.Graphics.Rect> rectangles) -> Microsoft.Maui.Controls.Region
+~static readonly Microsoft.Maui.Controls.InputView.IsTextPredictionEnabledProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.WebView.UserAgentProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static Microsoft.Maui.Controls.MessagingCenter.Send<TSender, TArgs>(TSender sender, string message, TArgs args) -> void
 *REMOVED*~static Microsoft.Maui.Controls.MessagingCenter.Send<TSender>(TSender sender, string message) -> void
diff --git a/src/Controls/src/Core/SearchBar/SearchBar.Mapper.cs b/src/Controls/src/Core/SearchBar/SearchBar.Mapper.cs
index d68c8e451a52..b562e8aaeb5f 100644
--- a/src/Controls/src/Core/SearchBar/SearchBar.Mapper.cs
+++ b/src/Controls/src/Core/SearchBar/SearchBar.Mapper.cs
@@ -6,9 +6,7 @@ public partial class SearchBar
 		public static IPropertyMapper<ISearchBar, SearchBarHandler> ControlsSearchBarMapper =
 			new PropertyMapper<SearchBar, SearchBarHandler>(SearchBarHandler.Mapper)
 			{
-#if WINDOWS
-				[PlatformConfiguration.WindowsSpecific.SearchBar.IsSpellCheckEnabledProperty.PropertyName] = MapIsSpellCheckEnabled,
-#elif IOS
+#if IOS
 				[PlatformConfiguration.iOSSpecific.SearchBar.SearchBarStyleProperty.PropertyName] = MapSearchBarStyle,
 #endif
 				[nameof(Text)] = MapText,
diff --git a/src/Controls/src/Core/SearchBar/SearchBar.Windows.cs b/src/Controls/src/Core/SearchBar/SearchBar.Windows.cs
index 99aac9c3133c..b2379ea0aea3 100644
--- a/src/Controls/src/Core/SearchBar/SearchBar.Windows.cs
+++ b/src/Controls/src/Core/SearchBar/SearchBar.Windows.cs
@@ -1,4 +1,7 @@
 #nullable disable
+
+using System;
+
 namespace Microsoft.Maui.Controls
 {
 	public partial class SearchBar
@@ -6,12 +9,16 @@ public partial class SearchBar
 		public static void MapText(SearchBarHandler handler, SearchBar searchBar) =>
 			MapText((ISearchBarHandler)handler, searchBar);
 
-		public static void MapIsSpellCheckEnabled(SearchBarHandler handler, SearchBar searchBar) =>
-			MapIsSpellCheckEnabled((ISearchBarHandler)handler, searchBar);
+		[Obsolete("Use the SearchBarHandler's mapper instead")]
+		public static void MapIsSpellCheckEnabled(SearchBarHandler handler, SearchBar searchBar)
+		{
+			handler.PlatformView?.UpdateIsSpellCheckEnabled(searchBar);
+		}
 
+		[Obsolete("Use the SearchBarHandler's mapper instead.")]
 		public static void MapIsSpellCheckEnabled(ISearchBarHandler handler, SearchBar searchBar)
 		{
-			Platform.AutoSuggestBoxExtensions.UpdateIsSpellCheckEnabled(handler.PlatformView, searchBar);
+			handler.PlatformView?.UpdateIsSpellCheckEnabled(searchBar);
 		}
 
 		public static void MapText(ISearchBarHandler handler, SearchBar searchBar)
@@ -19,4 +26,4 @@ public static void MapText(ISearchBarHandler handler, SearchBar searchBar)
 			Platform.AutoSuggestBoxExtensions.UpdateText(handler.PlatformView, searchBar);
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/src/Controls/src/Core/SearchBar/SearchBar.cs b/src/Controls/src/Core/SearchBar/SearchBar.cs
index b7e0e4239751..69b387800827 100644
--- a/src/Controls/src/Core/SearchBar/SearchBar.cs
+++ b/src/Controls/src/Core/SearchBar/SearchBar.cs
@@ -41,8 +41,10 @@ public partial class SearchBar : InputView, IFontElement, ITextAlignmentElement,
 		/// <summary>Bindable property for <see cref="FontAttributes"/>.</summary>
 		public static readonly BindableProperty FontAttributesProperty = FontElement.FontAttributesProperty;
 
-		/// <summary>Bindable property for <see cref="IsTextPredictionEnabled"/>.</summary>
-		public static readonly BindableProperty IsTextPredictionEnabledProperty = BindableProperty.Create(nameof(IsTextPredictionEnabled), typeof(bool), typeof(SearchBar), true, BindingMode.Default);
+		/// <summary>
+		/// Backing store for the <see cref="InputView.IsTextPredictionEnabled"/> property.
+		/// </summary>
+		public static new readonly BindableProperty IsTextPredictionEnabledProperty = InputView.IsTextPredictionEnabledProperty;
 
 		/// <summary>Bindable property for <see cref="CursorPosition"/>.</summary>
 		public static readonly BindableProperty CursorPositionProperty = BindableProperty.Create(nameof(CursorPosition), typeof(int), typeof(SearchBar), 0, validateValue: (b, v) => (int)v >= 0);
@@ -109,12 +111,6 @@ public FontAttributes FontAttributes
 			set { SetValue(FontAttributesProperty, value); }
 		}
 
-		public bool IsTextPredictionEnabled
-		{
-			get { return (bool)GetValue(IsTextPredictionEnabledProperty); }
-			set { SetValue(IsTextPredictionEnabledProperty, value); }
-		}
-
 		public int CursorPosition
 		{
 			get { return (int)GetValue(CursorPositionProperty); }
diff --git a/src/Core/src/Core/ITextInput.cs b/src/Core/src/Core/ITextInput.cs
index 53c6a76ce1c8..dada5abf4cd4 100644
--- a/src/Core/src/Core/ITextInput.cs
+++ b/src/Core/src/Core/ITextInput.cs
@@ -15,6 +15,11 @@ public interface ITextInput : IText, IPlaceholder
 		/// </summary>
 		bool IsTextPredictionEnabled { get; }
 
+		/// <summary>
+		/// Gets a value that controls whether spellchecking is on or off.
+		/// </summary>
+		bool IsSpellCheckEnabled { get; }
+
 		/// <summary>
 		/// Gets a value indicating whether or not the view is read-only.
 		/// </summary>
diff --git a/src/Core/src/Handlers/Editor/EditorHandler.Android.cs b/src/Core/src/Handlers/Editor/EditorHandler.Android.cs
index 2ab594d295d7..f59393b0a851 100644
--- a/src/Core/src/Handlers/Editor/EditorHandler.Android.cs
+++ b/src/Core/src/Handlers/Editor/EditorHandler.Android.cs
@@ -90,6 +90,9 @@ public static void MapIsReadOnly(IEditorHandler handler, IEditor editor) =>
 		public static void MapIsTextPredictionEnabled(IEditorHandler handler, IEditor editor) =>
 			handler.PlatformView?.UpdateIsTextPredictionEnabled(editor);
 
+		public static void MapIsSpellCheckEnabled(IEditorHandler handler, IEditor editor) =>
+			handler.PlatformView?.UpdateIsSpellCheckEnabled(editor);
+
 		public static void MapFont(IEditorHandler handler, IEditor editor) =>
 			handler.PlatformView?.UpdateFont(editor, handler.GetRequiredService<IFontManager>());
 
diff --git a/src/Core/src/Handlers/Editor/EditorHandler.Standard.cs b/src/Core/src/Handlers/Editor/EditorHandler.Standard.cs
index f575ff803a76..8df9fcc77654 100644
--- a/src/Core/src/Handlers/Editor/EditorHandler.Standard.cs
+++ b/src/Core/src/Handlers/Editor/EditorHandler.Standard.cs
@@ -12,7 +12,20 @@ public static void MapPlaceholder(IViewHandler handler, IEditor editor) { }
 		public static void MapPlaceholderColor(IViewHandler handler, IEditor editor) { }
 		public static void MapCharacterSpacing(IViewHandler handler, IEditor editor) { }
 		public static void MapMaxLength(IViewHandler handler, IEditor editor) { }
+
+		/// <summary>
+		/// Maps the abstract <see cref="ITextInput.IsTextPredictionEnabled"/> property to the platform-specific implementations.
+		/// </summary>
+		/// <param name="handler"> The associated handler.</param>
+		/// <param name="editor"> The associated <see cref="IEditor"/> instance.</param>
 		public static void MapIsTextPredictionEnabled(IEditorHandler handler, IEditor editor) { }
+
+		/// <summary>
+		/// Maps the abstract <see cref="ITextInput.IsSpellCheckEnabled"/> property to the platform-specific implementations.
+		/// </summary>
+		/// <param name="handler"> The associated handler.</param>
+		/// <param name="editor"> The associated <see cref="IEditor"/> instance.</param>
+		public static void MapIsSpellCheckEnabled(IEditorHandler handler, IEditor editor) { }
 		public static void MapFont(IViewHandler handler, IEditor editor) { }
 		public static void MapIsReadOnly(IViewHandler handler, IEditor editor) { }
 		public static void MapTextColor(IEditorHandler handler, IEditor editor) { }
diff --git a/src/Core/src/Handlers/Editor/EditorHandler.Tizen.cs b/src/Core/src/Handlers/Editor/EditorHandler.Tizen.cs
index 057e128c4bd2..9745844826ef 100644
--- a/src/Core/src/Handlers/Editor/EditorHandler.Tizen.cs
+++ b/src/Core/src/Handlers/Editor/EditorHandler.Tizen.cs
@@ -94,6 +94,9 @@ public static void MapIsReadOnly(IEditorHandler handler, IEditor editor) =>
 		public static void MapIsTextPredictionEnabled(IEditorHandler handler, IEditor editor) =>
 			handler.PlatformView?.UpdateIsTextPredictionEnabled(editor);
 
+		[MissingMapper]
+		public static void MapIsSpellCheckEnabled(IEditorHandler handler, IEditor editor) { }
+
 		public static void MapFont(IEditorHandler handler, IEditor editor) =>
 			handler.PlatformView?.UpdateFont(editor, handler.GetRequiredService<IFontManager>());
 
diff --git a/src/Core/src/Handlers/Editor/EditorHandler.Windows.cs b/src/Core/src/Handlers/Editor/EditorHandler.Windows.cs
index 38019a654b84..42cf53cbff68 100644
--- a/src/Core/src/Handlers/Editor/EditorHandler.Windows.cs
+++ b/src/Core/src/Handlers/Editor/EditorHandler.Windows.cs
@@ -63,6 +63,9 @@ public static void MapMaxLength(IEditorHandler handler, IEditor editor) =>
 		public static void MapIsTextPredictionEnabled(IEditorHandler handler, IEditor editor) =>
 			handler.PlatformView?.UpdateIsTextPredictionEnabled(editor);
 
+		public static void MapIsSpellCheckEnabled(IEditorHandler handler, IEditor editor) =>
+			handler.PlatformView?.UpdateIsSpellCheckEnabled(editor);
+
 		public static void MapFont(IEditorHandler handler, IEditor editor) =>
 			handler.PlatformView?.UpdateFont(editor, handler.GetRequiredService<IFontManager>());
 
diff --git a/src/Core/src/Handlers/Editor/EditorHandler.cs b/src/Core/src/Handlers/Editor/EditorHandler.cs
index 45d89b98b034..632bcb5b28e5 100644
--- a/src/Core/src/Handlers/Editor/EditorHandler.cs
+++ b/src/Core/src/Handlers/Editor/EditorHandler.cs
@@ -22,6 +22,7 @@ public partial class EditorHandler : IEditorHandler
 			[nameof(IEditor.Font)] = MapFont,
 			[nameof(IEditor.IsReadOnly)] = MapIsReadOnly,
 			[nameof(IEditor.IsTextPredictionEnabled)] = MapIsTextPredictionEnabled,
+			[nameof(IEditor.IsSpellCheckEnabled)] = MapIsSpellCheckEnabled,
 			[nameof(IEditor.MaxLength)] = MapMaxLength,
 			[nameof(IEditor.Placeholder)] = MapPlaceholder,
 			[nameof(IEditor.PlaceholderColor)] = MapPlaceholderColor,
diff --git a/src/Core/src/Handlers/Editor/EditorHandler.iOS.cs b/src/Core/src/Handlers/Editor/EditorHandler.iOS.cs
index ade8b6ce3084..c0da6da14881 100644
--- a/src/Core/src/Handlers/Editor/EditorHandler.iOS.cs
+++ b/src/Core/src/Handlers/Editor/EditorHandler.iOS.cs
@@ -120,6 +120,9 @@ public static void MapIsReadOnly(IEditorHandler handler, IEditor editor) =>
 		public static void MapIsTextPredictionEnabled(IEditorHandler handler, IEditor editor) =>
 			handler.PlatformView?.UpdateIsTextPredictionEnabled(editor);
 
+		public static void MapIsSpellCheckEnabled(IEditorHandler handler, IEditor editor) =>
+			handler.PlatformView?.UpdateIsSpellCheckEnabled(editor);
+
 		public static void MapFont(IEditorHandler handler, IEditor editor) =>
 			handler.PlatformView?.UpdateFont(editor, handler.GetRequiredService<IFontManager>());
 
diff --git a/src/Core/src/Handlers/Entry/EntryHandler.Android.cs b/src/Core/src/Handlers/Entry/EntryHandler.Android.cs
index 0b6dbbebd93e..ac60efa26e1c 100644
--- a/src/Core/src/Handlers/Entry/EntryHandler.Android.cs
+++ b/src/Core/src/Handlers/Entry/EntryHandler.Android.cs
@@ -85,6 +85,9 @@ public static void MapVerticalTextAlignment(IEntryHandler handler, IEntry entry)
 		public static void MapIsTextPredictionEnabled(IEntryHandler handler, IEntry entry) =>
 			handler.PlatformView?.UpdateIsTextPredictionEnabled(entry);
 
+		public static void MapIsSpellCheckEnabled(IEntryHandler handler, IEntry entry) =>
+			handler.PlatformView?.UpdateIsSpellCheckEnabled(entry);
+
 		public static void MapMaxLength(IEntryHandler handler, IEntry entry) =>
 			handler.PlatformView?.UpdateMaxLength(entry);
 
diff --git a/src/Core/src/Handlers/Entry/EntryHandler.Standard.cs b/src/Core/src/Handlers/Entry/EntryHandler.Standard.cs
index a3c379f96b60..adf3cb2ab6a4 100644
--- a/src/Core/src/Handlers/Entry/EntryHandler.Standard.cs
+++ b/src/Core/src/Handlers/Entry/EntryHandler.Standard.cs
@@ -11,7 +11,20 @@ public static void MapTextColor(IEntryHandler handler, IEntry entry) { }
 		public static void MapIsPassword(IEntryHandler handler, IEntry entry) { }
 		public static void MapHorizontalTextAlignment(IEntryHandler handler, IEntry entry) { }
 		public static void MapVerticalTextAlignment(IEntryHandler handler, IEntry entry) { }
+
+		/// <summary>
+		/// Maps the abstract <see cref="ITextInput.IsTextPredictionEnabled"/> property to the platform-specific implementations.
+		/// </summary>
+		/// <param name="handler"> The associated handler.</param>
+		/// <param name="entry"> The associated <see cref="IEntry"/> instance.</param>
 		public static void MapIsTextPredictionEnabled(IEntryHandler handler, IEntry entry) { }
+
+		/// <summary>
+		/// Maps the abstract <see cref="ITextInput.IsSpellCheckEnabled"/> property to the platform-specific implementations.
+		/// </summary>
+		/// <param name="handler"> The associated handler.</param>
+		/// <param name="entry"> The associated <see cref="IEntry"/> instance.</param>
+		public static void MapIsSpellCheckEnabled(IEntryHandler handler, IEntry entry) { }
 		public static void MapMaxLength(IEntryHandler handler, IEntry entry) { }
 		public static void MapPlaceholder(IEntryHandler handler, IEntry entry) { }
 		public static void MapPlaceholderColor(IEntryHandler handler, IEntry entry) { }
diff --git a/src/Core/src/Handlers/Entry/EntryHandler.Tizen.cs b/src/Core/src/Handlers/Entry/EntryHandler.Tizen.cs
index 523fc0cba767..4643822f87dc 100644
--- a/src/Core/src/Handlers/Entry/EntryHandler.Tizen.cs
+++ b/src/Core/src/Handlers/Entry/EntryHandler.Tizen.cs
@@ -91,6 +91,9 @@ public static void MapVerticalTextAlignment(IEntryHandler handler, IEntry entry)
 		public static void MapIsTextPredictionEnabled(IEntryHandler handler, IEntry entry) =>
 			handler.PlatformView?.UpdateIsTextPredictionEnabled(entry);
 
+		[MissingMapper]
+		public static void MapIsSpellCheckEnabled(IEntryHandler handler, IEntry entry) { }
+
 		public static void MapMaxLength(IEntryHandler handler, IEntry entry) =>
 			handler.PlatformView?.UpdateMaxLength(entry);
 
diff --git a/src/Core/src/Handlers/Entry/EntryHandler.Windows.cs b/src/Core/src/Handlers/Entry/EntryHandler.Windows.cs
index 382474af8280..f01fd8e095c5 100644
--- a/src/Core/src/Handlers/Entry/EntryHandler.Windows.cs
+++ b/src/Core/src/Handlers/Entry/EntryHandler.Windows.cs
@@ -70,6 +70,9 @@ public static void MapVerticalTextAlignment(IEntryHandler handler, IEntry entry)
 		public static void MapIsTextPredictionEnabled(IEntryHandler handler, IEntry entry) =>
 			handler.PlatformView?.UpdateIsTextPredictionEnabled(entry);
 
+		public static void MapIsSpellCheckEnabled(IEntryHandler handler, IEntry entry) =>
+			handler.PlatformView?.UpdateIsSpellCheckEnabled(entry);
+
 		public static void MapMaxLength(IEntryHandler handler, IEntry entry) =>
 			handler.PlatformView?.UpdateMaxLength(entry);
 
diff --git a/src/Core/src/Handlers/Entry/EntryHandler.cs b/src/Core/src/Handlers/Entry/EntryHandler.cs
index 38f0b20ef605..3d4d666adffc 100644
--- a/src/Core/src/Handlers/Entry/EntryHandler.cs
+++ b/src/Core/src/Handlers/Entry/EntryHandler.cs
@@ -28,6 +28,7 @@ public partial class EntryHandler : IEntryHandler
 			[nameof(IEntry.VerticalTextAlignment)] = MapVerticalTextAlignment,
 			[nameof(IEntry.IsReadOnly)] = MapIsReadOnly,
 			[nameof(IEntry.IsTextPredictionEnabled)] = MapIsTextPredictionEnabled,
+			[nameof(IEntry.IsSpellCheckEnabled)] = MapIsSpellCheckEnabled,
 			[nameof(IEntry.Keyboard)] = MapKeyboard,
 			[nameof(IEntry.MaxLength)] = MapMaxLength,
 			[nameof(IEntry.Placeholder)] = MapPlaceholder,
diff --git a/src/Core/src/Handlers/Entry/EntryHandler.iOS.cs b/src/Core/src/Handlers/Entry/EntryHandler.iOS.cs
index 85b41ee428f6..94a523ee30ea 100644
--- a/src/Core/src/Handlers/Entry/EntryHandler.iOS.cs
+++ b/src/Core/src/Handlers/Entry/EntryHandler.iOS.cs
@@ -76,6 +76,9 @@ public static void MapVerticalTextAlignment(IEntryHandler handler, IEntry entry)
 		public static void MapIsTextPredictionEnabled(IEntryHandler handler, IEntry entry) =>
 			handler.PlatformView?.UpdateIsTextPredictionEnabled(entry);
 
+		public static void MapIsSpellCheckEnabled(IEntryHandler handler, IEntry entry) =>
+			handler.PlatformView?.UpdateIsSpellCheckEnabled(entry);
+
 		public static void MapMaxLength(IEntryHandler handler, IEntry entry) =>
 			handler.PlatformView?.UpdateMaxLength(entry);
 
diff --git a/src/Core/src/Handlers/SearchBar/SearchBarHandler.Android.cs b/src/Core/src/Handlers/SearchBar/SearchBarHandler.Android.cs
index 48f982b050f4..8db07133ff04 100644
--- a/src/Core/src/Handlers/SearchBar/SearchBarHandler.Android.cs
+++ b/src/Core/src/Handlers/SearchBar/SearchBarHandler.Android.cs
@@ -99,6 +99,11 @@ public static void MapIsTextPredictionEnabled(ISearchBarHandler handler, ISearch
 			handler.PlatformView?.UpdateIsTextPredictionEnabled(searchBar, handler.QueryEditor);
 		}
 
+		public static void MapIsSpellCheckEnabled(ISearchBarHandler handler, ISearchBar searchBar)
+		{
+			handler.PlatformView?.UpdateIsSpellCheckEnabled(searchBar, handler.QueryEditor);
+		}
+
 		public static void MapMaxLength(ISearchBarHandler handler, ISearchBar searchBar)
 		{
 			handler.PlatformView?.UpdateMaxLength(searchBar, handler.QueryEditor);
diff --git a/src/Core/src/Handlers/SearchBar/SearchBarHandler.Standard.cs b/src/Core/src/Handlers/SearchBar/SearchBarHandler.Standard.cs
index 698d58d8c3dd..195098888c71 100644
--- a/src/Core/src/Handlers/SearchBar/SearchBarHandler.Standard.cs
+++ b/src/Core/src/Handlers/SearchBar/SearchBarHandler.Standard.cs
@@ -19,7 +19,20 @@ public static void MapVerticalTextAlignment(IViewHandler handler, ISearchBar sea
 		public static void MapCharacterSpacing(IViewHandler handler, ISearchBar searchBar) { }
 		public static void MapTextColor(IViewHandler handler, ISearchBar searchBar) { }
 		public static void MapCancelButtonColor(IViewHandler handler, ISearchBar searchBar) { }
+
+		/// <summary>
+		/// Maps the abstract <see cref="ITextInput.IsTextPredictionEnabled"/> property to the platform-specific implementations.
+		/// </summary>
+		/// <param name="handler"> The associated handler.</param>
+		/// <param name="searchBar"> The associated <see cref="ISearchBar"/> instance.</param>
 		public static void MapIsTextPredictionEnabled(IViewHandler handler, ISearchBar searchBar) { }
+
+		/// <summary>
+		/// Maps the abstract <see cref="ITextInput.IsSpellCheckEnabled"/> property to the platform-specific implementations.
+		/// </summary>
+		/// <param name="handler"> The associated handler.</param>
+		/// <param name="searchBar"> The associated <see cref="ISearchBar"/> instance.</param>
+		public static void MapIsSpellCheckEnabled(IViewHandler handler, ISearchBar searchBar) { }
 		public static void MapMaxLength(IViewHandler handler, ISearchBar searchBar) { }
 		public static void MapIsReadOnly(IViewHandler handler, ISearchBar searchBar) { }
 		public static void MapKeyboard(IViewHandler handler, ISearchBar searchBar) { }
diff --git a/src/Core/src/Handlers/SearchBar/SearchBarHandler.Tizen.cs b/src/Core/src/Handlers/SearchBar/SearchBarHandler.Tizen.cs
index d5bad14c27fc..6a92572e0768 100644
--- a/src/Core/src/Handlers/SearchBar/SearchBarHandler.Tizen.cs
+++ b/src/Core/src/Handlers/SearchBar/SearchBarHandler.Tizen.cs
@@ -75,6 +75,9 @@ public static void MapIsTextPredictionEnabled(ISearchBarHandler handler, ISearch
 			handler.PlatformView?.Entry.UpdateIsTextPredictionEnabled(searchBar);
 		}
 
+		[MissingMapper]
+		public static void MapIsSpellCheckEnabled(ISearchBarHandler handler, ISearchBar searchBar) { }
+
 		public static void MapKeyboard(ISearchBarHandler handler, ISearchBar searchBar)
 		{
 			handler.PlatformView?.Entry.UpdateKeyboard(searchBar);
diff --git a/src/Core/src/Handlers/SearchBar/SearchBarHandler.Windows.cs b/src/Core/src/Handlers/SearchBar/SearchBarHandler.Windows.cs
index 37a4f09b2970..b31d8c58ae26 100644
--- a/src/Core/src/Handlers/SearchBar/SearchBarHandler.Windows.cs
+++ b/src/Core/src/Handlers/SearchBar/SearchBarHandler.Windows.cs
@@ -84,6 +84,11 @@ public static void MapIsTextPredictionEnabled(ISearchBarHandler handler, ISearch
 			handler.PlatformView?.UpdateIsTextPredictionEnabled(searchBar);
 		}
 
+		public static void MapIsSpellCheckEnabled(ISearchBarHandler handler, ISearchBar searchBar)
+		{
+			handler.PlatformView?.UpdateIsSpellCheckEnabled(searchBar);
+		}
+
 		public static void MapMaxLength(ISearchBarHandler handler, ISearchBar searchBar)
 		{
 			handler.PlatformView?.UpdateMaxLength(searchBar);
@@ -114,6 +119,7 @@ void OnLoaded(object sender, UI.Xaml.RoutedEventArgs e)
 				PlatformView?.UpdateMaxLength(VirtualView);
 				PlatformView?.UpdateIsReadOnly(VirtualView);
 				PlatformView?.UpdateIsTextPredictionEnabled(VirtualView);
+				PlatformView?.UpdateIsSpellCheckEnabled(VirtualView);
 				PlatformView?.UpdateCancelButtonColor(VirtualView);
 				PlatformView?.UpdateKeyboard(VirtualView);
 			}
diff --git a/src/Core/src/Handlers/SearchBar/SearchBarHandler.cs b/src/Core/src/Handlers/SearchBar/SearchBarHandler.cs
index 771131bc7d57..ef6615dbbc30 100644
--- a/src/Core/src/Handlers/SearchBar/SearchBarHandler.cs
+++ b/src/Core/src/Handlers/SearchBar/SearchBarHandler.cs
@@ -27,6 +27,7 @@ public partial class SearchBarHandler : ISearchBarHandler
 			[nameof(ITextAlignment.VerticalTextAlignment)] = MapVerticalTextAlignment,
 			[nameof(ISearchBar.IsReadOnly)] = MapIsReadOnly,
 			[nameof(ISearchBar.IsTextPredictionEnabled)] = MapIsTextPredictionEnabled,
+			[nameof(ISearchBar.IsSpellCheckEnabled)] = MapIsSpellCheckEnabled,
 			[nameof(ISearchBar.MaxLength)] = MapMaxLength,
 			[nameof(ISearchBar.Placeholder)] = MapPlaceholder,
 			[nameof(ISearchBar.PlaceholderColor)] = MapPlaceholderColor,
diff --git a/src/Core/src/Handlers/SearchBar/SearchBarHandler.iOS.cs b/src/Core/src/Handlers/SearchBar/SearchBarHandler.iOS.cs
index 0a33aec5eaf7..0d48dd38b988 100644
--- a/src/Core/src/Handlers/SearchBar/SearchBarHandler.iOS.cs
+++ b/src/Core/src/Handlers/SearchBar/SearchBarHandler.iOS.cs
@@ -142,6 +142,11 @@ public static void MapIsTextPredictionEnabled(ISearchBarHandler handler, ISearch
 			handler.PlatformView?.UpdateIsTextPredictionEnabled(searchBar, handler?.QueryEditor);
 		}
 
+		public static void MapIsSpellCheckEnabled(ISearchBarHandler handler, ISearchBar searchBar)
+		{
+			handler.PlatformView?.UpdateIsSpellCheckEnabled(searchBar, handler?.QueryEditor);
+		}
+
 		public static void MapMaxLength(ISearchBarHandler handler, ISearchBar searchBar)
 		{
 			handler.PlatformView?.UpdateMaxLength(searchBar);
diff --git a/src/Core/src/Platform/Android/EditTextExtensions.cs b/src/Core/src/Platform/Android/EditTextExtensions.cs
index 2c61cf105a13..d7a17185c94f 100644
--- a/src/Core/src/Platform/Android/EditTextExtensions.cs
+++ b/src/Core/src/Platform/Android/EditTextExtensions.cs
@@ -65,15 +65,44 @@ public static void UpdateVerticalTextAlignment(this EditText editText, ITextAlig
 
 		public static void UpdateIsTextPredictionEnabled(this EditText editText, IEntry entry)
 		{
-			editText.SetInputType(entry);
+			editText.UpdateIsTextPredictionEnabled(entry as ITextInput);
+		}
+
+		public static void UpdateIsSpellCheckEnabled(this EditText editText, IEntry entry)
+		{
+			editText.UpdateIsSpellCheckEnabled(entry as ITextInput);
 		}
 
 		public static void UpdateIsTextPredictionEnabled(this EditText editText, IEditor editor)
 		{
-			if (editor.IsTextPredictionEnabled)
-				editText.InputType &= ~InputTypes.TextFlagNoSuggestions;
+			editText.UpdateIsTextPredictionEnabled(editor as ITextInput);
+		}
+
+		public static void UpdateIsSpellCheckEnabled(this EditText editText, IEditor editor)
+		{
+			editText.UpdateIsSpellCheckEnabled(editor as ITextInput);
+		}
+
+		private static void UpdateIsTextPredictionEnabled(this EditText editText, ITextInput textInput)
+		{
+			var keyboard = textInput.Keyboard;
+
+			// TextFlagAutoCorrect will correct "Whats" -> "What's"
+			// TextFlagAutoCorrect should not be confused with TextFlagAutocomplete
+			// Autocomplete property pertains to fields that will "self-fill" - like an "Address" input box that fills with your saved data
+			if (textInput.IsTextPredictionEnabled)
+				editText.InputType |= InputTypes.TextFlagAutoCorrect;
 			else
+				editText.InputType &= ~InputTypes.TextFlagAutoCorrect;
+		}
+
+		private static void UpdateIsSpellCheckEnabled(this EditText editText, ITextInput textInput)
+		{
+			// TextFlagNoSuggestions disables spellchecking (the red squiggly lines)
+			if (!textInput.IsSpellCheckEnabled)
 				editText.InputType |= InputTypes.TextFlagNoSuggestions;
+			else
+				editText.InputType &= ~InputTypes.TextFlagNoSuggestions;
 		}
 
 		public static void UpdateMaxLength(this EditText editText, IEntry entry) =>
@@ -254,13 +283,8 @@ internal static void SetInputType(this EditText editText, ITextInput textInput)
 
 			if (keyboard is not CustomKeyboard)
 			{
-				if (!editText.InputType.HasFlag(InputTypes.TextFlagNoSuggestions))
-				{
-					// TODO: IsSpellCheckEnabled handling must be here.
-
-					if (!textInput.IsTextPredictionEnabled)
-						editText.InputType |= InputTypes.TextFlagNoSuggestions;
-				}
+				editText.UpdateIsTextPredictionEnabled(textInput);
+				editText.UpdateIsSpellCheckEnabled(textInput);
 			}
 
 			if (keyboard == Keyboard.Numeric)
diff --git a/src/Core/src/Platform/Android/KeyboardExtensions.cs b/src/Core/src/Platform/Android/KeyboardExtensions.cs
index 2f3b0342bf15..4818c3dbd217 100644
--- a/src/Core/src/Platform/Android/KeyboardExtensions.cs
+++ b/src/Core/src/Platform/Android/KeyboardExtensions.cs
@@ -9,23 +9,16 @@ public static InputTypes ToInputType(this Keyboard self)
 		{
 			var result = new InputTypes();
 
-			// ClassText:																						!autocaps, spellcheck, suggestions 
-			// TextFlagNoSuggestions:																			!autocaps, !spellcheck, !suggestions
-			// InputTypes.ClassText | InputTypes.TextFlagCapSentences											 autocaps,	spellcheck,  suggestions
-			// InputTypes.ClassText | InputTypes.TextFlagCapSentences | InputTypes.TextFlagNoSuggestions;		 autocaps, !spellcheck, !suggestions
-
 			if (self == Keyboard.Default)
 				result = InputTypes.ClassText | InputTypes.TextVariationNormal;
-			else if (self == Keyboard.Chat)
-				result = InputTypes.ClassText | InputTypes.TextFlagCapSentences | InputTypes.TextFlagNoSuggestions;
+			else if (self == Keyboard.Chat || self == Keyboard.Text)
+				result = InputTypes.ClassText | InputTypes.TextFlagCapSentences | InputTypes.TextFlagAutoComplete;
 			else if (self == Keyboard.Email)
 				result = InputTypes.ClassText | InputTypes.TextVariationEmailAddress;
 			else if (self == Keyboard.Numeric)
 				result = InputTypes.ClassNumber | InputTypes.NumberFlagDecimal | InputTypes.NumberFlagSigned;
 			else if (self == Keyboard.Telephone)
 				result = InputTypes.ClassPhone;
-			else if (self == Keyboard.Text)
-				result = InputTypes.ClassText | InputTypes.TextFlagCapSentences;
 			else if (self == Keyboard.Url)
 				result = InputTypes.ClassText | InputTypes.TextVariationUri;
 			else if (self is CustomKeyboard custom)
@@ -37,37 +30,16 @@ public static InputTypes ToInputType(this Keyboard self)
 				var spellcheckEnabled = (custom.Flags & KeyboardFlags.Spellcheck) == KeyboardFlags.Spellcheck;
 				var suggestionsEnabled = (custom.Flags & KeyboardFlags.Suggestions) == KeyboardFlags.Suggestions;
 
-				if (!capitalizedSentenceEnabled && !spellcheckEnabled && !suggestionsEnabled)
-					result = InputTypes.ClassText | InputTypes.TextFlagNoSuggestions;
-
-				if (!capitalizedSentenceEnabled && !spellcheckEnabled && suggestionsEnabled)
-				{
-					// Due to the nature of android, TextFlagAutoCorrect includes Spellcheck
-
-					Debug.WriteLine("On Android, KeyboardFlags.Suggestions enables KeyboardFlags.Spellcheck as well due to a platform limitation.");
-					result = InputTypes.ClassText | InputTypes.TextFlagAutoCorrect;
-				}
-				if (!capitalizedSentenceEnabled && spellcheckEnabled && !suggestionsEnabled)
-					result = InputTypes.ClassText | InputTypes.TextFlagAutoComplete;
+				result |= InputTypes.ClassText;
 
-				if (!capitalizedSentenceEnabled && spellcheckEnabled && suggestionsEnabled)
-					result = InputTypes.ClassText | InputTypes.TextFlagAutoCorrect;
-
-				if (capitalizedSentenceEnabled && !spellcheckEnabled && !suggestionsEnabled)
-					result = InputTypes.ClassText | InputTypes.TextFlagCapSentences | InputTypes.TextFlagNoSuggestions;
-
-				if (capitalizedSentenceEnabled && !spellcheckEnabled && suggestionsEnabled)
-				{
-					// Due to the nature of android, TextFlagAutoCorrect includes Spellcheck
-					Debug.WriteLine("On Android, KeyboardFlags.Suggestions enables KeyboardFlags.Spellcheck as well due to a platform limitation.");
-					result = InputTypes.ClassText | InputTypes.TextFlagCapSentences | InputTypes.TextFlagAutoCorrect;
-				}
+				if (capitalizedSentenceEnabled)
+					result |= InputTypes.TextFlagCapSentences;
 
-				if (capitalizedSentenceEnabled && spellcheckEnabled && !suggestionsEnabled)
-					result = InputTypes.ClassText | InputTypes.TextFlagCapSentences | InputTypes.TextFlagAutoComplete;
+				if (!spellcheckEnabled)
+					result |= InputTypes.TextFlagNoSuggestions;
 
-				if (capitalizedSentenceEnabled && spellcheckEnabled && suggestionsEnabled)
-					result = InputTypes.ClassText | InputTypes.TextFlagCapSentences | InputTypes.TextFlagAutoCorrect;
+				if (suggestionsEnabled)
+					result |= InputTypes.TextFlagAutoCorrect;
 
 				// All existed before these settings. This ensures these changes are backwards compatible
 				// without this check TextFlagCapCharacters would win
diff --git a/src/Core/src/Platform/Android/SearchViewExtensions.cs b/src/Core/src/Platform/Android/SearchViewExtensions.cs
index 1e3ef258adb5..cdfe739f80bc 100644
--- a/src/Core/src/Platform/Android/SearchViewExtensions.cs
+++ b/src/Core/src/Platform/Android/SearchViewExtensions.cs
@@ -126,9 +126,22 @@ public static void UpdateIsTextPredictionEnabled(this SearchView searchView, ISe
 				return;
 
 			if (searchBar.IsTextPredictionEnabled)
-				editText.InputType &= ~InputTypes.TextFlagNoSuggestions;
+				editText.InputType |= InputTypes.TextFlagAutoCorrect;
 			else
+				editText.InputType &= ~InputTypes.TextFlagAutoCorrect;
+		}
+
+		public static void UpdateIsSpellCheckEnabled(this SearchView searchView, ISearchBar searchBar, EditText? editText = null)
+		{
+			editText ??= searchView.GetFirstChildOfType<EditText>();
+
+			if (editText == null)
+				return;
+
+			if (!searchBar.IsSpellCheckEnabled)
 				editText.InputType |= InputTypes.TextFlagNoSuggestions;
+			else
+				editText.InputType &= ~InputTypes.TextFlagNoSuggestions;
 		}
 
 		public static void UpdateIsEnabled(this SearchView searchView, ISearchBar searchBar, EditText? editText = null)
diff --git a/src/Core/src/Platform/Windows/SearchBarExtensions.cs b/src/Core/src/Platform/Windows/SearchBarExtensions.cs
index 5bb2070811b2..42f66c9f8680 100644
--- a/src/Core/src/Platform/Windows/SearchBarExtensions.cs
+++ b/src/Core/src/Platform/Windows/SearchBarExtensions.cs
@@ -138,6 +138,16 @@ public static void UpdateIsTextPredictionEnabled(this AutoSuggestBox platformCon
 			textBox.UpdateIsTextPredictionEnabled(searchBar);
 		}
 
+		public static void UpdateIsSpellCheckEnabled(this AutoSuggestBox platformControl, ISearchBar searchBar)
+		{
+			var textBox = platformControl.GetFirstDescendant<TextBox> ();
+
+			if (textBox is null) 
+				return;
+
+			textBox.UpdateIsSpellCheckEnabled(searchBar);
+		}
+
 		public static void UpdateKeyboard(this AutoSuggestBox platformControl, ISearchBar searchBar)
 		{
 			var queryTextBox = platformControl.GetFirstDescendant<TextBox>();
diff --git a/src/Core/src/Platform/Windows/TextBoxExtensions.cs b/src/Core/src/Platform/Windows/TextBoxExtensions.cs
index 7ad9099248b5..e353db5a7e43 100644
--- a/src/Core/src/Platform/Windows/TextBoxExtensions.cs
+++ b/src/Core/src/Platform/Windows/TextBoxExtensions.cs
@@ -154,6 +154,11 @@ public static void UpdateIsTextPredictionEnabled(this TextBox textBox, ITextInpu
 			textBox.UpdateInputScope(textInput);
 		}
 
+		public static void UpdateIsSpellCheckEnabled(this TextBox textBox, ITextInput textInput)
+		{
+			textBox.UpdateInputScope(textInput);
+		}
+
 		public static void UpdateKeyboard(this TextBox textBox, ITextInput textInput)
 		{
 			textBox.UpdateInputScope(textInput);
@@ -169,7 +174,7 @@ internal static void UpdateInputScope(this TextBox textBox, ITextInput textInput
 			else
 			{
 				textBox.IsTextPredictionEnabled = textInput.IsTextPredictionEnabled;
-				textBox.IsSpellCheckEnabled = textInput.IsTextPredictionEnabled;
+				textBox.IsSpellCheckEnabled = textInput.IsSpellCheckEnabled;
 			}
 
 			var inputScope = new InputScope();
diff --git a/src/Core/src/Platform/iOS/KeyboardExtensions.cs b/src/Core/src/Platform/iOS/KeyboardExtensions.cs
index 0a33a05a3b3f..1ebbbd967292 100644
--- a/src/Core/src/Platform/iOS/KeyboardExtensions.cs
+++ b/src/Core/src/Platform/iOS/KeyboardExtensions.cs
@@ -18,16 +18,14 @@ public static void ApplyKeyboard(this IUITextInputTraits textInput, Keyboard key
 			textInput.SetSpellCheckingType(UITextSpellCheckingType.No);
 			textInput.SetKeyboardType(UIKeyboardType.Default);
 
-			if (keyboard == Keyboard.Default)
-			{
-				textInput.SetAutocapitalizationType(UITextAutocapitalizationType.Sentences);
-				textInput.SetAutocorrectionType(UITextAutocorrectionType.Default);
-				textInput.SetSpellCheckingType(UITextSpellCheckingType.Default);
-			}
-			else if (keyboard == Keyboard.Chat)
+			if (keyboard == Keyboard.Chat || keyboard == Keyboard.Default || keyboard == Keyboard.Text)
 			{
+				// Since IsSpellCheckEnabled and IsTextPredictionEnabled are true by default
+				// Autocorrection and Spellchecking will be forced to be true
+				// This makes chat, default, and text keyboards the same thing on iOS
 				textInput.SetAutocapitalizationType(UITextAutocapitalizationType.Sentences);
 				textInput.SetAutocorrectionType(UITextAutocorrectionType.Yes);
+				textInput.SetSpellCheckingType(UITextSpellCheckingType.Yes);
 			}
 			else if (keyboard == Keyboard.Email)
 				textInput.SetKeyboardType(UIKeyboardType.EmailAddress);
@@ -35,12 +33,6 @@ public static void ApplyKeyboard(this IUITextInputTraits textInput, Keyboard key
 				textInput.SetKeyboardType(UIKeyboardType.DecimalPad);
 			else if (keyboard == Keyboard.Telephone)
 				textInput.SetKeyboardType(UIKeyboardType.PhonePad);
-			else if (keyboard == Keyboard.Text)
-			{
-				textInput.SetAutocapitalizationType(UITextAutocapitalizationType.Sentences);
-				textInput.SetAutocorrectionType(UITextAutocorrectionType.Yes);
-				textInput.SetSpellCheckingType(UITextSpellCheckingType.Yes);
-			}
 			else if (keyboard == Keyboard.Url)
 				textInput.SetKeyboardType(UIKeyboardType.Url);
 			else if (keyboard is CustomKeyboard)
diff --git a/src/Core/src/Platform/iOS/SearchBarExtensions.cs b/src/Core/src/Platform/iOS/SearchBarExtensions.cs
index 2b221671778e..01f183e76f36 100644
--- a/src/Core/src/Platform/iOS/SearchBarExtensions.cs
+++ b/src/Core/src/Platform/iOS/SearchBarExtensions.cs
@@ -141,6 +141,19 @@ public static void UpdateIsTextPredictionEnabled(this UISearchBar uiSearchBar, I
 				textField.AutocorrectionType = UITextAutocorrectionType.No;
 		}
 
+		public static void UpdateIsSpellCheckEnabled(this UISearchBar uiSearchBar, ISearchBar searchBar, UITextField? textField = null)
+		{
+			textField ??= uiSearchBar.GetSearchTextField();
+
+			if (textField == null)
+				return;
+
+			if (searchBar.IsSpellCheckEnabled)
+				textField.SpellCheckingType = UITextSpellCheckingType.Yes;
+			else
+				textField.SpellCheckingType = UITextSpellCheckingType.No;
+		}
+
 		public static void UpdateKeyboard(this UISearchBar uiSearchBar, ISearchBar searchBar)
 		{
 			var keyboard = searchBar.Keyboard;
@@ -148,7 +161,10 @@ public static void UpdateKeyboard(this UISearchBar uiSearchBar, ISearchBar searc
 			uiSearchBar.ApplyKeyboard(keyboard);
 
 			if (keyboard is not CustomKeyboard)
+			{
 				uiSearchBar.UpdateIsTextPredictionEnabled(searchBar);
+				uiSearchBar.UpdateIsSpellCheckEnabled(searchBar);
+			}
 
 			uiSearchBar.ReloadInputViews();
 		}
diff --git a/src/Core/src/Platform/iOS/TextFieldExtensions.cs b/src/Core/src/Platform/iOS/TextFieldExtensions.cs
index 6d839bb367c8..fdf5b0d27bf2 100644
--- a/src/Core/src/Platform/iOS/TextFieldExtensions.cs
+++ b/src/Core/src/Platform/iOS/TextFieldExtensions.cs
@@ -52,6 +52,14 @@ public static void UpdateIsTextPredictionEnabled(this UITextField textField, IEn
 				textField.AutocorrectionType = UITextAutocorrectionType.No;
 		}
 
+		public static void UpdateIsSpellCheckEnabled(this UITextField textField, IEntry entry)
+		{
+			if (entry.IsSpellCheckEnabled)
+				textField.SpellCheckingType = UITextSpellCheckingType.Yes;
+			else
+				textField.SpellCheckingType = UITextSpellCheckingType.No;
+		}
+
 		public static void UpdateMaxLength(this UITextField textField, IEntry entry)
 		{
 			var newText = textField.AttributedText.TrimToMaxLength(entry.MaxLength);
@@ -112,7 +120,10 @@ public static void UpdateKeyboard(this UITextField textField, IEntry entry)
 			textField.ApplyKeyboard(keyboard);
 
 			if (keyboard is not CustomKeyboard)
+			{
 				textField.UpdateIsTextPredictionEnabled(entry);
+				textField.UpdateIsSpellCheckEnabled(entry);
+			}
 
 			textField.ReloadInputViews();
 		}
diff --git a/src/Core/src/Platform/iOS/TextViewExtensions.cs b/src/Core/src/Platform/iOS/TextViewExtensions.cs
index 5eb4b50d083d..3b7fab357330 100644
--- a/src/Core/src/Platform/iOS/TextViewExtensions.cs
+++ b/src/Core/src/Platform/iOS/TextViewExtensions.cs
@@ -53,6 +53,14 @@ public static void UpdateIsTextPredictionEnabled(this UITextView textView, IEdit
 				textView.AutocorrectionType = UITextAutocorrectionType.No;
 		}
 
+		public static void UpdateIsSpellCheckEnabled(this UITextView textView, IEditor editor)
+		{
+			if (editor.IsSpellCheckEnabled)
+				textView.SpellCheckingType = UITextSpellCheckingType.Yes;
+			else
+				textView.SpellCheckingType = UITextSpellCheckingType.No;
+		}
+
 		public static void UpdateFont(this UITextView textView, ITextStyle textStyle, IFontManager fontManager)
 		{
 			var font = textStyle.Font;
@@ -77,7 +85,10 @@ public static void UpdateKeyboard(this UITextView textView, IEditor editor)
 			textView.ApplyKeyboard(keyboard);
 
 			if (keyboard is not CustomKeyboard)
+			{
 				textView.UpdateIsTextPredictionEnabled(editor);
+				textView.UpdateIsSpellCheckEnabled(editor);
+			}
 
 			textView.ReloadInputViews();
 		}
diff --git a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
index 5549a6b61f4e..ce01bf0fae0a 100644
--- a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -15,6 +15,7 @@ Microsoft.Maui.ICommandMapper.Invoke(Microsoft.Maui.IElementHandler! viewHandler
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>.Add(string! key, System.Action<TViewHandler, TVirtualView, object?>! action) -> void
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>.Add(string! key, System.Action<TViewHandler, TVirtualView>! action) -> void
+Microsoft.Maui.ITextInput.IsSpellCheckEnabled.get -> bool
 Microsoft.Maui.IMenuElement.Accelerators.get -> System.Collections.Generic.IReadOnlyList<Microsoft.Maui.IAccelerator!>?
 Microsoft.Maui.Handlers.IImageSourcePartSetter
 Microsoft.Maui.Handlers.IImageSourcePartSetter.SetImageSource(Android.Graphics.Drawables.Drawable? obj) -> void
@@ -73,12 +74,18 @@ static Microsoft.Maui.FontSize.operator ==(Microsoft.Maui.FontSize left, Microso
 static Microsoft.Maui.Graphics.PaintExtensions.ToDrawable(this Microsoft.Maui.Graphics.Paint? paint, Android.Content.Context? context) -> Android.Graphics.Drawables.Drawable?
 static Microsoft.Maui.GridLength.operator !=(Microsoft.Maui.GridLength left, Microsoft.Maui.GridLength right) -> bool
 static Microsoft.Maui.GridLength.operator ==(Microsoft.Maui.GridLength left, Microsoft.Maui.GridLength right) -> bool
+static Microsoft.Maui.Handlers.EditorHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.IEditorHandler! handler, Microsoft.Maui.IEditor! editor) -> void
+static Microsoft.Maui.Handlers.EntryHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.IEntryHandler! handler, Microsoft.Maui.IEntry! entry) -> void
 static Microsoft.Maui.Handlers.SearchBarHandler.MapFocus(Microsoft.Maui.Handlers.ISearchBarHandler! handler, Microsoft.Maui.ISearchBar! searchBar, object? args) -> void
+static Microsoft.Maui.Handlers.SearchBarHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.ISearchBarHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
 static Microsoft.Maui.Handlers.StepperHandler.MapIsEnabled(Microsoft.Maui.Handlers.IStepperHandler! handler, Microsoft.Maui.IStepper! stepper) -> void
 static Microsoft.Maui.Layouts.FlexBasis.operator !=(Microsoft.Maui.Layouts.FlexBasis left, Microsoft.Maui.Layouts.FlexBasis right) -> bool
 static Microsoft.Maui.Layouts.FlexBasis.operator ==(Microsoft.Maui.Layouts.FlexBasis left, Microsoft.Maui.Layouts.FlexBasis right) -> bool
 static Microsoft.Maui.Layouts.LayoutExtensions.ArrangeContentUnbounded(this Microsoft.Maui.IContentView! contentView, Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
 static Microsoft.Maui.Handlers.SearchBarHandler.MapKeyboard(Microsoft.Maui.Handlers.ISearchBarHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
+static Microsoft.Maui.Platform.EditTextExtensions.UpdateIsSpellCheckEnabled(this Android.Widget.EditText! editText, Microsoft.Maui.IEditor! editor) -> void
+static Microsoft.Maui.Platform.EditTextExtensions.UpdateIsSpellCheckEnabled(this Android.Widget.EditText! editText, Microsoft.Maui.IEntry! entry) -> void
+static Microsoft.Maui.Platform.SearchViewExtensions.UpdateIsSpellCheckEnabled(this AndroidX.AppCompat.Widget.SearchView! searchView, Microsoft.Maui.ISearchBar! searchBar, Android.Widget.EditText? editText = null) -> void
 static Microsoft.Maui.Platform.SearchViewExtensions.UpdateKeyboard(this AndroidX.AppCompat.Widget.SearchView! searchView, Microsoft.Maui.ISearchBar! searchBar) -> void
 Microsoft.Maui.IWebView.UserAgent.get -> string?
 Microsoft.Maui.IWebView.UserAgent.set -> void
diff --git a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index 7948328f1e78..9c1f0cd5db6a 100644
--- a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -17,6 +17,7 @@ Microsoft.Maui.ICommandMapper.Invoke(Microsoft.Maui.IElementHandler! viewHandler
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>.Add(string! key, System.Action<TViewHandler, TVirtualView, object?>! action) -> void
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>.Add(string! key, System.Action<TViewHandler, TVirtualView>! action) -> void
+Microsoft.Maui.ITextInput.IsSpellCheckEnabled.get -> bool
 Microsoft.Maui.IMenuElement.Accelerators.get -> System.Collections.Generic.IReadOnlyList<Microsoft.Maui.IAccelerator!>?
 Microsoft.Maui.Handlers.IImageSourcePartSetter
 Microsoft.Maui.Handlers.IImageSourcePartSetter.SetImageSource(UIKit.UIImage? obj) -> void
@@ -64,12 +65,16 @@ static Microsoft.Maui.CommandMapperExtensions.PrependToMapping<TVirtualView, TVi
 static Microsoft.Maui.CommandMapperExtensions.ReplaceMapping<TVirtualView, TViewHandler>(this Microsoft.Maui.ICommandMapper<Microsoft.Maui.IElement!, Microsoft.Maui.IElementHandler!>! commandMapper, string! key, System.Action<TViewHandler, TVirtualView, object?>! method) -> void
 static Microsoft.Maui.GridLength.operator !=(Microsoft.Maui.GridLength left, Microsoft.Maui.GridLength right) -> bool
 static Microsoft.Maui.GridLength.operator ==(Microsoft.Maui.GridLength left, Microsoft.Maui.GridLength right) -> bool
+static Microsoft.Maui.Handlers.EditorHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.IEditorHandler! handler, Microsoft.Maui.IEditor! editor) -> void
+static Microsoft.Maui.Handlers.EntryHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.IEntryHandler! handler, Microsoft.Maui.IEntry! entry) -> void
+static Microsoft.Maui.Handlers.SearchBarHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.ISearchBarHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
 static Microsoft.Maui.Layouts.FlexBasis.operator !=(Microsoft.Maui.Layouts.FlexBasis left, Microsoft.Maui.Layouts.FlexBasis right) -> bool
 static Microsoft.Maui.Layouts.FlexBasis.operator ==(Microsoft.Maui.Layouts.FlexBasis left, Microsoft.Maui.Layouts.FlexBasis right) -> bool
 static Microsoft.Maui.Layouts.LayoutExtensions.ArrangeContentUnbounded(this Microsoft.Maui.IContentView! contentView, Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
 static Microsoft.Maui.Handlers.SearchBarHandler.MapKeyboard(Microsoft.Maui.Handlers.ISearchBarHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
 static Microsoft.Maui.Platform.KeyboardAutoManagerScroll.Connect() -> void
 static Microsoft.Maui.Platform.KeyboardAutoManagerScroll.Disconnect() -> void
+static Microsoft.Maui.Platform.SearchBarExtensions.UpdateIsSpellCheckEnabled(this UIKit.UISearchBar! uiSearchBar, Microsoft.Maui.ISearchBar! searchBar, UIKit.UITextField? textField = null) -> void
 static Microsoft.Maui.Platform.SearchBarExtensions.UpdateIsTextPredictionEnabled(this UIKit.UISearchBar! uiSearchBar, Microsoft.Maui.ISearchBar! searchBar, UIKit.UITextField? textField = null) -> void
 static Microsoft.Maui.Platform.SearchBarExtensions.UpdateKeyboard(this UIKit.UISearchBar! uiSearchBar, Microsoft.Maui.ISearchBar! searchBar) -> void
 override Microsoft.Maui.Platform.MauiTextField.WillMoveToWindow(UIKit.UIWindow? window) -> void
@@ -80,6 +85,8 @@ Microsoft.Maui.IWebView.UserAgent.get -> string?
 Microsoft.Maui.IWebView.UserAgent.set -> void
 static Microsoft.Maui.Handlers.WebViewHandler.MapUserAgent(Microsoft.Maui.Handlers.IWebViewHandler! handler, Microsoft.Maui.IWebView! webView) -> void
 static Microsoft.Maui.Platform.ApplicationExtensions.UpdateUserInterfaceStyle(this Microsoft.Maui.IApplication! application) -> void
+static Microsoft.Maui.Platform.TextFieldExtensions.UpdateIsSpellCheckEnabled(this UIKit.UITextField! textField, Microsoft.Maui.IEntry! entry) -> void
+static Microsoft.Maui.Platform.TextViewExtensions.UpdateIsSpellCheckEnabled(this UIKit.UITextView! textView, Microsoft.Maui.IEditor! editor) -> void
 static Microsoft.Maui.Platform.WebViewExtensions.UpdateUserAgent(this WebKit.WKWebView! platformWebView, Microsoft.Maui.IWebView! webView) -> void
 *REMOVED*Microsoft.Maui.WeakEventManager.HandleEvent(object! sender, object! args, string! eventName) -> void
 Microsoft.Maui.WeakEventManager.HandleEvent(object? sender, object? args, string! eventName) -> void
diff --git a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index cd98412197ba..d4a82e363fdb 100644
--- a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -17,6 +17,7 @@ Microsoft.Maui.ICommandMapper.Invoke(Microsoft.Maui.IElementHandler! viewHandler
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>.Add(string! key, System.Action<TViewHandler, TVirtualView, object?>! action) -> void
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>.Add(string! key, System.Action<TViewHandler, TVirtualView>! action) -> void
+Microsoft.Maui.ITextInput.IsSpellCheckEnabled.get -> bool
 Microsoft.Maui.IMenuElement.Accelerators.get -> System.Collections.Generic.IReadOnlyList<Microsoft.Maui.IAccelerator!>?
 Microsoft.Maui.Handlers.IImageSourcePartSetter
 Microsoft.Maui.Handlers.IImageSourcePartSetter.SetImageSource(UIKit.UIImage? obj) -> void
@@ -66,10 +67,14 @@ static Microsoft.Maui.CommandMapperExtensions.PrependToMapping<TVirtualView, TVi
 static Microsoft.Maui.CommandMapperExtensions.ReplaceMapping<TVirtualView, TViewHandler>(this Microsoft.Maui.ICommandMapper<Microsoft.Maui.IElement!, Microsoft.Maui.IElementHandler!>! commandMapper, string! key, System.Action<TViewHandler, TVirtualView, object?>! method) -> void
 static Microsoft.Maui.GridLength.operator !=(Microsoft.Maui.GridLength left, Microsoft.Maui.GridLength right) -> bool
 static Microsoft.Maui.GridLength.operator ==(Microsoft.Maui.GridLength left, Microsoft.Maui.GridLength right) -> bool
+static Microsoft.Maui.Handlers.EditorHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.IEditorHandler! handler, Microsoft.Maui.IEditor! editor) -> void
+static Microsoft.Maui.Handlers.EntryHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.IEntryHandler! handler, Microsoft.Maui.IEntry! entry) -> void
+static Microsoft.Maui.Handlers.SearchBarHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.ISearchBarHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
 static Microsoft.Maui.Layouts.FlexBasis.operator !=(Microsoft.Maui.Layouts.FlexBasis left, Microsoft.Maui.Layouts.FlexBasis right) -> bool
 static Microsoft.Maui.Layouts.FlexBasis.operator ==(Microsoft.Maui.Layouts.FlexBasis left, Microsoft.Maui.Layouts.FlexBasis right) -> bool
 static Microsoft.Maui.Layouts.LayoutExtensions.ArrangeContentUnbounded(this Microsoft.Maui.IContentView! contentView, Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
 static Microsoft.Maui.Handlers.SearchBarHandler.MapKeyboard(Microsoft.Maui.Handlers.ISearchBarHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
+static Microsoft.Maui.Platform.SearchBarExtensions.UpdateIsSpellCheckEnabled(this UIKit.UISearchBar! uiSearchBar, Microsoft.Maui.ISearchBar! searchBar, UIKit.UITextField? textField = null) -> void
 static Microsoft.Maui.Platform.SearchBarExtensions.UpdateIsTextPredictionEnabled(this UIKit.UISearchBar! uiSearchBar, Microsoft.Maui.ISearchBar! searchBar, UIKit.UITextField? textField = null) -> void
 static Microsoft.Maui.Platform.SearchBarExtensions.UpdateKeyboard(this UIKit.UISearchBar! uiSearchBar, Microsoft.Maui.ISearchBar! searchBar) -> void
 static Microsoft.Maui.Platform.KeyboardAutoManagerScroll.Connect() -> void
@@ -82,6 +87,8 @@ Microsoft.Maui.IWebView.UserAgent.get -> string?
 Microsoft.Maui.IWebView.UserAgent.set -> void
 static Microsoft.Maui.Handlers.WebViewHandler.MapUserAgent(Microsoft.Maui.Handlers.IWebViewHandler! handler, Microsoft.Maui.IWebView! webView) -> void
 static Microsoft.Maui.Platform.ApplicationExtensions.UpdateUserInterfaceStyle(this Microsoft.Maui.IApplication! application) -> void
+static Microsoft.Maui.Platform.TextFieldExtensions.UpdateIsSpellCheckEnabled(this UIKit.UITextField! textField, Microsoft.Maui.IEntry! entry) -> void
+static Microsoft.Maui.Platform.TextViewExtensions.UpdateIsSpellCheckEnabled(this UIKit.UITextView! textView, Microsoft.Maui.IEditor! editor) -> void
 static Microsoft.Maui.Platform.WebViewExtensions.UpdateUserAgent(this WebKit.WKWebView! platformWebView, Microsoft.Maui.IWebView! webView) -> void
 *REMOVED*Microsoft.Maui.WeakEventManager.HandleEvent(object! sender, object! args, string! eventName) -> void
 Microsoft.Maui.WeakEventManager.HandleEvent(object? sender, object? args, string! eventName) -> void
diff --git a/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
index 879e114ca66e..feaa1124bb1f 100644
--- a/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
@@ -9,6 +9,7 @@ Microsoft.Maui.ICommandMapper.Invoke(Microsoft.Maui.IElementHandler! viewHandler
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>.Add(string! key, System.Action<TViewHandler, TVirtualView, object?>! action) -> void
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>.Add(string! key, System.Action<TViewHandler, TVirtualView>! action) -> void
+Microsoft.Maui.ITextInput.IsSpellCheckEnabled.get -> bool
 Microsoft.Maui.ICrossPlatformLayout
 Microsoft.Maui.ICrossPlatformLayout.CrossPlatformArrange(Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
 Microsoft.Maui.ICrossPlatformLayout.CrossPlatformMeasure(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
@@ -33,6 +34,9 @@ static Microsoft.Maui.CommandMapperExtensions.PrependToMapping<TVirtualView, TVi
 static Microsoft.Maui.CommandMapperExtensions.ReplaceMapping<TVirtualView, TViewHandler>(this Microsoft.Maui.ICommandMapper<Microsoft.Maui.IElement!, Microsoft.Maui.IElementHandler!>! commandMapper, string! key, System.Action<TViewHandler, TVirtualView, object?>! method) -> void
 static Microsoft.Maui.GridLength.operator !=(Microsoft.Maui.GridLength left, Microsoft.Maui.GridLength right) -> bool
 static Microsoft.Maui.GridLength.operator ==(Microsoft.Maui.GridLength left, Microsoft.Maui.GridLength right) -> bool
+static Microsoft.Maui.Handlers.EditorHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.IEditorHandler! handler, Microsoft.Maui.IEditor! editor) -> void
+static Microsoft.Maui.Handlers.EntryHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.IEntryHandler! handler, Microsoft.Maui.IEntry! entry) -> void
+static Microsoft.Maui.Handlers.SearchBarHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.ISearchBarHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
 static Microsoft.Maui.Layouts.FlexBasis.operator !=(Microsoft.Maui.Layouts.FlexBasis left, Microsoft.Maui.Layouts.FlexBasis right) -> bool
 static Microsoft.Maui.Layouts.FlexBasis.operator ==(Microsoft.Maui.Layouts.FlexBasis left, Microsoft.Maui.Layouts.FlexBasis right) -> bool
 Microsoft.Maui.IWebView.UserAgent.get -> string?
diff --git a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index 0621a6e24c93..356c84e6db1e 100644
--- a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -6,6 +6,7 @@ Microsoft.Maui.IAccelerator.Key.get -> string!
 Microsoft.Maui.IAccelerator.Modifiers.get -> System.Collections.Generic.IReadOnlyList<string!>!
 Microsoft.Maui.IApplication.UserAppTheme.get -> Microsoft.Maui.ApplicationModel.AppTheme
 Microsoft.Maui.Hosting.MauiApp.DisposeAsync() -> System.Threading.Tasks.ValueTask
+Microsoft.Maui.ITextInput.IsSpellCheckEnabled.get -> bool
 Microsoft.Maui.Handlers.IImageSourcePartSetter
 Microsoft.Maui.Handlers.IImageSourcePartSetter.SetImageSource(Microsoft.UI.Xaml.Media.ImageSource? obj) -> void
 Microsoft.Maui.ICrossPlatformLayout
@@ -48,20 +49,25 @@ static Microsoft.Maui.CommandMapperExtensions.PrependToMapping<TVirtualView, TVi
 static Microsoft.Maui.CommandMapperExtensions.ReplaceMapping<TVirtualView, TViewHandler>(this Microsoft.Maui.ICommandMapper<Microsoft.Maui.IElement!, Microsoft.Maui.IElementHandler!>! commandMapper, string! key, System.Action<TViewHandler, TVirtualView, object?>! method) -> void
 static Microsoft.Maui.GridLength.operator !=(Microsoft.Maui.GridLength left, Microsoft.Maui.GridLength right) -> bool
 static Microsoft.Maui.GridLength.operator ==(Microsoft.Maui.GridLength left, Microsoft.Maui.GridLength right) -> bool
+static Microsoft.Maui.Handlers.EditorHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.IEditorHandler! handler, Microsoft.Maui.IEditor! editor) -> void
+static Microsoft.Maui.Handlers.EntryHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.IEntryHandler! handler, Microsoft.Maui.IEntry! entry) -> void
+static Microsoft.Maui.Handlers.SearchBarHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.ISearchBarHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
 static Microsoft.Maui.Layouts.FlexBasis.operator !=(Microsoft.Maui.Layouts.FlexBasis left, Microsoft.Maui.Layouts.FlexBasis right) -> bool
 static Microsoft.Maui.Layouts.FlexBasis.operator ==(Microsoft.Maui.Layouts.FlexBasis left, Microsoft.Maui.Layouts.FlexBasis right) -> bool
 static Microsoft.Maui.Layouts.LayoutExtensions.ArrangeContentUnbounded(this Microsoft.Maui.IContentView! contentView, Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
 static Microsoft.Maui.Handlers.SearchBarHandler.MapKeyboard(Microsoft.Maui.Handlers.ISearchBarHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
+static Microsoft.Maui.Platform.SearchBarExtensions.UpdateIsSpellCheckEnabled(this Microsoft.UI.Xaml.Controls.AutoSuggestBox! platformControl, Microsoft.Maui.ISearchBar! searchBar) -> void
+static Microsoft.Maui.Platform.SearchBarExtensions.UpdateKeyboard(this Microsoft.UI.Xaml.Controls.AutoSuggestBox! platformControl, Microsoft.Maui.ISearchBar! searchBar) -> void
 static Microsoft.Maui.Platform.KeyboardAcceleratorExtensions.ToPlatform(this Microsoft.Maui.IAccelerator! accelerator) -> System.Collections.Generic.IList<Microsoft.UI.Xaml.Input.KeyboardAccelerator!>?
 static Microsoft.Maui.Platform.KeyboardAcceleratorExtensions.ToPlatform(this System.Collections.Generic.IReadOnlyList<Microsoft.Maui.IAccelerator!>! accelerators) -> System.Collections.Generic.IList<Microsoft.UI.Xaml.Input.KeyboardAccelerator!>?
 static Microsoft.Maui.Platform.KeyboardAcceleratorExtensions.UpdateAccelerator(this Microsoft.UI.Xaml.Controls.MenuFlyoutItemBase! platformView, Microsoft.Maui.IMenuFlyoutItem! menuFlyoutItem) -> void
 static Microsoft.Maui.Platform.NavigationViewExtensions.UpdateTopNavigationViewItemSelectedColor(this Microsoft.Maui.Platform.MauiNavigationView! navigationView, Microsoft.Maui.Graphics.Paint? paint) -> void
 static Microsoft.Maui.Platform.NavigationViewExtensions.UpdateTopNavigationViewItemTextSelectedColor(this Microsoft.Maui.Platform.MauiNavigationView! navigationView, Microsoft.Maui.Graphics.Paint? paint) -> void
 static Microsoft.Maui.Platform.NavigationViewExtensions.UpdateTopNavigationViewItemUnselectedColor(this Microsoft.Maui.Platform.MauiNavigationView! navigationView, Microsoft.Maui.Graphics.Paint? paint) -> void
-static Microsoft.Maui.Platform.SearchBarExtensions.UpdateKeyboard(this Microsoft.UI.Xaml.Controls.AutoSuggestBox! platformControl, Microsoft.Maui.ISearchBar! searchBar) -> void
 Microsoft.Maui.IWebView.UserAgent.get -> string?
 Microsoft.Maui.IWebView.UserAgent.set -> void
 static Microsoft.Maui.Handlers.WebViewHandler.MapUserAgent(Microsoft.Maui.Handlers.IWebViewHandler! handler, Microsoft.Maui.IWebView! webView) -> void
+static Microsoft.Maui.Platform.TextBoxExtensions.UpdateIsSpellCheckEnabled(this Microsoft.UI.Xaml.Controls.TextBox! textBox, Microsoft.Maui.ITextInput! textInput) -> void
 static Microsoft.Maui.Platform.WebViewExtensions.UpdateUserAgent(this Microsoft.UI.Xaml.Controls.WebView2! platformWebView, Microsoft.Maui.IWebView! webView) -> void
 *REMOVED*Microsoft.Maui.WeakEventManager.HandleEvent(object! sender, object! args, string! eventName) -> void
 Microsoft.Maui.WeakEventManager.HandleEvent(object? sender, object? args, string! eventName) -> void
diff --git a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
index 3e44924facf1..446bd2d9d14c 100644
--- a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -12,6 +12,7 @@ Microsoft.Maui.ICommandMapper.Invoke(Microsoft.Maui.IElementHandler! viewHandler
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>.Add(string! key, System.Action<TViewHandler, TVirtualView, object?>! action) -> void
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>.Add(string! key, System.Action<TViewHandler, TVirtualView>! action) -> void
+Microsoft.Maui.ITextInput.IsSpellCheckEnabled.get -> bool
 Microsoft.Maui.IMenuElement.Accelerators.get -> System.Collections.Generic.IReadOnlyList<Microsoft.Maui.IAccelerator!>?
 Microsoft.Maui.Handlers.IImageSourcePartSetter
 Microsoft.Maui.Handlers.IImageSourcePartSetter.SetImageSource(object? obj) -> void
@@ -37,6 +38,9 @@ static Microsoft.Maui.CommandMapperExtensions.PrependToMapping<TVirtualView, TVi
 static Microsoft.Maui.CommandMapperExtensions.ReplaceMapping<TVirtualView, TViewHandler>(this Microsoft.Maui.ICommandMapper<Microsoft.Maui.IElement!, Microsoft.Maui.IElementHandler!>! commandMapper, string! key, System.Action<TViewHandler, TVirtualView, object?>! method) -> void
 static Microsoft.Maui.GridLength.operator !=(Microsoft.Maui.GridLength left, Microsoft.Maui.GridLength right) -> bool
 static Microsoft.Maui.GridLength.operator ==(Microsoft.Maui.GridLength left, Microsoft.Maui.GridLength right) -> bool
+static Microsoft.Maui.Handlers.EditorHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.IEditorHandler! handler, Microsoft.Maui.IEditor! editor) -> void
+static Microsoft.Maui.Handlers.EntryHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.IEntryHandler! handler, Microsoft.Maui.IEntry! entry) -> void
+static Microsoft.Maui.Handlers.SearchBarHandler.MapIsSpellCheckEnabled(Microsoft.Maui.IViewHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
 static Microsoft.Maui.Layouts.FlexBasis.operator !=(Microsoft.Maui.Layouts.FlexBasis left, Microsoft.Maui.Layouts.FlexBasis right) -> bool
 static Microsoft.Maui.Layouts.FlexBasis.operator ==(Microsoft.Maui.Layouts.FlexBasis left, Microsoft.Maui.Layouts.FlexBasis right) -> bool
 static Microsoft.Maui.Layouts.LayoutExtensions.ArrangeContentUnbounded(this Microsoft.Maui.IContentView! contentView, Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
diff --git a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
index 5e0a56c1cd69..087d66429a02 100644
--- a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -9,6 +9,7 @@ Microsoft.Maui.ICommandMapper.Invoke(Microsoft.Maui.IElementHandler! viewHandler
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>.Add(string! key, System.Action<TViewHandler, TVirtualView, object?>! action) -> void
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>.Add(string! key, System.Action<TViewHandler, TVirtualView>! action) -> void
+Microsoft.Maui.ITextInput.IsSpellCheckEnabled.get -> bool
 Microsoft.Maui.IMenuElement.Accelerators.get -> System.Collections.Generic.IReadOnlyList<Microsoft.Maui.IAccelerator!>?
 Microsoft.Maui.Handlers.IImageSourcePartSetter
 Microsoft.Maui.Handlers.IImageSourcePartSetter.SetImageSource(object? obj) -> void
@@ -34,6 +35,9 @@ static Microsoft.Maui.CommandMapperExtensions.PrependToMapping<TVirtualView, TVi
 static Microsoft.Maui.CommandMapperExtensions.ReplaceMapping<TVirtualView, TViewHandler>(this Microsoft.Maui.ICommandMapper<Microsoft.Maui.IElement!, Microsoft.Maui.IElementHandler!>! commandMapper, string! key, System.Action<TViewHandler, TVirtualView, object?>! method) -> void
 static Microsoft.Maui.GridLength.operator !=(Microsoft.Maui.GridLength left, Microsoft.Maui.GridLength right) -> bool
 static Microsoft.Maui.GridLength.operator ==(Microsoft.Maui.GridLength left, Microsoft.Maui.GridLength right) -> bool
+static Microsoft.Maui.Handlers.EditorHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.IEditorHandler! handler, Microsoft.Maui.IEditor! editor) -> void
+static Microsoft.Maui.Handlers.EntryHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.IEntryHandler! handler, Microsoft.Maui.IEntry! entry) -> void
+static Microsoft.Maui.Handlers.SearchBarHandler.MapIsSpellCheckEnabled(Microsoft.Maui.IViewHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
 static Microsoft.Maui.Layouts.FlexBasis.operator !=(Microsoft.Maui.Layouts.FlexBasis left, Microsoft.Maui.Layouts.FlexBasis right) -> bool
 static Microsoft.Maui.Layouts.FlexBasis.operator ==(Microsoft.Maui.Layouts.FlexBasis left, Microsoft.Maui.Layouts.FlexBasis right) -> bool
 static Microsoft.Maui.Layouts.LayoutExtensions.ArrangeContentUnbounded(this Microsoft.Maui.IContentView! contentView, Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
diff --git a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
index 3e44924facf1..446bd2d9d14c 100644
--- a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
@@ -12,6 +12,7 @@ Microsoft.Maui.ICommandMapper.Invoke(Microsoft.Maui.IElementHandler! viewHandler
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>.Add(string! key, System.Action<TViewHandler, TVirtualView, object?>! action) -> void
 Microsoft.Maui.ICommandMapper<TVirtualView, TViewHandler>.Add(string! key, System.Action<TViewHandler, TVirtualView>! action) -> void
+Microsoft.Maui.ITextInput.IsSpellCheckEnabled.get -> bool
 Microsoft.Maui.IMenuElement.Accelerators.get -> System.Collections.Generic.IReadOnlyList<Microsoft.Maui.IAccelerator!>?
 Microsoft.Maui.Handlers.IImageSourcePartSetter
 Microsoft.Maui.Handlers.IImageSourcePartSetter.SetImageSource(object? obj) -> void
@@ -37,6 +38,9 @@ static Microsoft.Maui.CommandMapperExtensions.PrependToMapping<TVirtualView, TVi
 static Microsoft.Maui.CommandMapperExtensions.ReplaceMapping<TVirtualView, TViewHandler>(this Microsoft.Maui.ICommandMapper<Microsoft.Maui.IElement!, Microsoft.Maui.IElementHandler!>! commandMapper, string! key, System.Action<TViewHandler, TVirtualView, object?>! method) -> void
 static Microsoft.Maui.GridLength.operator !=(Microsoft.Maui.GridLength left, Microsoft.Maui.GridLength right) -> bool
 static Microsoft.Maui.GridLength.operator ==(Microsoft.Maui.GridLength left, Microsoft.Maui.GridLength right) -> bool
+static Microsoft.Maui.Handlers.EditorHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.IEditorHandler! handler, Microsoft.Maui.IEditor! editor) -> void
+static Microsoft.Maui.Handlers.EntryHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.IEntryHandler! handler, Microsoft.Maui.IEntry! entry) -> void
+static Microsoft.Maui.Handlers.SearchBarHandler.MapIsSpellCheckEnabled(Microsoft.Maui.IViewHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
 static Microsoft.Maui.Layouts.FlexBasis.operator !=(Microsoft.Maui.Layouts.FlexBasis left, Microsoft.Maui.Layouts.FlexBasis right) -> bool
 static Microsoft.Maui.Layouts.FlexBasis.operator ==(Microsoft.Maui.Layouts.FlexBasis left, Microsoft.Maui.Layouts.FlexBasis right) -> bool
 static Microsoft.Maui.Layouts.LayoutExtensions.ArrangeContentUnbounded(this Microsoft.Maui.IContentView! contentView, Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
diff --git a/src/Core/tests/DeviceTests/Handlers/Editor/EditorHandlerTests.Android.cs b/src/Core/tests/DeviceTests/Handlers/Editor/EditorHandlerTests.Android.cs
index 112e2db2a422..89cc9b22339b 100644
--- a/src/Core/tests/DeviceTests/Handlers/Editor/EditorHandlerTests.Android.cs
+++ b/src/Core/tests/DeviceTests/Handlers/Editor/EditorHandlerTests.Android.cs
@@ -127,6 +127,9 @@ bool GetNativeIsReadOnly(EditorHandler editorHandler) =>
 			!GetNativeEditor(editorHandler).Focusable;
 
 		bool GetNativeIsTextPredictionEnabled(EditorHandler editorHandler) =>
+			GetNativeEditor(editorHandler).InputType.HasFlag(InputTypes.TextFlagAutoCorrect);
+
+		bool GetNativeIsSpellCheckEnabled(EditorHandler editorHandler) =>
 			!GetNativeEditor(editorHandler).InputType.HasFlag(InputTypes.TextFlagNoSuggestions);
 
 		double GetNativeCharacterSpacing(EditorHandler editorHandler)
@@ -174,7 +177,7 @@ bool GetNativeIsChatKeyboard(EditorHandler editorHandler)
 			var textView = GetNativeEditor(editorHandler);
 			var inputTypes = textView.InputType;
 
-			return inputTypes.HasFlag(InputTypes.ClassText) && inputTypes.HasFlag(InputTypes.TextFlagCapSentences) && inputTypes.HasFlag(InputTypes.TextFlagNoSuggestions);
+			return inputTypes.HasFlag(InputTypes.ClassText) && inputTypes.HasFlag(InputTypes.TextFlagCapSentences) && inputTypes.HasFlag(InputTypes.TextFlagAutoComplete);
 		}
 
 		bool GetNativeIsEmailKeyboard(EditorHandler editorHandler)
@@ -206,7 +209,7 @@ bool GetNativeIsTextKeyboard(EditorHandler editorHandler)
 			var textView = GetNativeEditor(editorHandler);
 			var inputTypes = textView.InputType;
 
-			return inputTypes.HasFlag(InputTypes.ClassText) && inputTypes.HasFlag(InputTypes.TextFlagCapSentences) && !inputTypes.HasFlag(InputTypes.TextFlagNoSuggestions);
+			return inputTypes.HasFlag(InputTypes.ClassText) && inputTypes.HasFlag(InputTypes.TextFlagCapSentences) && inputTypes.HasFlag(InputTypes.TextFlagAutoComplete);
 		}
 
 		int GetNativeCursorPosition(EditorHandler editorHandler)
diff --git a/src/Core/tests/DeviceTests/Handlers/Editor/EditorHandlerTests.Windows.cs b/src/Core/tests/DeviceTests/Handlers/Editor/EditorHandlerTests.Windows.cs
index 274336b69711..e94bc8c358e7 100644
--- a/src/Core/tests/DeviceTests/Handlers/Editor/EditorHandlerTests.Windows.cs
+++ b/src/Core/tests/DeviceTests/Handlers/Editor/EditorHandlerTests.Windows.cs
@@ -49,6 +49,9 @@ bool GetNativeIsReadOnly(EditorHandler editorHandler) =>
 		bool GetNativeIsTextPredictionEnabled(EditorHandler editorHandler) =>
 			GetNativeEditor(editorHandler).IsTextPredictionEnabled;
 
+		bool GetNativeIsSpellCheckEnabled(EditorHandler editorHandler) =>
+			GetNativeEditor(editorHandler).IsSpellCheckEnabled;
+
 		Color GetNativeTextColor(EditorHandler editorHandler) =>
 			GetNativeEditor(editorHandler).Resources.TryGet<SolidColorBrush>("TextControlForeground").ToColor();
 
diff --git a/src/Core/tests/DeviceTests/Handlers/Editor/EditorHandlerTests.cs b/src/Core/tests/DeviceTests/Handlers/Editor/EditorHandlerTests.cs
index bcf7813ce628..e01e30d35040 100644
--- a/src/Core/tests/DeviceTests/Handlers/Editor/EditorHandlerTests.cs
+++ b/src/Core/tests/DeviceTests/Handlers/Editor/EditorHandlerTests.cs
@@ -220,22 +220,40 @@ public async Task MaxLengthClipsNativeTextCorrectly(int maxLength)
 			//Assert.Equal(expectedText, editor.Text);
 		}
 
-		[Theory(DisplayName = "Is Text Prediction Enabled")]
+		[Theory(DisplayName = "IsTextPredictionEnabled Initializes Correctly")]
 		[InlineData(true)]
 		[InlineData(false)]
-		public async Task IsTextPredictionEnabledCorrectly(bool isEnabled)
+		public async Task IsTextPredictionEnabledInitializesCorrectly(bool isEnabled)
 		{
 			var editor = new EditorStub()
 			{
 				IsTextPredictionEnabled = isEnabled
 			};
 
-			var nativeIsTextPredictionEnabled = await GetValueAsync(editor, handler =>
+			await AttachAndRun(editor, async (editorHandler) =>
 			{
-				return GetNativeIsTextPredictionEnabled(handler);
+				await AssertionExtensions.Wait(() => editorHandler.PlatformView.IsLoaded());
 			});
 
-			Assert.Equal(isEnabled, nativeIsTextPredictionEnabled);
+			await ValidatePropertyInitValue(editor, () => editor.IsTextPredictionEnabled, GetNativeIsTextPredictionEnabled, isEnabled);
+		}
+
+		[Theory(DisplayName = "IsSpellCheckEnabled Initializes Correctly")]
+		[InlineData(true)]
+		[InlineData(false)]
+		public async Task IsSpellCheckEnabledInitializesCorrectly(bool isEnabled)
+		{
+			var editor = new EditorStub
+			{
+				IsSpellCheckEnabled = isEnabled
+			};
+
+			await AttachAndRun(editor, async (editorHandler) =>
+			{
+				await AssertionExtensions.Wait(() => editorHandler.PlatformView.IsLoaded());
+			});
+
+			await ValidatePropertyInitValue(editor, () => editor.IsSpellCheckEnabled, GetNativeIsSpellCheckEnabled, isEnabled);
 		}
 
 		[Theory(DisplayName = "IsTextPredictionEnabled Updates Correctly")]
@@ -245,7 +263,15 @@ public async Task IsTextPredictionEnabledCorrectly(bool isEnabled)
 		[InlineData(false, false)]
 		public async Task IsTextPredictionEnabledUpdatesCorrectly(bool setValue, bool unsetValue)
 		{
-			var editor = new EditorStub();
+			var editor = new EditorStub()
+			{
+				IsTextPredictionEnabled = setValue
+			};
+
+			await AttachAndRun(editor, async (editorHandler) =>
+			{
+				await AssertionExtensions.Wait(() => editorHandler.PlatformView.IsLoaded());
+			});
 
 			await ValidatePropertyUpdatesValue(
 				editor,
@@ -255,6 +281,59 @@ await ValidatePropertyUpdatesValue(
 				unsetValue);
 		}
 
+		[Theory(DisplayName = "IsSpellCheckEnabled Updates Correctly")]
+		[InlineData(true, true)]
+		[InlineData(true, false)]
+		[InlineData(false, true)]
+		[InlineData(false, false)]
+		public async Task IsSpellCheckEnabledUpdatesCorrectly(bool setValue, bool unsetValue)
+		{
+			var editor = new EditorStub()
+			{
+				IsSpellCheckEnabled = setValue
+			};
+
+			await AttachAndRun(editor, async (editorHandler) =>
+			{
+				await AssertionExtensions.Wait(() => editorHandler.PlatformView.IsLoaded());
+			});
+
+			await ValidatePropertyUpdatesValue(
+				editor,
+				nameof(IEditor.IsSpellCheckEnabled),
+				GetNativeIsSpellCheckEnabled,
+				setValue,
+				unsetValue);
+		}
+
+		[Theory(DisplayName = "IsTextPredictionEnabled differs from IsSpellCheckEnabled")]
+		[InlineData(true, true)]
+		[InlineData(true, false)]
+		[InlineData(false, true)]
+		[InlineData(false, false)]
+		public async Task TextPredictionDiffersFromSpellChecking(bool textPredictionValue, bool spellCheckValue)
+		{
+			// Test to prevent: https://github.com/dotnet/maui/issues/8558
+			var areValuesEqual = textPredictionValue == spellCheckValue;
+
+			var editor = new EditorStub()
+			{
+				IsTextPredictionEnabled = textPredictionValue,
+				IsSpellCheckEnabled = spellCheckValue
+			};
+
+			await AttachAndRun(editor, async (editorHandler) =>
+			{
+				await AssertionExtensions.Wait(() => editorHandler.PlatformView.IsLoaded());
+			});
+
+			var nativeTextPrediction = await GetValueAsync(editor, GetNativeIsTextPredictionEnabled);
+			var nativeSpellChecking = await GetValueAsync(editor, GetNativeIsSpellCheckEnabled);
+
+			Assert.Equal(areValuesEqual, (nativeTextPrediction == nativeSpellChecking));
+		}
+
+
 		[Theory(DisplayName = "Validates Numeric Keyboard")]
 		[InlineData(nameof(Keyboard.Chat), false)]
 		[InlineData(nameof(Keyboard.Default), false)]
@@ -328,7 +407,12 @@ public async Task ValidateUrlKeyboard(string keyboardName, bool expected)
 		}
 
 		[Theory(DisplayName = "Validates Text Keyboard")]
+#if ANDROID || IOS || MACCATALYST
+		// Android text and Chat keyboards are the same
+		[InlineData(nameof(Keyboard.Chat), true)]
+#else
 		[InlineData(nameof(Keyboard.Chat), false)]
+#endif
 		[InlineData(nameof(Keyboard.Email), false)]
 		[InlineData(nameof(Keyboard.Numeric), false)]
 		[InlineData(nameof(Keyboard.Telephone), false)]
@@ -339,6 +423,10 @@ public async Task ValidateUrlKeyboard(string keyboardName, bool expected)
 		[InlineData(nameof(Keyboard.Default), true)]
 		// Plain is the same as the Default keyboard on Windows
 		[InlineData(nameof(Keyboard.Plain), true)]
+#elif IOS || MACCATALYST
+		// On ios the text and default keyboards are the same
+		[InlineData(nameof(Keyboard.Default), true)]
+		[InlineData(nameof(Keyboard.Plain), false)]
 #else
 		[InlineData(nameof(Keyboard.Default), false)]
 		[InlineData(nameof(Keyboard.Plain), false)]
@@ -354,12 +442,22 @@ public async Task ValidateTextKeyboard(string keyboardName, bool expected)
 
 		[Theory(DisplayName = "Validates Chat Keyboard")]
 		[InlineData(nameof(Keyboard.Chat), true)]
+#if IOS || MACCATALYST
+		// On iOS the default and chat keyboard are the same
+		[InlineData(nameof(Keyboard.Default), true)]
+#else
 		[InlineData(nameof(Keyboard.Default), false)]
+#endif
 		[InlineData(nameof(Keyboard.Email), false)]
 		[InlineData(nameof(Keyboard.Numeric), false)]
 		[InlineData(nameof(Keyboard.Plain), false)]
 		[InlineData(nameof(Keyboard.Telephone), false)]
+#if ANDROID || IOS || MACCATALYST
+		// Android & iOS text and Chat keyboards are the same
+		[InlineData(nameof(Keyboard.Text), true)]
+#else
 		[InlineData(nameof(Keyboard.Text), false)]
+#endif
 		[InlineData(nameof(Keyboard.Url), false)]
 		public async Task ValidateChatKeyboard(string keyboardName, bool expected)
 		{
@@ -391,7 +489,6 @@ await AttachAndRun(editor, (handler) =>
 						PlatformViewValue = GetNativeVerticalTextAlignment(handler)
 					});
 
-
 			Assert.Equal(textAlignment, values.ViewValue);
 			Assert.Equal(platformAlignment, values.PlatformViewValue);
 		}
diff --git a/src/Core/tests/DeviceTests/Handlers/Editor/EditorHandlerTests.iOS.cs b/src/Core/tests/DeviceTests/Handlers/Editor/EditorHandlerTests.iOS.cs
index 6c03c6753c27..d133c6b2c292 100644
--- a/src/Core/tests/DeviceTests/Handlers/Editor/EditorHandlerTests.iOS.cs
+++ b/src/Core/tests/DeviceTests/Handlers/Editor/EditorHandlerTests.iOS.cs
@@ -231,6 +231,9 @@ bool GetNativeIsReadOnly(EditorHandler editorHandler) =>
 		bool GetNativeIsTextPredictionEnabled(EditorHandler editorHandler) =>
 			GetNativeEditor(editorHandler).AutocorrectionType == UITextAutocorrectionType.Yes;
 
+		bool GetNativeIsSpellCheckEnabled(EditorHandler editorHandler) =>
+			GetNativeEditor(editorHandler).SpellCheckingType == UITextSpellCheckingType.Yes;
+
 		Color GetNativeTextColor(EditorHandler editorHandler) =>
 			GetNativeEditor(editorHandler).TextColor.ToColor();
 
@@ -264,7 +267,7 @@ bool GetNativeIsChatKeyboard(EditorHandler editorHandler)
 
 			return nativeEditor.AutocapitalizationType == UITextAutocapitalizationType.Sentences &&
 				nativeEditor.AutocorrectionType == UITextAutocorrectionType.Yes &&
-				nativeEditor.SpellCheckingType == UITextSpellCheckingType.No;
+				nativeEditor.SpellCheckingType == UITextSpellCheckingType.Yes;
 		}
 
 		int GetNativeCursorPosition(EditorHandler editorHandler)
diff --git a/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.Android.cs b/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.Android.cs
index 4eccd3e7f477..09529b05a014 100644
--- a/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.Android.cs
+++ b/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.Android.cs
@@ -247,6 +247,9 @@ bool GetNativeIsPassword(EntryHandler entryHandler)
 		}
 
 		bool GetNativeIsTextPredictionEnabled(EntryHandler entryHandler) =>
+			GetNativeEntry(entryHandler).InputType.HasFlag(InputTypes.TextFlagAutoCorrect);
+
+		bool GetNativeIsSpellCheckEnabled(EntryHandler entryHandler) =>
 			!GetNativeEntry(entryHandler).InputType.HasFlag(InputTypes.TextFlagNoSuggestions);
 
 		string GetNativePlaceholder(EntryHandler entryHandler) =>
@@ -280,7 +283,7 @@ bool GetNativeIsChatKeyboard(EntryHandler entryHandler)
 			var editText = GetNativeEntry(entryHandler);
 			var inputTypes = editText.InputType;
 
-			return inputTypes.HasFlag(InputTypes.ClassText) && inputTypes.HasFlag(InputTypes.TextFlagCapSentences) && inputTypes.HasFlag(InputTypes.TextFlagNoSuggestions);
+			return inputTypes.HasFlag(InputTypes.ClassText) && inputTypes.HasFlag(InputTypes.TextFlagCapSentences) && inputTypes.HasFlag(InputTypes.TextFlagAutoComplete);
 		}
 
 		bool GetNativeIsEmailKeyboard(EntryHandler entryHandler)
@@ -312,7 +315,7 @@ bool GetNativeIsTextKeyboard(EntryHandler entryHandler)
 			var editText = GetNativeEntry(entryHandler);
 			var inputTypes = editText.InputType;
 
-			return inputTypes.HasFlag(InputTypes.ClassText) && inputTypes.HasFlag(InputTypes.TextFlagCapSentences) && !inputTypes.HasFlag(InputTypes.TextFlagNoSuggestions);
+			return inputTypes.HasFlag(InputTypes.ClassText) && inputTypes.HasFlag(InputTypes.TextFlagCapSentences) && inputTypes.HasFlag(InputTypes.TextFlagAutoComplete);
 		}
 
 		Android.Views.TextAlignment GetNativeHorizontalTextAlignment(EntryHandler entryHandler) =>
diff --git a/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.Windows.cs b/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.Windows.cs
index 3868d27a7d46..268bfa8b2d6a 100644
--- a/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.Windows.cs
+++ b/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.Windows.cs
@@ -118,6 +118,9 @@ string GetNativePlaceholder(EntryHandler entryHandler) =>
 		bool GetNativeIsTextPredictionEnabled(EntryHandler entryHandler) =>
 			GetNativeEntry(entryHandler).IsTextPredictionEnabled;
 
+		bool GetNativeIsSpellCheckEnabled(EntryHandler entryHandler) =>
+			GetNativeEntry(entryHandler).IsSpellCheckEnabled;
+
 		bool GetNativeIsReadOnly(EntryHandler entryHandler) =>
 			GetNativeEntry(entryHandler).IsReadOnly;
 
diff --git a/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.cs b/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.cs
index 4aa67276dac1..60086d52d4f1 100644
--- a/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.cs
+++ b/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.cs
@@ -71,19 +71,6 @@ public async Task PlaceholderInitializesCorrectly()
 			await ValidatePropertyInitValue(entry, () => entry.Placeholder, GetNativePlaceholder, "Placeholder");
 		}
 
-		[Theory(DisplayName = "Is Text Prediction Enabled")]
-		[InlineData(true)]
-		[InlineData(false)]
-		public async Task IsTextPredictionEnabledCorrectly(bool isEnabled)
-		{
-			var entry = new EntryStub()
-			{
-				IsTextPredictionEnabled = isEnabled
-			};
-
-			await ValidatePropertyInitValue(entry, () => entry.IsTextPredictionEnabled, GetNativeIsTextPredictionEnabled, isEnabled);
-		}
-
 		[Theory(DisplayName = "IsPassword Updates Correctly")]
 		[InlineData(true, true)]
 		[InlineData(true, false)]
@@ -142,6 +129,42 @@ await ValidatePropertyUpdatesValue(
 				unsetValue);
 		}
 
+		[Theory(DisplayName = "IsTextPredictionEnabled Initializes Correctly")]
+		[InlineData(true)]
+		[InlineData(false)]
+		public async Task IsTextPredictionEnabledInitializesCorrectly(bool isEnabled)
+		{
+			var entry = new EntryStub()
+			{
+				IsTextPredictionEnabled = isEnabled
+			};
+
+			await AttachAndRun(entry, async (entryHandler) =>
+			{
+				await AssertionExtensions.Wait(() => entryHandler.PlatformView.IsLoaded());
+			});
+
+			await ValidatePropertyInitValue(entry, () => entry.IsTextPredictionEnabled, GetNativeIsTextPredictionEnabled, isEnabled);
+		}
+
+		[Theory(DisplayName = "IsSpellCheckEnabled Initializes Correctly")]
+		[InlineData(true)]
+		[InlineData(false)]
+		public async Task IsSpellCheckEnabledInitializesCorrectly(bool isEnabled)
+		{
+			var entry = new EntryStub()
+			{
+				IsSpellCheckEnabled = isEnabled
+			};
+
+			await AttachAndRun(entry, async (entryHandler) =>
+			{
+				await AssertionExtensions.Wait(() => entryHandler.PlatformView.IsLoaded());
+			});
+
+			await ValidatePropertyInitValue(entry, () => entry.IsSpellCheckEnabled, GetNativeIsSpellCheckEnabled, isEnabled);
+		}
+
 		[Theory(DisplayName = "IsTextPredictionEnabled Updates Correctly")]
 		[InlineData(true, true)]
 		[InlineData(true, false)]
@@ -149,7 +172,15 @@ await ValidatePropertyUpdatesValue(
 		[InlineData(false, false)]
 		public async Task IsTextPredictionEnabledUpdatesCorrectly(bool setValue, bool unsetValue)
 		{
-			var entry = new EntryStub();
+			var entry = new EntryStub()
+			{
+				IsTextPredictionEnabled = setValue
+			};
+
+			await AttachAndRun(entry, async (entryHandler) =>
+			{
+				await AssertionExtensions.Wait(() => entryHandler.PlatformView.IsLoaded());
+			});
 
 			await ValidatePropertyUpdatesValue(
 				entry,
@@ -159,6 +190,58 @@ await ValidatePropertyUpdatesValue(
 				unsetValue);
 		}
 
+		[Theory(DisplayName = "IsSpellCheckEnabled Updates Correctly")]
+		[InlineData(true, true)]
+		[InlineData(true, false)]
+		[InlineData(false, true)]
+		[InlineData(false, false)]
+		public async Task IsSpellCheckEnabledUpdatesCorrectly(bool setValue, bool unsetValue)
+		{
+			var entry = new EntryStub()
+			{
+				IsSpellCheckEnabled = setValue
+			};
+
+			await AttachAndRun(entry, async (entryHandler) =>
+			{
+				await AssertionExtensions.Wait(() => entryHandler.PlatformView.IsLoaded());
+			});
+
+			await ValidatePropertyUpdatesValue(
+				entry,
+				nameof(IEntry.IsSpellCheckEnabled),
+				GetNativeIsSpellCheckEnabled,
+				setValue,
+				unsetValue);
+		}
+
+		[Theory(DisplayName = "IsTextPredictionEnabled differs from IsSpellCheckEnabled")]
+		[InlineData(true, true)]
+		[InlineData(true, false)]
+		[InlineData(false, true)]
+		[InlineData(false, false)]
+		public async Task TextPredictionDiffersFromSpellChecking(bool textPredictionValue, bool spellCheckValue)
+		{
+			// Test to prevent: https://github.com/dotnet/maui/issues/8558
+			var areValuesEqual = textPredictionValue == spellCheckValue;
+
+			var entry = new EntryStub()
+			{
+				IsTextPredictionEnabled = textPredictionValue,
+				IsSpellCheckEnabled = spellCheckValue
+			};
+
+			await AttachAndRun(entry, async (entryHandler) =>
+			{
+				await AssertionExtensions.Wait(() => entryHandler.PlatformView.IsLoaded());
+			});
+
+			var nativeTextPrediction = await GetValueAsync(entry, GetNativeIsTextPredictionEnabled);
+			var nativeSpellChecking = await GetValueAsync(entry, GetNativeIsSpellCheckEnabled);
+
+			Assert.Equal(areValuesEqual, (nativeTextPrediction == nativeSpellChecking));
+		}
+
 		[Theory(DisplayName = "IsReadOnly Updates Correctly")]
 		[InlineData(true, true)]
 		[InlineData(true, false)]
@@ -264,21 +347,30 @@ public async Task ValidateUrlKeyboard(string keyboardName, bool expected)
 		}
 
 		[Theory(DisplayName = "Validates Text Keyboard")]
+#if ANDROID || IOS || MACCATALYST
+		// Android text and Chat keyboards are the same
+		[InlineData(nameof(Keyboard.Chat), true)]
+#else
 		[InlineData(nameof(Keyboard.Chat), false)]
+#endif
+		[InlineData(nameof(Keyboard.Email), false)]
+		[InlineData(nameof(Keyboard.Numeric), false)]
+		[InlineData(nameof(Keyboard.Telephone), false)]
+		[InlineData(nameof(Keyboard.Text), true)]
+		[InlineData(nameof(Keyboard.Url), false)]
 #if WINDOWS
 		// The Text keyboard is the default one on Windows
 		[InlineData(nameof(Keyboard.Default), true)]
 		// Plain is the same as the Default keyboard on Windows
 		[InlineData(nameof(Keyboard.Plain), true)]
+#elif IOS || MACCATALYST
+		// On ios the text and default keyboards are the same
+		[InlineData(nameof(Keyboard.Default), true)]
+		[InlineData(nameof(Keyboard.Plain), false)]
 #else
 		[InlineData(nameof(Keyboard.Default), false)]
 		[InlineData(nameof(Keyboard.Plain), false)]
 #endif
-		[InlineData(nameof(Keyboard.Email), false)]
-		[InlineData(nameof(Keyboard.Numeric), false)]
-		[InlineData(nameof(Keyboard.Telephone), false)]
-		[InlineData(nameof(Keyboard.Text), true)]
-		[InlineData(nameof(Keyboard.Url), false)]
 		public async Task ValidateTextKeyboard(string keyboardName, bool expected)
 		{
 			var keyboard = (Keyboard)typeof(Keyboard).GetProperty(keyboardName).GetValue(null);
@@ -290,12 +382,22 @@ public async Task ValidateTextKeyboard(string keyboardName, bool expected)
 
 		[Theory(DisplayName = "Validates Chat Keyboard")]
 		[InlineData(nameof(Keyboard.Chat), true)]
+#if IOS || MACCATALYST
+		// On iOS the default and chat keyboard are the same
+		[InlineData(nameof(Keyboard.Default), true)]
+#else
 		[InlineData(nameof(Keyboard.Default), false)]
+#endif
 		[InlineData(nameof(Keyboard.Email), false)]
 		[InlineData(nameof(Keyboard.Numeric), false)]
 		[InlineData(nameof(Keyboard.Plain), false)]
 		[InlineData(nameof(Keyboard.Telephone), false)]
+#if ANDROID || IOS || MACCATALYST
+		// Android & iOS text and Chat keyboards are the same
+		[InlineData(nameof(Keyboard.Text), true)]
+#else
 		[InlineData(nameof(Keyboard.Text), false)]
+#endif
 		[InlineData(nameof(Keyboard.Url), false)]
 		public async Task ValidateChatKeyboard(string keyboardName, bool expected)
 		{
diff --git a/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.iOS.cs b/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.iOS.cs
index cbb2e16d0161..9f52881d5c5d 100644
--- a/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.iOS.cs
+++ b/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.iOS.cs
@@ -669,6 +669,9 @@ string GetNativePlaceholder(EntryHandler entryHandler) =>
 		bool GetNativeIsTextPredictionEnabled(EntryHandler entryHandler) =>
 			GetNativeEntry(entryHandler).AutocorrectionType == UITextAutocorrectionType.Yes;
 
+		bool GetNativeIsSpellCheckEnabled(EntryHandler entryHandler) =>
+			GetNativeEntry(entryHandler).SpellCheckingType == UITextSpellCheckingType.Yes;
+
 		bool GetNativeIsReadOnly(EntryHandler entryHandler) =>
 			!GetNativeEntry(entryHandler).UserInteractionEnabled;
 
@@ -699,7 +702,7 @@ bool GetNativeIsChatKeyboard(EntryHandler entryHandler)
 
 			return nativeEntry.AutocapitalizationType == UITextAutocapitalizationType.Sentences &&
 				nativeEntry.AutocorrectionType == UITextAutocorrectionType.Yes &&
-				nativeEntry.SpellCheckingType == UITextSpellCheckingType.No;
+				nativeEntry.SpellCheckingType == UITextSpellCheckingType.Yes;
 		}
 
 		bool GetNativeClearButtonVisibility(EntryHandler entryHandler) =>
diff --git a/src/Core/tests/DeviceTests/Handlers/SearchBar/SearchBarHandlerTests.Android.cs b/src/Core/tests/DeviceTests/Handlers/SearchBar/SearchBarHandlerTests.Android.cs
index 56a1e54d1f77..4f9f9af09ef6 100644
--- a/src/Core/tests/DeviceTests/Handlers/SearchBar/SearchBarHandlerTests.Android.cs
+++ b/src/Core/tests/DeviceTests/Handlers/SearchBar/SearchBarHandlerTests.Android.cs
@@ -278,7 +278,7 @@ bool GetNativeIsChatKeyboard(SearchBarHandler searchBarHandler)
 
 			var inputTypes = editText.InputType;
 
-			return inputTypes.HasFlag(InputTypes.ClassText) && inputTypes.HasFlag(InputTypes.TextFlagCapSentences) && inputTypes.HasFlag(InputTypes.TextFlagNoSuggestions);
+			return inputTypes.HasFlag(InputTypes.ClassText) && inputTypes.HasFlag(InputTypes.TextFlagCapSentences) && inputTypes.HasFlag(InputTypes.TextFlagAutoComplete);
 		}
 
 		bool GetNativeIsEmailKeyboard(SearchBarHandler searchBarHandler)
@@ -330,7 +330,33 @@ bool GetNativeIsTextKeyboard(SearchBarHandler searchBarHandler)
 
 			var inputTypes = editText.InputType;
 
-			return inputTypes.HasFlag(InputTypes.ClassText) && inputTypes.HasFlag(InputTypes.TextFlagCapSentences) && !inputTypes.HasFlag(InputTypes.TextFlagNoSuggestions);
+			return inputTypes.HasFlag(InputTypes.ClassText) && inputTypes.HasFlag(InputTypes.TextFlagCapSentences) && inputTypes.HasFlag(InputTypes.TextFlagAutoComplete);
+		}
+
+		bool GetNativeIsTextPredictionEnabled(SearchBarHandler searchBarHandler)
+		{
+			var searchView = GetNativeSearchBar(searchBarHandler);
+			var editText = searchView.GetChildrenOfType<EditText>().First();
+
+			if (editText is null)
+				return false;
+
+			var inputTypes = editText.InputType;
+
+			return inputTypes.HasFlag(InputTypes.TextFlagAutoCorrect);
+		}
+
+		bool GetNativeIsSpellCheckEnabled(SearchBarHandler searchBarHandler)
+		{
+			var searchView = GetNativeSearchBar(searchBarHandler);
+			var editText = searchView.GetChildrenOfType<EditText>().First();
+
+			if (editText is null)
+				return false;
+
+			var inputTypes = editText.InputType;
+
+			return !inputTypes.HasFlag(InputTypes.TextFlagNoSuggestions);
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Handlers/SearchBar/SearchBarHandlerTests.Windows.cs b/src/Core/tests/DeviceTests/Handlers/SearchBar/SearchBarHandlerTests.Windows.cs
index 6e80b74e60f5..03bcadd19c28 100644
--- a/src/Core/tests/DeviceTests/Handlers/SearchBar/SearchBarHandlerTests.Windows.cs
+++ b/src/Core/tests/DeviceTests/Handlers/SearchBar/SearchBarHandlerTests.Windows.cs
@@ -32,25 +32,6 @@ await AttachAndRun(searchBar, async (searchBarHandler) =>
 			await ValidatePropertyInitValue(searchBar, () => searchBar.CancelButtonColor, GetNativeCancelButtonColor, expected);
 		}
 
-		[Theory(DisplayName = "Is Text Prediction Enabled")]
-		[InlineData(true)]
-		[InlineData(false)]
-		public async Task IsTextPredictionEnabledCorrectly(bool isEnabled)
-		{
-			var searchBar = new SearchBarStub()
-			{
-				IsTextPredictionEnabled = isEnabled
-			};
-
-			await AttachAndRun(searchBar, async (searchBarHandler) =>
-			{
-				await AssertionExtensions.Wait(() => searchBarHandler.PlatformView.Width != 0);
-			});
-
-			var nativeIsTextPredictionEnabled = await GetValueAsync(searchBar, GetNativeIsTextPredictionEnabled);
-			Assert.Equal(isEnabled, nativeIsTextPredictionEnabled);
-		}
-
 		static AutoSuggestBox GetNativeSearchBar(SearchBarHandler searchBarHandler) =>
 			searchBarHandler.PlatformView;
 
@@ -119,6 +100,20 @@ bool GetNativeIsTextPredictionEnabled(SearchBarHandler searchBarHandler)
 			return false;
 		}
 
+		bool GetNativeIsSpellCheckEnabled(SearchBarHandler searchBarHandler)
+		{
+			var platformSearchBar = GetNativeSearchBar(searchBarHandler);
+
+			var textBox = platformSearchBar.GetFirstDescendant<TextBox>();
+
+			if (textBox is not null)
+			{
+				return textBox.IsSpellCheckEnabled;
+			}
+
+			return false;
+		}
+
 		Color GetNativeCancelButtonColor(SearchBarHandler searchBarHandler)
 		{
 			var platformSearchBar = GetNativeSearchBar(searchBarHandler);
diff --git a/src/Core/tests/DeviceTests/Handlers/SearchBar/SearchBarHandlerTests.cs b/src/Core/tests/DeviceTests/Handlers/SearchBar/SearchBarHandlerTests.cs
index 2071c311eeb1..5b7e6d84e80d 100644
--- a/src/Core/tests/DeviceTests/Handlers/SearchBar/SearchBarHandlerTests.cs
+++ b/src/Core/tests/DeviceTests/Handlers/SearchBar/SearchBarHandlerTests.cs
@@ -64,6 +64,119 @@ await ValidatePropertyUpdatesValue(
 				unsetValue);
 		}
 
+		[Theory(DisplayName = "IsTextPredictionEnabled Initializes Correctly")]
+		[InlineData(true)]
+		[InlineData(false)]
+		public async Task IsTextPredictionEnabledInitializesCorrectly(bool isEnabled)
+		{
+			var searchBar = new SearchBarStub() 
+			{
+				IsTextPredictionEnabled = isEnabled
+			};
+
+			await AttachAndRun(searchBar, async (searchBarHandler) =>
+			{
+				await AssertionExtensions.Wait(() => searchBarHandler.PlatformView.IsLoaded());
+			});
+
+			await ValidatePropertyInitValue(searchBar, () => searchBar.IsTextPredictionEnabled, GetNativeIsTextPredictionEnabled, isEnabled);
+		}
+
+		[Theory(DisplayName = "IsSpellCheckEnabled Initializes Correctly")]
+		[InlineData(true)]
+		[InlineData(false)]
+		public async Task IsSpellCheckEnabledInitializesCorrectly(bool isEnabled)
+		{
+			var searchBar = new SearchBarStub()
+			{
+				IsSpellCheckEnabled = isEnabled
+			};
+
+			await AttachAndRun(searchBar, async (searchBarHandler) =>
+			{
+				await AssertionExtensions.Wait(() => searchBarHandler.PlatformView.IsLoaded());
+			});
+
+			await ValidatePropertyInitValue(searchBar, () => searchBar.IsSpellCheckEnabled, GetNativeIsSpellCheckEnabled, isEnabled);
+		}
+
+		[Theory(DisplayName = "IsTextPredictionEnabled Updates Correctly")]
+		[InlineData(true, true)]
+		[InlineData(true, false)]
+		[InlineData(false, true)]
+		[InlineData(false, false)]
+		public async Task IsTextPredictionEnabledUpdatesCorrectly(bool setValue, bool unsetValue)
+		{
+			var searchBar = new SearchBarStub()
+			{
+				IsTextPredictionEnabled = setValue
+			};
+
+			await AttachAndRun(searchBar, async (searchBarHandler) =>
+			{
+				await AssertionExtensions.Wait(() => searchBarHandler.PlatformView.IsLoaded());
+			});
+
+			await ValidatePropertyUpdatesValue(
+				searchBar,
+				nameof(ISearchBar.IsTextPredictionEnabled),
+				GetNativeIsTextPredictionEnabled,
+				setValue,
+				unsetValue);
+		}
+
+		[Theory(DisplayName = "IsSpellCheckEnabled Updates Correctly")]
+		[InlineData(true, true)]
+		[InlineData(true, false)]
+		[InlineData(false, true)]
+		[InlineData(false, false)]
+		public async Task IsSpellCheckEnabledUpdatesCorrectly(bool setValue, bool unsetValue)
+		{
+			var searchBar = new SearchBarStub()
+			{
+				IsSpellCheckEnabled = setValue
+			};
+
+			await AttachAndRun(searchBar, async (searchBarHandler) =>
+			{
+				await AssertionExtensions.Wait(() => searchBarHandler.PlatformView.IsLoaded());
+			});
+
+			await ValidatePropertyUpdatesValue(
+				searchBar,
+				nameof(ISearchBar.IsSpellCheckEnabled),
+				GetNativeIsSpellCheckEnabled,
+				setValue,
+				unsetValue);
+		}
+
+		[Theory(DisplayName = "IsTextPredictionEnabled differs from IsSpellCheckEnabled")]
+		[InlineData(true, true)]
+		[InlineData(true, false)]
+		[InlineData(false, true)]
+		[InlineData(false, false)]
+		public async Task TextPredictionDiffersFromSpellChecking(bool textPredictionValue, bool spellCheckValue)
+		{
+			// Test to prevent: https://github.com/dotnet/maui/issues/8558
+			var areValuesEqual = textPredictionValue == spellCheckValue;
+
+			var searchBar = new SearchBarStub()
+			{
+				IsTextPredictionEnabled = textPredictionValue,
+				IsSpellCheckEnabled = spellCheckValue
+			};
+
+			await AttachAndRun(searchBar, async (searchBarHandler) =>
+			{
+				await AssertionExtensions.Wait(() => searchBarHandler.PlatformView.IsLoaded());
+			});
+
+			var nativeTextPrediction = await GetValueAsync(searchBar, GetNativeIsTextPredictionEnabled);
+			var nativeSpellChecking = await GetValueAsync(searchBar, GetNativeIsSpellCheckEnabled);
+
+			Assert.Equal(areValuesEqual, (nativeTextPrediction == nativeSpellChecking));
+		}
+
 		[Fact(DisplayName = "TextColor Initializes Correctly")]
 		public async Task TextColorInitializesCorrectly()
 		{
@@ -160,6 +273,7 @@ await AttachAndRun(searchBar, (handler) =>
 			});
 		}
 
+		// TODO: JD - re-enable these tests for windows. Seems they were disabled because there is no implementation of "GetNativeKeyboard" in the .Windows test file
 #if !WINDOWS
 		[Theory]
 		[InlineData(true)]
@@ -174,7 +288,6 @@ public async Task IsReadOnlyInitializesCorrectly(bool isReadOnly)
 
 			await ValidatePropertyInitValue(searchBar, () => searchBar.IsReadOnly, GetNativeIsReadOnly, searchBar.IsReadOnly);
 		}
-
 		[Theory(DisplayName = "Validates Numeric Keyboard")]
 		[InlineData(nameof(Keyboard.Chat), false)]
 		[InlineData(nameof(Keyboard.Default), false)]
@@ -248,7 +361,12 @@ public async Task ValidateUrlKeyboard(string keyboardName, bool expected)
 		}
 
 		[Theory(DisplayName = "Validates Text Keyboard")]
+#if ANDROID || IOS || MACCATALYST
+		// Android text and Chat keyboards are the same
+		[InlineData(nameof(Keyboard.Chat), true)]
+#else
 		[InlineData(nameof(Keyboard.Chat), false)]
+#endif
 		[InlineData(nameof(Keyboard.Email), false)]
 		[InlineData(nameof(Keyboard.Numeric), false)]
 		[InlineData(nameof(Keyboard.Telephone), false)]
@@ -259,6 +377,10 @@ public async Task ValidateUrlKeyboard(string keyboardName, bool expected)
 		[InlineData(nameof(Keyboard.Default), true)]
 		// Plain is the same as the Default keyboard on Windows
 		[InlineData(nameof(Keyboard.Plain), true)]
+#elif IOS || MACCATALYST
+		// On ios the text and default keyboards are the same
+		[InlineData(nameof(Keyboard.Default), true)]
+		[InlineData(nameof(Keyboard.Plain), false)]
 #else
 		[InlineData(nameof(Keyboard.Default), false)]
 		[InlineData(nameof(Keyboard.Plain), false)]
@@ -274,12 +396,22 @@ public async Task ValidateTextKeyboard(string keyboardName, bool expected)
 
 		[Theory(DisplayName = "Validates Chat Keyboard")]
 		[InlineData(nameof(Keyboard.Chat), true)]
+#if IOS || MACCATALYST
+		// On iOS the default and chat keyboard are the same
+		[InlineData(nameof(Keyboard.Default), true)]
+#else
 		[InlineData(nameof(Keyboard.Default), false)]
+#endif
 		[InlineData(nameof(Keyboard.Email), false)]
 		[InlineData(nameof(Keyboard.Numeric), false)]
 		[InlineData(nameof(Keyboard.Plain), false)]
 		[InlineData(nameof(Keyboard.Telephone), false)]
+#if ANDROID || IOS || MACCATALYST
+		// Android & iOS text and Chat keyboards are the same
+		[InlineData(nameof(Keyboard.Text), true)]
+#else
 		[InlineData(nameof(Keyboard.Text), false)]
+#endif
 		[InlineData(nameof(Keyboard.Url), false)]
 		public async Task ValidateChatKeyboard(string keyboardName, bool expected)
 		{
diff --git a/src/Core/tests/DeviceTests/Handlers/SearchBar/SearchBarHandlerTests.iOS.cs b/src/Core/tests/DeviceTests/Handlers/SearchBar/SearchBarHandlerTests.iOS.cs
index 16f6b9ff76f1..b244e4f71b20 100644
--- a/src/Core/tests/DeviceTests/Handlers/SearchBar/SearchBarHandlerTests.iOS.cs
+++ b/src/Core/tests/DeviceTests/Handlers/SearchBar/SearchBarHandlerTests.iOS.cs
@@ -288,7 +288,28 @@ bool GetNativeIsChatKeyboard(SearchBarHandler searchBarHandler)
 
 			return textField.AutocapitalizationType == UITextAutocapitalizationType.Sentences &&
 				textField.AutocorrectionType == UITextAutocorrectionType.Yes &&
-				textField.SpellCheckingType == UITextSpellCheckingType.No;
+				textField.SpellCheckingType == UITextSpellCheckingType.Yes;
+		}
+		bool GetNativeIsTextPredictionEnabled(SearchBarHandler searchBarHandler)
+		{
+			var searchView = GetNativeSearchBar(searchBarHandler);
+			var textField = searchView.GetSearchTextField();
+
+			if (textField is null)
+				return false;
+
+			return textField.AutocorrectionType == UITextAutocorrectionType.Yes;
+		}
+
+		bool GetNativeIsSpellCheckEnabled(SearchBarHandler searchBarHandler)
+		{
+			var searchView = GetNativeSearchBar(searchBarHandler);
+			var textField = searchView.GetSearchTextField();
+
+			if (textField is null)
+				return false;
+
+			return textField.SpellCheckingType == UITextSpellCheckingType.Yes;
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Stubs/EditorStub.cs b/src/Core/tests/DeviceTests/Stubs/EditorStub.cs
index a72d8b48dec9..1cbeb026688f 100644
--- a/src/Core/tests/DeviceTests/Stubs/EditorStub.cs
+++ b/src/Core/tests/DeviceTests/Stubs/EditorStub.cs
@@ -29,6 +29,8 @@ public string Text
 
 		public bool IsTextPredictionEnabled { get; set; } = true;
 
+		public bool IsSpellCheckEnabled { get; set; } = true;
+
 		public Keyboard Keyboard { get; set; } = Keyboard.Default;
 
 		public TextAlignment HorizontalTextAlignment { get; set; }
diff --git a/src/Core/tests/DeviceTests/Stubs/EntryStub.cs b/src/Core/tests/DeviceTests/Stubs/EntryStub.cs
index 4b8edf0bbdce..41154a48d0c8 100644
--- a/src/Core/tests/DeviceTests/Stubs/EntryStub.cs
+++ b/src/Core/tests/DeviceTests/Stubs/EntryStub.cs
@@ -21,6 +21,8 @@ public string Text
 
 		public bool IsTextPredictionEnabled { get; set; } = true;
 
+		public bool IsSpellCheckEnabled { get; set; } = true;
+
 		public string Placeholder { get; set; }
 
 		public Color PlaceholderColor { get; set; }
diff --git a/src/Core/tests/DeviceTests/Stubs/SearchBarStub.cs b/src/Core/tests/DeviceTests/Stubs/SearchBarStub.cs
index d2cf5220f087..04e7c2cceaab 100644
--- a/src/Core/tests/DeviceTests/Stubs/SearchBarStub.cs
+++ b/src/Core/tests/DeviceTests/Stubs/SearchBarStub.cs
@@ -41,6 +41,8 @@ void OnTextChanged(string oldValue, string newValue) =>
 
 		public bool IsTextPredictionEnabled { get; set; } = true;
 
+		public bool IsSpellCheckEnabled { get; set; } = true;
+
 		public bool IsReadOnly { get; set; }
 
 		public int MaxLength { get; set; } = int.MaxValue;

From 05b741dba520e6eb71faea4476ad0fb8a460af7f Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Sat, 8 Jul 2023 00:36:36 +0200
Subject: [PATCH 073/105] Implement all permutations of InputTransparent and
 CascadeInputTransparent (#14846)

* Fix InputTransparent and CascadeInputTransparent

* Adding some tests for the baseline

* This works better

* Fix this

* Also these platforms

* Support compatibility

* Improved the sample for testing

* See what this does

* Revert "See what this does"

This reverts commit 960969707ac6d4ec9d9509569d8fac4c0bbb3da4.

* comment out new tests

* Try reverting these

* Revert "Try reverting these"

This reverts commit 31bfb3478f756681183b5f442c876364c760f0c1.

* Revert the bad code hacks

* This should work!

* Skip the failing test for now

* this is no longer needed

* removed as it is not needed
---
 .../Pages/Core/InputTransparentPage.xaml      | 150 +++--
 .../Core/IInputTransparentContainerElement.cs |  14 +
 src/Controls/src/Core/Layout.cs               |  15 +-
 .../src/Core/Layout/Layout.Android.cs         |  27 +-
 src/Controls/src/Core/Layout/Layout.Mapper.cs |   2 -
 src/Controls/src/Core/Layout/Layout.Tizen.cs  |  32 +-
 .../src/Core/Layout/Layout.Windows.cs         |  22 +-
 src/Controls/src/Core/Layout/Layout.cs        |  32 +-
 src/Controls/src/Core/Layout/Layout.iOS.cs    |  22 +-
 .../src/Core/VisualElement/VisualElement.cs   |  73 ++-
 .../Core.UnitTests/Layouts/LayoutTests.cs     |  57 --
 .../VisualElementInputTransparentTests.cs     | 557 ++++++++++++++++++
 .../Xaml.UnitTests/Issues/Bz54334.xaml.cs     |   2 +-
 13 files changed, 763 insertions(+), 242 deletions(-)
 create mode 100644 src/Controls/src/Core/IInputTransparentContainerElement.cs
 create mode 100644 src/Controls/tests/Core.UnitTests/VisualElementInputTransparentTests.cs

diff --git a/src/Controls/samples/Controls.Sample/Pages/Core/InputTransparentPage.xaml b/src/Controls/samples/Controls.Sample/Pages/Core/InputTransparentPage.xaml
index 70ff593aed87..5c10fc7f2ffb 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Core/InputTransparentPage.xaml
+++ b/src/Controls/samples/Controls.Sample/Pages/Core/InputTransparentPage.xaml
@@ -3,70 +3,100 @@
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     x:Class="Maui.Controls.Sample.Pages.InputTransparentPage">
-	<ContentPage.Resources>
-		<ResourceDictionary>
+
+    <ContentPage.Resources>
+        <ResourceDictionary>
             <Style TargetType="Label">
             </Style>
-
             <Style TargetType="Button">
                 <!-- <Setter Property="Padding" Value="14,10" /> -->
-				<!-- <Setter Property="WidthRequest" Value="200"/> -->
+                <!-- <Setter Property="WidthRequest" Value="200"/> -->
             </Style>
         </ResourceDictionary>
-	</ContentPage.Resources>
-	
-    <ContentPage.Content>
-		<ScrollView>
-			<VerticalStackLayout>
-				<Label Text="This Button has InputTransparent=false; it should be clickable."/>
-				<Button Text="Clickable" Clicked="ClickSuccess" HorizontalOptions="Center" />
-						
-				<Label Margin="0,10,0,0" Text="This Button has InputTransparent=true; it should not be clickable."/>
-				<Button InputTransparent="True" Text="Not Clickable" Clicked="ClickFail" HorizontalOptions="Center" />
-				
-				<Grid Margin="0,10,0,0" RowDefinitions="Auto, Auto">
-				
-					<Label Text="This Button has InputTransparent=true; it should not be clickable. But the button hidden under it should be."/>
-					
-					<Button	Grid.Row="1" Margin="2,2,0,0" InputTransparent="False" Text="Clickable" Clicked="ClickSuccess" 
-						HorizontalOptions="Center" />
-						
-					<Button BackgroundColor="LightBlue"	Grid.Row="1" InputTransparent="True" Text="Not Clickable" Clicked="ClickFail"
-						HorizontalOptions="Center"/>
-				
-				</Grid>
-				
-				<Label Margin="0,10,0,0" Text="The Grid below has controls and an overlay layer with more controls."/>
-				
-				<Grid>
-					
-					<Grid Margin="10" HeightRequest="100" BackgroundColor="LightBlue">
-						<Button Text="Bottom Layer" Clicked="ClickSuccess" HorizontalOptions="Center" VerticalOptions="Center" />
-					</Grid>
-				
-					<Grid HorizontalOptions="Fill" VerticalOptions="Fill" InputTransparent="True" CascadeInputTransparent="False">
-						<Button Text="Overlay BR" Clicked="ClickSuccess" HorizontalOptions="End" VerticalOptions="End" Margin="5" />
-						<Button Text="Overlay TL" Clicked="ClickSuccess" HorizontalOptions="Start" VerticalOptions="Start" Margin="5" />
-					</Grid>
-					
-				</Grid>
-				
-				<Label Margin="0,10,0,0" Text="The Grid below has controls an overlay with CascadeInputTransparent set to true; the overlay buttons should not be usable."/>
-				
-				<Grid>
-					
-					<Grid Margin="10" HeightRequest="100" BackgroundColor="LightBlue">
-						<Button Text="Bottom Layer" Clicked="ClickSuccess" HorizontalOptions="Center" VerticalOptions="Center" />
-					</Grid>
-				
-					<Grid HorizontalOptions="Fill" VerticalOptions="Fill" InputTransparent="True" CascadeInputTransparent="True">
-						<Button Text="Overlay BR" Clicked="ClickFail" HorizontalOptions="End" VerticalOptions="End" Margin="5" />
-						<Button Text="Overlay TL" Clicked="ClickFail" HorizontalOptions="Start" VerticalOptions="Start" Margin="5" />
-					</Grid>
-					
-				</Grid>
-				
-			</VerticalStackLayout>
-		</ScrollView>
-    </ContentPage.Content>
+    </ContentPage.Resources>
+
+    <ScrollView>
+        <VerticalStackLayout>
+            <Label Text="This Button has InputTransparent=false; it should be clickable."/>
+            <Button Text="Clickable" Clicked="ClickSuccess" HorizontalOptions="Center" />
+
+            <Label Margin="0,10,0,0" Text="This Button has InputTransparent=true; it should not be clickable."/>
+            <Button InputTransparent="True" Text="Not Clickable" Clicked="ClickFail" HorizontalOptions="Center" />
+
+            <Label Margin="0,10,0,0" Text="This Button has InputTransparent=true; it should not be clickable. But the button hidden under it should be."/>
+            <Grid RowDefinitions="Auto" ColumnDefinitions="Auto">
+
+                <Button	InputTransparent="False" Text="Clickable" Clicked="ClickSuccess" Grid.Row="1" Margin="2,2,0,0" HorizontalOptions="Center" />
+
+                <Button InputTransparent="True" Text="Not Clickable" Clicked="ClickFail" BackgroundColor="LightBlue" Grid.Row="1" HorizontalOptions="Center" />
+
+            </Grid>
+
+            <Label Margin="0,10,0,0" Text="The Grid below has controls and an overlay layer with more controls."/>
+            <Grid>
+
+                <Grid Margin="10" HeightRequest="100" BackgroundColor="LightBlue">
+                    <Button Text="Bottom Layer" Clicked="ClickSuccess" HorizontalOptions="Center" VerticalOptions="Center" />
+                </Grid>
+
+                <Grid InputTransparent="True" CascadeInputTransparent="False" HorizontalOptions="Fill" VerticalOptions="Fill">
+                    <Button Text="Overlay BR" Clicked="ClickSuccess" HorizontalOptions="End" VerticalOptions="End" Margin="5" />
+                    <Button Text="Overlay TL" Clicked="ClickSuccess" HorizontalOptions="Start" VerticalOptions="Start" Margin="5" />
+                </Grid>
+
+            </Grid>
+
+            <Label Margin="0,10,0,0" Text="The Grid below has controls an overlay with CascadeInputTransparent set to true; the overlay buttons should not be usable."/>
+            <Grid>
+
+                <Grid Margin="10" HeightRequest="100" BackgroundColor="LightBlue">
+                    <Button Text="Bottom Layer" Clicked="ClickSuccess" HorizontalOptions="Center" VerticalOptions="Center" />
+                </Grid>
+
+                <Grid HorizontalOptions="Fill" VerticalOptions="Fill" InputTransparent="True" CascadeInputTransparent="True">
+                    <Button Text="Overlay BR" Clicked="ClickFail" HorizontalOptions="End" VerticalOptions="End" Margin="5" />
+                    <Button Text="Overlay TL" Clicked="ClickFail" HorizontalOptions="Start" VerticalOptions="Start" Margin="5" />
+                </Grid>
+
+            </Grid>
+
+            <Label Margin="0,10,0,0" Text="The Grid below has a 'Test Button' that is controlled by the switches."/>
+            <VerticalStackLayout>
+
+                <Grid Margin="10" HeightRequest="100" BackgroundColor="LightBlue">
+
+                    <Grid x:Name="rootLayout">
+                        <Grid x:Name="nestedLayout">
+                            <Button x:Name="testButton" Text="Test Button" Clicked="ClickSuccess" HorizontalOptions="Center" VerticalOptions="Center" />
+                        </Grid>
+                    </Grid>
+                </Grid>
+
+                <Grid ColumnDefinitions="Auto,Auto,Auto,Auto,Auto,2" RowDefinitions="Auto,Auto,Auto" ColumnSpacing="12" RowSpacing="6" Margin="10,0,10,0">
+                    <!-- root -->
+                    <Label Grid.Row="0" Grid.Column="0" Text="Root" VerticalOptions="Center" FontAttributes="Bold" />
+                    <Label Grid.Row="0" Grid.Column="1" Text="Transparent" VerticalOptions="Center" />
+                    <Switch Grid.Row="0" Grid.Column="2" IsToggled="{Binding InputTransparent, Source={Reference rootLayout}, Mode=OneWayToSource}" VerticalOptions="Center" />
+                    <Label Grid.Row="0" Grid.Column="3" Text="Cascade" VerticalOptions="Center" />
+                    <Switch Grid.Row="0" Grid.Column="4" IsToggled="{Binding CascadeInputTransparent, Source={Reference rootLayout}, Mode=OneWayToSource}" VerticalOptions="Center" />
+                    <BoxView Grid.Row="0" Grid.Column="5" Color="Green" WidthRequest="2" HorizontalOptions="End" IsVisible="{Binding InputTransparent, Source={Reference rootLayout}, Mode=OneWay}" />
+                    <!-- nested -->
+                    <Label Grid.Row="1" Grid.Column="0" Text="Nested" VerticalOptions="Center" FontAttributes="Bold" />
+                    <Label Grid.Row="1" Grid.Column="1" Text="Transparent" VerticalOptions="Center" />
+                    <Switch Grid.Row="1" Grid.Column="2" IsToggled="{Binding InputTransparent, Source={Reference nestedLayout}, Mode=OneWayToSource}" VerticalOptions="Center" />
+                    <Label Grid.Row="1" Grid.Column="3" Text="Cascade" VerticalOptions="Center" />
+                    <Switch Grid.Row="1" Grid.Column="4" IsToggled="{Binding CascadeInputTransparent, Source={Reference nestedLayout}, Mode=OneWayToSource}" VerticalOptions="Center" />
+                    <BoxView Grid.Row="1" Grid.Column="5" Color="Green" WidthRequest="2" HorizontalOptions="End" IsVisible="{Binding InputTransparent, Source={Reference nestedLayout}, Mode=OneWay}" />
+                    <!-- button -->
+                    <Label Grid.Row="2" Grid.Column="0" Text="Button" VerticalOptions="Center" FontAttributes="Bold" />
+                    <Label Grid.Row="2" Grid.Column="1" Text="Transparent" VerticalOptions="Center" />
+                    <Switch Grid.Row="2" Grid.Column="2" IsToggled="{Binding InputTransparent, Source={Reference testButton}, Mode=OneWayToSource}" VerticalOptions="Center" />
+                    <BoxView Grid.Row="2" Grid.Column="5" Color="Green" WidthRequest="2" HorizontalOptions="End" IsVisible="{Binding InputTransparent, Source={Reference testButton}, Mode=OneWay}" />
+                </Grid>
+
+            </VerticalStackLayout>
+
+        </VerticalStackLayout>
+    </ScrollView>
+
 </ContentPage>
\ No newline at end of file
diff --git a/src/Controls/src/Core/IInputTransparentContainerElement.cs b/src/Controls/src/Core/IInputTransparentContainerElement.cs
new file mode 100644
index 000000000000..19c9070a0630
--- /dev/null
+++ b/src/Controls/src/Core/IInputTransparentContainerElement.cs
@@ -0,0 +1,14 @@
+#nullable disable
+
+namespace Microsoft.Maui.Controls
+{
+	// There are 2 Layout types: Controls and Compatibility
+	interface IInputTransparentContainerElement
+	{
+		bool InputTransparent { get; }
+
+		bool CascadeInputTransparent { get; }
+
+		Element Parent { get; }
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/src/Core/Layout.cs b/src/Controls/src/Core/Layout.cs
index bd84179ac968..637b9dba3e8c 100644
--- a/src/Controls/src/Core/Layout.cs
+++ b/src/Controls/src/Core/Layout.cs
@@ -63,7 +63,7 @@ Size ILayoutManager.ArrangeChildren(Rect bounds)
 		}
 	}
 
-	public abstract class Layout : View, ILayout, ILayoutController, IPaddingElement, IView, IVisualTreeElement
+	public abstract class Layout : View, ILayout, ILayoutController, IPaddingElement, IView, IVisualTreeElement, IInputTransparentContainerElement
 	{
 		/// <summary>Bindable property for <see cref="IsClippedToBounds"/>.</summary>
 		public static readonly BindableProperty IsClippedToBoundsProperty =
@@ -72,7 +72,8 @@ public abstract class Layout : View, ILayout, ILayoutController, IPaddingElement
 
 		/// <summary>Bindable property for <see cref="CascadeInputTransparent"/>.</summary>
 		public static readonly BindableProperty CascadeInputTransparentProperty =
-			BindableProperty.Create(nameof(CascadeInputTransparent), typeof(bool), typeof(Layout), true);
+			BindableProperty.Create(nameof(CascadeInputTransparent), typeof(bool), typeof(Layout), true,
+				propertyChanged: OnCascadeInputTransparentPropertyChanged);
 
 		/// <summary>Bindable property for <see cref="Padding"/>.</summary>
 		public static readonly BindableProperty PaddingProperty = PaddingElement.PaddingProperty;
@@ -518,5 +519,15 @@ public Size CrossPlatformArrange(Rect bounds)
 
 			return Frame.Size;
 		}
+
+		static void OnCascadeInputTransparentPropertyChanged(BindableObject bindable, object oldValue, object newValue)
+		{
+			// We only need to update if the cascade changes anything, namely when InputTransparent=true.
+			// When InputTransparent=false, then the cascade property has no effect.
+			if (bindable is Layout layout && layout.InputTransparent)
+			{
+				layout.RefreshInputTransparentProperty();
+			}
+		}
 	}
 }
diff --git a/src/Controls/src/Core/Layout/Layout.Android.cs b/src/Controls/src/Core/Layout/Layout.Android.cs
index 9b0727a51a6c..9051d3efff17 100644
--- a/src/Controls/src/Core/Layout/Layout.Android.cs
+++ b/src/Controls/src/Core/Layout/Layout.Android.cs
@@ -7,31 +7,8 @@ namespace Microsoft.Maui.Controls
 {
 	public partial class Layout
 	{
-		public static void MapInputTransparent(LayoutHandler handler, Layout layout) =>
-			UpdateInputTransparent(handler, layout);
+		public static void MapInputTransparent(LayoutHandler handler, Layout layout) { }
 
-		public static void MapInputTransparent(ILayoutHandler handler, Layout layout) =>
-			UpdateInputTransparent(handler, layout);
-
-		static void MapInputTransparent(IViewHandler handler, IView layout) =>
-			UpdateInputTransparent(handler, layout);
-
-		static void UpdateInputTransparent(IViewHandler handler, IView layout)
-		{
-			if (handler is ILayoutHandler layoutHandler && layout is Layout controlsLayout)
-			{
-				if (layoutHandler.PlatformView is LayoutViewGroup layoutViewGroup)
-				{
-					// Handle input transparent for this view
-					layoutViewGroup.InputTransparent = layout.InputTransparent;
-				}
-
-				controlsLayout.UpdateDescendantInputTransparent();
-			}
-			else
-			{
-				ControlsVisualElementMapper.UpdateProperty(handler, layout, nameof(IView.InputTransparent));
-			}
-		}
+		public static void MapInputTransparent(ILayoutHandler handler, Layout layout) { }
 	}
 }
diff --git a/src/Controls/src/Core/Layout/Layout.Mapper.cs b/src/Controls/src/Core/Layout/Layout.Mapper.cs
index ab7fdf8142f2..30ab4848e259 100644
--- a/src/Controls/src/Core/Layout/Layout.Mapper.cs
+++ b/src/Controls/src/Core/Layout/Layout.Mapper.cs
@@ -15,8 +15,6 @@ public abstract partial class Layout
 
 		public static IPropertyMapper<IView, IViewHandler> ControlsLayoutMapper = new PropertyMapper<IView, IViewHandler>(ControlsVisualElementMapper)
 		{
-			[nameof(CascadeInputTransparent)] = MapInputTransparent,
-			[nameof(IView.InputTransparent)] = MapInputTransparent,
 		};
 	}
 }
diff --git a/src/Controls/src/Core/Layout/Layout.Tizen.cs b/src/Controls/src/Core/Layout/Layout.Tizen.cs
index 5a54a70be665..079d21ba8bda 100644
--- a/src/Controls/src/Core/Layout/Layout.Tizen.cs
+++ b/src/Controls/src/Core/Layout/Layout.Tizen.cs
@@ -3,36 +3,8 @@ namespace Microsoft.Maui.Controls
 {
 	public partial class Layout
 	{
-		public static void MapInputTransparent(LayoutHandler handler, Layout layout) =>
-			UpdateInputTransparent(handler, layout);
+		public static void MapInputTransparent(LayoutHandler handler, Layout layout) { }
 
-		public static void MapInputTransparent(ILayoutHandler handler, Layout layout) =>
-			UpdateInputTransparent(handler, layout);
-
-		static void MapInputTransparent(IViewHandler handler, IView layout) =>
-			UpdateInputTransparent(handler, layout);
-
-		static void UpdateInputTransparent(IViewHandler handler, IView view)
-		{
-			if (handler.PlatformView is not Microsoft.Maui.Platform.LayoutViewGroup platformView ||
-				view is not Layout layout)
-			{
-				return;
-			}
-
-			if (layout.CascadeInputTransparent)
-			{
-				// Sensitive property on NUI View was false, disabled all touch event including children
-				platformView.Sensitive = !layout.InputTransparent;
-				platformView.InputTransparent = false;
-			}
-			else
-			{
-				// InputTransparent property on LayoutViewGroup was false,
-				// Only LayoutViewGroup event was disabled but children are allowed
-				platformView.InputTransparent = layout.InputTransparent;
-				platformView.Sensitive = true;
-			}
-		}
+		public static void MapInputTransparent(ILayoutHandler handler, Layout layout) { }
 	}
 }
diff --git a/src/Controls/src/Core/Layout/Layout.Windows.cs b/src/Controls/src/Core/Layout/Layout.Windows.cs
index b118ff2ef221..1c2001468d15 100644
--- a/src/Controls/src/Core/Layout/Layout.Windows.cs
+++ b/src/Controls/src/Core/Layout/Layout.Windows.cs
@@ -5,26 +5,8 @@ namespace Microsoft.Maui.Controls
 {
 	public partial class Layout
 	{
-		public static void MapInputTransparent(LayoutHandler handler, Layout layout) =>
-			UpdateInputTransparent(handler, layout);
+		public static void MapInputTransparent(LayoutHandler handler, Layout layout) { }
 
-		public static void MapInputTransparent(ILayoutHandler handler, Layout layout) =>
-			UpdateInputTransparent(handler, layout);
-
-		static void MapInputTransparent(IViewHandler handler, IView layout) =>
-			UpdateInputTransparent(handler, layout);
-
-		static void UpdateInputTransparent(IViewHandler handler, IView layout)
-		{
-			if (handler is ILayoutHandler layoutHandler && layout is Layout controlsLayout)
-			{
-				layoutHandler.PlatformView?.UpdateInputTransparent(layoutHandler, controlsLayout);
-				controlsLayout.UpdateDescendantInputTransparent();
-			}
-			else
-			{
-				ControlsVisualElementMapper.UpdateProperty(handler, layout, nameof(IView.InputTransparent));
-			}
-		}
+		public static void MapInputTransparent(ILayoutHandler handler, Layout layout) { }
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/src/Core/Layout/Layout.cs b/src/Controls/src/Core/Layout/Layout.cs
index 94a29eccb50d..6acd909886d0 100644
--- a/src/Controls/src/Core/Layout/Layout.cs
+++ b/src/Controls/src/Core/Layout/Layout.cs
@@ -11,7 +11,7 @@ namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../../docs/Microsoft.Maui.Controls/Layout.xml" path="Type[@FullName='Microsoft.Maui.Controls.Layout']/Docs/*" />
 	[ContentProperty(nameof(Children))]
-	public abstract partial class Layout : View, Maui.ILayout, IList<IView>, IBindableLayout, IPaddingElement, IVisualTreeElement, ISafeAreaView
+	public abstract partial class Layout : View, Maui.ILayout, IList<IView>, IBindableLayout, IPaddingElement, IVisualTreeElement, ISafeAreaView, IInputTransparentContainerElement
 	{
 		protected ILayoutManager _layoutManager;
 
@@ -211,9 +211,6 @@ protected virtual void OnAdd(int index, IView view)
 		{
 			NotifyHandler(nameof(ILayoutHandler.Add), index, view);
 
-			// Make sure CascadeInputTransparent is applied, if necessary
-			Handler?.UpdateValue(nameof(CascadeInputTransparent));
-
 			// Take care of the Element internal bookkeeping
 			if (view is Element element)
 			{
@@ -241,9 +238,6 @@ protected virtual void OnInsert(int index, IView view)
 		{
 			NotifyHandler(nameof(ILayoutHandler.Insert), index, view);
 
-			// Make sure CascadeInputTransparent is applied, if necessary
-			Handler?.UpdateValue(nameof(CascadeInputTransparent));
-
 			// Take care of the Element internal bookkeeping
 			if (view is Element element)
 			{
@@ -254,9 +248,6 @@ protected virtual void OnInsert(int index, IView view)
 		protected virtual void OnUpdate(int index, IView view, IView oldView)
 		{
 			NotifyHandler(nameof(ILayoutHandler.Update), index, view);
-
-			// Make sure CascadeInputTransparent is applied, if necessary
-			Handler?.UpdateValue(nameof(CascadeInputTransparent));
 		}
 
 		void NotifyHandler(string action, int index, IView view)
@@ -287,7 +278,8 @@ public Graphics.Size CrossPlatformArrange(Graphics.Rect bounds)
 		}
 
 		public static readonly BindableProperty CascadeInputTransparentProperty =
-			BindableProperty.Create(nameof(CascadeInputTransparent), typeof(bool), typeof(Layout), true);
+			BindableProperty.Create(nameof(CascadeInputTransparent), typeof(bool), typeof(Layout), true,
+				propertyChanged: OnCascadeInputTransparentPropertyChanged);
 
 		public bool CascadeInputTransparent
 		{
@@ -295,21 +287,13 @@ public bool CascadeInputTransparent
 			set => SetValue(CascadeInputTransparentProperty, value);
 		}
 
-		void UpdateDescendantInputTransparent()
+		static void OnCascadeInputTransparentPropertyChanged(BindableObject bindable, object oldValue, object newValue)
 		{
-			if (!InputTransparent || !CascadeInputTransparent)
+			// We only need to update if the cascade changes anything, namely when InputTransparent=true.
+			// When InputTransparent=false, then the cascade property has no effect.
+			if (bindable is Layout layout && layout.InputTransparent)
 			{
-				// We only need to propagate values if the layout is InputTransparent AND Cascade is true
-				return;
-			}
-
-			// Set all the child InputTransparent values to match this one
-			for (int n = 0; n < Count; n++)
-			{
-				if (this[n] is VisualElement visualElement)
-				{
-					visualElement.InputTransparent = true;
-				}
+				layout.RefreshInputTransparentProperty();
 			}
 		}
 	}
diff --git a/src/Controls/src/Core/Layout/Layout.iOS.cs b/src/Controls/src/Core/Layout/Layout.iOS.cs
index 2f69361182f5..079d21ba8bda 100644
--- a/src/Controls/src/Core/Layout/Layout.iOS.cs
+++ b/src/Controls/src/Core/Layout/Layout.iOS.cs
@@ -3,26 +3,8 @@ namespace Microsoft.Maui.Controls
 {
 	public partial class Layout
 	{
-		public static void MapInputTransparent(LayoutHandler handler, Layout layout) =>
-			UpdateInputTransparent(handler, layout);
+		public static void MapInputTransparent(LayoutHandler handler, Layout layout) { }
 
-		public static void MapInputTransparent(ILayoutHandler handler, Layout layout) =>
-			UpdateInputTransparent(handler, layout);
-
-		static void MapInputTransparent(IViewHandler handler, IView layout) =>
-			UpdateInputTransparent(handler, layout);
-
-		static void UpdateInputTransparent(IViewHandler handler, IView layout)
-		{
-			if (handler is ILayoutHandler layoutHandler && layout is Layout controlsLayout)
-			{
-				layoutHandler.PlatformView?.UpdateInputTransparent(layoutHandler, controlsLayout);
-				controlsLayout.UpdateDescendantInputTransparent();
-			}
-			else
-			{
-				ControlsVisualElementMapper.UpdateProperty(handler, layout, nameof(IView.InputTransparent));
-			}
-		}
+		public static void MapInputTransparent(ILayoutHandler handler, Layout layout) { }
 	}
 }
diff --git a/src/Controls/src/Core/VisualElement/VisualElement.cs b/src/Controls/src/Core/VisualElement/VisualElement.cs
index 5b91b38c97d1..6d1a12d382ec 100644
--- a/src/Controls/src/Core/VisualElement/VisualElement.cs
+++ b/src/Controls/src/Core/VisualElement/VisualElement.cs
@@ -21,8 +21,12 @@ public partial class VisualElement : NavigableElement, IAnimatable, IVisualEleme
 		/// <include file="../../docs/Microsoft.Maui.Controls/VisualElement.xml" path="//Member[@MemberName='StyleProperty']/Docs/*" />
 		public new static readonly BindableProperty StyleProperty = NavigableElement.StyleProperty;
 
+		bool _inputTransparentExplicit = (bool)InputTransparentProperty.DefaultValue;
+
 		/// <summary>Bindable property for <see cref="InputTransparent"/>.</summary>
-		public static readonly BindableProperty InputTransparentProperty = BindableProperty.Create("InputTransparent", typeof(bool), typeof(VisualElement), default(bool));
+		public static readonly BindableProperty InputTransparentProperty = BindableProperty.Create(
+			"InputTransparent", typeof(bool), typeof(VisualElement), default(bool),
+			propertyChanged: OnInputTransparentPropertyChanged, coerceValue: CoerceInputTransparentProperty);
 
 		bool _isEnabledExplicit = (bool)IsEnabledProperty.DefaultValue;
 
@@ -586,6 +590,40 @@ protected virtual bool IsEnabledCore
 			}
 		}
 
+		/// <summary>
+		/// This value represents the cumulative InputTransparent value.
+		/// All types that override this property need to also invoke
+		/// the RefreshInputTransparentProperty() method if the value will change.
+		/// 
+		/// This method is not virtual as none of the derived types actually need
+		/// to change the calculation. If this ever needs to change, then the
+		/// RefreshInputTransparentProperty() method should also call the
+		/// RefreshPropertyValue() method - just like how the
+		/// RefreshIsEnabledProperty() method does.
+		/// </summary>
+		private protected bool InputTransparentCore
+		{
+			get
+			{
+				if (_inputTransparentExplicit == true)
+				{
+					// If the explicitly set value is true, then nothing else matters
+					// And we can save the effort of a Parent check
+					return true;
+				}
+
+				var parent = Parent as IInputTransparentContainerElement;
+				while (parent is not null)
+				{
+					if (parent.CascadeInputTransparent && parent.InputTransparent)
+						return true;
+					parent = parent.Parent as IInputTransparentContainerElement;
+				}
+
+				return _inputTransparentExplicit;
+			}
+		}
+
 		/// <include file="../../docs/Microsoft.Maui.Controls/VisualElement.xml" path="//Member[@MemberName='IsFocused']/Docs/*" />
 		public bool IsFocused => (bool)GetValue(IsFocusedProperty);
 
@@ -1276,6 +1314,22 @@ static void OnIsEnabledPropertyChanged(BindableObject bindable, object oldValue,
 			(bindable as IPropertyPropagationController)?.PropagatePropertyChanged(VisualElement.IsEnabledProperty.PropertyName);
 		}
 
+		static object CoerceInputTransparentProperty(BindableObject bindable, object value)
+		{
+			if (bindable is VisualElement visualElement)
+			{
+				visualElement._inputTransparentExplicit = (bool)value;
+				return visualElement.InputTransparentCore;
+			}
+
+			return false;
+		}
+
+		static void OnInputTransparentPropertyChanged(BindableObject bindable, object oldValue, object newValue)
+		{
+			(bindable as IPropertyPropagationController)?.PropagatePropertyChanged(VisualElement.InputTransparentProperty.PropertyName);
+		}
+
 		static void OnIsFocusedPropertyChanged(BindableObject bindable, object oldvalue, object newvalue)
 		{
 			var element = (VisualElement)bindable;
@@ -1335,6 +1389,9 @@ void IPropertyPropagationController.PropagatePropertyChanged(string propertyName
 			if (propertyName == null || propertyName == IsEnabledProperty.PropertyName)
 				this.RefreshPropertyValue(IsEnabledProperty, _isEnabledExplicit);
 
+			if (propertyName == null || propertyName == InputTransparentProperty.PropertyName)
+				this.RefreshPropertyValue(InputTransparentProperty, _inputTransparentExplicit);
+
 			PropertyPropagationExtensions.PropagatePropertyChanged(propertyName, this, ((IVisualTreeElement)this).GetVisualChildren());
 		}
 
@@ -1345,6 +1402,20 @@ void IPropertyPropagationController.PropagatePropertyChanged(string propertyName
 		protected void RefreshIsEnabledProperty() =>
 			this.RefreshPropertyValue(IsEnabledProperty, _isEnabledExplicit);
 
+		/// <summary>
+		/// This method must always be called if some event occurs and the value of
+		/// the InputTransparentCore property will change.
+		/// </summary>
+		private protected void RefreshInputTransparentProperty()
+		{
+			// This method does not need to call the
+			// this.RefreshPropertyValue(InputTransparentProperty, _inputTransparentExplicit);
+			// method because none of the derived types will affect this view. All we
+			// need to do is propagate the new value to all the children.
+
+			(this as IPropertyPropagationController)?.PropagatePropertyChanged(VisualElement.InputTransparentProperty.PropertyName);
+		}
+
 		void UpdateBoundsComponents(Rect bounds)
 		{
 			_frame = bounds;
diff --git a/src/Controls/tests/Core.UnitTests/Layouts/LayoutTests.cs b/src/Controls/tests/Core.UnitTests/Layouts/LayoutTests.cs
index 20c3817aa681..77979af6927e 100644
--- a/src/Controls/tests/Core.UnitTests/Layouts/LayoutTests.cs
+++ b/src/Controls/tests/Core.UnitTests/Layouts/LayoutTests.cs
@@ -128,63 +128,6 @@ static Layout CreateLayout(Type TLayout)
 			return layout;
 		}
 
-		[Fact]
-		public void AddRespectsCascadeInputTransparent()
-		{
-			var layout = new VerticalStackLayout()
-			{
-				InputTransparent = true,
-				CascadeInputTransparent = true
-			};
-
-			var handler = Substitute.For<IViewHandler>();
-			layout.Handler = handler;
-
-			var child0 = new Button() { InputTransparent = false };
-			layout.Add(child0);
-
-			handler.Received().UpdateValue(Arg.Is(nameof(Layout.CascadeInputTransparent)));
-		}
-
-		[Fact]
-		public void InsertRespectsCascadeInputTransparent()
-		{
-			var layout = new VerticalStackLayout()
-			{
-				InputTransparent = true,
-				CascadeInputTransparent = true
-			};
-
-			var handler = Substitute.For<IViewHandler>();
-			layout.Handler = handler;
-
-			var child0 = new Button() { InputTransparent = false };
-			layout.Insert(0, child0);
-
-			handler.Received().UpdateValue(Arg.Is(nameof(Layout.CascadeInputTransparent)));
-		}
-
-		[Fact]
-		public void UpdateRespectsCascadeInputTransparent()
-		{
-			var layout = new VerticalStackLayout()
-			{
-				InputTransparent = true,
-				CascadeInputTransparent = true
-			};
-
-			var handler = Substitute.For<IViewHandler>();
-			layout.Handler = handler;
-
-			var child0 = new Button() { InputTransparent = false };
-			layout.Add(child0);
-
-			var child1 = new Button() { InputTransparent = false };
-			layout[0] = child1;
-
-			handler.Received(2).UpdateValue(Arg.Is(nameof(Layout.CascadeInputTransparent)));
-		}
-
 		IMauiContext SetupContext(ILayoutManagerFactory layoutManagerFactory)
 		{
 			var services = Substitute.For<IServiceProvider>();
diff --git a/src/Controls/tests/Core.UnitTests/VisualElementInputTransparentTests.cs b/src/Controls/tests/Core.UnitTests/VisualElementInputTransparentTests.cs
new file mode 100644
index 000000000000..101265199279
--- /dev/null
+++ b/src/Controls/tests/Core.UnitTests/VisualElementInputTransparentTests.cs
@@ -0,0 +1,557 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.Maui.Controls.Shapes;
+using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Primitives;
+using Xunit;
+using Xunit.Sdk;
+
+namespace Microsoft.Maui.Controls.Core.UnitTests
+{
+	public class VisualElementInputTransparentTests
+	{
+		// this is both for color diff and cols
+		const bool truee = true;
+
+		static IReadOnlyDictionary<(bool, bool, bool, bool, bool), (bool, bool)> States = new Dictionary<(bool, bool, bool, bool, bool), (bool, bool)>
+		{
+			[(truee, truee, truee, truee, truee)] = (truee, truee),
+			[(truee, truee, truee, truee, false)] = (truee, truee),
+			[(truee, truee, truee, false, truee)] = (truee, truee),
+			[(truee, truee, truee, false, false)] = (truee, truee),
+			[(truee, truee, false, truee, truee)] = (truee, truee),
+			[(truee, truee, false, truee, false)] = (truee, truee),
+			[(truee, truee, false, false, truee)] = (truee, truee),
+			[(truee, truee, false, false, false)] = (truee, truee),
+			[(truee, false, truee, truee, truee)] = (truee, truee),
+			[(truee, false, truee, truee, false)] = (truee, truee),
+			[(truee, false, truee, false, truee)] = (truee, truee),
+			[(truee, false, truee, false, false)] = (truee, false),
+			[(truee, false, false, truee, truee)] = (false, truee),
+			[(truee, false, false, truee, false)] = (false, false),
+			[(truee, false, false, false, truee)] = (false, truee),
+			[(truee, false, false, false, false)] = (false, false),
+			[(false, truee, truee, truee, truee)] = (truee, truee),
+			[(false, truee, truee, truee, false)] = (truee, truee),
+			[(false, truee, truee, false, truee)] = (truee, truee),
+			[(false, truee, truee, false, false)] = (truee, false),
+			[(false, truee, false, truee, truee)] = (false, truee),
+			[(false, truee, false, truee, false)] = (false, false),
+			[(false, truee, false, false, truee)] = (false, truee),
+			[(false, truee, false, false, false)] = (false, false),
+			[(false, false, truee, truee, truee)] = (truee, truee),
+			[(false, false, truee, truee, false)] = (truee, truee),
+			[(false, false, truee, false, truee)] = (truee, truee),
+			[(false, false, truee, false, false)] = (truee, false),
+			[(false, false, false, truee, truee)] = (false, truee),
+			[(false, false, false, truee, false)] = (false, false),
+			[(false, false, false, false, truee)] = (false, truee),
+			[(false, false, false, false, false)] = (false, false),
+		};
+
+		public static IEnumerable<object[]> TransparencyStates()
+		{
+			foreach (var pair in States)
+			{
+				var (rT, rC, nT, nC, t) = pair.Key;
+
+				yield return new object[] { rT, rC, nT, nC, t };
+			}
+		}
+
+		static (Layout Root, Layout Nested, VisualElement Child) CreateViews(bool rootTrans, bool rootCascade, bool nestedTrans, bool nestedCascade, bool trans)
+		{
+			Layout root;
+			Layout nested;
+			VisualElement child;
+
+			root = new Grid
+			{
+				InputTransparent = rootTrans,
+				CascadeInputTransparent = rootCascade,
+				Children =
+ 				{
+ 					 (nested = new Grid
+ 					 {
+ 						 InputTransparent = nestedTrans,
+ 						 CascadeInputTransparent = nestedCascade,
+ 						 Children =
+ 						 {
+ 							 (child = new Button
+ 							 {
+ 								 InputTransparent = trans
+ 							 })
+ 						 }
+ 					 })
+ 				}
+			};
+
+			return (root, nested, child);
+		}
+
+		static void AssertState(bool rootTrans, bool rootCascade, bool nestedTrans, bool nestedCascade, bool trans, Layout nested, VisualElement child)
+		{
+			var (finalNestedTrans, finalTrans) = States[(rootTrans, rootCascade, nestedTrans, nestedCascade, trans)];
+
+			if (finalNestedTrans)
+				Assert.True(nested.InputTransparent, "Nested layout was not input transparent when it should have been.");
+			else
+				Assert.False(nested.InputTransparent, "Nested layout was input transparent when it should not have been.");
+
+			if (finalTrans)
+				Assert.True(child.InputTransparent, "Child element was not input transparent when it should have been.");
+			else
+				Assert.False(child.InputTransparent, "Child element was input transparent when it should not have been.");
+		}
+
+		static void AssertState(bool layoutTrans, bool layoutCascade, bool trans, Layout layout, VisualElement child)
+		{
+			var (finalLayoutTrans, finalTrans) = States[(false, false, layoutTrans, layoutCascade, trans)];
+
+			if (finalLayoutTrans)
+				Assert.True(layout.InputTransparent, "Layout was not input transparent when it should have been.");
+			else
+				Assert.False(layout.InputTransparent, "Layout was input transparent when it should not have been.");
+
+			if (finalTrans)
+				Assert.True(child.InputTransparent, "Child element was not input transparent when it should have been.");
+			else
+				Assert.False(child.InputTransparent, "Child element was input transparent when it should not have been.");
+		}
+
+		[Theory]
+		[MemberData(nameof(TransparencyStates))]
+		public void TestMethodsAreValid(bool rootTrans, bool rootCascade, bool nestedTrans, bool nestedCascade, bool trans)
+		{
+			var (rootLayout, nestedLayout, element) = CreateViews(rootTrans, rootCascade, nestedTrans, nestedCascade, trans);
+
+			AssertState(rootTrans, rootCascade, nestedTrans, nestedCascade, trans, nestedLayout, element);
+		}
+
+		[Theory]
+		[MemberData(nameof(TransparencyStates))]
+		public void InitialStateIsCorrectWhenOrderIsPropsRootChildNestedChild(bool rootTrans, bool rootCascade, bool nestedTrans, bool nestedCascade, bool trans)
+		{
+			var rootLayout = new Grid
+			{
+				InputTransparent = rootTrans,
+				CascadeInputTransparent = rootCascade
+			};
+			var nestedLayout = new Grid
+			{
+				InputTransparent = nestedTrans,
+				CascadeInputTransparent = nestedCascade
+			};
+			var element = new Button
+			{
+				InputTransparent = trans
+			};
+
+			rootLayout.Add(nestedLayout);
+			nestedLayout.Add(element);
+
+			AssertState(rootTrans, rootCascade, nestedTrans, nestedCascade, trans, nestedLayout, element);
+		}
+
+		[Theory]
+		[MemberData(nameof(TransparencyStates))]
+		public void InitialStateIsCorrectWhenOrderIsPropsNestedChildRootChild(bool rootTrans, bool rootCascade, bool nestedTrans, bool nestedCascade, bool trans)
+		{
+			var rootLayout = new Grid
+			{
+				InputTransparent = rootTrans,
+				CascadeInputTransparent = rootCascade
+			};
+			var nestedLayout = new Grid
+			{
+				InputTransparent = nestedTrans,
+				CascadeInputTransparent = nestedCascade
+			};
+			var element = new Button
+			{
+				InputTransparent = trans
+			};
+
+			nestedLayout.Add(element);
+			rootLayout.Add(nestedLayout);
+
+			AssertState(rootTrans, rootCascade, nestedTrans, nestedCascade, trans, nestedLayout, element);
+		}
+
+		[Theory]
+		[MemberData(nameof(TransparencyStates))]
+		public void StateIsCorrectWhenSettingChildNestedRoot(bool rootTrans, bool rootCascade, bool nestedTrans, bool nestedCascade, bool trans)
+		{
+			var element = new Button();
+			var nestedLayout = new Grid { element };
+			var rootLayout = new Grid { nestedLayout };
+
+			element.InputTransparent = trans;
+
+			nestedLayout.InputTransparent = nestedTrans;
+			nestedLayout.CascadeInputTransparent = nestedCascade;
+
+			rootLayout.InputTransparent = rootTrans;
+			rootLayout.CascadeInputTransparent = rootCascade;
+
+			AssertState(rootTrans, rootCascade, nestedTrans, nestedCascade, trans, nestedLayout, element);
+		}
+
+		[Theory]
+		[MemberData(nameof(TransparencyStates))]
+		public void StateIsCorrectWhenSettingRootNestedChild(bool rootTrans, bool rootCascade, bool nestedTrans, bool nestedCascade, bool trans)
+		{
+			var element = new Button();
+			var nestedLayout = new Grid { element };
+			var rootLayout = new Grid { nestedLayout };
+
+			rootLayout.InputTransparent = rootTrans;
+			rootLayout.CascadeInputTransparent = rootCascade;
+
+			nestedLayout.InputTransparent = nestedTrans;
+			nestedLayout.CascadeInputTransparent = nestedCascade;
+
+			element.InputTransparent = trans;
+
+			AssertState(rootTrans, rootCascade, nestedTrans, nestedCascade, trans, nestedLayout, element);
+		}
+
+		[Theory]
+		[MemberData(nameof(TransparencyStates))]
+		public void InvertingRootLayoutInputTransparentIsCorrect(bool rootTrans, bool rootCascade, bool nestedTrans, bool nestedCascade, bool trans)
+		{
+			var (rootLayout, nestedLayout, element) = CreateViews(rootTrans, rootCascade, nestedTrans, nestedCascade, trans);
+
+			rootLayout.InputTransparent = !rootTrans;
+
+			AssertState(!rootTrans, rootCascade, nestedTrans, nestedCascade, trans, nestedLayout, element);
+		}
+
+		[Theory]
+		[MemberData(nameof(TransparencyStates))]
+		public void InvertingRootLayoutCascadeInputTransparentIsCorrect(bool rootTrans, bool rootCascade, bool nestedTrans, bool nestedCascade, bool trans)
+		{
+			var (rootLayout, nestedLayout, element) = CreateViews(rootTrans, rootCascade, nestedTrans, nestedCascade, trans);
+
+			rootLayout.CascadeInputTransparent = !rootCascade;
+
+			AssertState(rootTrans, !rootCascade, nestedTrans, nestedCascade, trans, nestedLayout, element);
+		}
+
+		[Theory]
+		[MemberData(nameof(TransparencyStates))]
+		public void InvertingNestedLayoutInputTransparentIsCorrect(bool rootTrans, bool rootCascade, bool nestedTrans, bool nestedCascade, bool trans)
+		{
+			var (rootLayout, nestedLayout, element) = CreateViews(rootTrans, rootCascade, nestedTrans, nestedCascade, trans);
+
+			nestedLayout.InputTransparent = !nestedTrans;
+
+			AssertState(rootTrans, rootCascade, !nestedTrans, nestedCascade, trans, nestedLayout, element);
+		}
+
+		[Theory]
+		[MemberData(nameof(TransparencyStates))]
+		public void InvertingNestedLayoutCascadeInputTransparentIsCorrect(bool rootTrans, bool rootCascade, bool nestedTrans, bool nestedCascade, bool trans)
+		{
+			var (rootLayout, nestedLayout, element) = CreateViews(rootTrans, rootCascade, nestedTrans, nestedCascade, trans);
+
+			nestedLayout.CascadeInputTransparent = !nestedCascade;
+
+			AssertState(rootTrans, rootCascade, nestedTrans, !nestedCascade, trans, nestedLayout, element);
+		}
+
+		[Theory]
+		[MemberData(nameof(TransparencyStates))]
+		public void InvertingChildInputTransparentIsCorrect(bool rootTrans, bool rootCascade, bool nestedTrans, bool nestedCascade, bool trans)
+		{
+			var (rootLayout, nestedLayout, element) = CreateViews(rootTrans, rootCascade, nestedTrans, nestedCascade, trans);
+
+			element.InputTransparent = !trans;
+
+			AssertState(rootTrans, rootCascade, nestedTrans, nestedCascade, !trans, nestedLayout, element);
+		}
+
+		[Theory]
+		[InlineData(typeof(Button))]
+		[InlineData(typeof(VerticalStackLayout))]
+		[InlineData(typeof(Editor))]
+		[InlineData(typeof(Entry))]
+		public void VisualElementsCanToggleInputTransparency(Type type)
+		{
+			var element = (VisualElement)Activator.CreateInstance(type);
+
+			Assert.False(element.InputTransparent);
+
+			element.InputTransparent = true;
+
+			Assert.True(element.InputTransparent);
+
+			element.InputTransparent = false;
+
+			Assert.False(element.InputTransparent);
+		}
+
+		// TODO: the tests below may be duplicates of the tests above
+
+		[Theory]
+		[InlineData(typeof(Button), true)]
+		[InlineData(typeof(VerticalStackLayout), true)]
+		[InlineData(typeof(Editor), true)]
+		[InlineData(typeof(Entry), true)]
+		[InlineData(typeof(Button), false)]
+		[InlineData(typeof(VerticalStackLayout), false)]
+		[InlineData(typeof(Editor), false)]
+		[InlineData(typeof(Entry), false)]
+		public void InputTransparencyOnLayoutDoesNotAffectChildWhenNotCascadeInputTransparent(Type type, bool initialInputTransparent)
+		{
+			var element = (View)Activator.CreateInstance(type);
+			var layout = new Grid
+			{
+				InputTransparent = initialInputTransparent,
+				CascadeInputTransparent = false,
+				Children =
+ 				{
+ 					element
+ 				}
+			};
+
+			AssertState(initialInputTransparent, false, false, layout, element);
+
+			layout.InputTransparent = !initialInputTransparent;
+
+			AssertState(!initialInputTransparent, false, false, layout, element);
+
+			layout.InputTransparent = initialInputTransparent;
+
+			AssertState(initialInputTransparent, false, false, layout, element);
+		}
+
+		[Theory]
+		[InlineData(typeof(Button), true)]
+		[InlineData(typeof(VerticalStackLayout), true)]
+		[InlineData(typeof(Editor), true)]
+		[InlineData(typeof(Entry), true)]
+		[InlineData(typeof(Button), false)]
+		[InlineData(typeof(VerticalStackLayout), false)]
+		[InlineData(typeof(Editor), false)]
+		[InlineData(typeof(Entry), false)]
+		public void InputTransparencyOnLayoutAffectsChild(Type type, bool initialInputTransparent)
+		{
+			var element = (View)Activator.CreateInstance(type);
+			var layout = new Grid
+			{
+				InputTransparent = initialInputTransparent,
+				CascadeInputTransparent = true, // default
+				Children =
+ 				{
+ 					element
+ 				}
+			};
+
+			AssertState(initialInputTransparent, true, false, layout, element);
+
+			layout.InputTransparent = !initialInputTransparent;
+
+			AssertState(!initialInputTransparent, true, false, layout, element);
+
+			layout.InputTransparent = initialInputTransparent;
+
+			AssertState(initialInputTransparent, true, false, layout, element);
+		}
+
+		[Theory]
+		[InlineData(typeof(Button), true)]
+		[InlineData(typeof(VerticalStackLayout), true)]
+		[InlineData(typeof(Editor), true)]
+		[InlineData(typeof(Entry), true)]
+		[InlineData(typeof(Button), false)]
+		[InlineData(typeof(VerticalStackLayout), false)]
+		[InlineData(typeof(Editor), false)]
+		[InlineData(typeof(Entry), false)]
+		public void InputTransparencyOnLayoutDoesNotAffectDeeplyNestedChildWhenNotCascadeInputTransparent(Type type, bool initialInputTransparent)
+		{
+			var element = (View)Activator.CreateInstance(type);
+			var layout = new Grid
+			{
+				InputTransparent = initialInputTransparent,
+				CascadeInputTransparent = false,
+				Children =
+ 				{
+ 					new Grid { new Grid { new Grid { element } } }
+ 				}
+			};
+
+			AssertState(initialInputTransparent, false, false, layout, element);
+
+			layout.InputTransparent = !initialInputTransparent;
+
+			AssertState(!initialInputTransparent, false, false, layout, element);
+
+			layout.InputTransparent = initialInputTransparent;
+
+			AssertState(initialInputTransparent, false, false, layout, element);
+		}
+
+		[Theory]
+		[InlineData(typeof(Button), true)]
+		[InlineData(typeof(VerticalStackLayout), true)]
+		[InlineData(typeof(Editor), true)]
+		[InlineData(typeof(Entry), true)]
+		[InlineData(typeof(Button), false)]
+		[InlineData(typeof(VerticalStackLayout), false)]
+		[InlineData(typeof(Editor), false)]
+		[InlineData(typeof(Entry), false)]
+		public void InputTransparencyOnLayoutAffectsDeeplyNestedChild(Type type, bool initialInputTransparent)
+		{
+			var element = (View)Activator.CreateInstance(type);
+			var layout = new Grid
+			{
+				InputTransparent = initialInputTransparent,
+				CascadeInputTransparent = true, // default
+				Children =
+ 				{
+ 					new Grid { new Grid { new Grid { element } } }
+ 				}
+			};
+
+			AssertState(initialInputTransparent, true, false, layout, element);
+
+			layout.InputTransparent = !initialInputTransparent;
+
+			AssertState(!initialInputTransparent, true, false, layout, element);
+
+			layout.InputTransparent = initialInputTransparent;
+
+			AssertState(initialInputTransparent, true, false, layout, element);
+		}
+
+		[Theory]
+		[InlineData(true, true)]
+		[InlineData(true, false)]
+		[InlineData(false, true)]
+		[InlineData(false, false)]
+		public void InputTransparencyOnLayoutDoesNotOverrideNestedLayoutWhenNotCascadeInputTransparentButCascadeOnNested(bool parent, bool nested)
+		{
+			var element = new Button();
+			Grid nestedLayout;
+			var layout = new Grid
+			{
+				InputTransparent = parent,
+				CascadeInputTransparent = false,
+				Children =
+ 				{
+ 					new Grid
+ 					{
+ 						(nestedLayout = new Grid
+ 						{
+ 							InputTransparent = nested,
+ 							CascadeInputTransparent = true, // default
+ 							Children =
+ 							{
+ 								new Grid { element }
+ 							}
+ 						})
+ 					}
+ 				}
+			};
+
+			AssertState(parent, false, nested, true, false, nestedLayout, element);
+
+			layout.InputTransparent = !parent;
+
+			AssertState(!parent, false, nested, true, false, nestedLayout, element);
+
+			layout.InputTransparent = parent;
+
+			AssertState(parent, false, nested, true, false, nestedLayout, element);
+		}
+
+		[Theory]
+		[InlineData(true, true)]
+		[InlineData(true, false)]
+		[InlineData(false, true)]
+		[InlineData(false, false)]
+		public void InputTransparencyOnLayoutDoesNotOverrideNestedLayoutWhenNotCascadeInputTransparent(bool parent, bool nested)
+		{
+			var element = new Button();
+			Grid nestedLayout;
+			var layout = new Grid
+			{
+				InputTransparent = parent,
+				CascadeInputTransparent = false,
+				Children =
+ 				{
+ 					new Grid
+ 					{
+ 						(nestedLayout = new Grid
+ 						{
+ 							InputTransparent = nested,
+ 							CascadeInputTransparent = false,
+ 							Children =
+ 							{
+ 								new Grid { element }
+ 							}
+ 						})
+ 					}
+ 				}
+			};
+
+			AssertState(parent, false, nested, false, false, nestedLayout, element);
+
+			layout.InputTransparent = !parent;
+
+			AssertState(!parent, false, nested, false, false, nestedLayout, element);
+
+			layout.InputTransparent = parent;
+
+			AssertState(parent, false, nested, false, false, nestedLayout, element);
+		}
+
+		[Theory]
+		[InlineData(true, true, true)]
+		[InlineData(true, true, false)]
+		[InlineData(true, false, true)]
+		[InlineData(true, false, false)]
+		[InlineData(false, true, true)]
+		[InlineData(false, true, false)]
+		[InlineData(false, false, true)]
+		[InlineData(false, false, false)]
+		public void InputTransparencyOnLayoutOverridesNestedLayout(bool parent, bool nested, bool cascadeNested)
+		{
+			var element = new Button();
+			Grid nestedLayout;
+			var layout = new Grid
+			{
+				InputTransparent = parent,
+				CascadeInputTransparent = true, // default
+				Children =
+ 				{
+ 					new Grid
+ 					{
+ 						(nestedLayout = new Grid
+ 						{
+ 							InputTransparent = nested,
+ 							CascadeInputTransparent = cascadeNested,
+ 							Children =
+ 							{
+ 								new Grid { element }
+ 							}
+ 						})
+ 					}
+ 				}
+			};
+
+			AssertState(parent, true, nested, cascadeNested, false, nestedLayout, element);
+
+			layout.InputTransparent = !parent;
+
+			AssertState(!parent, true, nested, cascadeNested, false, nestedLayout, element);
+
+			layout.InputTransparent = parent;
+
+			AssertState(parent, true, nested, cascadeNested, false, nestedLayout, element);
+		}
+	}
+}
diff --git a/src/Controls/tests/Xaml.UnitTests/Issues/Bz54334.xaml.cs b/src/Controls/tests/Xaml.UnitTests/Issues/Bz54334.xaml.cs
index db0faa3a5f31..6d963ef1cac1 100644
--- a/src/Controls/tests/Xaml.UnitTests/Issues/Bz54334.xaml.cs
+++ b/src/Controls/tests/Xaml.UnitTests/Issues/Bz54334.xaml.cs
@@ -67,7 +67,7 @@ public void TearDown()
 			}
 
 			[TestCase(true)]
-			//	[TestCase(false)] TODO: Figure why this tests is failing with NRE on UnApply of the Style 
+			[TestCase(false, Ignore = "This is failing on CI on macOS: https://github.com/dotnet/maui/issues/15054")]
 			public void FooBz54334(bool useCompiledXaml)
 			{
 				var app = Application.Current = new Bz54334App(useCompiledXaml);

From b9f64e153dd96657de26d65dba59b3f9293a2467 Mon Sep 17 00:00:00 2001
From: "E.Z. Hart" <hartez@users.noreply.github.com>
Date: Mon, 10 Jul 2023 08:55:40 -0600
Subject: [PATCH 074/105] Include headers/footers in EmptySource count so they
 show up when ItemsSource is null (#15979)

* Include headers/footers in EmptySource count so they show up when ItemsSource is null
Fixes #8934

* More tests
---
 .../Android/Adapters/EmptyViewAdapter.cs      | 23 ++++---
 .../Items/Android/ItemsSources/EmptySource.cs |  2 +-
 .../CollectionViewTests.Android.cs            | 32 ++++++++++
 .../CollectionView/CollectionViewTests.cs     | 60 +++++++++++++++++++
 4 files changed, 108 insertions(+), 9 deletions(-)

diff --git a/src/Controls/src/Core/Handlers/Items/Android/Adapters/EmptyViewAdapter.cs b/src/Controls/src/Core/Handlers/Items/Android/Adapters/EmptyViewAdapter.cs
index 9be42c127b27..8820ce1986aa 100644
--- a/src/Controls/src/Core/Handlers/Items/Android/Adapters/EmptyViewAdapter.cs
+++ b/src/Controls/src/Core/Handlers/Items/Android/Adapters/EmptyViewAdapter.cs
@@ -10,12 +10,12 @@ namespace Microsoft.Maui.Controls.Handlers.Items
 {
 	public class EmptyViewAdapter : RecyclerView.Adapter
 	{
-		int _headerHeight;
+		double _headerHeight;
 		int _headerViewType;
 		object _headerView;
 		DataTemplate _headerViewTemplate;
 
-		int _footerHeight;
+		double _footerHeight;
 		int _footerViewType;
 		object _footerView;
 		DataTemplate _footerViewTemplate;
@@ -301,18 +301,25 @@ void UpdateHeaderFooterHeight(object item, bool isHeader)
 			if (item == null)
 				return;
 
-			var sizeRequest = new SizeRequest(new Size(0, 0));
+			var size = Size.Zero;
 
-			if (item is View view)
-				sizeRequest = view.Measure(double.PositiveInfinity, double.PositiveInfinity, MeasureFlags.IncludeMargins);
+			if (item is IView view)
+			{
+				if (view.Handler == null)
+				{
+					TemplateHelpers.GetHandler(view as View, ItemsView.FindMauiContext());
+				}
+
+				size = view.Measure(double.PositiveInfinity, double.PositiveInfinity);
+			}
 
 			if (item is DataTemplate dataTemplate)
 			{
-				var content = dataTemplate.CreateContent() as View;
-				sizeRequest = content.Measure(double.PositiveInfinity, double.PositiveInfinity, MeasureFlags.IncludeMargins);
+				var content = dataTemplate.CreateContent() as IView;
+				size = content.Measure(double.PositiveInfinity, double.PositiveInfinity);
 			}
 
-			var itemHeight = (int)sizeRequest.Request.Height;
+			var itemHeight = size.Height;
 
 			if (isHeader)
 				_headerHeight = itemHeight;
diff --git a/src/Controls/src/Core/Handlers/Items/Android/ItemsSources/EmptySource.cs b/src/Controls/src/Core/Handlers/Items/Android/ItemsSources/EmptySource.cs
index 15ba7e4c9cc0..c85c3213cc93 100644
--- a/src/Controls/src/Core/Handlers/Items/Android/ItemsSources/EmptySource.cs
+++ b/src/Controls/src/Core/Handlers/Items/Android/ItemsSources/EmptySource.cs
@@ -3,7 +3,7 @@ namespace Microsoft.Maui.Controls.Handlers.Items
 {
 	sealed internal class EmptySource : IItemsViewSource
 	{
-		public int Count => 0;
+		public int Count => (HasHeader? 1 : 0) + (HasFooter? 1 : 0);
 
 		public bool HasHeader { get; set; }
 		public bool HasFooter { get; set; }
diff --git a/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.Android.cs b/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.Android.cs
index faf1479a4d5f..ba3c607e4acc 100644
--- a/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.Android.cs
+++ b/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.Android.cs
@@ -50,5 +50,37 @@ await CreateHandlerAndAddToWindow<IWindowHandler>(rootPage,
 			// Without Exceptions here, the test has passed.
 			Assert.Equal(0, (rootPage as IPageContainer<Page>).CurrentPage.Navigation.ModalStack.Count);
 		}
+
+		[Fact]
+		public async Task NullItemsSourceDisplaysHeaderFooterAndEmptyView() 
+		{
+			SetupBuilder();
+
+			var emptyView = new Label { Text = "Empty" };
+			var header = new Label { Text = "Header" };
+			var footer = new Label { Text = "Footer" };
+
+			var collectionView = new CollectionView
+			{
+				ItemsSource = null,
+				EmptyView = emptyView,
+				Header = header,
+				Footer = footer
+			};
+
+			ContentPage contentPage = new ContentPage() { Content = collectionView };
+
+			var frame = collectionView.Frame;
+
+			await CreateHandlerAndAddToWindow<IWindowHandler>(contentPage,
+				async (_) =>
+				{
+					await WaitForUIUpdate(frame, collectionView);
+
+					Assert.True(emptyView.Height > 0, "EmptyView should be laid out");
+					Assert.True(header.Height > 0, "Header should be laid out");
+					Assert.True(footer.Height > 0, "Footer should be laid out");
+				});
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.cs b/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.cs
index cb60179cdd00..9e9725c879be 100644
--- a/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.cs
@@ -170,6 +170,66 @@ await CreateHandlerAndAddToWindow<LayoutHandler>(layout, async handler =>
 			});
 		}
 
+		[Theory]
+		[InlineData(true, false, false)]
+		[InlineData(true, false, true)]
+		[InlineData(true, true, false)]
+		[InlineData(true, true, true)]
+		[InlineData(false, false, false)]
+		[InlineData(false, false, true)]
+		[InlineData(false, true, false)]
+		[InlineData(false, true, true)]
+		public async Task CollectionViewStructuralItems(bool hasHeader, bool hasFooter, bool hasData) 
+		{
+			SetupBuilder();
+
+			double containerHeight = 500;
+			double containerWidth = 500;
+			var layout = new Grid() { IgnoreSafeArea = true, HeightRequest = containerHeight, WidthRequest = containerWidth };
+
+			Label headerLabel = hasHeader ? new Label { Text = "header" } : null;
+			Label footerLabel = hasFooter ? new Label { Text = "footer" } : null;
+
+			var collectionView = new CollectionView
+			{
+				ItemsLayout = LinearItemsLayout.Vertical,
+				ItemTemplate = new DataTemplate(() => new Label() { HeightRequest = 20, WidthRequest = 20 }),
+				Header = headerLabel,
+				Footer = footerLabel,
+				ItemsSource = hasData ? null : new ObservableCollection<string> { "data" }
+			};
+
+			layout.Add(collectionView);
+
+			var frame = collectionView.Frame;
+
+			await CreateHandlerAndAddToWindow<LayoutHandler>(layout, async handler =>
+			{
+				await WaitForUIUpdate(frame, collectionView);
+				frame = collectionView.Frame;
+
+#if WINDOWS
+					// On Windows, the ListView pops in and changes the frame, then actually
+					// loads in the data, which updates it again. So we need to wait for the second
+					// update before checking the size
+					await WaitForUIUpdate(frame, collectionView);
+					frame = collectionView.Frame;
+#endif
+
+				if (hasHeader)
+				{
+					Assert.True(headerLabel.Height > 0);
+					Assert.True(headerLabel.Width > 0);
+				}
+
+				if (hasFooter)
+				{
+					Assert.True(footerLabel.Height > 0);
+					Assert.True(footerLabel.Width > 0);
+				}
+			});
+		}
+
 		public static IEnumerable<object[]> GenerateLayoutOptionsCombos()
 		{
 			var layoutOptions = new LayoutOptions[] { LayoutOptions.Center, LayoutOptions.Start, LayoutOptions.End, LayoutOptions.Fill };

From fc270b7daf07608a63e854bf686d59dbcb6f9c11 Mon Sep 17 00:00:00 2001
From: TJ Lambert <50846373+tj-devel709@users.noreply.github.com>
Date: Tue, 11 Jul 2023 17:38:31 -0500
Subject: [PATCH 075/105] Set the SafeAreaInset Property with updated value
 (#15512)

* Can now update the safearea after changing

* Add Page HandlerImpl directory

* adding pageTest

* rename and move impl files

* remove space

* moving extension to own file

* change the page directory

* use Replace mapping instead

* one more merge conflict

* fix merge spacing

---------

Co-authored-by: tj-devel709 <tjlambert@microsoft.com>
---
 src/Controls/src/Core/Page/Page.cs            | 10 ++++-
 .../Elements/Page/PageTests.iOS.cs            | 44 +++++++++++++++++++
 src/Core/src/Core/ISafeAreaView2.cs           | 16 +++++++
 src/Core/src/Platform/iOS/MauiView.cs         | 10 ++++-
 .../Platform/iOS/UIEdgeInsetsExtensions.cs    |  9 ++++
 .../PublicAPI/net-ios/PublicAPI.Unshipped.txt |  5 ++-
 .../net-maccatalyst/PublicAPI.Unshipped.txt   |  5 ++-
 7 files changed, 95 insertions(+), 4 deletions(-)
 create mode 100644 src/Controls/tests/DeviceTests/Elements/Page/PageTests.iOS.cs
 create mode 100644 src/Core/src/Core/ISafeAreaView2.cs
 create mode 100644 src/Core/src/Platform/iOS/UIEdgeInsetsExtensions.cs

diff --git a/src/Controls/src/Core/Page/Page.cs b/src/Controls/src/Core/Page/Page.cs
index 219e553cb095..1b44baddcb11 100644
--- a/src/Controls/src/Core/Page/Page.cs
+++ b/src/Controls/src/Core/Page/Page.cs
@@ -14,7 +14,7 @@
 namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/Page.xml" path="Type[@FullName='Microsoft.Maui.Controls.Page']/Docs/*" />
-	public partial class Page : VisualElement, ILayout, IPageController, IElementConfiguration<Page>, IPaddingElement, ISafeAreaView, IView, ITitledElement, IToolbarElement
+	public partial class Page : VisualElement, ILayout, IPageController, IElementConfiguration<Page>, IPaddingElement, ISafeAreaView, ISafeAreaView2, IView, ITitledElement, IToolbarElement
 	{
 		/// <include file="../../docs/Microsoft.Maui.Controls/Page.xml" path="//Member[@MemberName='BusySetSignalName']/Docs/*" />
 		public const string BusySetSignalName = "Microsoft.Maui.Controls.BusySet";
@@ -178,6 +178,14 @@ internal override IEnumerable<Element> ChildrenNotDrawnByThisElement
 
 		bool ISafeAreaView.IgnoreSafeArea => !On<PlatformConfiguration.iOS>().UsingSafeArea();
 
+		Thickness ISafeAreaView2.SafeAreaInsets
+		{
+			set
+			{
+				On<PlatformConfiguration.iOS>().SetSafeAreaInsets(value);
+			}
+		}
+
 		public event EventHandler LayoutChanged;
 
 		public event EventHandler Appearing;
diff --git a/src/Controls/tests/DeviceTests/Elements/Page/PageTests.iOS.cs b/src/Controls/tests/DeviceTests/Elements/Page/PageTests.iOS.cs
new file mode 100644
index 000000000000..1c71d20140cb
--- /dev/null
+++ b/src/Controls/tests/DeviceTests/Elements/Page/PageTests.iOS.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Controls.PlatformConfiguration;
+using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
+using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Handlers;
+using Microsoft.Maui.Hosting;
+using Xunit;
+
+namespace Microsoft.Maui.DeviceTests
+{
+	public partial class PageTests : ControlsHandlerTestBase
+	{
+		void SetupBuilder()
+		{
+			EnsureHandlerCreated(builder =>
+			{
+				builder.ConfigureMauiHandlers(handlers =>
+				{
+					SetupShellHandlers(handlers);
+				});
+			});
+		}
+
+		[Fact("SafeAreaInset Property is Set")]
+		public async Task SafeAreaInsetIsSet()
+		{
+			SetupBuilder();
+
+			var page = new ContentPage { Background = Colors.Blue };
+
+			var shell = new Shell() { CurrentItem = page };
+
+			await CreateHandlerAndAddToWindow<IWindowHandler>(shell, (handler) =>
+			{
+				if (handler.VirtualView is Window window && window.Page is Shell shellPage)
+				{
+					Assert.NotEqual(shellPage.CurrentPage.On<iOS>().SafeAreaInsets(), Thickness.Zero);
+				}
+			});
+		}
+	}
+}
diff --git a/src/Core/src/Core/ISafeAreaView2.cs b/src/Core/src/Core/ISafeAreaView2.cs
new file mode 100644
index 000000000000..e0f0fb9ec757
--- /dev/null
+++ b/src/Core/src/Core/ISafeAreaView2.cs
@@ -0,0 +1,16 @@
+namespace Microsoft.Maui
+{
+	/// <summary>
+	/// Provides functionality for the Page's SafeAreaInsets that may be changed in the future.
+	/// </summary>
+	/// <remarks>
+	/// This interface is only recognized on the iOS/Mac Catalyst platforms; other platforms will ignore it.
+	/// </remarks>
+	internal interface ISafeAreaView2
+	{
+		/// <summary>
+		/// Internal property for the Page's SafeAreaInsets Thickness that may be changed in the future.
+		/// </summary>
+		internal Thickness SafeAreaInsets { set; }
+	}
+}
diff --git a/src/Core/src/Platform/iOS/MauiView.cs b/src/Core/src/Platform/iOS/MauiView.cs
index 153c7019b9ec..94aae52ad420 100644
--- a/src/Core/src/Platform/iOS/MauiView.cs
+++ b/src/Core/src/Platform/iOS/MauiView.cs
@@ -60,7 +60,15 @@ protected void CacheMeasureConstraints(double widthConstraint, double heightCons
 			_lastMeasureHeight = heightConstraint;
 		}
 
-		public ICrossPlatformLayout? CrossPlatformLayout
+		public override void SafeAreaInsetsDidChange()
+		{
+			base.SafeAreaInsetsDidChange();
+
+			if (View is ISafeAreaView2 isav2)
+				isav2.SafeAreaInsets = this.SafeAreaInsets.ToThickness();
+		}
+
+   		public ICrossPlatformLayout? CrossPlatformLayout
 		{
 			get => _crossPlatformLayoutReference != null && _crossPlatformLayoutReference.TryGetTarget(out var v) ? v : null;
 			set => _crossPlatformLayoutReference = value == null ? null : new WeakReference<ICrossPlatformLayout>(value);
diff --git a/src/Core/src/Platform/iOS/UIEdgeInsetsExtensions.cs b/src/Core/src/Platform/iOS/UIEdgeInsetsExtensions.cs
new file mode 100644
index 000000000000..be3b6ff02d27
--- /dev/null
+++ b/src/Core/src/Platform/iOS/UIEdgeInsetsExtensions.cs
@@ -0,0 +1,9 @@
+using System;
+using UIKit;
+
+namespace Microsoft.Maui.Platform;
+
+public static class UIEdgeInsetsExtensions
+{
+	public static Thickness ToThickness(this UIEdgeInsets insets) => new(insets.Left, insets.Top, insets.Right, insets.Bottom);
+}
diff --git a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index 9c1f0cd5db6a..e34952ca4407 100644
--- a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -51,6 +51,7 @@ override Microsoft.Maui.Platform.MauiRefreshView.Bounds.set -> void
 override Microsoft.Maui.Platform.MauiScrollView.ScrollRectToVisible(CoreGraphics.CGRect rect, bool animated) -> void
 override Microsoft.Maui.Platform.MauiTextView.Font.get -> UIKit.UIFont?
 override Microsoft.Maui.Platform.MauiTextView.Font.set -> void
+override Microsoft.Maui.Platform.MauiView.SafeAreaInsetsDidChange() -> void
 override Microsoft.Maui.Platform.MauiView.LayoutSubviews() -> void
 override Microsoft.Maui.Platform.MauiView.SetNeedsLayout() -> void
 override Microsoft.Maui.Platform.MauiView.SizeThatFits(CoreGraphics.CGSize size) -> CoreGraphics.CGSize
@@ -110,4 +111,6 @@ Microsoft.Maui.Platform.MauiView.IsMeasureValid(double widthConstraint, double h
 *REMOVED*override Microsoft.Maui.Platform.LayoutView.SetNeedsLayout() -> void
 *REMOVED*override Microsoft.Maui.Platform.LayoutView.SetNeedsLayout() -> void
 *REMOVED*override Microsoft.Maui.Platform.LayoutView.SizeThatFits(CoreGraphics.CGSize size) -> CoreGraphics.CGSize
-*REMOVED*override Microsoft.Maui.Platform.ContentView.SetNeedsLayout() -> void
\ No newline at end of file
+*REMOVED*override Microsoft.Maui.Platform.ContentView.SetNeedsLayout() -> void
+Microsoft.Maui.Platform.UIEdgeInsetsExtensions
+static Microsoft.Maui.Platform.UIEdgeInsetsExtensions.ToThickness(this UIKit.UIEdgeInsets insets) -> Microsoft.Maui.Thickness
\ No newline at end of file
diff --git a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index d4a82e363fdb..b3f26d213972 100644
--- a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -51,6 +51,7 @@ override Microsoft.Maui.Layouts.FlexBasis.GetHashCode() -> int
 override Microsoft.Maui.Platform.MauiRefreshView.Bounds.get -> CoreGraphics.CGRect
 override Microsoft.Maui.Platform.MauiRefreshView.Bounds.set -> void
 override Microsoft.Maui.Platform.MauiScrollView.ScrollRectToVisible(CoreGraphics.CGRect rect, bool animated) -> void
+override Microsoft.Maui.Platform.MauiView.SafeAreaInsetsDidChange() -> void
 override Microsoft.Maui.Platform.MauiTextView.Font.get -> UIKit.UIFont?
 override Microsoft.Maui.Platform.MauiTextView.Font.set -> void
 override Microsoft.Maui.Platform.MauiView.LayoutSubviews() -> void
@@ -110,4 +111,6 @@ virtual Microsoft.Maui.MauiUIApplicationDelegate.PerformFetch(UIKit.UIApplicatio
 *REMOVED*override Microsoft.Maui.Platform.LayoutView.SetNeedsLayout() -> void
 *REMOVED*override Microsoft.Maui.Platform.LayoutView.SetNeedsLayout() -> void
 *REMOVED*override Microsoft.Maui.Platform.LayoutView.SizeThatFits(CoreGraphics.CGSize size) -> CoreGraphics.CGSize
-*REMOVED*override Microsoft.Maui.Platform.ContentView.SetNeedsLayout() -> void
\ No newline at end of file
+*REMOVED*override Microsoft.Maui.Platform.ContentView.SetNeedsLayout() -> void
+Microsoft.Maui.Platform.UIEdgeInsetsExtensions
+static Microsoft.Maui.Platform.UIEdgeInsetsExtensions.ToThickness(this UIKit.UIEdgeInsets insets) -> Microsoft.Maui.Thickness
\ No newline at end of file

From 31e343765f9f16344090a629f10aac46ee0348a2 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Wed, 12 Jul 2023 12:01:23 +0200
Subject: [PATCH 076/105] Improve the customization of WebView on Android
 (#16032)

* Avoid magical fields in the WebView hander
* Fixes #11004
* Add a test for the fix!
---
 .../WebView/WebViewHandler.Android.cs         |  26 ++--
 .../src/Platform/Android/MauiWebViewClient.cs |  30 ++--
 .../WebView/WebViewHandlerTests.Android.cs    | 142 +++++++++++++++++-
 .../Resources/Raw/extracontent.html           |   9 ++
 .../tests/DeviceTests/Stubs/LayoutStub.cs     |  27 ++--
 src/Core/tests/DeviceTests/Stubs/StubBase.cs  |   2 +-
 6 files changed, 193 insertions(+), 43 deletions(-)
 create mode 100644 src/Core/tests/DeviceTests/Resources/Raw/extracontent.html

diff --git a/src/Core/src/Handlers/WebView/WebViewHandler.Android.cs b/src/Core/src/Handlers/WebView/WebViewHandler.Android.cs
index 2ac29e41b274..db3bb87c4838 100644
--- a/src/Core/src/Handlers/WebView/WebViewHandler.Android.cs
+++ b/src/Core/src/Handlers/WebView/WebViewHandler.Android.cs
@@ -11,9 +11,6 @@ public partial class WebViewHandler : ViewHandler<IWebView, AWebView>
 	{
 		internal const string AssetBaseUrl = "file:///android_asset/";
 
-		WebViewClient? _webViewClient;
-		MauiWebChromeClient? _webChromeClient;
-
 		bool _firstRun = true;
 		readonly HashSet<string> _loadedCookies = new HashSet<string>();
 
@@ -52,17 +49,20 @@ public override void SetVirtualView(IView view)
 
 		protected override void DisconnectHandler(AWebView platformView)
 		{
-			if (_webViewClient is MauiWebViewClient mauiWebViewClient)
-				mauiWebViewClient.Disconnect();
+			if (OperatingSystem.IsAndroidVersionAtLeast(26))
+			{
+				if (platformView.WebViewClient is MauiWebViewClient webViewClient)
+					webViewClient.Disconnect();
 
-			_webChromeClient?.Disconnect();
+				if (platformView.WebChromeClient is MauiWebChromeClient webChromeClient)
+					webChromeClient.Disconnect();
+			}
+
+			platformView.SetWebViewClient(null!);
 			platformView.SetWebChromeClient(null);
 
 			platformView.StopLoading();
 
-			_webViewClient = null;
-			_webChromeClient = null;
-
 			base.DisconnectHandler(platformView);
 		}
 
@@ -79,13 +79,13 @@ public static void MapUserAgent(IWebViewHandler handler, IWebView webView)
 		public static void MapWebViewClient(IWebViewHandler handler, IWebView webView)
 		{
 			if (handler is WebViewHandler platformHandler)
-				handler.PlatformView.SetWebViewClient(platformHandler._webViewClient ??= new MauiWebViewClient(platformHandler));
+				handler.PlatformView.SetWebViewClient(new MauiWebViewClient(platformHandler));
 		}
 
 		public static void MapWebChromeClient(IWebViewHandler handler, IWebView webView)
 		{
 			if (handler is WebViewHandler platformHandler)
-				handler.PlatformView.SetWebChromeClient(platformHandler._webChromeClient ??= new MauiWebChromeClient(platformHandler));
+				handler.PlatformView.SetWebChromeClient(new MauiWebChromeClient(platformHandler));
 		}
 
 		public static void MapWebViewSettings(IWebViewHandler handler, IWebView webView)
@@ -143,7 +143,7 @@ public static void MapEvaluateJavaScriptAsync(IWebViewHandler handler, IWebView
 
 		protected internal bool NavigatingCanceled(string? url)
 		{
-			if (VirtualView == null || string.IsNullOrWhiteSpace(url) || _webViewClient == null)
+			if (VirtualView == null || string.IsNullOrWhiteSpace(url))
 				return true;
 
 			if (url == AssetBaseUrl)
@@ -153,7 +153,7 @@ protected internal bool NavigatingCanceled(string? url)
 			bool cancel = VirtualView.Navigating(CurrentNavigationEvent, url);
 
 			// if the user disconnects from the handler we want to exit
-			if (_webViewClient == null)
+			if (!PlatformView.IsAlive())
 				return true;
 
 			PlatformView?.UpdateCanGoBackForward(VirtualView);
diff --git a/src/Core/src/Platform/Android/MauiWebViewClient.cs b/src/Core/src/Platform/Android/MauiWebViewClient.cs
index bc6b854abd87..ab80ed5819cb 100644
--- a/src/Core/src/Platform/Android/MauiWebViewClient.cs
+++ b/src/Core/src/Platform/Android/MauiWebViewClient.cs
@@ -7,13 +7,14 @@ namespace Microsoft.Maui.Platform
 	public class MauiWebViewClient : WebViewClient
 	{
 		WebNavigationResult _navigationResult;
-		WebViewHandler? _handler;
+		WeakReference<WebViewHandler?> _handler;
 		string? _lastUrlNavigatedCancel;
 
 		public MauiWebViewClient(WebViewHandler handler)
 		{
-			_handler = handler ?? throw new ArgumentNullException(nameof(handler));
+			_ = handler ?? throw new ArgumentNullException(nameof(handler));
 
+			_handler = new WeakReference<WebViewHandler?>(handler);
 			_navigationResult = WebNavigationResult.Success;
 		}
 		public override bool ShouldOverrideUrlLoading(WebView? view, IWebResourceRequest? request)
@@ -21,20 +22,20 @@ public override bool ShouldOverrideUrlLoading(WebView? view, IWebResourceRequest
 
 		public override void OnPageStarted(WebView? view, string? url, Bitmap? favicon)
 		{
-			if (_handler?.VirtualView == null || url == WebViewHandler.AssetBaseUrl)
+			if (!_handler.TryGetTarget(out var handler) || handler.VirtualView == null || url == WebViewHandler.AssetBaseUrl)
 				return;
 
 			if (!string.IsNullOrWhiteSpace(url))
 			{
-				_handler.SyncPlatformCookiesToVirtualView(url);
+				handler.SyncPlatformCookiesToVirtualView(url);
 			}
 
 			var cancel = false;
 
-			if (!GetValidUrl(url).Equals(_handler.UrlCanceled, StringComparison.OrdinalIgnoreCase))
+			if (!GetValidUrl(url).Equals(handler.UrlCanceled, StringComparison.OrdinalIgnoreCase))
 				cancel = NavigatingCanceled(url);
 
-			_handler.UrlCanceled = null;
+			handler.UrlCanceled = null;
 
 			if (cancel)
 			{
@@ -50,19 +51,19 @@ public override void OnPageStarted(WebView? view, string? url, Bitmap? favicon)
 
 		public override void OnPageFinished(WebView? view, string? url)
 		{
-			if (_handler?.VirtualView == null || string.IsNullOrWhiteSpace(url) || url == WebViewHandler.AssetBaseUrl)
+			if (!_handler.TryGetTarget(out var handler) || handler.VirtualView == null || string.IsNullOrWhiteSpace(url) || url == WebViewHandler.AssetBaseUrl)
 				return;
 
 			bool navigate = _navigationResult != WebNavigationResult.Failure || !GetValidUrl(url).Equals(_lastUrlNavigatedCancel, StringComparison.OrdinalIgnoreCase);
 			_lastUrlNavigatedCancel = _navigationResult == WebNavigationResult.Cancel ? url : null;
 
 			if (navigate)
-				_handler.VirtualView.Navigated(_handler.CurrentNavigationEvent, GetValidUrl(url), _navigationResult);
+				handler.VirtualView.Navigated(handler.CurrentNavigationEvent, GetValidUrl(url), _navigationResult);
 
-			_handler.SyncPlatformCookiesToVirtualView(url);
+			handler.SyncPlatformCookiesToVirtualView(url);
 
-			if (_handler != null)
-				_handler.PlatformView.UpdateCanGoBackForward(_handler.VirtualView);
+			if (handler != null)
+				handler.PlatformView.UpdateCanGoBackForward(handler.VirtualView);
 
 			base.OnPageFinished(view, url);
 		}
@@ -70,7 +71,7 @@ public override void OnPageFinished(WebView? view, string? url)
 		[System.Runtime.Versioning.SupportedOSPlatform("android23.0")]
 		public override void OnReceivedError(WebView? view, IWebResourceRequest? request, WebResourceError? error)
 		{
-			if (request != null && request.Url?.ToString() == _handler?.PlatformView.Url)
+			if (request != null && _handler.TryGetTarget(out var handler) && request.Url?.ToString() == handler?.PlatformView.Url)
 			{
 				_navigationResult = WebNavigationResult.Failure;
 
@@ -81,7 +82,8 @@ public override void OnReceivedError(WebView? view, IWebResourceRequest? request
 			base.OnReceivedError(view, request, error);
 		}
 
-		bool NavigatingCanceled(string? url) => _handler?.NavigatingCanceled(url) ?? true;
+		bool NavigatingCanceled(string? url) =>
+			!_handler.TryGetTarget(out var handler) || handler.NavigatingCanceled(url);
 
 		string GetValidUrl(string? url)
 		{
@@ -101,7 +103,7 @@ protected override void Dispose(bool disposing)
 
 		internal void Disconnect()
 		{
-			_handler = null;
+			_handler.SetTarget(null);
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Handlers/WebView/WebViewHandlerTests.Android.cs b/src/Core/tests/DeviceTests/Handlers/WebView/WebViewHandlerTests.Android.cs
index 250dc2caf5bb..616a78b40bcc 100644
--- a/src/Core/tests/DeviceTests/Handlers/WebView/WebViewHandlerTests.Android.cs
+++ b/src/Core/tests/DeviceTests/Handlers/WebView/WebViewHandlerTests.Android.cs
@@ -1,14 +1,154 @@
-using Microsoft.Maui.Handlers;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Android.Webkit;
+using Microsoft.Maui.DeviceTests.Stubs;
+using Xunit;
 using AWebView = Android.Webkit.WebView;
 
 namespace Microsoft.Maui.DeviceTests
 {
 	public partial class WebViewHandlerTests
 	{
+		[Fact]
+		public Task EnsureSupportForCustomWebViewClients() =>
+			InvokeOnMainThreadAsync(async () =>
+			{
+				// create the cross-platform view
+				var webView = new WebViewStub
+				{
+					Width = 300,
+					Height = 200,
+					Background = new SolidPaint(Colors.Red),
+				};
+
+				// create the platform view
+				await AttachAndRun<CustomWebViewHandler>(webView, async webViewHandler =>
+				{
+					var platformWebView = webViewHandler.PlatformView;
+
+					var tcsLoaded = new TaskCompletionSource<bool>();
+					var tcsNavigating = new TaskCompletionSource();
+					var tcsRequested = new TaskCompletionSource();
+
+					// if the timeout happens, cancel everything
+					var pageLoadTimeout = TimeSpan.FromSeconds(30);
+					var ctsTimeout = new CancellationTokenSource(pageLoadTimeout);
+					ctsTimeout.Token.Register(() =>
+					{
+						tcsLoaded.TrySetException(new TimeoutException($"Failed to load HTML"));
+						tcsNavigating.TrySetException(new TimeoutException($"Failed to navigate to the loaded page"));
+						tcsRequested.TrySetException(new TimeoutException($"Failed to request the image"));
+					});
+
+					// attach some event handlers to track things
+					var navigatingCount = 0;
+					webView.NavigatingDelegate = new((evnt, url) =>
+					{
+						navigatingCount++;
+
+						if (url == "file:///android_asset/extracontent.html")
+							tcsNavigating.TrySetResult();
+
+						return false; // do not cancel the navigation
+					});
+					var shouldRequestCount = 0;
+					webViewHandler.ShouldInterceptRequestDelegate = new((view, request) =>
+					{
+						shouldRequestCount++;
+
+						if (request.Url.ToString().StartsWith("https://raw.githubusercontent.com/dotnet/maui/4c096c1f17e9a23bf3961ba5778d3936039ad881/Assets/icon.png"))
+							tcsRequested.TrySetResult();
+					});
+
+					// set up a task to wait for the page to load
+					webView.NavigatedDelegate = (evnt, url, result) =>
+					{
+						// Set success when we have a successful nav result
+						if (result == WebNavigationResult.Success && url == "file:///android_asset/extracontent.html")
+							tcsLoaded.TrySetResult(result == WebNavigationResult.Success);
+					};
+
+					// load the page
+					webView.Source = new UrlWebViewSourceStub { Url = "extracontent.html" };
+					webViewHandler.UpdateValue(nameof(IWebView.Source));
+
+					// wait for the loaded event
+					Assert.True(await tcsLoaded.Task, "HTML Source Failed to Load");
+
+					// make sure the mapper override fired at least once
+					Assert.IsType<CustomWebClient>(webViewHandler.CustomWebClient);
+
+					// wait for the navigation to complete
+					await tcsNavigating.Task;
+					Assert.True(navigatingCount > 1); // at least 1 navigation, Android seems to do a few
+
+					// wait for the image to be requested
+					await tcsRequested.Task;
+					Assert.Equal(1, shouldRequestCount); // only 1 request for the image to load
+				});
+			});
+
 		AWebView GetNativeWebView(WebViewHandler webViewHandler) =>
 			webViewHandler.PlatformView;
 
 		string GetNativeSource(WebViewHandler webViewHandler) =>
 			GetNativeWebView(webViewHandler).Url;
+
+		class CustomWebViewHandler : WebViewHandler
+		{
+			// make a copy of the Core mappers because we don't want any Controls changes or to override us
+			static IPropertyMapper<IWebView, IWebViewHandler> TestMapper =
+				new PropertyMapper<IWebView, IWebViewHandler>(WebViewHandler.Mapper);
+			static CommandMapper<IWebView, IWebViewHandler> TestCommandMapper =
+				new(WebViewHandler.CommandMapper);
+
+			static CustomWebViewHandler()
+			{
+				// this is part of the test: testing the modify/replace the existing mapper
+				TestMapper.ModifyMapping(
+					nameof(WebViewClient),
+					(handler, view, setter) =>
+					{
+						if (handler is not CustomWebViewHandler custom)
+							throw new Exception("The CustomWebViewHandler.TestMapper is only meant to be used with the CustomWebViewHandler tests.");
+
+						if (custom.CustomWebClient is not null)
+							throw new Exception("The [WebViewClient] mapper method is only supposed to be called once.");
+
+						custom.CustomWebClient = new CustomWebClient((CustomWebViewHandler)handler);
+
+						handler.PlatformView.SetWebViewClient(custom.CustomWebClient);
+					});
+			}
+
+			// make sure to use the Core mappers
+			public CustomWebViewHandler()
+				: base(TestMapper, TestCommandMapper)
+			{
+			}
+
+			public CustomWebClient CustomWebClient { get; private set; }
+
+			public Action<AWebView, IWebResourceRequest> ShouldInterceptRequestDelegate { get; set; }
+		}
+
+		class CustomWebClient : MauiWebViewClient
+		{
+			CustomWebViewHandler _handler;
+
+			public CustomWebClient(CustomWebViewHandler handler)
+				: base(handler)
+			{
+				_handler = handler;
+			}
+
+			public override WebResourceResponse ShouldInterceptRequest(AWebView view, IWebResourceRequest request)
+			{
+				_handler.ShouldInterceptRequestDelegate(view, request);
+
+				return base.ShouldInterceptRequest(view, request);
+			}
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Resources/Raw/extracontent.html b/src/Core/tests/DeviceTests/Resources/Raw/extracontent.html
new file mode 100644
index 000000000000..8f12800bf4cf
--- /dev/null
+++ b/src/Core/tests/DeviceTests/Resources/Raw/extracontent.html
@@ -0,0 +1,9 @@
+<html>
+  <body>
+      <h3>Remote Image Test</h3>
+      <img id="iconImg" src=""></img>
+      <script language='javascript'>
+          document.getElementById('iconImg').src = 'https://raw.githubusercontent.com/dotnet/maui/4c096c1f17e9a23bf3961ba5778d3936039ad881/Assets/icon.png?random=' + Math.random()
+      </script>
+  </body>
+</html>
diff --git a/src/Core/tests/DeviceTests/Stubs/LayoutStub.cs b/src/Core/tests/DeviceTests/Stubs/LayoutStub.cs
index b11d956bc509..a65f0a5204a8 100644
--- a/src/Core/tests/DeviceTests/Stubs/LayoutStub.cs
+++ b/src/Core/tests/DeviceTests/Stubs/LayoutStub.cs
@@ -9,58 +9,57 @@ namespace Microsoft.Maui.DeviceTests.Stubs
 	public class LayoutStub : StubBase, ILayout
 	{
 		ILayoutManager _layoutManager;
-		IList<IView> _children = new List<IView>();
 
 		public ILayoutHandler LayoutHandler => Handler as ILayoutHandler;
 
 		public void Add(IView child)
 		{
-			_children.Add(child);
+			Children.Add(child);
 		}
 
 		public bool Remove(IView child)
 		{
-			return _children.Remove(child);
+			return Children.Remove(child);
 		}
 
 		public int IndexOf(IView item)
 		{
-			return _children.IndexOf(item);
+			return Children.IndexOf(item);
 		}
 
 		public void Insert(int index, IView item)
 		{
-			_children.Insert(index, item);
+			Children.Insert(index, item);
 		}
 
 		public void RemoveAt(int index)
 		{
-			_children.RemoveAt(index);
+			Children.RemoveAt(index);
 		}
 
 		public void Clear()
 		{
-			_children.Clear();
+			Children.Clear();
 		}
 
 		public bool Contains(IView item)
 		{
-			return _children.Contains(item);
+			return Children.Contains(item);
 		}
 
 		public void CopyTo(IView[] array, int arrayIndex)
 		{
-			_children.CopyTo(array, arrayIndex);
+			Children.CopyTo(array, arrayIndex);
 		}
 
 		public IEnumerator<IView> GetEnumerator()
 		{
-			return _children.GetEnumerator();
+			return Children.GetEnumerator();
 		}
 
 		IEnumerator IEnumerable.GetEnumerator()
 		{
-			return _children.GetEnumerator();
+			return Children.GetEnumerator();
 		}
 
 		public Size CrossPlatformMeasure(double widthConstraint, double heightConstraint)
@@ -74,8 +73,8 @@ public Size CrossPlatformArrange(Rect bounds)
 		}
 
 		public Thickness Padding { get; set; }
-		public int Count => _children.Count;
-		public bool IsReadOnly => _children.IsReadOnly;
+		public int Count => Children.Count;
+		public bool IsReadOnly => Children.IsReadOnly;
 
 		ILayoutManager LayoutManager => _layoutManager ??= CreateLayoutManager();
 
@@ -85,6 +84,6 @@ public Size CrossPlatformArrange(Rect bounds)
 
 		public bool ClipsToBounds { get; set; }
 
-		public IView this[int index] { get => _children[index]; set => _children[index] = value; }
+		public IView this[int index] { get => Children[index]; set => Children[index] = value; }
 	}
 }
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Stubs/StubBase.cs b/src/Core/tests/DeviceTests/Stubs/StubBase.cs
index 64eacc3da430..65e4949f4b47 100644
--- a/src/Core/tests/DeviceTests/Stubs/StubBase.cs
+++ b/src/Core/tests/DeviceTests/Stubs/StubBase.cs
@@ -19,7 +19,7 @@ IElementHandler IElement.Handler
 
 		public bool IsFocused { get; set; }
 
-		public List<StubBase> Children { get; set; }
+		public IList<IView> Children { get; set; } = new List<IView>();
 
 		public Visibility Visibility { get; set; } = Visibility.Visible;
 

From ac16ce63692da98f502b72eaa9e071f1b3410ae6 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Wed, 12 Jul 2023 08:55:04 -0500
Subject: [PATCH 077/105] [android] fix memory leak in Window (#16045)

* [android] fix memory leak in Window

Fixes: https://github.com/dotnet/maui/issues/15972
Context: https://github.com/markusroessler/MauiWindowScopeSample

In the above sample, `android.permission.FOREGROUND_SERVICE` is utilized
to keep the app running even when terminated by the user.

Unfortunately, in this case `Window` & various other objects live
forever. When running the sample, the `InstanceCount` grows each time
you close & launch the app again:

    07-07 16:08:32.281 22562 22562 I DOTNET  : ScopedService InstanceCount: 3
    07-07 16:08:32.291 22562 22562 I DOTNET  : MainWindow InstanceCount: 3

The first issue I noticed was `IWindow.Destroying()` was never called
because of this code in `OnDestroy()`:

    if (!activity.IsFinishing)
    {
        var window = activity.GetWindow();
        window?.Destroying();
    }

`IsFinishing` was always `true` from my debugging in this spot.

`OnStop()` had the code:

    // As of Ice Cream Sandwich, Stopped is guaranteed to be called
    // even when the activity is finishing or being destroyed
    // We check for finishing and call destroying here if so
    if (activity.IsFinishing)
        window?.Destroying();

In this case `IsFinishing` was `false`.

I think the solution here is that `OnDestroy()` should attempt to
destroy the `Window` in all cases. There isn't a case you would *not*
want to destroy it. The only problem being we can now destroy it twice
-- and there is no `IWindow.IsDestroyed` value to check. We can simply
handle `InvalidOperationException`, as this should be rare.

With this change in place, I still saw a leak. Reviewing a `.gcdump` of
the app, I saw the object tree:

    Microsoft.Maui.Controls.Platform.AlertManager.AlertRequestHelper
        List<Microsoft.Maui.Controls.Platform.AlertManager.AlertRequestHelper>
            Microsoft.Maui.Controls.Platform.AlertManager
                MauiWindowScopeSample.MainWindow
        Microsoft.Maui.Controls.MessagingCenter.MaybeWeakReference
            Microsoft.Maui.Controls.MessagingCenter.Subscription
                List<Microsoft.Maui.Controls.MessagingCenter.Subscription>
                    Dictionary<Microsoft.Maui.Controls.MessagingCenter.Sender, List<Microsoft.Maui.Controls.MessagingCenter.Subscription>>
                        Microsoft.Maui.Controls.MessagingCenter
                            Other Roots

Where `MessagingCenter` appears to keep `AlertRequestHelper` alive,
which keeps the `Window` alive.

After these changes, we instead get this every time:

    07-07 16:08:38.967 22562 22562 I DOTNET  : ScopedService InstanceCount: 2
    07-07 16:08:38.978 22562 22562 I DOTNET  : MainWindow InstanceCount: 2
    07-07 16:08:39.015 22562 22562 I DOTNET  : Lifecycle event: OnStart
    07-07 16:08:39.072 22562 22562 I DOTNET  : Lifecycle event: OnPostCreate
    07-07 16:08:39.073 22562 22562 I DOTNET  : Lifecycle event: OnResume
    07-07 16:08:39.074 22562 22562 I DOTNET  : Lifecycle event: OnPostResume
    07-07 16:08:39.411 22562 22585 I DOTNET  : MainWindow InstanceCount: 1
    07-07 16:08:39.414 22562 22585 I DOTNET  : ScopedService InstanceCount: 1

The `InstanceCount` returns to 1 as the finalizers run for these types.

I have yet to figure out how to write a test for this scenario -- I've
only been able to validate this fix manually testing the app.

* Update AppHostBuilderExtensions.Android.cs

* Update AppHostBuilderExtensions.Android.cs
---
 src/Controls/src/Core/Window/Window.cs                |  1 +
 .../AppHostBuilderExtensions.Android.cs               | 11 ++---------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/Controls/src/Core/Window/Window.cs b/src/Controls/src/Core/Window/Window.cs
index eefd4d178c06..fb31d65d32cb 100644
--- a/src/Controls/src/Core/Window/Window.cs
+++ b/src/Controls/src/Core/Window/Window.cs
@@ -506,6 +506,7 @@ void IWindow.Destroying()
 			Destroying?.Invoke(this, EventArgs.Empty);
 			OnDestroying();
 
+			AlertManager.Unsubscribe();
 			Application?.RemoveWindow(this);
 			Handler?.DisconnectHandler();
 		}
diff --git a/src/Core/src/Hosting/LifecycleEvents/AppHostBuilderExtensions.Android.cs b/src/Core/src/Hosting/LifecycleEvents/AppHostBuilderExtensions.Android.cs
index 22c5dfdd237e..3820044e3311 100644
--- a/src/Core/src/Hosting/LifecycleEvents/AppHostBuilderExtensions.Android.cs
+++ b/src/Core/src/Hosting/LifecycleEvents/AppHostBuilderExtensions.Android.cs
@@ -55,15 +55,8 @@ static void OnConfigureLifeCycle(IAndroidLifecycleBuilder android)
 				})
 				.OnDestroy(activity =>
 				{
-					// If the activity is being recreated from a configuration change
-					// or something like the inspector getting attached then
-					// IsFinishing will be set to false so we still need to call
-					// Destroying to remove the xplat Window from Application
-					if (!activity.IsFinishing)
-					{
-						var window = activity.GetWindow();
-						window?.Destroying();
-					}
+					// If we tried to call window.Destroying() before, GetWindow() should return null
+					activity.GetWindow()?.Destroying();
 				})
 				.OnBackPressed(activity =>
 				{

From 49d22ac57ce1aeb23546f5b2f8155fa97cf002e3 Mon Sep 17 00:00:00 2001
From: Jonathan Dick <jodick@microsoft.com>
Date: Wed, 12 Jul 2023 10:15:38 -0400
Subject: [PATCH 078/105] [housekeeping] Group dependabot PR's by dependency
 area/type (#16111)

* Group dependabot PR's by dependency area/type

This should start grouping PR's into single a single PR by matching the group patterns.  For example we want all AndroidX updates to come in via one PR, and probably all aspnet core as well.

We still can add more rules for System.* and other dependencies

* Add more androidx packages to group

* Add more groups

* Add xunit group
---
 .github/dependabot.yml | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 8e40c99b4b12..0da1cb85a63c 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -5,6 +5,35 @@ updates:
   schedule:
     interval: daily
   open-pull-requests-limit: 25
+  groups:
+    AndroidX:
+      patterns:
+        - "Xamarin.AndroidX.*"
+        - "Xamarin.Build.Download"
+        - "Xamarin.Google.Android.Material"
+        - "Xamarin.Google.Crypto.Tink.Android"
+    AspNetCore:
+      patterns:
+        - "Microsoft.AspNetCore.*"
+        - "Microsoft.JSInterop"
+    SkiaSharp:
+      patterns:
+        - "SkiaSharp.*"
+        - "Svg.*"
+        - "ShimSkiaSharp"
+        - "Fizzler"
+    MicrosoftExtensions:
+      patterns:
+        - "Microsoft.Extensions.*"
+    WindowsAppSDK:
+      patterns:
+        - "Microsoft.Graphics.Win2D"
+        - "Microsoft.Windows.SDK.BuildTools"
+        - "Microsoft.WindowsAppSDK"
+    xunit:
+      patterns:
+        - "xunit"
+        - "xunit.runner.*"
   ignore:
     - dependency-name: "MicrosoftMauiGraphicsVersion"         # maestro
     - dependency-name: "Microsoft.Maui.Graphics*"             # maestro

From efbd3bb957ee5190912336c04563a4902eab3dd0 Mon Sep 17 00:00:00 2001
From: Scott Banning <scoban@microsoft.com>
Date: Mon, 10 Jul 2023 17:21:38 -0700
Subject: [PATCH 079/105] Add issue test for example

---
 docs/design/UITesting.md                      |  19 ++-
 .../Issues/RefreshViewPage.cs                 | 123 ++++++++++++++++++
 .../Issues/TestContentPage.cs                 |  14 ++
 .../tests/UITests/Tests/AppExtensions.cs      |  36 ++++-
 .../UITests/Tests/Issues/RefreshViewTests.cs  |  23 ++++
 .../UITests/Tests/Issues/_IssuesUITest.cs     |  36 +++++
 .../tests/UITests/Tests/UITestBase.cs         |   4 +-
 7 files changed, 250 insertions(+), 5 deletions(-)
 create mode 100644 src/Controls/samples/Controls.Sample.UITests/Issues/RefreshViewPage.cs
 create mode 100644 src/Controls/samples/Controls.Sample.UITests/Issues/TestContentPage.cs
 create mode 100644 src/Controls/tests/UITests/Tests/Issues/RefreshViewTests.cs
 create mode 100644 src/Controls/tests/UITests/Tests/Issues/_IssuesUITest.cs

diff --git a/docs/design/UITesting.md b/docs/design/UITesting.md
index 1cb41162ef01..3a777ca6b318 100644
--- a/docs/design/UITesting.md
+++ b/docs/design/UITesting.md
@@ -16,9 +16,26 @@ Appium relies on different implementations called `drivers` for each platform th
 
 The project that is used for UI Tests is located here: `src\Controls\samples\Controls.Sample.UITests\Controls.Sample.UITests.csproj`
 
+There are two types of tests you can add, Issue and Gallery.
+
+### Adding a new Issue
+
+This will be the majority of new tests added which will be primarily for testing functionality and adding regression tests.
+
+You will need to create some kind of UI to test against, which will go in the Controls.Sample.UITests project. Create a new class and attribute it with `[Issue]` and derive from `TestContentPage`.
+
+Then in the Controls.AppiumTests project add a new class that derives from `_IssuesUITest` and add your test.
+
+You can use the example for the sample project [here](https://github.com/dotnet/maui/blob/main/src/Controls/samples/Controls.Sample.UITests/Issues/RefreshViewPage.cs) and the example for the corresponding test [here](https://github.com/dotnet/maui/tree/main/src/Controls/tests/UITests/Tests/Issues/RefreshViewTests.cs).
+
+
+
+
 ### Adding a GalleryPage
 
-Each test will need to have some UI to test against, we have some base classes you can derive from to make setting this up easier: [CoreGalleryPage](https://github.com/dotnet/maui/blob/main/src/Controls/samples/Controls.Sample.UITests/CoreViews/CoreGalleryPage.cs) and [ContentViewGalleryPage](https://github.com/dotnet/maui/blob/main/src/Controls/samples/Controls.Sample.UITests/Elements/ContentViewGalleryPage.cs)
+Gallery tests are to make it easier to run the same set of tests on controls, if you are creating a new control you would want to add a new gallery page.
+
+We have some base classes you can derive from to make setting this up easier: [CoreGalleryPage](https://github.com/dotnet/maui/blob/main/src/Controls/samples/Controls.Sample.UITests/CoreViews/CoreGalleryPage.cs) and [ContentViewGalleryPage](https://github.com/dotnet/maui/blob/main/src/Controls/samples/Controls.Sample.UITests/Elements/ContentViewGalleryPage.cs)
 
 All controls you intend to interact with need to set the 'AutomationId' property as this will be what you use to query for the element.
 
diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/RefreshViewPage.cs b/src/Controls/samples/Controls.Sample.UITests/Issues/RefreshViewPage.cs
new file mode 100644
index 000000000000..e10455b0fdec
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample.UITests/Issues/RefreshViewPage.cs
@@ -0,0 +1,123 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Graphics;
+
+namespace Maui.Controls.Sample.Issues
+{
+
+	[Issue(IssueTracker.None, 0, "Refresh View Tests", PlatformAffected.All)]
+	public class RefreshViewPage : TestContentPage
+	{
+		RefreshView _refreshView;
+		Command _refreshCommand;
+
+		public RefreshViewPage()
+		{
+		}
+
+		protected override void Init()
+		{
+			Title = "Refresh View Tests";
+			var scrollViewContent = new StackLayout();
+
+			Enumerable
+				.Range(0, 10)
+				.Select(_ => new Label() { HeightRequest = 200, Text = "Pull me down to refresh me" })
+				.ToList()
+				.ForEach(scrollViewContent.Children.Add);
+
+
+			bool canExecute = true;
+			_refreshCommand = new Command(async (parameter) =>
+			{
+				if (!_refreshView.IsRefreshing)
+				{
+					throw new Exception("IsRefreshing should be true when command executes");
+				}
+
+				if (parameter != null && !(bool)parameter)
+				{
+					throw new Exception("Refresh command incorrectly firing with disabled parameter");
+				}
+
+				await Task.Delay(4000); // Appium catalyst driver seems to be slow, have a longer delay here because of that
+				_refreshView.IsRefreshing = false;
+			}, (object parameter) =>
+			{
+				return parameter != null && canExecute && (bool)parameter;
+			});
+
+			_refreshView = new RefreshView()
+			{
+				Content = new ScrollView()
+				{
+					HeightRequest = 2000,
+					BackgroundColor = Colors.Green,
+					Content = scrollViewContent,
+					AutomationId = "LayoutContainer"
+				},
+				Command = _refreshCommand,
+				CommandParameter = true
+			};
+
+			var isRefreshingLabel = new Label { AutomationId = "IsRefreshingLabel", BindingContext = _refreshView };
+			isRefreshingLabel.SetBinding(Label.TextProperty, new Binding("IsRefreshing", stringFormat: "IsRefreshing: {0}", source: _refreshView));
+
+			var commandEnabledLabel = new Label { AutomationId = "IsEnabledLabel", BindingContext = _refreshView };
+			commandEnabledLabel.SetBinding(Label.TextProperty, new Binding("IsEnabled", stringFormat: "IsEnabled: {0}", source: _refreshView));
+
+			Content = new StackLayout()
+			{
+				Children =
+				{
+					isRefreshingLabel,
+					commandEnabledLabel,
+					new Button()
+					{
+						AutomationId = "ToggleRefresh",
+						Text = "Toggle Refresh",
+						Command = new Command(() =>
+						{
+							_refreshView.IsRefreshing = !_refreshView.IsRefreshing;
+						})
+					},
+					new Button()
+					{
+						Text = "Toggle Can Execute",
+						Command = new Command(() =>
+						{
+							canExecute = !canExecute;
+							_refreshCommand.ChangeCanExecute();
+						}),
+						AutomationId = "ToggleCanExecute"
+					},
+					new Button()
+					{
+						Text = "Toggle Can Execute Parameter",
+						Command = new Command(() =>
+						{
+							_refreshView.CommandParameter = !((bool)_refreshView.CommandParameter);
+							_refreshCommand.ChangeCanExecute();
+						}),
+						AutomationId = "ToggleCanExecuteParameter"
+					},
+					new Button()
+					{
+						Text = "Toggle Command Being Set",
+						Command = new Command(() =>
+						{
+							if(_refreshView.Command != null)
+								_refreshView.Command = null;
+							else
+								_refreshView.Command = _refreshCommand;
+						}),
+						AutomationId = "ToggleCommandBeingSet"
+					},
+					_refreshView
+				}
+			};
+		}
+	}
+}
diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/TestContentPage.cs b/src/Controls/samples/Controls.Sample.UITests/Issues/TestContentPage.cs
new file mode 100644
index 000000000000..19046baabce6
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample.UITests/Issues/TestContentPage.cs
@@ -0,0 +1,14 @@
+using Microsoft.Maui.Controls;
+
+namespace Maui.Controls.Sample.Issues
+{
+	public abstract class TestContentPage : ContentPage
+	{
+		protected TestContentPage()
+		{
+			Init();
+		}
+
+		protected abstract void Init();
+	}
+}
diff --git a/src/Controls/tests/UITests/Tests/AppExtensions.cs b/src/Controls/tests/UITests/Tests/AppExtensions.cs
index 7450323c0afd..f435450a06dd 100644
--- a/src/Controls/tests/UITests/Tests/AppExtensions.cs
+++ b/src/Controls/tests/UITests/Tests/AppExtensions.cs
@@ -11,13 +11,39 @@ public static void NavigateTo(this IApp app, string text)
 		{
 			app.WaitForElement("SearchBar");
 			app.ClearText("SearchBar");
-			app.EnterText("SearchBar", text);
-
+			if (!string.IsNullOrWhiteSpace(text))
+			{
+				app.EnterText("SearchBar", text);
+			}
 			app.Tap(goToTestButtonId);
 
 			app.WaitForNoElement(goToTestButtonId, "Timed out waiting for Go To Test button to disappear", TimeSpan.FromMinutes(1));
 		}
 
+		public static bool WaitForTextToBePresentInElement(this IApp app, string automationId, string text)
+		{
+			var timeout = TimeSpan.FromSeconds(15);
+			TimeSpan retryFrequency = TimeSpan.FromMilliseconds(500);
+
+			DateTime start = DateTime.Now;
+			long elapsed = 0;
+
+			while (elapsed <= timeout.Ticks)
+			{
+				elapsed = DateTime.Now.Subtract(start).Ticks;
+				
+				var elementText = app.Query(automationId).FirstOrDefault()?.Text;
+				if (elementText != null && elementText.Contains(text, StringComparison.OrdinalIgnoreCase))
+				{
+					return true;
+				}
+
+				Task.Delay(retryFrequency.Milliseconds).Wait();
+			}
+			
+			return false;
+		}
+
 		public static void NavigateToGallery(this IApp app, string page)
 		{
 			app.WaitForElement(goToTestButtonId, "Timed out waiting for Go To Test button to appear", TimeSpan.FromMinutes(2));
@@ -25,6 +51,12 @@ public static void NavigateToGallery(this IApp app, string page)
 			NavigateTo(app, text);
 		}
 
+		public static void NavigateToIssues(this IApp app)
+		{
+			app.WaitForElement(goToTestButtonId, "Timed out waiting for Go To Test button to appear", TimeSpan.FromMinutes(2));
+			NavigateTo(app, string.Empty);
+		}
+
 		public static void NavigateBack(this IApp app)
 		{
 			app.Back();
diff --git a/src/Controls/tests/UITests/Tests/Issues/RefreshViewTests.cs b/src/Controls/tests/UITests/Tests/Issues/RefreshViewTests.cs
new file mode 100644
index 000000000000..df83666d291a
--- /dev/null
+++ b/src/Controls/tests/UITests/Tests/Issues/RefreshViewTests.cs
@@ -0,0 +1,23 @@
+using Microsoft.Maui.Appium;
+using Microsoft.Maui.AppiumTests;
+using NUnit.Framework;
+
+namespace Controls.AppiumTests.Tests.Issues
+{
+	public class RefreshViewTests : _IssuesUITest
+	{
+		public RefreshViewTests(TestDevice device)
+			: base(device)
+		{ }
+
+		public override string Issue => "Refresh View Tests";
+
+		[Test]
+		public void IsRefreshingAndCommandTest()
+		{
+			App.Tap("ToggleRefresh");
+			Assert.IsTrue(App.WaitForTextToBePresentInElement("IsRefreshingLabel", "IsRefreshing: True"));
+			Assert.IsTrue(App.WaitForTextToBePresentInElement("IsRefreshingLabel", "IsRefreshing: False"));
+		}
+	}
+}
diff --git a/src/Controls/tests/UITests/Tests/Issues/_IssuesUITest.cs b/src/Controls/tests/UITests/Tests/Issues/_IssuesUITest.cs
new file mode 100644
index 000000000000..7303b7498111
--- /dev/null
+++ b/src/Controls/tests/UITests/Tests/Issues/_IssuesUITest.cs
@@ -0,0 +1,36 @@
+using Microsoft.Maui.Appium;
+
+namespace Microsoft.Maui.AppiumTests
+{
+	public abstract class _IssuesUITest : UITestBase
+	{
+		public _IssuesUITest(TestDevice device) : base(device) { }
+
+		protected override void FixtureSetup()
+		{
+			base.FixtureSetup();
+			NavigateToIssue(Issue);
+		}
+
+		protected override void FixtureTeardown()
+		{
+			base.FixtureTeardown();
+			App.NavigateBack();
+			App.Tap("GoBackToGalleriesButton");
+		}
+
+		public abstract string Issue { get; }
+
+		private void NavigateToIssue(string issue)
+		{
+			App.NavigateToIssues();
+			App.WaitForElement(q => q.Raw("* marked:'TestCasesIssueList'"));
+
+			App.EnterText(q => q.Raw("* marked:'SearchBarGo'"), $"{issue}");
+
+			App.WaitForElement(q => q.Raw("* marked:'SearchButton'"));
+			App.Tap(q => q.Raw("* marked:'SearchButton'"));
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/src/Controls/tests/UITests/Tests/UITestBase.cs b/src/Controls/tests/UITests/Tests/UITestBase.cs
index db01d76384fe..fe7761b0ec88 100644
--- a/src/Controls/tests/UITests/Tests/UITestBase.cs
+++ b/src/Controls/tests/UITests/Tests/UITestBase.cs
@@ -74,7 +74,7 @@ public override TestConfig GetTestConfig()
 				AppProjectPath = appProjectPath
 			};
 			var windowsExe = "Controls.Sample.UITests.exe";
-			var windoesExePath = Path.Combine(appProjectFolder, $"bin\\{testConfig.Configuration}\\{testConfig.FrameworkVersion}-windows10.0.20348\\win10-x64\\{windowsExe}");
+			var windowsExePath = Path.Combine(appProjectFolder, $"bin\\{testConfig.Configuration}\\{testConfig.FrameworkVersion}-windows10.0.20348\\win10-x64\\{windowsExe}");
 
 			switch (_testDevice)
 			{
@@ -86,7 +86,7 @@ public override TestConfig GetTestConfig()
 				case TestDevice.Windows:
 					testConfig.DeviceName = "WindowsPC";
 					testConfig.AppPath = string.IsNullOrEmpty(Environment.GetEnvironmentVariable("WINDOWS_APP_PATH"))
-						? windoesExePath
+						? windowsExePath
 						: Environment.GetEnvironmentVariable("WINDOWS_APP_PATH");
 					break;
 			}

From 291a3565514303dd65b1bacc9230a22cf7448a8d Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Wed, 12 Jul 2023 21:34:03 +0200
Subject: [PATCH 080/105] Revert "Bump Xamarin.UITest from 4.1.4 to 4.2.0
 (#15987)" (#16122)

This reverts commit 095a94ea532e358c275743cff071ea779f1c1221.
---
 .../Compatibility.ControlGallery.Android.UITests.csproj         | 2 +-
 .../ControlGallery/test/WinUI.UITests/WinUI.UITests.csproj      | 2 +-
 .../iOS.UITests/Compatibility.ControlGallery.iOS.UITests.csproj | 2 +-
 src/Controls/tests/UITests/Controls.AppiumTests.csproj          | 2 +-
 .../TestUtils.Appium.UITests/TestUtils.Appium.UITests.csproj    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Compatibility/ControlGallery/test/Android.UITests/Compatibility.ControlGallery.Android.UITests.csproj b/src/Compatibility/ControlGallery/test/Android.UITests/Compatibility.ControlGallery.Android.UITests.csproj
index 396083714384..4141ef7210ff 100644
--- a/src/Compatibility/ControlGallery/test/Android.UITests/Compatibility.ControlGallery.Android.UITests.csproj
+++ b/src/Compatibility/ControlGallery/test/Android.UITests/Compatibility.ControlGallery.Android.UITests.csproj
@@ -18,7 +18,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="Xam.Plugin.DeviceInfo" Version="4.1.1" />
-    <PackageReference Include="Xamarin.UITest" Version="4.2.0" />
+    <PackageReference Include="Xamarin.UITest" Version="4.1.4" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
   </ItemGroup>
 
diff --git a/src/Compatibility/ControlGallery/test/WinUI.UITests/WinUI.UITests.csproj b/src/Compatibility/ControlGallery/test/WinUI.UITests/WinUI.UITests.csproj
index 270969045a8f..b50ebe15c332 100644
--- a/src/Compatibility/ControlGallery/test/WinUI.UITests/WinUI.UITests.csproj
+++ b/src/Compatibility/ControlGallery/test/WinUI.UITests/WinUI.UITests.csproj
@@ -23,7 +23,7 @@
     <PackageReference Include="Selenium.Support" Version="4.1.1" />
     <PackageReference Include="Selenium.WebDriver" Version="4.1.1" />
     <PackageReference Include="Xam.Plugin.DeviceInfo" Version="4.1.1" />
-    <PackageReference Include="Xamarin.UITest" Version="4.2.0" />
+    <PackageReference Include="Xamarin.UITest" Version="4.1.4" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
   </ItemGroup>
 
diff --git a/src/Compatibility/ControlGallery/test/iOS.UITests/Compatibility.ControlGallery.iOS.UITests.csproj b/src/Compatibility/ControlGallery/test/iOS.UITests/Compatibility.ControlGallery.iOS.UITests.csproj
index f45b7848f070..054a9bef3812 100644
--- a/src/Compatibility/ControlGallery/test/iOS.UITests/Compatibility.ControlGallery.iOS.UITests.csproj
+++ b/src/Compatibility/ControlGallery/test/iOS.UITests/Compatibility.ControlGallery.iOS.UITests.csproj
@@ -18,7 +18,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="Xam.Plugin.DeviceInfo" Version="4.1.1" />
-    <PackageReference Include="Xamarin.UITest" Version="4.2.0" />
+    <PackageReference Include="Xamarin.UITest" Version="4.1.4" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
   </ItemGroup>
 
diff --git a/src/Controls/tests/UITests/Controls.AppiumTests.csproj b/src/Controls/tests/UITests/Controls.AppiumTests.csproj
index d7668c7ee2e2..9a82c76f822c 100644
--- a/src/Controls/tests/UITests/Controls.AppiumTests.csproj
+++ b/src/Controls/tests/UITests/Controls.AppiumTests.csproj
@@ -37,7 +37,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
-    <PackageReference Include="Xamarin.UITest" Version="4.2.0" />
+    <PackageReference Include="Xamarin.UITest" Version="4.1.4" />
   </ItemGroup>
 
 </Project>
diff --git a/src/TestUtils/src/TestUtils.Appium.UITests/TestUtils.Appium.UITests.csproj b/src/TestUtils/src/TestUtils.Appium.UITests/TestUtils.Appium.UITests.csproj
index 6a21dadc2bc9..d6855a5ac4c5 100644
--- a/src/TestUtils/src/TestUtils.Appium.UITests/TestUtils.Appium.UITests.csproj
+++ b/src/TestUtils/src/TestUtils.Appium.UITests/TestUtils.Appium.UITests.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.UITest" Version="4.2.0" />
+    <PackageReference Include="Xamarin.UITest" Version="4.1.4" />
   </ItemGroup>
 
   <ItemGroup>

From decf86b61af04f8dcb798c8c16f0c6940ac1a1b0 Mon Sep 17 00:00:00 2001
From: Lehonti Ramos <17771375+Lehonti@users.noreply.github.com>
Date: Wed, 12 Jul 2023 23:29:38 +0200
Subject: [PATCH 081/105] Update Page.cs (#16086)

Updated null check to use nameof()
---
 src/Controls/src/Core/Page/Page.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Controls/src/Core/Page/Page.cs b/src/Controls/src/Core/Page/Page.cs
index 1b44baddcb11..2d096190e3fc 100644
--- a/src/Controls/src/Core/Page/Page.cs
+++ b/src/Controls/src/Core/Page/Page.cs
@@ -239,7 +239,7 @@ public Task<bool> DisplayAlert(string title, string message, string accept, stri
 #pragma warning restore CS1573 // Parameter has no matching param tag in the XML comment (but other parameters do)
 		{
 			if (string.IsNullOrEmpty(cancel))
-				throw new ArgumentNullException("cancel");
+				throw new ArgumentNullException(nameof(cancel));
 
 			var args = new AlertArguments(title, message, accept, cancel);
 			args.FlowDirection = flowDirection;

From 3d3d03138d5c68bb292343f4bd3a0e06b1ebfcd1 Mon Sep 17 00:00:00 2001
From: Rachel Kang <rachelkang@microsoft.com>
Date: Wed, 12 Jul 2023 19:20:59 -0400
Subject: [PATCH 082/105] Revert "[Windows] Allow to refresh the RefreshView
 using the mouse  (#14261) Fixes #6404" (#16128)

This reverts commit 0ba7058ef19e97b35ad7050571cb02329180a195.
---
 .../RefreshView/RefreshViewHandler.Windows.cs | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/src/Core/src/Handlers/RefreshView/RefreshViewHandler.Windows.cs b/src/Core/src/Handlers/RefreshView/RefreshViewHandler.Windows.cs
index b3060a1283a0..2b90c6eeee80 100644
--- a/src/Core/src/Handlers/RefreshView/RefreshViewHandler.Windows.cs
+++ b/src/Core/src/Handlers/RefreshView/RefreshViewHandler.Windows.cs
@@ -14,20 +14,16 @@ public partial class RefreshViewHandler : ViewHandler<IRefreshView, RefreshConta
 
 		protected override RefreshContainer CreatePlatformView()
 		{
-			var refreshContainer = new RefreshContainer
+			return new RefreshContainer
 			{
-				ManipulationMode = UI.Xaml.Input.ManipulationModes.All,
 				PullDirection = RefreshPullDirection.TopToBottom
 			};
-
-			return refreshContainer;
 		}
 
 		protected override void ConnectHandler(RefreshContainer nativeView)
 		{
 			nativeView.Loaded += OnLoaded;
 			nativeView.RefreshRequested += OnRefresh;
-			nativeView.ManipulationDelta += OnManipulationDelta;
 
 			base.ConnectHandler(nativeView);
 		}
@@ -36,7 +32,6 @@ protected override void DisconnectHandler(RefreshContainer nativeView)
 		{
 			nativeView.Loaded -= OnLoaded;
 			nativeView.RefreshRequested -= OnRefresh;
-			nativeView.ManipulationDelta += OnManipulationDelta;
 
 			CompleteRefresh();
 
@@ -119,18 +114,6 @@ void OnRefresh(object sender, RefreshRequestedEventArgs args)
 				VirtualView.IsRefreshing = true;
 		}
 
-		void OnManipulationDelta(object sender, UI.Xaml.Input.ManipulationDeltaRoutedEventArgs e)
-		{
-			if (e.PointerDeviceType is UI.Input.PointerDeviceType.Touch)
-				return; // Already managed by the RefreshContainer control itself
-
-			const double minimumCumulativeY = 20;
-			double cumulativeY = e.Cumulative.Translation.Y;
-
-			if (cumulativeY > minimumCumulativeY && VirtualView is not null && !VirtualView.IsRefreshing)
-				VirtualView.IsRefreshing = true;
-		}
-
 		void CompleteRefresh()
 		{
 			if (_refreshCompletionDeferral != null)

From 432caf178c4f39858faa1906af29b7210602430f Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Wed, 12 Jul 2023 20:59:45 -0500
Subject: [PATCH 083/105] Add GotoAsync overload for single use query
 parameters (#15585)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add API for temporary nav parameter

* - update to collection

* - modify unshipped bits

* - fix api script

* - fix docs

* - correctly build up returned parameters

* - fix

---------

Co-authored-by: Javier Suárez <javiersuarezruiz@hotmail.com>
---
 .../net-android/PublicAPI.Unshipped.txt       |  24 ++-
 .../PublicAPI/net-ios/PublicAPI.Unshipped.txt |  22 +++
 .../net-maccatalyst/PublicAPI.Unshipped.txt   |  22 +++
 .../net-tizen/PublicAPI.Unshipped.txt         |  22 +++
 .../net-windows/PublicAPI.Unshipped.txt       |  24 ++-
 .../PublicAPI/net/PublicAPI.Unshipped.txt     |  24 ++-
 .../netstandard/PublicAPI.Unshipped.txt       |  22 +++
 src/Controls/src/Core/Shell/Shell.cs          |  23 +++
 src/Controls/src/Core/Shell/ShellContent.cs   |  18 ++-
 .../src/Core/Shell/ShellNavigationManager.cs  |  33 +---
 .../Shell/ShellNavigationQueryParameters.cs   | 110 +++++++++++++
 .../src/Core/Shell/ShellRouteParameters.cs    |  98 +++++++++++-
 .../ShellParameterPassingTests.cs             | 149 +++++++++++++++++-
 .../tests/Core.UnitTests/ShellTestBase.cs     |  11 +-
 14 files changed, 553 insertions(+), 49 deletions(-)
 create mode 100644 src/Controls/src/Core/Shell/ShellNavigationQueryParameters.cs

diff --git a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
index 0616af2e2268..9440ba3acf61 100644
--- a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -105,4 +105,26 @@ override Microsoft.Maui.Controls.SearchBar.IsEnabledCore.get -> bool
 Microsoft.Maui.Controls.IValueConverter.Convert(object? value, System.Type! targetType, object? parameter, System.Globalization.CultureInfo! culture) -> object?
 Microsoft.Maui.Controls.IValueConverter.ConvertBack(object? value, System.Type! targetType, object? parameter, System.Globalization.CultureInfo! culture) -> object?
 ~static Microsoft.Maui.Controls.GridExtensions.Add(this Microsoft.Maui.Controls.Grid grid, Microsoft.Maui.IView view, int left, int right, int top, int bottom) -> void
-~static Microsoft.Maui.Controls.GridExtensions.AddWithSpan(this Microsoft.Maui.Controls.Grid grid, Microsoft.Maui.IView view, int row = 0, int column = 0, int rowSpan = 1, int columnSpan = 1) -> void
\ No newline at end of file
+~static Microsoft.Maui.Controls.GridExtensions.AddWithSpan(this Microsoft.Maui.Controls.Grid grid, Microsoft.Maui.IView view, int row = 0, int column = 0, int rowSpan = 1, int columnSpan = 1) -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Add(string! key, object! value) -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Add(System.Collections.Generic.KeyValuePair<string!, object!> item) -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Clear() -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Contains(System.Collections.Generic.KeyValuePair<string!, object!> item) -> bool
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.ContainsKey(string! key) -> bool
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.CopyTo(System.Collections.Generic.KeyValuePair<string!, object!>[]! array, int arrayIndex) -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Count.get -> int
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.GetEnumerator() -> System.Collections.Generic.IEnumerator<System.Collections.Generic.KeyValuePair<string!, object!>>!
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.IsReadOnly.get -> bool
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Keys.get -> System.Collections.Generic.ICollection<string!>!
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Remove(string! key) -> bool
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Remove(System.Collections.Generic.KeyValuePair<string!, object!> item) -> bool
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.ShellNavigationQueryParameters() -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.ShellNavigationQueryParameters(System.Collections.Generic.IDictionary<string!, object!>! dictionary) -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.ShellNavigationQueryParameters(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string!, object!>>! collection) -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.this[string! key].get -> object!
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.this[string! key].set -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.TryGetValue(string! key, out object! value) -> bool
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Values.get -> System.Collections.Generic.ICollection<object!>!
+~Microsoft.Maui.Controls.Shell.GoToAsync(Microsoft.Maui.Controls.ShellNavigationState state, bool animate, Microsoft.Maui.Controls.ShellNavigationQueryParameters shellNavigationQueryParameters) -> System.Threading.Tasks.Task
+~Microsoft.Maui.Controls.Shell.GoToAsync(Microsoft.Maui.Controls.ShellNavigationState state, Microsoft.Maui.Controls.ShellNavigationQueryParameters shellNavigationQueryParameters) -> System.Threading.Tasks.Task
\ No newline at end of file
diff --git a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index cee4b8a1b18c..f8f1f0acb145 100644
--- a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -108,3 +108,25 @@ Microsoft.Maui.Controls.IValueConverter.ConvertBack(object? value, System.Type!
 *REMOVED*override Microsoft.Maui.Controls.Handlers.Compatibility.PhoneFlyoutPageRenderer.WillRotate(UIKit.UIInterfaceOrientation toInterfaceOrientation, double duration) -> void
 ~virtual Microsoft.Maui.Controls.Handlers.Items.ItemsViewController<TItemsView>.DetermineCellReuseId(Foundation.NSIndexPath indexPath) -> string
 override Microsoft.Maui.Controls.Handlers.Items.ItemsViewHandler<TItemsView>.GetDesiredSize(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
+Microsoft.Maui.Controls.ShellNavigationQueryParameters
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Add(string! key, object! value) -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Add(System.Collections.Generic.KeyValuePair<string!, object!> item) -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Clear() -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Contains(System.Collections.Generic.KeyValuePair<string!, object!> item) -> bool
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.ContainsKey(string! key) -> bool
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.CopyTo(System.Collections.Generic.KeyValuePair<string!, object!>[]! array, int arrayIndex) -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Count.get -> int
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.GetEnumerator() -> System.Collections.Generic.IEnumerator<System.Collections.Generic.KeyValuePair<string!, object!>>!
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.IsReadOnly.get -> bool
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Keys.get -> System.Collections.Generic.ICollection<string!>!
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Remove(string! key) -> bool
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Remove(System.Collections.Generic.KeyValuePair<string!, object!> item) -> bool
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.ShellNavigationQueryParameters() -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.ShellNavigationQueryParameters(System.Collections.Generic.IDictionary<string!, object!>! dictionary) -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.ShellNavigationQueryParameters(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string!, object!>>! collection) -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.this[string! key].get -> object!
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.this[string! key].set -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.TryGetValue(string! key, out object! value) -> bool
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Values.get -> System.Collections.Generic.ICollection<object!>!
+~Microsoft.Maui.Controls.Shell.GoToAsync(Microsoft.Maui.Controls.ShellNavigationState state, bool animate, Microsoft.Maui.Controls.ShellNavigationQueryParameters shellNavigationQueryParameters) -> System.Threading.Tasks.Task
+~Microsoft.Maui.Controls.Shell.GoToAsync(Microsoft.Maui.Controls.ShellNavigationState state, Microsoft.Maui.Controls.ShellNavigationQueryParameters shellNavigationQueryParameters) -> System.Threading.Tasks.Task
\ No newline at end of file
diff --git a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index cee4b8a1b18c..f8f1f0acb145 100644
--- a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -108,3 +108,25 @@ Microsoft.Maui.Controls.IValueConverter.ConvertBack(object? value, System.Type!
 *REMOVED*override Microsoft.Maui.Controls.Handlers.Compatibility.PhoneFlyoutPageRenderer.WillRotate(UIKit.UIInterfaceOrientation toInterfaceOrientation, double duration) -> void
 ~virtual Microsoft.Maui.Controls.Handlers.Items.ItemsViewController<TItemsView>.DetermineCellReuseId(Foundation.NSIndexPath indexPath) -> string
 override Microsoft.Maui.Controls.Handlers.Items.ItemsViewHandler<TItemsView>.GetDesiredSize(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
+Microsoft.Maui.Controls.ShellNavigationQueryParameters
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Add(string! key, object! value) -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Add(System.Collections.Generic.KeyValuePair<string!, object!> item) -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Clear() -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Contains(System.Collections.Generic.KeyValuePair<string!, object!> item) -> bool
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.ContainsKey(string! key) -> bool
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.CopyTo(System.Collections.Generic.KeyValuePair<string!, object!>[]! array, int arrayIndex) -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Count.get -> int
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.GetEnumerator() -> System.Collections.Generic.IEnumerator<System.Collections.Generic.KeyValuePair<string!, object!>>!
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.IsReadOnly.get -> bool
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Keys.get -> System.Collections.Generic.ICollection<string!>!
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Remove(string! key) -> bool
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Remove(System.Collections.Generic.KeyValuePair<string!, object!> item) -> bool
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.ShellNavigationQueryParameters() -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.ShellNavigationQueryParameters(System.Collections.Generic.IDictionary<string!, object!>! dictionary) -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.ShellNavigationQueryParameters(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string!, object!>>! collection) -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.this[string! key].get -> object!
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.this[string! key].set -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.TryGetValue(string! key, out object! value) -> bool
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Values.get -> System.Collections.Generic.ICollection<object!>!
+~Microsoft.Maui.Controls.Shell.GoToAsync(Microsoft.Maui.Controls.ShellNavigationState state, bool animate, Microsoft.Maui.Controls.ShellNavigationQueryParameters shellNavigationQueryParameters) -> System.Threading.Tasks.Task
+~Microsoft.Maui.Controls.Shell.GoToAsync(Microsoft.Maui.Controls.ShellNavigationState state, Microsoft.Maui.Controls.ShellNavigationQueryParameters shellNavigationQueryParameters) -> System.Threading.Tasks.Task
\ No newline at end of file
diff --git a/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
index 372b793ed721..41e62a8610f3 100644
--- a/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
@@ -90,4 +90,26 @@ Microsoft.Maui.Controls.Shapes.Shape.~Shape() -> void
 override Microsoft.Maui.Controls.Shapes.Shape.OnBindingContextChanged() -> void
 ~override Microsoft.Maui.Controls.ImageButton.OnPropertyChanged(string propertyName = null) -> void
 ~static Microsoft.Maui.Controls.Region.FromRectangles(System.Collections.Generic.IEnumerable<Microsoft.Maui.Graphics.Rect> rectangles) -> Microsoft.Maui.Controls.Region
+Microsoft.Maui.Controls.ShellNavigationQueryParameters
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Add(string! key, object! value) -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Add(System.Collections.Generic.KeyValuePair<string!, object!> item) -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Clear() -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Contains(System.Collections.Generic.KeyValuePair<string!, object!> item) -> bool
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.ContainsKey(string! key) -> bool
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.CopyTo(System.Collections.Generic.KeyValuePair<string!, object!>[]! array, int arrayIndex) -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Count.get -> int
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.GetEnumerator() -> System.Collections.Generic.IEnumerator<System.Collections.Generic.KeyValuePair<string!, object!>>!
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.IsReadOnly.get -> bool
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Keys.get -> System.Collections.Generic.ICollection<string!>!
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Remove(string! key) -> bool
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Remove(System.Collections.Generic.KeyValuePair<string!, object!> item) -> bool
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.ShellNavigationQueryParameters() -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.ShellNavigationQueryParameters(System.Collections.Generic.IDictionary<string!, object!>! dictionary) -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.ShellNavigationQueryParameters(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string!, object!>>! collection) -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.this[string! key].get -> object!
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.this[string! key].set -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.TryGetValue(string! key, out object! value) -> bool
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Values.get -> System.Collections.Generic.ICollection<object!>!
+~Microsoft.Maui.Controls.Shell.GoToAsync(Microsoft.Maui.Controls.ShellNavigationState state, bool animate, Microsoft.Maui.Controls.ShellNavigationQueryParameters shellNavigationQueryParameters) -> System.Threading.Tasks.Task
+~Microsoft.Maui.Controls.Shell.GoToAsync(Microsoft.Maui.Controls.ShellNavigationState state, Microsoft.Maui.Controls.ShellNavigationQueryParameters shellNavigationQueryParameters) -> System.Threading.Tasks.Task
 ~static readonly Microsoft.Maui.Controls.InputView.IsTextPredictionEnabledProperty -> Microsoft.Maui.Controls.BindableProperty
diff --git a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index e4fb9de02d08..c14625882eef 100644
--- a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -17,6 +17,7 @@ Microsoft.Maui.Controls.PointerGestureRecognizer.PointerMovedCommandParameter.ge
 *REMOVED*Microsoft.Maui.Controls.PointerGestureRecognizer.PointerExitedCommandParameter.get -> System.Windows.Input.ICommand!
 *REMOVED*Microsoft.Maui.Controls.PointerGestureRecognizer.PointerMovedCommandParameter.get -> System.Windows.Input.ICommand!
 Microsoft.Maui.Controls.Handlers.Items.StructuredItemsViewHandler<TItemsView>.~StructuredItemsViewHandler() -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.TryGetValue(string! key, out object! value) -> bool
 override Microsoft.Maui.Controls.Handlers.BoxViewHandler.NeedsContainer.get -> bool
 Microsoft.Maui.Controls.Handlers.BoxViewHandler
 Microsoft.Maui.Controls.Handlers.BoxViewHandler.BoxViewHandler() -> void
@@ -105,4 +106,25 @@ override Microsoft.Maui.Controls.SearchBar.IsEnabledCore.get -> bool
 Microsoft.Maui.Controls.IValueConverter.Convert(object? value, System.Type! targetType, object? parameter, System.Globalization.CultureInfo! culture) -> object?
 Microsoft.Maui.Controls.IValueConverter.ConvertBack(object? value, System.Type! targetType, object? parameter, System.Globalization.CultureInfo! culture) -> object?
 ~static Microsoft.Maui.Controls.GridExtensions.Add(this Microsoft.Maui.Controls.Grid grid, Microsoft.Maui.IView view, int left, int right, int top, int bottom) -> void
-~static Microsoft.Maui.Controls.GridExtensions.AddWithSpan(this Microsoft.Maui.Controls.Grid grid, Microsoft.Maui.IView view, int row = 0, int column = 0, int rowSpan = 1, int columnSpan = 1) -> void
\ No newline at end of file
+~static Microsoft.Maui.Controls.GridExtensions.AddWithSpan(this Microsoft.Maui.Controls.Grid grid, Microsoft.Maui.IView view, int row = 0, int column = 0, int rowSpan = 1, int columnSpan = 1) -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Add(string! key, object! value) -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Add(System.Collections.Generic.KeyValuePair<string!, object!> item) -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Clear() -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Contains(System.Collections.Generic.KeyValuePair<string!, object!> item) -> bool
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.ContainsKey(string! key) -> bool
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.CopyTo(System.Collections.Generic.KeyValuePair<string!, object!>[]! array, int arrayIndex) -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Count.get -> int
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.GetEnumerator() -> System.Collections.Generic.IEnumerator<System.Collections.Generic.KeyValuePair<string!, object!>>!
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.IsReadOnly.get -> bool
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Keys.get -> System.Collections.Generic.ICollection<string!>!
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Remove(string! key) -> bool
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Remove(System.Collections.Generic.KeyValuePair<string!, object!> item) -> bool
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.ShellNavigationQueryParameters() -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.ShellNavigationQueryParameters(System.Collections.Generic.IDictionary<string!, object!>! dictionary) -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.ShellNavigationQueryParameters(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string!, object!>>! collection) -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.this[string! key].get -> object!
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.this[string! key].set -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Values.get -> System.Collections.Generic.ICollection<object!>!
+~Microsoft.Maui.Controls.Shell.GoToAsync(Microsoft.Maui.Controls.ShellNavigationState state, bool animate, Microsoft.Maui.Controls.ShellNavigationQueryParameters shellNavigationQueryParameters) -> System.Threading.Tasks.Task
+~Microsoft.Maui.Controls.Shell.GoToAsync(Microsoft.Maui.Controls.ShellNavigationState state, Microsoft.Maui.Controls.ShellNavigationQueryParameters shellNavigationQueryParameters) -> System.Threading.Tasks.Task
\ No newline at end of file
diff --git a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
index d45f74eb2f3f..0b86d15a5581 100644
--- a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -93,4 +93,26 @@ override Microsoft.Maui.Controls.SearchBar.IsEnabledCore.get -> bool
 Microsoft.Maui.Controls.IValueConverter.Convert(object? value, System.Type! targetType, object? parameter, System.Globalization.CultureInfo! culture) -> object?
 Microsoft.Maui.Controls.IValueConverter.ConvertBack(object? value, System.Type! targetType, object? parameter, System.Globalization.CultureInfo! culture) -> object?
 ~static Microsoft.Maui.Controls.GridExtensions.Add(this Microsoft.Maui.Controls.Grid grid, Microsoft.Maui.IView view, int left, int right, int top, int bottom) -> void
-~static Microsoft.Maui.Controls.GridExtensions.AddWithSpan(this Microsoft.Maui.Controls.Grid grid, Microsoft.Maui.IView view, int row = 0, int column = 0, int rowSpan = 1, int columnSpan = 1) -> void
\ No newline at end of file
+~static Microsoft.Maui.Controls.GridExtensions.AddWithSpan(this Microsoft.Maui.Controls.Grid grid, Microsoft.Maui.IView view, int row = 0, int column = 0, int rowSpan = 1, int columnSpan = 1) -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Add(string! key, object! value) -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Add(System.Collections.Generic.KeyValuePair<string!, object!> item) -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Clear() -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Contains(System.Collections.Generic.KeyValuePair<string!, object!> item) -> bool
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.ContainsKey(string! key) -> bool
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.CopyTo(System.Collections.Generic.KeyValuePair<string!, object!>[]! array, int arrayIndex) -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Count.get -> int
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.GetEnumerator() -> System.Collections.Generic.IEnumerator<System.Collections.Generic.KeyValuePair<string!, object!>>!
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.IsReadOnly.get -> bool
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Keys.get -> System.Collections.Generic.ICollection<string!>!
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Remove(string! key) -> bool
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Remove(System.Collections.Generic.KeyValuePair<string!, object!> item) -> bool
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.ShellNavigationQueryParameters() -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.ShellNavigationQueryParameters(System.Collections.Generic.IDictionary<string!, object!>! dictionary) -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.ShellNavigationQueryParameters(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string!, object!>>! collection) -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.this[string! key].get -> object!
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.this[string! key].set -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.TryGetValue(string! key, out object! value) -> bool
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Values.get -> System.Collections.Generic.ICollection<object!>!
+~Microsoft.Maui.Controls.Shell.GoToAsync(Microsoft.Maui.Controls.ShellNavigationState state, bool animate, Microsoft.Maui.Controls.ShellNavigationQueryParameters shellNavigationQueryParameters) -> System.Threading.Tasks.Task
+~Microsoft.Maui.Controls.Shell.GoToAsync(Microsoft.Maui.Controls.ShellNavigationState state, Microsoft.Maui.Controls.ShellNavigationQueryParameters shellNavigationQueryParameters) -> System.Threading.Tasks.Task
\ No newline at end of file
diff --git a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
index 42db94feb726..4752cffc98ec 100644
--- a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -18,6 +18,26 @@ Microsoft.Maui.Controls.PointerGestureRecognizer.PointerMovedCommandParameter.ge
 Microsoft.Maui.Controls.Region.Equals(Microsoft.Maui.Controls.Region other) -> bool
 Microsoft.Maui.Controls.Shapes.Matrix.Equals(Microsoft.Maui.Controls.Shapes.Matrix other) -> bool
 Microsoft.Maui.Controls.Shapes.Shape.~Shape() -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Add(string! key, object! value) -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Add(System.Collections.Generic.KeyValuePair<string!, object!> item) -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Clear() -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Contains(System.Collections.Generic.KeyValuePair<string!, object!> item) -> bool
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.ContainsKey(string! key) -> bool
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.CopyTo(System.Collections.Generic.KeyValuePair<string!, object!>[]! array, int arrayIndex) -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Count.get -> int
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.GetEnumerator() -> System.Collections.Generic.IEnumerator<System.Collections.Generic.KeyValuePair<string!, object!>>!
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.IsReadOnly.get -> bool
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Keys.get -> System.Collections.Generic.ICollection<string!>!
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Remove(string! key) -> bool
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Remove(System.Collections.Generic.KeyValuePair<string!, object!> item) -> bool
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.ShellNavigationQueryParameters() -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.ShellNavigationQueryParameters(System.Collections.Generic.IDictionary<string!, object!>! dictionary) -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.ShellNavigationQueryParameters(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string!, object!>>! collection) -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.this[string! key].get -> object!
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.this[string! key].set -> void
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.TryGetValue(string! key, out object! value) -> bool
+Microsoft.Maui.Controls.ShellNavigationQueryParameters.Values.get -> System.Collections.Generic.ICollection<object!>!
 Microsoft.Maui.Controls.VisualElement.~VisualElement() -> void
 override Microsoft.Maui.Controls.LayoutOptions.GetHashCode() -> int
 override Microsoft.Maui.Controls.Region.GetHashCode() -> int
@@ -45,6 +65,8 @@ Microsoft.Maui.Controls.VisualElement.RefreshIsEnabledProperty() -> void
 override Microsoft.Maui.Controls.Button.IsEnabledCore.get -> bool
 override Microsoft.Maui.Controls.ImageButton.IsEnabledCore.get -> bool
 override Microsoft.Maui.Controls.SearchBar.IsEnabledCore.get -> bool
+~Microsoft.Maui.Controls.Shell.GoToAsync(Microsoft.Maui.Controls.ShellNavigationState state, bool animate, Microsoft.Maui.Controls.ShellNavigationQueryParameters shellNavigationQueryParameters) -> System.Threading.Tasks.Task
+~Microsoft.Maui.Controls.Shell.GoToAsync(Microsoft.Maui.Controls.ShellNavigationState state, Microsoft.Maui.Controls.ShellNavigationQueryParameters shellNavigationQueryParameters) -> System.Threading.Tasks.Task
 ~Microsoft.Maui.Controls.WebView.UserAgent.get -> string
 ~Microsoft.Maui.Controls.WebView.UserAgent.set -> void
 ~override Microsoft.Maui.Controls.ImageButton.OnPropertyChanged(string propertyName = null) -> void
diff --git a/src/Controls/src/Core/Shell/Shell.cs b/src/Controls/src/Core/Shell/Shell.cs
index 8f6510bcbc60..1f3f93756796 100644
--- a/src/Controls/src/Core/Shell/Shell.cs
+++ b/src/Controls/src/Core/Shell/Shell.cs
@@ -691,6 +691,29 @@ public Task GoToAsync(ShellNavigationState state, bool animate, IDictionary<stri
 			return _navigationManager.GoToAsync(state, animate, false, parameters: new ShellRouteParameters(parameters));
 		}
 
+		/// <summary>
+		/// This method navigates to a <see cref="ShellNavigationState" /> and returns a <see cref="Task" /> that will complete once the navigation animation.
+		/// </summary>
+		/// <param name="state">Defines the path for Shell to navigate to.</param>
+		/// <param name="shellNavigationQueryParameters">Parameters to use for this specific navigation operation.</param>
+		/// <returns></returns>
+		public Task GoToAsync(ShellNavigationState state, ShellNavigationQueryParameters shellNavigationQueryParameters)
+		{
+			return _navigationManager.GoToAsync(state, null, false, parameters: new ShellRouteParameters(shellNavigationQueryParameters));
+		}
+
+		/// <summary>
+		/// This method navigates to a <see cref="ShellNavigationState" /> and returns a <see cref="Task" />.
+		/// </summary>
+		/// <param name="state">Defines the path for Shell to navigate to.</param>
+		/// <param name="animate">Indicates if your transition is animated</param>
+		/// <param name="shellNavigationQueryParameters">Parameters to use for this specific navigation operation.</param>
+		/// <returns></returns>
+		public Task GoToAsync(ShellNavigationState state, bool animate, ShellNavigationQueryParameters shellNavigationQueryParameters)
+		{
+			return _navigationManager.GoToAsync(state, animate, false, parameters: new ShellRouteParameters(shellNavigationQueryParameters));
+		}
+
 		public void AddLogicalChild(Element element)
 		{
 			if (element == null)
diff --git a/src/Controls/src/Core/Shell/ShellContent.cs b/src/Controls/src/Core/Shell/ShellContent.cs
index 9c3a465a682a..c0c06b8d0ef3 100644
--- a/src/Controls/src/Core/Shell/ShellContent.cs
+++ b/src/Controls/src/Core/Shell/ShellContent.cs
@@ -287,7 +287,10 @@ static void ApplyQueryAttributes(object content, ShellRouteParameters query, She
 			oldQuery = oldQuery ?? new ShellRouteParameters();
 
 			if (content is IQueryAttributable attributable)
-				attributable.ApplyQueryAttributes(query);
+			{
+				attributable
+					.ApplyQueryAttributes(query.ToReadOnlyIfUsingShellNavigationQueryParameters());
+			}
 
 			if (content is BindableObject bindable && bindable.BindingContext != null && content != bindable.BindingContext)
 				ApplyQueryAttributes(bindable.BindingContext, query, oldQuery);
@@ -295,7 +298,10 @@ static void ApplyQueryAttributes(object content, ShellRouteParameters query, She
 			var type = content.GetType();
 			var queryPropertyAttributes = type.GetCustomAttributes(typeof(QueryPropertyAttribute), true);
 			if (queryPropertyAttributes.Length == 0)
+			{
+				ClearQueryIfAppliedToPage(query, content);
 				return;
+			}
 
 			foreach (QueryPropertyAttribute attrib in queryPropertyAttributes)
 			{
@@ -327,6 +333,16 @@ static void ApplyQueryAttributes(object content, ShellRouteParameters query, She
 						prop.SetValue(content, null);
 				}
 			}
+
+			ClearQueryIfAppliedToPage(query, content);
+
+			static void ClearQueryIfAppliedToPage(ShellRouteParameters query, object content)
+			{
+				// Once we've applied the attributes to ContentPage lets remove the 
+				// parameters used during navigation
+				if (content is ContentPage)
+					query.ResetToQueryParameters();
+			}
 		}
 	}
 }
diff --git a/src/Controls/src/Core/Shell/ShellNavigationManager.cs b/src/Controls/src/Core/Shell/ShellNavigationManager.cs
index 986684000caa..9329bf1a5f11 100644
--- a/src/Controls/src/Core/Shell/ShellNavigationManager.cs
+++ b/src/Controls/src/Core/Shell/ShellNavigationManager.cs
@@ -92,8 +92,7 @@ internal async Task GoToAsync(
 
 			var uri = navigationRequest.Request.FullUri;
 			var queryString = navigationRequest.Query;
-			var queryData = ParseQueryString(queryString);
-			parameters.Merge(queryData);
+			parameters.SetQueryStringParameters(queryString);
 			ApplyQueryAttributes(_shell, parameters, false, false);
 
 			var shellItem = navigationRequest.Request.Item;
@@ -306,17 +305,7 @@ public static void ApplyQueryAttributes(Element element, ShellRouteParameters qu
 				baseShellItem = element?.Parent as BaseShellItem;
 
 			//filter the query to only apply the keys with matching prefix
-			var filteredQuery = new ShellRouteParameters(query.Count);
-
-			foreach (var q in query)
-			{
-				if (!q.Key.StartsWith(prefix, StringComparison.Ordinal))
-					continue;
-				var key = q.Key.Substring(prefix.Length);
-				if (key.IndexOf(".", StringComparison.Ordinal) != -1)
-					continue;
-				filteredQuery.Add(key, q.Value);
-			}
+			var filteredQuery = new ShellRouteParameters(query, prefix);
 
 
 			if (baseShellItem is ShellContent)
@@ -488,24 +477,6 @@ public static ShellNavigationSource CalculateNavigationSource(Shell shell, Shell
 			return ShellNavigationSource.Push;
 		}
 
-		static Dictionary<string, string> ParseQueryString(string query)
-		{
-			if (query.StartsWith("?", StringComparison.Ordinal))
-				query = query.Substring(1);
-			Dictionary<string, string> lookupDict = new(StringComparer.Ordinal);
-			if (query == null)
-				return lookupDict;
-			foreach (var part in query.Split('&'))
-			{
-				var p = part.Split('=');
-				if (p.Length != 2)
-					continue;
-				lookupDict[p[0]] = p[1];
-			}
-
-			return lookupDict;
-		}
-
 		public static ShellNavigationParameters GetNavigationParameters(
 			ShellItem shellItem,
 			ShellSection shellSection,
diff --git a/src/Controls/src/Core/Shell/ShellNavigationQueryParameters.cs b/src/Controls/src/Core/Shell/ShellNavigationQueryParameters.cs
new file mode 100644
index 000000000000..c71a6592474a
--- /dev/null
+++ b/src/Controls/src/Core/Shell/ShellNavigationQueryParameters.cs
@@ -0,0 +1,110 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Microsoft.Maui.Controls
+{
+	public class ShellNavigationQueryParameters : IDictionary<string, object>
+	{
+		Dictionary<string, object> _internal = new Dictionary<string, object>();
+		bool _isReadonly;
+
+		public ShellNavigationQueryParameters()
+		{
+		}
+
+		public ShellNavigationQueryParameters(IEnumerable<KeyValuePair<string, object>> collection)
+		{
+			foreach (var item in collection)
+				this.Add(item.Key, item.Value);
+		}
+
+		public ShellNavigationQueryParameters(IDictionary<string, object> dictionary)
+		{
+			foreach (var item in dictionary)
+				this.Add(item.Key, item.Value);
+		}
+
+		internal ShellNavigationQueryParameters SetToReadOnly()
+		{
+			_isReadonly = true;
+			return this;
+		}
+
+		void CheckReadOnlyState()
+		{
+			if (_isReadonly)
+				throw new InvalidOperationException($"ShellNavigationQueryParameters are ReadOnly");
+		}
+
+		public object this[string key]
+		{
+			get => _internal[key];
+			set
+			{
+				CheckReadOnlyState();
+				_internal[key] = value;
+			}
+		}
+
+		public ICollection<string> Keys => _internal.Keys;
+
+		public ICollection<object> Values => _internal.Values;
+
+		public int Count => _internal.Count;
+
+		public bool IsReadOnly => _isReadonly;
+
+		public void Add(string key, object value)
+		{
+			CheckReadOnlyState();
+			_internal.Add(key, value);
+		}
+
+		public void Add(KeyValuePair<string, object> item)
+		{
+			CheckReadOnlyState();
+			_internal.Add(item.Key, item.Value);
+		}
+
+		public void Clear()
+		{
+			CheckReadOnlyState();
+			_internal.Clear();
+		}
+
+		public bool Contains(KeyValuePair<string, object> item) => _internal.ContainsKey(item.Key);
+
+		public bool ContainsKey(string key) => _internal.ContainsKey(key);
+
+		public void CopyTo(KeyValuePair<string, object>[] array, int arrayIndex)
+			=> (_internal as ICollection<KeyValuePair<string, object>>)?.CopyTo(array, arrayIndex);
+
+		public IEnumerator<KeyValuePair<string, object>> GetEnumerator() => _internal.GetEnumerator();
+
+		public bool Remove(string key)
+		{
+			CheckReadOnlyState();
+			return _internal.Remove(key);
+		}
+
+		public bool Remove(KeyValuePair<string, object> item)
+		{
+			CheckReadOnlyState();
+			return (_internal as ICollection<KeyValuePair<string, object>>).Remove(item);
+		}
+
+#if NETSTANDARD2_1 || NETSTANDARD2_0
+		public bool TryGetValue(string key, out object value)
+#else
+		public bool TryGetValue(string key, [MaybeNullWhen(false)] out object value)
+#endif
+		{
+			return _internal.TryGetValue(key, out value);
+		}
+
+		IEnumerator IEnumerable.GetEnumerator() =>
+			_internal.GetEnumerator();
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/src/Core/Shell/ShellRouteParameters.cs b/src/Controls/src/Core/Shell/ShellRouteParameters.cs
index 5b67497fc2a8..495f55b02ac3 100644
--- a/src/Controls/src/Core/Shell/ShellRouteParameters.cs
+++ b/src/Controls/src/Core/Shell/ShellRouteParameters.cs
@@ -1,5 +1,6 @@
 #nullable disable
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Text;
 
@@ -7,33 +8,114 @@ namespace Microsoft.Maui.Controls
 {
 	internal class ShellRouteParameters : Dictionary<string, object>
 	{
+		readonly ShellNavigationQueryParameters _shellNavigationQueryParameters =
+			new ShellNavigationQueryParameters();
+
 		public ShellRouteParameters()
 		{
 		}
 
 		public ShellRouteParameters(ShellRouteParameters shellRouteParams) : base(shellRouteParams)
 		{
+			foreach (var item in shellRouteParams._shellNavigationQueryParameters)
+				_shellNavigationQueryParameters[item.Key] = item.Value;
+		}
+
+		internal IDictionary<string, object> ToReadOnlyIfUsingShellNavigationQueryParameters()
+		{
+			if (_shellNavigationQueryParameters.Count > 0)
+			{
+				var returnValue = new ShellNavigationQueryParameters(_shellNavigationQueryParameters);
+
+				foreach (var item in this)
+				{
+					if (!returnValue.ContainsKey(item.Key))
+						returnValue.Add(item.Key, item.Value);
+				}
+
+				return returnValue.SetToReadOnly();
+			}
+
+			return this;
+		}
+
+		internal ShellRouteParameters(ShellRouteParameters query, string prefix)
+			: base(query.Count)
+		{
+			foreach (var q in query)
+			{
+				if (!q.Key.StartsWith(prefix, StringComparison.Ordinal))
+					continue;
+				var key = q.Key.Substring(prefix.Length);
+				if (key.IndexOf(".", StringComparison.Ordinal) != -1)
+					continue;
+				this.Add(key, q.Value);
+			}
+
+			foreach (var item in query._shellNavigationQueryParameters)
+				_shellNavigationQueryParameters[item.Key] = item.Value;
 		}
 
-		public ShellRouteParameters(IDictionary<string, object> shellRouteParams) : base(shellRouteParams)
+		internal ShellRouteParameters(IDictionary<string, object> shellRouteParams) : base(shellRouteParams)
 		{
 		}
 
-		public ShellRouteParameters(int count)
-			: base(count)
+		internal ShellRouteParameters(ShellNavigationQueryParameters shellNavigationQueryParameterss)
 		{
+			foreach (var item in shellNavigationQueryParameterss)
+				this.Add(item.Key, item.Value);
+
+			foreach (var item in shellNavigationQueryParameterss)
+				_shellNavigationQueryParameters[item.Key] = item.Value;
 		}
 
-		internal void Merge(IDictionary<string, string> input)
+		internal void ResetToQueryParameters()
 		{
-			if (input == null || input.Count == 0)
+			if (_shellNavigationQueryParameters.Count == 0)
 				return;
 
-			foreach (var item in input)
-				Add(item.Key, item.Value);
+			foreach (var item in _shellNavigationQueryParameters)
+			{
+				if (this.ContainsKey(item.Key))
+				{
+					this.Remove(item.Key);
+				}
+			}
+
+			_shellNavigationQueryParameters.Clear();
 		}
-	}
 
+		internal void SetQueryStringParameters(string query)
+		{
+			var queryStringParameters = ParseQueryString(query);
+			if (queryStringParameters == null || queryStringParameters.Count == 0)
+				return;
+
+			foreach (var item in queryStringParameters)
+			{
+				if (!this.ContainsKey(item.Key))
+					this[item.Key] = item.Value;
+			}
+		}
+
+		static Dictionary<string, string> ParseQueryString(string query)
+		{
+			if (query.StartsWith("?", StringComparison.Ordinal))
+				query = query.Substring(1);
+			Dictionary<string, string> lookupDict = new(StringComparer.Ordinal);
+			if (query == null)
+				return lookupDict;
+			foreach (var part in query.Split('&'))
+			{
+				var p = part.Split('=');
+				if (p.Length != 2)
+					continue;
+				lookupDict[p[0]] = p[1];
+			}
+
+			return lookupDict;
+		}
+	}
 
 	internal static class ShellParameterExtensions
 	{
diff --git a/src/Controls/tests/Core.UnitTests/ShellParameterPassingTests.cs b/src/Controls/tests/Core.UnitTests/ShellParameterPassingTests.cs
index 73978e3b78c8..0e2f31b61a09 100644
--- a/src/Controls/tests/Core.UnitTests/ShellParameterPassingTests.cs
+++ b/src/Controls/tests/Core.UnitTests/ShellParameterPassingTests.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Xunit;
 
@@ -150,7 +151,7 @@ public async Task NavigationBetweenShellContentsPassesQueryString()
 			await shell.GoToAsync(new ShellNavigationState($"//content?{nameof(ShellTestPage.SomeQueryParameter)}=1234"));
 			await shell.GoToAsync(new ShellNavigationState($"//section2/details?{nameof(ShellTestPage.SomeQueryParameter)}=4321"));
 
-			var testPage = (shell.CurrentItem.CurrentItem as IShellSectionController).PresentedPage as ShellTestPage;
+			var testPage = shell.CurrentPage as ShellTestPage;
 			Assert.Equal("4321", testPage.SomeQueryParameter);
 		}
 
@@ -200,7 +201,7 @@ public async Task NavigationBetweenFlyoutItemWithPushedPageRetainsQueryString()
 			await shellController.OnFlyoutItemSelectedAsync(flyoutItem1);
 			await shellController.OnFlyoutItemSelectedAsync(flyoutItem2);
 
-			var testPage = (shell.CurrentItem.CurrentItem as IShellSectionController).PresentedPage as ShellTestPage;
+			var testPage = shell.CurrentPage as ShellTestPage;
 			Assert.Equal("1234", testPage.SomeQueryParameter);
 		}
 
@@ -213,7 +214,7 @@ public async Task BasicQueryStringTest()
 			Routing.RegisterRoute("details", typeof(ShellTestPage));
 			shell.Items.Add(item);
 			await shell.GoToAsync(new ShellNavigationState($"details?{nameof(ShellTestPage.SomeQueryParameter)}=1234"));
-			var testPage = (shell.CurrentItem.CurrentItem as IShellSectionController).PresentedPage as ShellTestPage;
+			var testPage = shell.CurrentPage as ShellTestPage;
 			Assert.Equal("1234", testPage.SomeQueryParameter);
 		}
 
@@ -290,7 +291,7 @@ public async Task SetParameterOfTypeThatsNotAString()
 			Routing.RegisterRoute("details", typeof(ShellTestPage));
 			shell.Items.Add(item);
 			await shell.GoToAsync(new ShellNavigationState($"details?{nameof(ShellTestPage.DoubleQueryParameter)}=1234"));
-			var testPage = (shell.CurrentItem.CurrentItem as IShellSectionController).PresentedPage as ShellTestPage;
+			var testPage = shell.CurrentPage as ShellTestPage;
 			Assert.Equal(1234d, testPage.DoubleQueryParameter);
 		}
 
@@ -370,12 +371,150 @@ public async Task BasicShellParameterTest()
 			};
 
 			await shell.GoToAsync(new ShellNavigationState($"details?{nameof(ShellTestPage.SomeQueryParameter)}=1234"), parameter);
-			var testPage = (shell.CurrentItem.CurrentItem as IShellSectionController).PresentedPage as ShellTestPage;
+			var testPage = shell.CurrentPage as ShellTestPage;
 			Assert.Equal("1234", testPage.SomeQueryParameter);
 			Assert.Equal(2d, testPage.DoubleQueryParameter);
 			Assert.Equal(obj, testPage.ComplexObject);
 		}
 
+		[Fact]
+		public async Task ValidateReadOnlyDictionary()
+		{
+			var obj = new object();
+			var parameter = new ShellNavigationQueryParameters
+			{
+				{"DoubleQueryParameter", 2d },
+				{ "ComplexObject", obj}
+			}.SetToReadOnly();
+
+			Assert.Throws<InvalidOperationException>(() => parameter.Add("key", "value"));
+			Assert.Throws<InvalidOperationException>(() => parameter.Add(new KeyValuePair<string, object>("key", "value")));
+			Assert.Throws<InvalidOperationException>(() => parameter.Remove(parameter.First()));
+			Assert.Throws<InvalidOperationException>(() => parameter.Remove("DoubleQueryParameter"));
+			Assert.Throws<InvalidOperationException>(() => parameter["key"] = "value");
+			Assert.Throws<InvalidOperationException>(() => parameter.Clear());
+		}
+
+		[Fact]
+		public async Task ShellNavigationQueryParametersPassedInAsReadOnly()
+		{
+			var shell = new Shell();
+			var item = CreateShellItem(shellSectionRoute: "section2");
+			Routing.RegisterRoute("details", typeof(ShellTestPage));
+			shell.Items.Add(item);
+			var obj = new object();
+			var parameter = new ShellNavigationQueryParameters
+			{
+				{"DoubleQueryParameter", 2d },
+				{ "ComplexObject", obj}
+			};
+
+			await shell.GoToAsync(new ShellNavigationState($"details"), parameter);
+			var testPage = shell.CurrentPage as ShellTestPage;
+			Assert.True(testPage.AppliedQueryAttributes[0].IsReadOnly);
+			Assert.False(parameter.IsReadOnly);
+			Assert.Single(testPage.AppliedQueryAttributes);
+		}
+
+		[Fact]
+		public async Task ExtraParametersDontGetRetained()
+		{
+			var shell = new Shell();
+			var item = CreateShellItem(shellSectionRoute: "section2");
+			Routing.RegisterRoute("details", typeof(ShellTestPage));
+			shell.Items.Add(item);
+			var obj = new object();
+			var parameter = new ShellNavigationQueryParameters
+			{
+				{"DoubleQueryParameter", 2d },
+				{"ComplexObject", obj}
+			};
+
+			await shell.GoToAsync(new ShellNavigationState($"details?{nameof(ShellTestPage.SomeQueryParameter)}=1234"), parameter);
+			var testPage = shell.CurrentPage as ShellTestPage;
+
+			await shell.Navigation.PushAsync(new ContentPage());
+
+			testPage.SomeQueryParameter = String.Empty;
+			testPage.DoubleQueryParameter = -1d;
+			testPage.ComplexObject = null;
+
+			await shell.GoToAsync("..");
+
+			Assert.Equal("1234", testPage.SomeQueryParameter);
+			Assert.Equal(-1d, testPage.DoubleQueryParameter);
+			Assert.Null(testPage.ComplexObject);
+
+			// ensure that AppliedQueryAttributes is called with correct parameters each time
+			Assert.Equal(2, testPage.AppliedQueryAttributes.Count);
+			Assert.Equal(3, testPage.AppliedQueryAttributes[0].Count);
+			Assert.Equal(1, testPage.AppliedQueryAttributes[1].Count);
+			Assert.Equal($"{nameof(ShellTestPage.SomeQueryParameter)}", testPage.AppliedQueryAttributes[1].Keys.First());
+		}
+
+		[Fact]
+		public async Task ExtraParametersArentReAppliedWhenNavigatingBackToShellContent()
+		{
+			var shell = new Shell();
+			var item = CreateShellItem(shellContentRoute: "start");
+			var withParams = CreateShellItem(page: new ShellTestPage(), shellContentRoute: "withParams", templated: true);
+			shell.Items.Add(item);
+			shell.Items.Add(withParams);
+			var obj = new object();
+			var parameter = new ShellRouteParameters
+			{
+				{ "ComplexObject", obj},
+				{ nameof(ShellTestPage.SomeQueryParameter), "1234"}
+			};
+
+			await shell.GoToAsync(new ShellNavigationState($"//start"));
+			await shell.GoToAsync(new ShellNavigationState($"//withParams"), parameter);
+
+			var testPage = (shell.CurrentItem.CurrentItem.CurrentItem as IShellContentController).GetOrCreateContent() as ShellTestPage;
+
+			// Validate parameter was set during first navigation
+			Assert.Equal(obj, testPage.ComplexObject);
+
+			// Clear parameters
+			testPage.ComplexObject = null;
+			testPage.SomeQueryParameter = null;
+
+			// Navigate away and back to page with params
+			await shell.GoToAsync(new ShellNavigationState($"//start"));
+			shell.CurrentItem = withParams;
+			await Task.Yield();
+
+			var testPage2 = shell.CurrentPage as ShellTestPage;
+			Assert.Null(testPage2.SomeQueryParameter);
+			Assert.Null(testPage2.ComplexObject);
+			Assert.Equal(testPage2, testPage);
+		}
+
+		[Fact]
+		public async Task SingleUseQueryParametersReplaceQueryStringParams()
+		{
+			var shell = new Shell();
+			var item = CreateShellItem(shellSectionRoute: "section2");
+			Routing.RegisterRoute("details", typeof(ShellTestPage));
+			shell.Items.Add(item);
+
+			var parameter = new ShellNavigationQueryParameters()
+			{
+				{nameof(ShellTestPage.SomeQueryParameter), "4321" }
+			};
+
+			await shell.GoToAsync(new ShellNavigationState($"details?{nameof(ShellTestPage.SomeQueryParameter)}=1234"), parameter);
+			var testPage = shell.CurrentPage as ShellTestPage;
+
+			// Parameters passed in will win
+			Assert.Equal("4321", testPage.SomeQueryParameter);
+			await shell.Navigation.PushAsync(new ContentPage());
+			testPage.SomeQueryParameter = "TheseDontGetSetAgain";
+			await shell.GoToAsync("..");
+
+			Assert.Equal("TheseDontGetSetAgain", testPage.SomeQueryParameter);
+		}
+
 		[Fact]
 		public async Task DotDotNavigationPassesShellParameters()
 		{
diff --git a/src/Controls/tests/Core.UnitTests/ShellTestBase.cs b/src/Controls/tests/Core.UnitTests/ShellTestBase.cs
index a21c6d557ce4..624fcc1d3ff6 100644
--- a/src/Controls/tests/Core.UnitTests/ShellTestBase.cs
+++ b/src/Controls/tests/Core.UnitTests/ShellTestBase.cs
@@ -88,7 +88,7 @@ protected ShellSection MakeSimpleShellSection(string route, string contentRoute,
 		[QueryProperty("SomeQueryParameter", "SomeQueryParameter")]
 		[QueryProperty("CancelNavigationOnBackButtonPressed", "CancelNavigationOnBackButtonPressed")]
 		[QueryProperty("ComplexObject", "ComplexObject")]
-		public class ShellTestPage : ContentPage
+		public class ShellTestPage : ContentPage, IQueryAttributable
 		{
 			public string CancelNavigationOnBackButtonPressed { get; set; }
 			public ShellTestPage()
@@ -128,6 +128,15 @@ protected override bool OnBackButtonPressed()
 
 				return base.OnBackButtonPressed();
 			}
+
+			public List<IDictionary<string, object>> AppliedQueryAttributes = new List<IDictionary<string, object>>();
+			public void ApplyQueryAttributes(IDictionary<string, object> query)
+			{
+				if (query is ShellNavigationQueryParameters param && param.IsReadOnly)
+					AppliedQueryAttributes.Add(query);
+				else
+					AppliedQueryAttributes.Add(new Dictionary<string, object>(query));
+			}
 		}
 
 		protected ShellItem CreateShellItem(

From 43b9397bf3b58e75f1ae4e0dc68014f060de2457 Mon Sep 17 00:00:00 2001
From: Mike Corsaro <corsarom@gmail.com>
Date: Thu, 13 Jul 2023 01:54:23 -0700
Subject: [PATCH 084/105] Add logic to set DefaultLabelPosition on the WinUI
 CommandBar (#15835)

* Make toolbar use right labels by default, and collapsed if all items are just icons

* Add tests!

* Add better mix to test

* Fix issue w/ toolbar items not updating default label position

---------

Co-authored-by: Mike Corsaro <mikecorsaro@microsoft.com>
---
 .../src/Core/Toolbar/Toolbar.Windows.cs       |  65 ++++++++-
 .../Elements/Toolbar/ToolbarTests.Windows.cs  | 129 ++++++++++++++++++
 2 files changed, 192 insertions(+), 2 deletions(-)
 create mode 100644 src/Controls/tests/DeviceTests/Elements/Toolbar/ToolbarTests.Windows.cs

diff --git a/src/Controls/src/Core/Toolbar/Toolbar.Windows.cs b/src/Controls/src/Core/Toolbar/Toolbar.Windows.cs
index 8a92e7d10e08..e229095e5899 100644
--- a/src/Controls/src/Core/Toolbar/Toolbar.Windows.cs
+++ b/src/Controls/src/Core/Toolbar/Toolbar.Windows.cs
@@ -3,7 +3,6 @@
 using System.ComponentModel;
 using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
-using Microsoft.Maui.Handlers;
 using Microsoft.UI.Xaml.Controls;
 using NativeAutomationProperties = Microsoft.UI.Xaml.Automation.AutomationProperties;
 using WImage = Microsoft.UI.Xaml.Controls.Image;
@@ -18,13 +17,21 @@ public partial class Toolbar
 		NavigationRootManager? NavigationRootManager =>
 			MauiContext?.GetNavigationRootManager();
 
+		partial void OnHandlerChanging(IElementHandler oldHandler, IElementHandler newHandler)
+		{
+			if (newHandler == null)
+			{
+				foreach (var item in ToolbarItems)
+					item.PropertyChanged -= OnToolbarItemPropertyChanged;
+			}
+		}
+
 		internal void UpdateMenu()
 		{
 			if (Handler.PlatformView is not MauiToolbar wh)
 				return;
 
 			var commandBar = wh.CommandBar;
-
 			if (commandBar == null)
 			{
 				return;
@@ -71,8 +78,62 @@ internal void UpdateMenu()
 				{
 					commandBar.SecondaryCommands.Add(button);
 				}
+
+				item.PropertyChanged -= OnToolbarItemPropertyChanged;
+				item.PropertyChanged += OnToolbarItemPropertyChanged;
+			}
+
+			SetDefaultLabelPosition(commandBar, toolbarItems);
+		}
+
+		internal void OnToolbarItemPropertyChanged(object? sender, PropertyChangedEventArgs e)
+		{
+			if (Handler.PlatformView is not MauiToolbar wh)
+				return;
+
+			var commandBar = wh.CommandBar;
+			if (commandBar == null)
+			{
+				return;
+			}
+
+			if (e.PropertyName == nameof(ToolbarItem.Text) || e.PropertyName == nameof(ToolbarItem.IconImageSource))
+			{
+				var toolbarItems = new List<ToolbarItem>(ToolbarItems ?? Array.Empty<ToolbarItem>());
+				SetDefaultLabelPosition(commandBar, toolbarItems);
+			}
+		}
+
+		private static void SetDefaultLabelPosition(CommandBar commandBar, IList<ToolbarItem> toolbarItems)
+		{
+			int itemsWithTextCount = 0;
+			int itemsWithIconCount = 0;
+
+			foreach (ToolbarItem item in toolbarItems)
+			{
+				if (!string.IsNullOrEmpty(item.Text))
+				{
+					itemsWithTextCount++;
+				}
+				if (item.IconImageSource != null)
+				{
+					itemsWithIconCount++;
+				}
+			}
+
+			bool allItemsHaveIcons = toolbarItems.Count == itemsWithIconCount;
+
+			// All items have icons, none have text
+			if (allItemsHaveIcons && itemsWithTextCount == 0)
+			{
+				commandBar.DefaultLabelPosition = CommandBarDefaultLabelPosition.Collapsed;
+			}
+			else
+			{
+				commandBar.DefaultLabelPosition = CommandBarDefaultLabelPosition.Right;
 			}
 		}
+
 		public static void MapBarTextColor(ToolbarHandler arg1, Toolbar arg2) =>
 			MapBarTextColor((IToolbarHandler)arg1, arg2);
 
diff --git a/src/Controls/tests/DeviceTests/Elements/Toolbar/ToolbarTests.Windows.cs b/src/Controls/tests/DeviceTests/Elements/Toolbar/ToolbarTests.Windows.cs
new file mode 100644
index 000000000000..37355fa95390
--- /dev/null
+++ b/src/Controls/tests/DeviceTests/Elements/Toolbar/ToolbarTests.Windows.cs
@@ -0,0 +1,129 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Maui;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Controls.Handlers;
+using Microsoft.Maui.DeviceTests.Stubs;
+using Microsoft.Maui.DeviceTests.TestCases;
+using Microsoft.Maui.Handlers;
+using Microsoft.Maui.Hosting;
+using Microsoft.Maui.Platform;
+using Microsoft.UI.Xaml.Controls;
+using Xunit;
+using Xunit.Sdk;
+
+namespace Microsoft.Maui.DeviceTests
+{
+	[Category(TestCategory.Toolbar)]
+	public partial class ToolbarTests : ControlsHandlerTestBase
+	{
+		[Fact(DisplayName = "Toolbar Default Label Position")]
+		public async Task ToolbarDefaultLabelPositionWithNoImages()
+		{
+			SetupBuilder();
+			var item1 = new ToolbarItem() { Text = "Toolbar Item 1" };
+			var item2 = new ToolbarItem() { Text = "Toolbar Item 2" };
+
+			var navPage = new NavigationPage(new ContentPage()
+			{
+				ToolbarItems =
+				{
+					item1,
+					item2
+				}
+			});
+
+			await CreateHandlerAndAddToWindow<WindowHandlerStub>(new Window(navPage), (handler) =>
+			{
+				var toolbar = (Toolbar)(navPage.Window as IToolbarElement).Toolbar;
+				var platformCommandBar = ((MauiToolbar)toolbar.Handler.PlatformView).CommandBar;
+				Assert.True(platformCommandBar.DefaultLabelPosition == CommandBarDefaultLabelPosition.Right);
+				return Task.CompletedTask;
+			});
+		}
+
+		[Fact(DisplayName = "Toolbar Default Label Position with Image and Text")]
+		public async Task ToolbarDefaultLabelPositionWithTextAndImages()
+		{
+			SetupBuilder();
+			var item1 = new ToolbarItem() { IconImageSource = "red.png" };
+			var item2 = new ToolbarItem() { Text = "Toolbar Item 2" };
+			var item3 = new ToolbarItem() { Text = "Toolbar Item 2", IconImageSource = "red.png" };
+
+			var navPage = new NavigationPage(new ContentPage()
+			{
+				ToolbarItems =
+				{
+					item1,
+					item2,
+					item3
+				}
+			});
+
+			await CreateHandlerAndAddToWindow<WindowHandlerStub>(new Window(navPage), (handler) =>
+			{
+				var toolbar = (Toolbar)(navPage.Window as IToolbarElement).Toolbar;
+				var platformCommandBar = ((MauiToolbar)toolbar.Handler.PlatformView).CommandBar;
+				Assert.True(platformCommandBar.DefaultLabelPosition == CommandBarDefaultLabelPosition.Right);
+				return Task.CompletedTask;
+			});
+		}
+
+		[Fact(DisplayName = "Toolbar Default Label Position With Images")]
+		public async Task ToolbarDefaultLabelPositionOnlyImages()
+		{
+			SetupBuilder();
+			var item1 = new ToolbarItem() { IconImageSource = "red.png" };
+			var item2 = new ToolbarItem() { IconImageSource = "red.png" };
+
+			var navPage = new NavigationPage(new ContentPage()
+			{
+				ToolbarItems =
+				{
+					item1,
+					item2
+				}
+			});
+
+			await CreateHandlerAndAddToWindow<WindowHandlerStub>(new Window(navPage), (handler) =>
+			{
+				var toolbar = (Toolbar)(navPage.Window as IToolbarElement).Toolbar;
+				var platformCommandBar = ((MauiToolbar)toolbar.Handler.PlatformView).CommandBar;
+				Assert.True(platformCommandBar.DefaultLabelPosition == CommandBarDefaultLabelPosition.Collapsed);
+				return Task.CompletedTask;
+			});
+		}
+
+		[Fact(DisplayName = "Toolbar Default Label Position Add Text to Images")]
+		public async Task ToolbarDefaultLabelPositionAddText()
+		{
+			SetupBuilder();
+
+			var item1 = new ToolbarItem() { IconImageSource = "red.png" };
+			var item2 = new ToolbarItem() { IconImageSource = "red.png" };
+
+			var navPage = new NavigationPage(new ContentPage()
+			{
+				ToolbarItems =
+				{
+					item1,
+					item2
+				}
+			});
+
+			await CreateHandlerAndAddToWindow<WindowHandlerStub>(new Window(navPage), (handler) =>
+			{
+				navPage.CurrentPage.ToolbarItems[0].Text = "Toolbar Item 1";
+
+				var toolbar = (Toolbar)(navPage.Window as IToolbarElement).Toolbar;
+				var platformCommandBar = ((MauiToolbar)toolbar.Handler.PlatformView).CommandBar;
+				Assert.True(platformCommandBar.DefaultLabelPosition == CommandBarDefaultLabelPosition.Right);
+				return Task.CompletedTask;
+			});
+		}
+	}
+}

From 2ac61e5eb8e9e46f71b37ea47b41afcad0f6991f Mon Sep 17 00:00:00 2001
From: Jonathan Dick <jodick@microsoft.com>
Date: Thu, 13 Jul 2023 06:12:57 -0400
Subject: [PATCH 085/105] Update sourcelink, set deterministic builds in CI
 (#16127)

---
 Directory.Build.props      | 1 +
 eng/SourceLink.Build.props | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index f49d904a3ac1..899603881899 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -159,6 +159,7 @@
     <PackageOutputPath>$(MSBuildThisFileDirectory)artifacts</PackageOutputPath>
     <LicenseFile>$(MSBuildThisFileDirectory)LICENSE.TXT</LicenseFile>
     <PackageThirdPartyNoticesFile>$(MSBuildThisFileDirectory)THIRD-PARTY-NOTICES.TXT</PackageThirdPartyNoticesFile>
+    <ContinuousIntegrationBuild Condition=" '$(CI)' == 'true' ">true</ContinuousIntegrationBuild>
   </PropertyGroup>
   <!-- This target is replaced by GitInfo when restored. Allows Versions.targets to rely on it before restore. -->
   <Target Name="GitVersion" />
diff --git a/eng/SourceLink.Build.props b/eng/SourceLink.Build.props
index d5673842e499..5aabeb7a1a15 100644
--- a/eng/SourceLink.Build.props
+++ b/eng/SourceLink.Build.props
@@ -1,5 +1,5 @@
 <Project>
   <ItemGroup >
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-*" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
   </ItemGroup>
 </Project>
\ No newline at end of file

From cda3eb3381cfb686567ed05e3eb8e8f26c02d785 Mon Sep 17 00:00:00 2001
From: webwarrior-ws <webwarrior-ws@users.noreply.github.com>
Date: Thu, 13 Jul 2023 15:22:02 +0200
Subject: [PATCH 086/105] Android: fix dialog button colors in dark mode
 (#15091)

* Core(Android): fix dialog button colors in dark mode

Fix alert dialog button colors in dark mode.
Use ?attr/colorOnSurface for text color in dialogs.
This ensures contrasting color for both dark and light modes.

* Core(Android): use AppCompat alert dialog in picker

Use AppCompat version of AlertDialog in picker.
This ensures consistent styling between picker dialog and
alert dialog.

* Controls.DeviceTests: add AlertDialogTests

Add tests for checking brightness of AlertDialog button text.

Co-authored-by: webwarrior <reg@webwarrior.ws>

---------

Co-authored-by: Parham Saremi <parhaamsaremi@gmail.com>
---
 .../AlertDialog/AlertDialogTests.Android.cs   | 54 +++++++++++++++++++
 .../Handlers/Picker/PickerHandler.Android.cs  |  5 +-
 .../src/Platform/Android/PickerExtensions.cs  |  2 +-
 .../Android/Resources/values/styles.xml       |  5 ++
 4 files changed, 63 insertions(+), 3 deletions(-)
 create mode 100644 src/Controls/tests/DeviceTests/Elements/AlertDialog/AlertDialogTests.Android.cs

diff --git a/src/Controls/tests/DeviceTests/Elements/AlertDialog/AlertDialogTests.Android.cs b/src/Controls/tests/DeviceTests/Elements/AlertDialog/AlertDialogTests.Android.cs
new file mode 100644
index 000000000000..4f541067ac8a
--- /dev/null
+++ b/src/Controls/tests/DeviceTests/Elements/AlertDialog/AlertDialogTests.Android.cs
@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.Maui.DeviceTests.Stubs;
+using Microsoft.Maui.Platform;
+using Xunit;
+using AndroidX.AppCompat.App;
+using Android.Graphics;
+
+namespace Microsoft.Maui.DeviceTests
+{
+	public partial class AlertDialogTests: ControlsHandlerTestBase
+	{
+
+		async Task<Color> GetDialogButtonTextColor(int nightMode)
+		{
+			var mauiContextStub1 = new ContextStub(ApplicationServices);
+			var activity = mauiContextStub1.GetActivity();
+			mauiContextStub1.Context = new Android.Views.ContextThemeWrapper(activity, Resource.Style.Maui_MainTheme_NoActionBar);
+			Color color = Color.Transparent;
+			await InvokeOnMainThreadAsync(() =>
+			{
+				var initialNightMode = activity.Delegate.LocalNightMode;
+				activity.Delegate.SetLocalNightMode(nightMode);
+				var builder = new AlertDialog.Builder(activity);
+				var alertDialog = builder.Create();
+				alertDialog.Show();
+				var button = alertDialog.GetButton((int)Android.Content.DialogButtonType.Negative);
+				var textColor = button.CurrentTextColor;
+				color = new Color(textColor);
+				activity.Delegate.SetLocalNightMode(initialNightMode);
+				alertDialog.Hide();
+			});
+
+			return color;
+		}
+
+		[Fact]
+		public void AlertDialogButtonColorLightTheme()
+		{
+			var textColor = GetDialogButtonTextColor(AppCompatDelegate.ModeNightNo).Result;
+			Assert.True(textColor.GetBrightness() < 0.5);
+		}
+
+		[Fact]
+		public void AlertDialogButtonColorDarkTheme()
+		{
+			var textColor = GetDialogButtonTextColor(AppCompatDelegate.ModeNightYes).Result;
+			Assert.True(textColor.GetBrightness() > 0.5);
+		}
+	}
+}
diff --git a/src/Core/src/Handlers/Picker/PickerHandler.Android.cs b/src/Core/src/Handlers/Picker/PickerHandler.Android.cs
index ffe3e01e0e9f..7b087aaf5b14 100644
--- a/src/Core/src/Handlers/Picker/PickerHandler.Android.cs
+++ b/src/Core/src/Handlers/Picker/PickerHandler.Android.cs
@@ -6,12 +6,13 @@
 using Android.Text;
 using Android.Text.Style;
 using AResource = Android.Resource;
+using AppCompatAlertDialog = AndroidX.AppCompat.App.AlertDialog;
 
 namespace Microsoft.Maui.Handlers
 {
 	public partial class PickerHandler : ViewHandler<IPicker, MauiPicker>
 	{
-		AlertDialog? _dialog;
+		AppCompatAlertDialog? _dialog;
 
 		protected override MauiPicker CreatePlatformView() =>
 			new MauiPicker(Context);
@@ -108,7 +109,7 @@ void OnClick(object? sender, EventArgs e)
 		{
 			if (_dialog == null && VirtualView != null)
 			{
-				using (var builder = new AlertDialog.Builder(Context))
+				using (var builder = new AppCompatAlertDialog.Builder(Context))
 				{
 					if (VirtualView.TitleColor == null)
 					{
diff --git a/src/Core/src/Platform/Android/PickerExtensions.cs b/src/Core/src/Platform/Android/PickerExtensions.cs
index 71aaef380d1f..a33ba47fd8d4 100644
--- a/src/Core/src/Platform/Android/PickerExtensions.cs
+++ b/src/Core/src/Platform/Android/PickerExtensions.cs
@@ -47,7 +47,7 @@ internal static void UpdatePicker(this MauiPicker platformPicker, IPicker picker
 				platformPicker.Text = picker.GetItem(picker.SelectedIndex);
 		}
 
-		internal static void UpdateFlowDirection(this AlertDialog alertDialog, MauiPicker platformPicker)
+		internal static void UpdateFlowDirection(this AndroidX.AppCompat.App.AlertDialog alertDialog, MauiPicker platformPicker)
 		{
 			var platformLayoutDirection = platformPicker.LayoutDirection;
 
diff --git a/src/Core/src/Platform/Android/Resources/values/styles.xml b/src/Core/src/Platform/Android/Resources/values/styles.xml
index c33b209fdd7e..65b1da7b63af 100644
--- a/src/Core/src/Platform/Android/Resources/values/styles.xml
+++ b/src/Core/src/Platform/Android/Resources/values/styles.xml
@@ -11,6 +11,7 @@
         <item name="materialButtonStyle">@style/MauiMaterialButton</item>
         <item name="checkboxStyle">@style/MauiCheckBox</item>
         <item name="android:textAllCaps">false</item>
+        <item name="alertDialogTheme">@style/MauiAlertDialogTheme</item>
     </style>
     <style name="Maui.MainTheme.NoActionBar" parent="Maui.MainTheme">
         <item name="windowActionBar">false</item>
@@ -66,6 +67,10 @@
       <item name="android:minHeight">0dp</item>
     </style>
 
+    <style name="MauiAlertDialogTheme" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
+      <item name="colorPrimary">?attr/colorOnSurface</item>
+    </style>
+
   <!-- 
     The collectionViewScrollBars style will be used as the default style for ItemsViewRenderer (the base renderer
     for CollectionView and CarouselView. We have to use a style to set up the scrollbars because there is currently

From ed18303d2490715c564dd49b02b8d89b0a1003e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Su=C3=A1rez?= <javiersuarezruiz@hotmail.com>
Date: Thu, 13 Jul 2023 19:58:42 +0200
Subject: [PATCH 087/105] Avoid to use CornerCurve in iOS < 13 (#16101)

---
 src/Core/src/Platform/iOS/ContentView.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Core/src/Platform/iOS/ContentView.cs b/src/Core/src/Platform/iOS/ContentView.cs
index 59917e6e420e..add8ccd78107 100644
--- a/src/Core/src/Platform/iOS/ContentView.cs
+++ b/src/Core/src/Platform/iOS/ContentView.cs
@@ -13,7 +13,8 @@ public class ContentView : MauiView
 
 		public ContentView()
 		{
-			Layer.CornerCurve = CACornerCurve.Continuous;
+			if (OperatingSystem.IsIOSVersionAtLeast(13) || OperatingSystem.IsMacCatalystVersionAtLeast(13, 1))
+				Layer.CornerCurve = CACornerCurve.Continuous; // Available from iOS 13. More info: https://developer.apple.com/documentation/quartzcore/calayercornercurve/3152600-continuous
 		}
 
 		public override void LayoutSubviews()

From 5a779d6061a436488507623d0a61128892b30b05 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Thu, 13 Jul 2023 17:37:55 -0500
Subject: [PATCH 088/105] [tests] fix DeviceTests on Windows, maybe other
 platforms? (#16151)

Since ac16ce63 was merged, I found several tests related to `Window`
fail on Windows with:

    InvalidOperationException: MauiContext is null.

In this case, `AlertManager.Unsubscribe()` is called after
`Window.Handler` is null:

    internal IMauiContext MauiContext =>
        Handler?.MauiContext ?? throw new InvalidOperationException("MauiContext is null.");

I updated `AlertManager.Unsubscribe()` on each platform to check
for this case and `return` instead of throwing an exception.

I am not sure if regular apps could ever hit this issue or just the
DeviceTests. .NET MAUI project templates seemed OK, so I think this
might be due to how `CreateHandlerAndAddToWindow()` works in tests?
---
 .../src/Core/Platform/AlertManager/AlertManager.Android.cs | 6 ++++--
 .../src/Core/Platform/AlertManager/AlertManager.Tizen.cs   | 7 +++++--
 .../src/Core/Platform/AlertManager/AlertManager.Windows.cs | 5 ++++-
 .../src/Core/Platform/AlertManager/AlertManager.iOS.cs     | 5 ++++-
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/Controls/src/Core/Platform/AlertManager/AlertManager.Android.cs b/src/Controls/src/Core/Platform/AlertManager/AlertManager.Android.cs
index 62016fae08f8..f04234b87f71 100644
--- a/src/Controls/src/Core/Platform/AlertManager/AlertManager.Android.cs
+++ b/src/Controls/src/Core/Platform/AlertManager/AlertManager.Android.cs
@@ -39,9 +39,11 @@ internal void Subscribe(Window window)
 
 		internal void Unsubscribe(Window window)
 		{
-			IMauiContext mauiContext = window?.MauiContext;
+			IMauiContext mauiContext = window?.Handler?.MauiContext;
 			Context context = mauiContext?.Context;
-			Activity activity = context.GetActivity();
+			Activity activity = context?.GetActivity();
+			if (activity == null)
+				return;
 
 			var toRemove = Subscriptions.Where(s => s.Activity == activity).ToList();
 
diff --git a/src/Controls/src/Core/Platform/AlertManager/AlertManager.Tizen.cs b/src/Controls/src/Core/Platform/AlertManager/AlertManager.Tizen.cs
index 1fd56e7b9834..8db138b16164 100644
--- a/src/Controls/src/Core/Platform/AlertManager/AlertManager.Tizen.cs
+++ b/src/Controls/src/Core/Platform/AlertManager/AlertManager.Tizen.cs
@@ -26,9 +26,12 @@ internal void Subscribe(Window window)
 
 		internal void Unsubscribe(Window window)
 		{
-			var nativeWindow = window?.MauiContext.GetPlatformWindow();
+			IMauiContext mauiContext = window?.Handler?.MauiContext;
+			var platformWindow = mauiContext?.GetPlatformWindow();
+			if (platformWindow == null)
+				return;
 
-			var toRemove = Subscriptions.Where(s => s.Window == nativeWindow).ToList();
+			var toRemove = Subscriptions.Where(s => s.Window == platformWindow).ToList();
 
 			foreach (AlertRequestHelper alertRequestHelper in toRemove)
 			{
diff --git a/src/Controls/src/Core/Platform/AlertManager/AlertManager.Windows.cs b/src/Controls/src/Core/Platform/AlertManager/AlertManager.Windows.cs
index 56a7ea52e531..9528e45477ac 100644
--- a/src/Controls/src/Core/Platform/AlertManager/AlertManager.Windows.cs
+++ b/src/Controls/src/Core/Platform/AlertManager/AlertManager.Windows.cs
@@ -24,7 +24,10 @@ internal void Subscribe(Window window)
 
 		internal void Unsubscribe(Window window)
 		{
-			var platformWindow = window.MauiContext.GetPlatformWindow();
+			IMauiContext? mauiContext = window?.Handler?.MauiContext;
+			var platformWindow = mauiContext?.GetPlatformWindow();
+			if (platformWindow == null)
+				return;
 
 			var toRemove = Subscriptions.Where(s => s.PlatformView == platformWindow).ToList();
 
diff --git a/src/Controls/src/Core/Platform/AlertManager/AlertManager.iOS.cs b/src/Controls/src/Core/Platform/AlertManager/AlertManager.iOS.cs
index ec313a89bf61..4950d3f95545 100644
--- a/src/Controls/src/Core/Platform/AlertManager/AlertManager.iOS.cs
+++ b/src/Controls/src/Core/Platform/AlertManager/AlertManager.iOS.cs
@@ -28,7 +28,10 @@ internal void Subscribe(Window window)
 
 		internal void Unsubscribe(Window window)
 		{
-			var platformWindow = window?.MauiContext.GetPlatformWindow();
+			IMauiContext mauiContext = window?.Handler?.MauiContext;
+			var platformWindow = mauiContext?.GetPlatformWindow();
+			if (platformWindow == null)
+				return;
 
 			var toRemove = Subscriptions.Where(s => s.PlatformView == platformWindow).ToList();
 

From dc5f65d05813a77a73e568ec3e1cd36f401dc591 Mon Sep 17 00:00:00 2001
From: Scott Banning <scoban@microsoft.com>
Date: Thu, 13 Jul 2023 16:15:46 -0700
Subject: [PATCH 089/105] Catch hidekeyboard failures for iOS and simplify the
 refreshview test

---
 .../Issues/RefreshViewPage.cs                 |  8 +++--
 .../Controls.Sample.UITests/TestCases.cs      |  8 ++---
 .../tests/UITests/Tests/AppExtensions.cs      | 31 +++++++------------
 .../UITests/Tests/Issues/RefreshViewTests.cs  |  3 +-
 .../UITests/Tests/Issues/_IssuesUITest.cs     | 11 +++----
 .../tests/UITests/Tests/UITestBase.cs         |  4 +--
 .../AppiumUITestApp.cs                        | 26 +++++++++++++++-
 .../src/TestUtils.Appium.UITests/IApp2.cs     |  1 +
 8 files changed, 55 insertions(+), 37 deletions(-)

diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/RefreshViewPage.cs b/src/Controls/samples/Controls.Sample.UITests/Issues/RefreshViewPage.cs
index e10455b0fdec..3dfb70275b56 100644
--- a/src/Controls/samples/Controls.Sample.UITests/Issues/RefreshViewPage.cs
+++ b/src/Controls/samples/Controls.Sample.UITests/Issues/RefreshViewPage.cs
@@ -28,6 +28,7 @@ protected override void Init()
 				.ToList()
 				.ForEach(scrollViewContent.Children.Add);
 
+			var isRefreshingLabel = new Label { AutomationId = "IsRefreshingLabel" };
 
 			bool canExecute = true;
 			_refreshCommand = new Command(async (parameter) =>
@@ -42,8 +43,10 @@ protected override void Init()
 					throw new Exception("Refresh command incorrectly firing with disabled parameter");
 				}
 
-				await Task.Delay(4000); // Appium catalyst driver seems to be slow, have a longer delay here because of that
+				await Task.Delay(1000);
 				_refreshView.IsRefreshing = false;
+				isRefreshingLabel.Text += "IsRefreshing: False;";
+
 			}, (object parameter) =>
 			{
 				return parameter != null && canExecute && (bool)parameter;
@@ -62,8 +65,7 @@ protected override void Init()
 				CommandParameter = true
 			};
 
-			var isRefreshingLabel = new Label { AutomationId = "IsRefreshingLabel", BindingContext = _refreshView };
-			isRefreshingLabel.SetBinding(Label.TextProperty, new Binding("IsRefreshing", stringFormat: "IsRefreshing: {0}", source: _refreshView));
+			_refreshView.Refreshing += (sender, args) => isRefreshingLabel.Text += $"IsRefreshing: {_refreshView.IsRefreshing};";
 
 			var commandEnabledLabel = new Label { AutomationId = "IsEnabledLabel", BindingContext = _refreshView };
 			commandEnabledLabel.SetBinding(Label.TextProperty, new Binding("IsEnabled", stringFormat: "IsEnabled: {0}", source: _refreshView));
diff --git a/src/Controls/samples/Controls.Sample.UITests/TestCases.cs b/src/Controls/samples/Controls.Sample.UITests/TestCases.cs
index 6ed17c5c75e8..306c57b71240 100644
--- a/src/Controls/samples/Controls.Sample.UITests/TestCases.cs
+++ b/src/Controls/samples/Controls.Sample.UITests/TestCases.cs
@@ -11,7 +11,7 @@ public static class TestCases
 	{
 		public class TestCaseScreen : TableView
 		{
-			public static Dictionary<string, Action> PageToAction = new Dictionary<string, Action>();
+			public static Dictionary<string, Action> PageToAction = new Dictionary<string, Action>(StringComparer.OrdinalIgnoreCase);
 
 			bool _filterBugzilla;
 			bool _filterNone;
@@ -149,7 +149,7 @@ void VerifyNoDuplicates()
 				var duplicates = new HashSet<string>();
 				_issues.ForEach(im =>
 				{
-					if (duplicates.Contains(im.Name) && !IsExempt(im.Name))
+					if (duplicates.Contains(im.Name, StringComparer.OrdinalIgnoreCase) && !IsExempt(im.Name))
 					{
 						throw new NotSupportedException("Please provide unique tracker + issue number combo: "
 							+ im.IssueTracker.ToString() + im.IssueNumber.ToString() + im.IssueTestNumber.ToString());
@@ -208,7 +208,7 @@ public void FilterTracker(IssueTracker tracker)
 
 			public bool TryToNavigateTo(string name)
 			{
-				var issue = _issues.SingleOrDefault(x => String.Equals(x.Name, name, StringComparison.OrdinalIgnoreCase));
+				var issue = _issues.SingleOrDefault(x => string.Equals(x.Name, name, StringComparison.OrdinalIgnoreCase));
 				if (issue == null)
 					return false;
 
@@ -279,7 +279,7 @@ from issueModel in _issues
 				Root.Add(_section);
 			}
 
-			HashSet<string> _exemptNames = new HashSet<string> { "N0", "G342", "G1305", "G1461", "G1653", "G1700" };
+			HashSet<string> _exemptNames = new HashSet<string> { };
 
 			// Legacy reasons, do not add to this list
 			// Going forward, make sure only one Issue attribute exist for a Tracker + Issue number pair
diff --git a/src/Controls/tests/UITests/Tests/AppExtensions.cs b/src/Controls/tests/UITests/Tests/AppExtensions.cs
index f435450a06dd..889c06d3e88b 100644
--- a/src/Controls/tests/UITests/Tests/AppExtensions.cs
+++ b/src/Controls/tests/UITests/Tests/AppExtensions.cs
@@ -1,4 +1,6 @@
 using System.Text.RegularExpressions;
+using OpenQA.Selenium.Support.UI;
+using TestUtils.Appium.UITests;
 using Xamarin.UITest;
 
 namespace Microsoft.Maui.AppiumTests
@@ -22,26 +24,12 @@ public static void NavigateTo(this IApp app, string text)
 
 		public static bool WaitForTextToBePresentInElement(this IApp app, string automationId, string text)
 		{
-			var timeout = TimeSpan.FromSeconds(15);
-			TimeSpan retryFrequency = TimeSpan.FromMilliseconds(500);
-
-			DateTime start = DateTime.Now;
-			long elapsed = 0;
-
-			while (elapsed <= timeout.Ticks)
+			if (app is IApp2 app2)
 			{
-				elapsed = DateTime.Now.Subtract(start).Ticks;
-				
-				var elementText = app.Query(automationId).FirstOrDefault()?.Text;
-				if (elementText != null && elementText.Contains(text, StringComparison.OrdinalIgnoreCase))
-				{
-					return true;
-				}
-
-				Task.Delay(retryFrequency.Milliseconds).Wait();
+				return app2.WaitForTextToBePresentInElement(automationId, text);
 			}
-			
-			return false;
+
+			throw new InvalidOperationException("Not supported on IApp");
 		}
 
 		public static void NavigateToGallery(this IApp app, string page)
@@ -54,7 +42,12 @@ public static void NavigateToGallery(this IApp app, string page)
 		public static void NavigateToIssues(this IApp app)
 		{
 			app.WaitForElement(goToTestButtonId, "Timed out waiting for Go To Test button to appear", TimeSpan.FromMinutes(2));
-			NavigateTo(app, string.Empty);
+
+			app.WaitForElement("SearchBar");
+			app.ClearText("SearchBar");
+
+			app.Tap(goToTestButtonId);
+			app.WaitForElement("TestCasesIssueList");
 		}
 
 		public static void NavigateBack(this IApp app)
diff --git a/src/Controls/tests/UITests/Tests/Issues/RefreshViewTests.cs b/src/Controls/tests/UITests/Tests/Issues/RefreshViewTests.cs
index df83666d291a..36f8cb9c7c74 100644
--- a/src/Controls/tests/UITests/Tests/Issues/RefreshViewTests.cs
+++ b/src/Controls/tests/UITests/Tests/Issues/RefreshViewTests.cs
@@ -1,8 +1,7 @@
 using Microsoft.Maui.Appium;
-using Microsoft.Maui.AppiumTests;
 using NUnit.Framework;
 
-namespace Controls.AppiumTests.Tests.Issues
+namespace Microsoft.Maui.AppiumTests.Issues
 {
 	public class RefreshViewTests : _IssuesUITest
 	{
diff --git a/src/Controls/tests/UITests/Tests/Issues/_IssuesUITest.cs b/src/Controls/tests/UITests/Tests/Issues/_IssuesUITest.cs
index 7303b7498111..77470dcbcd23 100644
--- a/src/Controls/tests/UITests/Tests/Issues/_IssuesUITest.cs
+++ b/src/Controls/tests/UITests/Tests/Issues/_IssuesUITest.cs
@@ -1,4 +1,5 @@
 using Microsoft.Maui.Appium;
+using OpenQA.Selenium.Support.UI;
 
 namespace Microsoft.Maui.AppiumTests
 {
@@ -21,16 +22,14 @@ protected override void FixtureTeardown()
 
 		public abstract string Issue { get; }
 
-		private void NavigateToIssue(string issue)
+		private static void NavigateToIssue(string issue)
 		{
 			App.NavigateToIssues();
-			App.WaitForElement(q => q.Raw("* marked:'TestCasesIssueList'"));
 
-			App.EnterText(q => q.Raw("* marked:'SearchBarGo'"), $"{issue}");
+			App.EnterText("SearchBarGo", issue);
 
-			App.WaitForElement(q => q.Raw("* marked:'SearchButton'"));
-			App.Tap(q => q.Raw("* marked:'SearchButton'"));
+			App.WaitForElement("SearchButton");
+			App.Tap("SearchButton");
 		}
 	}
-
 }
\ No newline at end of file
diff --git a/src/Controls/tests/UITests/Tests/UITestBase.cs b/src/Controls/tests/UITests/Tests/UITestBase.cs
index fe7761b0ec88..b421d813c61b 100644
--- a/src/Controls/tests/UITests/Tests/UITestBase.cs
+++ b/src/Controls/tests/UITests/Tests/UITestBase.cs
@@ -41,12 +41,12 @@ public void UITestBaseTearDown()
 			{
 				var logDir = (Path.GetDirectoryName(Environment.GetEnvironmentVariable("APPIUM_LOG_FILE")) ?? Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location))!;
 
-				_ = App.Screenshot(Path.Combine(logDir, $"{TestContext.CurrentContext.Test.MethodName}-ScreenShot"));
+				_ = App.Screenshot(Path.Combine(logDir, $"{TestContext.CurrentContext.Test.MethodName}-{UITestContext.TestConfig.TestDevice}-ScreenShot"));
 
 				if (App is IApp2 app2)
 				{
 					var pageSource = app2.ElementTree;
-					File.WriteAllText(Path.Combine(logDir, $"{TestContext.CurrentContext.Test.MethodName}-PageSource.txt"), pageSource);
+					File.WriteAllText(Path.Combine(logDir, $"{TestContext.CurrentContext.Test.MethodName}-{UITestContext.TestConfig.TestDevice}-PageSource.txt"), pageSource);
 				}
 			}
 		}
diff --git a/src/TestUtils/src/TestUtils.Appium.UITests/AppiumUITestApp.cs b/src/TestUtils/src/TestUtils.Appium.UITests/AppiumUITestApp.cs
index 32790b58d148..7d3e3d49c630 100644
--- a/src/TestUtils/src/TestUtils.Appium.UITests/AppiumUITestApp.cs
+++ b/src/TestUtils/src/TestUtils.Appium.UITests/AppiumUITestApp.cs
@@ -8,6 +8,7 @@
 using OpenQA.Selenium.Appium.Interactions;
 using OpenQA.Selenium.Appium.iOS;
 using OpenQA.Selenium.Interactions;
+using OpenQA.Selenium.Support.UI;
 using Xamarin.UITest;
 using Xamarin.UITest.Queries;
 using Xamarin.UITest.Queries.Tokens;
@@ -174,7 +175,14 @@ public void DismissKeyboard()
 				{
 					if (IsiOS)
 					{
-						_driver.HideKeyboard("return");
+						try
+						{
+							_driver.HideKeyboard("return");
+						}
+						catch (InvalidElementStateException)
+						{
+							// Appium iOS driver does not have a consistent way to dismiss the keyboard
+						}
 					}
 					else
 					{
@@ -343,6 +351,22 @@ private void EnterText(AppiumElement element, string text)
 			DismissKeyboard();
 		}
 
+		public bool WaitForTextToBePresentInElement(string automationId, string text)
+		{
+			WebDriverWait wait = new WebDriverWait(_driver, TimeSpan.FromSeconds(15));
+
+			return wait.Until(driver =>
+			{
+				var elementText = Query(automationId).FirstOrDefault()?.Text;
+				if (elementText != null && elementText.Contains(text, StringComparison.OrdinalIgnoreCase))
+				{
+					return true;
+				}
+
+				return false;
+			});
+		}
+
 		public void EnterText(Func<AppQuery, AppWebQuery> query, string text)
 		{
 			throw new NotImplementedException();
diff --git a/src/TestUtils/src/TestUtils.Appium.UITests/IApp2.cs b/src/TestUtils/src/TestUtils.Appium.UITests/IApp2.cs
index 263378e47e09..23bee918e9f2 100644
--- a/src/TestUtils/src/TestUtils.Appium.UITests/IApp2.cs
+++ b/src/TestUtils/src/TestUtils.Appium.UITests/IApp2.cs
@@ -7,5 +7,6 @@ public interface IApp2 : IApp, IDisposable
 		void ActivateApp();
 		void CloseApp();
 		string ElementTree { get; }
+		bool WaitForTextToBePresentInElement(string automationId, string text);
 	}
 }

From 95583f7d8527103bd34f58e3000d42b738c35e9e Mon Sep 17 00:00:00 2001
From: molesmoke <molesmoke@googlemail.com>
Date: Fri, 14 Jul 2023 23:18:27 +1200
Subject: [PATCH 090/105] [Windows] Fix Slider MinimumTrackColor (#16056)
 (#16057)

Fix typo that prevents MinimumTackColor being mapped to
SliderTrackValueFillPointerOver on WinUI 3

Co-authored-by: Jeremy Powell <jeremy@visionaid.com>
---
 src/Core/src/Platform/Windows/SliderExtensions.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Core/src/Platform/Windows/SliderExtensions.cs b/src/Core/src/Platform/Windows/SliderExtensions.cs
index 1bf543c358bb..246d11370c4b 100644
--- a/src/Core/src/Platform/Windows/SliderExtensions.cs
+++ b/src/Core/src/Platform/Windows/SliderExtensions.cs
@@ -57,7 +57,7 @@ public static void UpdateMinimumTrackColor(this Slider platformSlider, ISlider s
 		static readonly string[] MinimumTrackColorResourceKeys =
 		{
 			"SliderTrackValueFill",
-			"SliderTrackValueFilllPointerOver",
+			"SliderTrackValueFillPointerOver",
 			"SliderTrackValueFillPressed",
 			"SliderTrackValueFillDisabled",
 		};

From dfee07354dd1b1e0ed9c717e66467a84e107daa2 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Sun, 16 Jul 2023 00:57:46 +0200
Subject: [PATCH 091/105] Map all menu items through a single selector (#16174)

---
 .../MenuFlyoutItemHandler.iOS.cs              |   7 -
 .../src/Platform/iOS/AcceleratorExtensions.cs |  27 +-
 .../iOS/MauiUIApplicationDelegate.Menu.cs     | 357 +-----------------
 3 files changed, 11 insertions(+), 380 deletions(-)

diff --git a/src/Core/src/Handlers/MenuFlyoutItem/MenuFlyoutItemHandler.iOS.cs b/src/Core/src/Handlers/MenuFlyoutItem/MenuFlyoutItemHandler.iOS.cs
index 075a6281dadf..30e932519a75 100644
--- a/src/Core/src/Handlers/MenuFlyoutItem/MenuFlyoutItemHandler.iOS.cs
+++ b/src/Core/src/Handlers/MenuFlyoutItem/MenuFlyoutItemHandler.iOS.cs
@@ -1,12 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using Foundation;
-using Microsoft.Maui.Platform;
-using ObjCRuntime;
 using UIKit;
-using static CoreMedia.CMTime;
 
 namespace Microsoft.Maui.Handlers
 {
@@ -21,9 +16,7 @@ bool IsInContextFlyout()
 			while (current != null)
 			{
 				if (current is Microsoft.Maui.IMenuFlyout)
-				{
 					return true;
-				}
 				current = current.Parent;
 			}
 			return false;
diff --git a/src/Core/src/Platform/iOS/AcceleratorExtensions.cs b/src/Core/src/Platform/iOS/AcceleratorExtensions.cs
index a86df1d32ea6..e6d5d5087ecb 100644
--- a/src/Core/src/Platform/iOS/AcceleratorExtensions.cs
+++ b/src/Core/src/Platform/iOS/AcceleratorExtensions.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 using Foundation;
 using ObjCRuntime;
 using UIKit;
@@ -8,25 +7,13 @@ namespace Microsoft.Maui.Platform
 {
 	internal static class AcceleratorExtensions
 	{
+		internal const string MenuItemSelectedSelector = "MenuItemSelected:";
+
 		internal static UIMenuElement CreateMenuItem(this IMenuFlyoutItem virtualView, IMauiContext mauiContext)
 		{
-			int index = MenuFlyoutItemHandler.menus.Count;
-			UIImage? uiImage = virtualView.Source.GetPlatformMenuImage(mauiContext);
-			var selector = new Selector($"MenuItem{index}:");
-
-			bool selectorFound =
-				MauiUIApplicationDelegate.Current.RespondsToSelector(selector);
-
-			if (!selectorFound)
-			{
-				throw new InvalidOperationException(
-					$"By default we only support 50 MenuItems. You can add more by adding the following code to {MauiUIApplicationDelegate.Current.GetType()}\n\n" +
-					$"[Export(\"MenuItem{index}: \")]\n" +
-					$"internal void MenuItem{index}(UICommand uICommand)\n" +
-					"{\n" +
-					"	uICommand.SendClicked();\n" +
-					"}");
-			}
+			var index = MenuFlyoutItemHandler.menus.Count;
+			var uiImage = virtualView.Source.GetPlatformMenuImage(mauiContext);
+			var selector = new Selector(MenuItemSelectedSelector);
 
 			var accelerator = virtualView.Accelerators?[0];
 			if (accelerator is null)
@@ -35,9 +22,8 @@ internal static UIMenuElement CreateMenuItem(this IMenuFlyoutItem virtualView, I
 			var key = accelerator.Key;
 			var modifiers = accelerator.Modifiers;
 
-			UIKeyModifierFlags modifierFlags = 0;
-
 			// Single key accelerators (no modifier, i.e. "A") and multi-key accelerators are supported (>=1 modifier and 1 key only, i.e. Ctrl+F, Ctrl+Shift+F)
+			UIKeyModifierFlags modifierFlags = 0;
 			if (modifiers is not null && modifiers.Count > 0)
 			{
 				foreach (var modifier in modifiers)
@@ -91,6 +77,7 @@ static UIMenuElement CreateMenuItemCommand(this IMenuFlyoutItem virtualView, int
 				new NSString(index.ToString()));
 
 			MenuFlyoutItemHandler.menus[index] = virtualView;
+
 			return command;
 		}
 	}
diff --git a/src/Core/src/Platform/iOS/MauiUIApplicationDelegate.Menu.cs b/src/Core/src/Platform/iOS/MauiUIApplicationDelegate.Menu.cs
index 5f3e59a3ab10..75c407a11acc 100644
--- a/src/Core/src/Platform/iOS/MauiUIApplicationDelegate.Menu.cs
+++ b/src/Core/src/Platform/iOS/MauiUIApplicationDelegate.Menu.cs
@@ -13,6 +13,7 @@ namespace Microsoft.Maui
 	public partial class MauiUIApplicationDelegate
 	{
 		internal IUIMenuBuilder? MenuBuilder { get; private set; }
+
 		[SupportedOSPlatform("ios13.0")]
 		public override void BuildMenu(IUIMenuBuilder builder)
 		{
@@ -79,361 +80,11 @@ public override bool CanPerform(Selector action, NSObject? withSender)
 			return base.CanPerform(action, withSender);
 		}
 
-		/* The Selector for every single MenuElement has to be unique. If you try to reuse the same selector
-		 * Then Catalyst will only ever create one MenuItem for the last menu item you added.
-		 * Because we can't dynamically export these selectors we end up with this large file of premade ones.
-		 * If users try to add too many menu items they will get an exception guiding them how to add their own 
-		 * selectors
-		 */
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem0:")]
-		internal void MenuItem0(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem1:")]
-		internal void MenuItem1(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem2:")]
-		internal void MenuItem2(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem3:")]
-		internal void MenuItem3(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem4:")]
-		internal void MenuItem4(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem5:")]
-		internal void MenuItem5(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem6:")]
-		internal void MenuItem6(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem7:")]
-		internal void MenuItem7(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem8:")]
-		internal void MenuItem8(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem9:")]
-		internal void MenuItem9(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem10:")]
-		internal void MenuItem10(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem11:")]
-		internal void MenuItem11(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem12:")]
-		internal void MenuItem12(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem13:")]
-		internal void MenuItem13(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem14:")]
-		internal void MenuItem14(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem15:")]
-		internal void MenuItem15(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem16:")]
-		internal void MenuItem16(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem17:")]
-		internal void MenuItem17(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem18:")]
-		internal void MenuItem18(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem19:")]
-		internal void MenuItem19(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem20:")]
-		internal void MenuItem20(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem21:")]
-		internal void MenuItem21(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem22:")]
-		internal void MenuItem22(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem23:")]
-		internal void MenuItem23(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem24:")]
-		internal void MenuItem24(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem25:")]
-		internal void MenuItem25(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem26:")]
-		internal void MenuItem26(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem27:")]
-		internal void MenuItem27(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem28:")]
-		internal void MenuItem28(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem29:")]
-		internal void MenuItem29(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem30:")]
-		internal void MenuItem30(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem31:")]
-		internal void MenuItem31(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem32:")]
-		internal void MenuItem32(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem33:")]
-		internal void MenuItem33(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem34:")]
-		internal void MenuItem34(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem35:")]
-		internal void MenuItem35(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem36:")]
-		internal void MenuItem36(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem37:")]
-		internal void MenuItem37(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem38:")]
-		internal void MenuItem38(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem39:")]
-		internal void MenuItem39(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem40:")]
-		internal void MenuItem40(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem41:")]
-		internal void MenuItem41(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem42:")]
-		internal void MenuItem42(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem43:")]
-		internal void MenuItem43(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem44:")]
-		internal void MenuItem44(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem45:")]
-		internal void MenuItem45(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem46:")]
-		internal void MenuItem46(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem47:")]
-		internal void MenuItem47(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
-		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem48:")]
-		internal void MenuItem48(UICommand uICommand)
-		{
-			uICommand.SendClicked();
-		}
-
 		[SupportedOSPlatform("ios13.0")]
-		[Export("MenuItem49:")]
-		internal void MenuItem49(UICommand uICommand)
+		[Export(AcceleratorExtensions.MenuItemSelectedSelector)]
+		internal void MenuItemSelected(UICommand uiCommand)
 		{
-			uICommand.SendClicked();
+			uiCommand.SendClicked();
 		}
 	}
 }

From 556073279bb713acdb89003d906df13c3ea38d30 Mon Sep 17 00:00:00 2001
From: Gerald Versluis <gerald.versluis@microsoft.com>
Date: Sun, 16 Jul 2023 21:06:31 +0200
Subject: [PATCH 092/105] Windows (packaged) Device tests for CI (#15629)

* Build & Run Packaged Windows DeviceTests

* Disable running for Core

* Skip failing tests

* Skip Launcher tests

* Update Launcher_Tests.cs

* Update windows.cake

* Revert "Update windows.cake"

This reverts commit f94dfdd3a5585ebb844080d723c9a9ea44e90811.

* Update windows.cake
---
 eng/devices/windows.cake                      | 208 +++++++++++++++++-
 eng/pipelines/common/device-tests-steps.yml   |  15 +-
 eng/pipelines/common/device-tests.yml         |  34 +++
 eng/pipelines/device-tests.yml                |  12 +
 .../Elements/BlazorWebViewTests.cs            |  12 +-
 .../Platforms/Windows/Package.appxmanifest    |   5 +-
 .../Platforms/Windows/Package.appxmanifest    |   2 +-
 .../DeviceTests/Tests/AppActions_Tests.cs     |   2 +-
 .../test/DeviceTests/Tests/AppInfo_Tests.cs   |   6 +-
 .../test/DeviceTests/Tests/Battery_Tests.cs   |   6 +-
 .../test/DeviceTests/Tests/Launcher_Tests.cs  |  72 +++++-
 .../test/DeviceTests/Tests/Vibration_Tests.cs |  12 +-
 .../AppHostBuilderExtensions.cs               |   2 +-
 .../HeadlessRunner/TestDevice.cs              |   2 +
 .../Windows/HeadlessTestRunner.cs             | 114 ++++++++++
 .../VisualRunner/Pages/HomePage.xaml.cs       |  30 +++
 16 files changed, 494 insertions(+), 40 deletions(-)
 create mode 100644 src/TestUtils/src/DeviceTests.Runners/HeadlessRunner/Windows/HeadlessTestRunner.cs

diff --git a/eng/devices/windows.cake b/eng/devices/windows.cake
index e03d96a7f4f1..ded46e112d8e 100644
--- a/eng/devices/windows.cake
+++ b/eng/devices/windows.cake
@@ -1,6 +1,9 @@
 #load "../cake/helpers.cake"
 #load "../cake/dotnet.cake"
 
+using System.Security.Cryptography;
+using System.Security.Cryptography.X509Certificates;
+
 string TARGET = Argument("target", "Test");
 
 const string defaultVersion = "10.0.19041";
@@ -8,7 +11,10 @@ const string dotnetVersion = "net7.0";
 
 // required
 FilePath PROJECT = Argument("project", EnvironmentVariable("WINDOWS_TEST_PROJECT") ?? "");
+// Not used for Windows. TODO Use this for packaged vs unpackaged?
 string TEST_DEVICE = Argument("device", EnvironmentVariable("WINDOWS_TEST_DEVICE") ?? $"");
+// Package ID of the WinUI Application
+var PACKAGEID = Argument("packageid", EnvironmentVariable("WINDOWS_TEST_PACKAGE_ID") ?? $"");
 
 // optional
 var DOTNET_PATH = Argument("dotnet-path", EnvironmentVariable("DOTNET_PATH"));
@@ -16,8 +22,10 @@ var TARGET_FRAMEWORK = Argument("tfm", EnvironmentVariable("TARGET_FRAMEWORK") ?
 var BINLOG_ARG = Argument("binlog", EnvironmentVariable("WINDOWS_TEST_BINLOG") ?? "");
 DirectoryPath BINLOG_DIR = string.IsNullOrEmpty(BINLOG_ARG) && !string.IsNullOrEmpty(PROJECT.FullPath) ? PROJECT.GetDirectory() : BINLOG_ARG;
 var TEST_APP = Argument("app", EnvironmentVariable("WINDOWS_TEST_APP") ?? "");
-FilePath TEST_APP_PROJECT = Argument("appproject", EnvironmentVariable("WINDOWS_TEST_APP_PROJECT") ?? "");
-var TEST_RESULTS = Argument("results", EnvironmentVariable("MAC_TEST_RESULTS") ?? "");
+var DEVICETEST_APP = Argument("devicetestapp", EnvironmentVariable("WINDOWS_DEVICETEST_APP") ?? "");
+FilePath TEST_APP_PROJECT = Argument("appproject", EnvironmentVariable("WINDOWS_TEST_APP_PROJECT") ?? PROJECT);
+FilePath DEVICETEST_APP_PROJECT = Argument("appproject", EnvironmentVariable("WINDOWS_DEVICETEST_APP_PROJECT") ?? PROJECT);
+var TEST_RESULTS = Argument("results", EnvironmentVariable("WINDOWS_TEST_RESULTS") ?? "");
 string CONFIGURATION = Argument("configuration", "Debug");
 
 var windowsVersion = Argument("apiversion", EnvironmentVariable("WINDOWS_PLATFORM_VERSION") ?? defaultVersion);
@@ -26,8 +34,22 @@ var windowsVersion = Argument("apiversion", EnvironmentVariable("WINDOWS_PLATFOR
 string PLATFORM = "windows";
 string DOTNET_PLATFORM = $"win10-x64";
 bool DEVICE_CLEANUP = Argument("cleanup", true);
+string certificateThumbprint = "";
+
+// Certificate Common Name to use/generate (eg: CN=DotNetMauiTests)
+var certCN = Argument("commonname", "DotNetMAUITests");
+
+// Uninstall the deployed app
+var uninstallPS = new Action(() =>
+{
+	try {
+		StartProcess("powershell",
+			"$app = Get-AppxPackage -Name " + PACKAGEID + "; if ($app) { Remove-AppxPackage -Package $app.PackageFullName }");
+	} catch { }
+});
 
 Information("Project File: {0}", PROJECT);
+Information("Application ID: {0}", PACKAGEID);
 Information("Build Binary Log (binlog): {0}", BINLOG_DIR);
 Information("Build Platform: {0}", PLATFORM);
 Information("Build Configuration: {0}", CONFIGURATION);
@@ -52,25 +74,199 @@ void Cleanup()
 
 Task("Cleanup");
 
-Task("uitest")
+Task("GenerateMsixCert")
+	.Does(() =>
+{
+	// We need the key to be in LocalMachine -> TrustedPeople to install the msix signed with the key
+	var localTrustedPeopleStore = new X509Store("TrustedPeople", StoreLocation.LocalMachine);
+	localTrustedPeopleStore.Open(OpenFlags.ReadWrite);
+
+	// We need to have the key also in CurrentUser -> My so that the msix can be built and signed
+	// with the key by passing the key's thumbprint to the build
+	var currentUserMyStore = new X509Store("My", StoreLocation.CurrentUser);
+	currentUserMyStore.Open(OpenFlags.ReadWrite);
+	certificateThumbprint = localTrustedPeopleStore.Certificates.FirstOrDefault(c => c.Subject.Contains(certCN))?.Thumbprint;
+	Information("Cert thumbprint: " + certificateThumbprint ?? "null");
+
+	if (string.IsNullOrEmpty(certificateThumbprint))
+	{
+		Information("Generating cert");
+		var rsa = RSA.Create();
+		var req = new CertificateRequest("CN=" + certCN, rsa, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
+
+		req.CertificateExtensions.Add(new X509EnhancedKeyUsageExtension(new OidCollection
+		{
+			new Oid
+			{
+				Value = "1.3.6.1.5.5.7.3.3",
+				FriendlyName = "Code Signing"
+			}
+		}, false));
+
+		req.CertificateExtensions.Add(new X509BasicConstraintsExtension(false, false, 0, false));
+		req.CertificateExtensions.Add(
+			new X509KeyUsageExtension(
+				X509KeyUsageFlags.DigitalSignature | X509KeyUsageFlags.NonRepudiation,
+				false));
+
+		req.CertificateExtensions.Add(
+						new X509SubjectKeyIdentifierExtension(req.PublicKey, false));
+		var cert = req.CreateSelfSigned(DateTimeOffset.Now, DateTimeOffset.Now.AddYears(5));
+
+		if (OperatingSystem.IsWindows())
+		{
+			cert.FriendlyName = certCN;
+		}
+
+		var tmpCert = new X509Certificate2(cert.Export(X509ContentType.Pfx), "", X509KeyStorageFlags.MachineKeySet | X509KeyStorageFlags.PersistKeySet);
+		certificateThumbprint = tmpCert.Thumbprint;
+		localTrustedPeopleStore.Add(tmpCert);
+		currentUserMyStore.Add(tmpCert);
+	}
+
+	localTrustedPeopleStore.Close();
+	currentUserMyStore.Close();
+});
+
+Task("Build")
+	.IsDependentOn("GenerateMsixCert")
+	.WithCriteria(!string.IsNullOrEmpty(PROJECT.FullPath))
+	.WithCriteria(!string.IsNullOrEmpty(PACKAGEID))
+	.Does(() =>
+{
+	var name = System.IO.Path.GetFileNameWithoutExtension(PROJECT.FullPath);
+	var binlog = $"{BINLOG_DIR}/{name}-{CONFIGURATION}-windows.binlog";
+
+	SetDotNetEnvironmentVariables(DOTNET_PATH);
+
+	Information("Building and publishing device test app");
+
+	// Build the app in publish mode
+	// Using the certificate thumbprint for the cert we just created
+	var s = new DotNetPublishSettings();
+	s.Configuration = CONFIGURATION;
+	s.Framework = TARGET_FRAMEWORK;
+	s.MSBuildSettings = new DotNetMSBuildSettings();
+	s.MSBuildSettings.Properties.Add("RuntimeIdentifierOverride", new List<string> { "win10-x64" });
+	s.MSBuildSettings.Properties.Add("PackageCertificateThumbprint", new List<string> { certificateThumbprint });
+	s.MSBuildSettings.Properties.Add("AppxPackageSigningEnabled", new List<string> { "True" });
+	
+	DotNetPublish(PROJECT.FullPath, s);
+});
+
+Task("Test")
+    .IsDependentOn("Build")
+	.IsDependentOn("SetupTestPaths")
 	.Does(() =>
 {
-	if (string.IsNullOrEmpty(TEST_APP) ) {
+	CleanDirectories(TEST_RESULTS);
+
+    Information("Cleaned directories");
+
+	// Try to uninstall the app if it exists from before
+	uninstallPS();
+
+    Information("Uninstalled previously deployed app");
+	var projectDir = PROJECT.GetDirectory();
+	var cerPath = GetFiles(projectDir.FullPath + "/**/AppPackages/*/*.cer").First();
+	var msixPath = GetFiles(projectDir.FullPath + "/**/AppPackages/*/*.msix").First();
+
+    var testResultsFile = MakeAbsolute((DirectoryPath)TEST_RESULTS).FullPath.Replace("/", "\\") + $"\\TestResults-{PACKAGEID.Replace(".", "_")}.xml";
+
+	Information($"Found MSIX, installing: {msixPath}");
+    Information($"Test Results File: {testResultsFile}");
+
+    if (FileExists(testResultsFile))
+	{
+        DeleteFile(testResultsFile);
+	}
+
+	// Install dependencies
+	var dependencies = GetFiles(projectDir.FullPath + "/**/AppPackages/**/Dependencies/x64/*.msix");
+    foreach (var dep in dependencies) {
+        Information("Installing Dependency MSIX: {0}", dep);
+        StartProcess("powershell", "Add-AppxPackage -Path \"" + MakeAbsolute(dep).FullPath + "\"");
+    }
+
+	// Install the DeviceTests app
+	StartProcess("powershell", "Add-AppxPackage -Path \"" + MakeAbsolute(msixPath).FullPath + "\"");
+
+    var startArgs = "Start-Process shell:AppsFolder\\$((Get-AppxPackage -Name \"" + PACKAGEID + "\").PackageFamilyName)!App -Args \"" + testResultsFile + "\"";
+
+    Information(startArgs);
+
+	// Start the DeviceTests app
+	StartProcess("powershell", startArgs);
+
+    var waited = 0;
+    while (!FileExists(testResultsFile)) {
+        System.Threading.Thread.Sleep(1000);
+        waited++;
+
+        Information($"Waiting {waited} second(s) for tests to finish...");
+        if (waited >= 120)
+            break;
+    }
+
+	if(!FileExists(testResultsFile))
+	{
+		throw new Exception($"Test results file not found after {waited} seconds, process might have crashed or not completed yet.");
+	}
+
+    Information($"Tests Finished");
+});
+
+
+Task("SetupTestPaths")
+	.Does(() => {
+
+	// UI Tests
+	if (string.IsNullOrEmpty(TEST_APP) )
+	{
 		if (string.IsNullOrEmpty(TEST_APP_PROJECT.FullPath))
+		{
 			throw new Exception("If no app was specified, an app must be provided.");
+		}
+
 		var binDir = TEST_APP_PROJECT.GetDirectory().Combine("bin").Combine(CONFIGURATION + "/" + $"{dotnetVersion}-windows{windowsVersion}").Combine(DOTNET_PLATFORM).FullPath;
 		Information("BinDir: {0}", binDir);
 		var apps = GetFiles(binDir + "/*.exe").Where(c => !c.FullPath.EndsWith("createdump.exe"));
 		TEST_APP = apps.First().FullPath;
 	}
-	if (string.IsNullOrEmpty(TEST_RESULTS)) {
+
+	if (string.IsNullOrEmpty(TEST_RESULTS))
+	{
 		TEST_RESULTS = TEST_APP + "-results";
 	}
 
+	// Device Tests
+	if (string.IsNullOrEmpty(DEVICETEST_APP) )
+	{
+		if (string.IsNullOrEmpty(DEVICETEST_APP_PROJECT.FullPath))
+		{
+			throw new Exception("If no app was specified, an app must be provided.");
+		}
+
+		DEVICETEST_APP = DEVICETEST_APP_PROJECT.GetFilenameWithoutExtension().ToString();
+	}
+
+	if (string.IsNullOrEmpty(TEST_RESULTS))
+	{
+		TEST_RESULTS = DEVICETEST_APP + "-results";
+	}
+
+	CreateDirectory(TEST_RESULTS);
+
 	Information("Test Device: {0}", TEST_DEVICE);
-	Information("Test App: {0}", TEST_APP);
+	Information("UITest App: {0}", TEST_APP);
+	Information("DeviceTest App: {0}", DEVICETEST_APP);
 	Information("Test Results Directory: {0}", TEST_RESULTS);
+});
 
+Task("uitest")
+	.IsDependentOn("SetupTestPaths")
+	.Does(() =>
+{
 	CleanDirectories(TEST_RESULTS);
 
 	Information("Build UITests project {0}",PROJECT.FullPath);
diff --git a/eng/pipelines/common/device-tests-steps.yml b/eng/pipelines/common/device-tests-steps.yml
index 4b75ef4cc3fc..a175c5b9d1ad 100644
--- a/eng/pipelines/common/device-tests-steps.yml
+++ b/eng/pipelines/common/device-tests-steps.yml
@@ -1,5 +1,5 @@
 parameters:
-  platform: '' # [ android, ios ]
+  platform: '' # [ android, ios, windows ]
   path: '' # path to csproj
   device: '' # the xharness device to use
   cakeArgs: '' # additional cake args
@@ -13,7 +13,12 @@ parameters:
 steps:
   - template: provision.yml
     parameters:
-      skipXcode: ${{ eq(parameters.platform, 'android') }}
+      ${{ if eq(parameters.platform, 'windows')}}:
+        platform: windows
+      ${{ if or(eq(parameters.platform, 'ios'), eq(parameters.platform, 'android'))}}:
+        platform: macos
+      skipXcode: ${{ or(eq(parameters.platform, 'android'), eq(parameters.platform, 'windows')) }}
+      skipProvisioning: ${{ eq(parameters.platform, 'windows') }}
       provisionatorChannel: ${{ parameters.provisionatorChannel }}
 
   - pwsh: ./build.ps1 --target=dotnet --configuration="Release" --verbosity=diagnostic
@@ -50,7 +55,7 @@ steps:
     - pwsh: ./build.ps1 --target=dotnet-buildtasks --configuration="Release"
       displayName: 'Build the MSBuild Tasks'
 
-  - pwsh: ./build.ps1 -Script eng/devices/${{ parameters.platform }}.cake --project="${{ parameters.path }}" --device=${{ parameters.device }} --results="$(TestResultsDirectory)" --binlog="$(LogDirectory)" ${{ parameters.cakeArgs }}
+  - pwsh: ./build.ps1 -Script eng/devices/${{ parameters.platform }}.cake --project="${{ parameters.path }}" --device=${{ parameters.device }} --packageid=${{ parameters.windowsPackageId }} --results="$(TestResultsDirectory)" --binlog="$(LogDirectory)" ${{ parameters.cakeArgs }}
     displayName: $(Agent.JobName)
     workingDirectory: ${{ parameters.checkoutDirectory }}
     retryCountOnTaskFailure: 2
@@ -60,8 +65,8 @@ steps:
     condition: always()
     inputs:
       testResultsFormat: xUnit
-      testResultsFiles: '$(TestResultsDirectory)/**/TestResults.xml'
-      testRunTitle: '$(System.PhaseName) (attempt: $(System.JobAttempt))'
+      testResultsFiles: '$(TestResultsDirectory)/**/TestResults*(-*).xml'
+      testRunTitle: '$(System.PhaseName)_${{ parameters.windowsPackageId }} (attempt: $(System.JobAttempt))'
 
   - task: PublishBuildArtifacts@1
     displayName: Publish Artifacts
diff --git a/eng/pipelines/common/device-tests.yml b/eng/pipelines/common/device-tests.yml
index c7774dfe4d1e..76da9e5d9274 100644
--- a/eng/pipelines/common/device-tests.yml
+++ b/eng/pipelines/common/device-tests.yml
@@ -46,6 +46,7 @@ stages:
             platform: android
             path: $(PROJECT_PATH) 
             device: $(DEVICE)
+            windowsPackageId: android # Only needed for Windows, will be ignored
             provisionatorChannel: ${{ parameters.provisionatorChannel }}
             agentPoolAccessToken: ${{ parameters.agentPoolAccessToken }}
             artifactName: ${{ parameters.artifactName }}
@@ -82,9 +83,42 @@ stages:
             platform: ios
             path: $(PROJECT_PATH)
             device: $(DEVICE)
+            windowsPackageId: ios # Only needed for Windows, will be ignored
             provisionatorChannel: ${{ parameters.provisionatorChannel }}
             agentPoolAccessToken: ${{ parameters.agentPoolAccessToken }}
             artifactName: ${{ parameters.artifactName }}
             artifactItemPattern: ${{ parameters.artifactItemPattern }}
             checkoutDirectory: ${{ parameters.checkoutDirectory }}
             useArtifacts: ${{ parameters.useArtifacts }}
+
+  - stage: windows_device_tests
+    displayName: Windows Device Tests
+    dependsOn: []
+    jobs:
+    - job: windows_device_tests
+      workspace:
+        clean: all
+      displayName: "Windows device tests"
+      pool:
+        vmImage: windows-latest
+      strategy:
+        matrix:
+          # create all the variables used for the matrix
+          ${{ each project in parameters.projects }}:
+            ${{ if ne(project.windows, '') }}:
+              ${{ replace(coalesce(project.desc, project.name), ' ', '_') }}:
+                PROJECT_PATH: ${{ project.windows }}
+                PACKAGE_ID: ${{ project.windowsPackageId }}
+      steps:
+        - template: device-tests-steps.yml
+          parameters:
+            platform: windows
+            path: $(PROJECT_PATH)
+            windowsPackageId: $(PACKAGE_ID)
+            device: windows
+            provisionatorChannel: ${{ parameters.provisionatorChannel }}
+            agentPoolAccessToken: ${{ parameters.agentPoolAccessToken }}
+            artifactName: ${{ parameters.artifactName }}
+            artifactItemPattern: ${{ parameters.artifactItemPattern }}
+            checkoutDirectory: ${{ parameters.checkoutDirectory }}
+            useArtifacts: ${{ parameters.useArtifacts }}
\ No newline at end of file
diff --git a/eng/pipelines/device-tests.yml b/eng/pipelines/device-tests.yml
index 362c6ed8ce70..f855e5ecc101 100644
--- a/eng/pipelines/device-tests.yml
+++ b/eng/pipelines/device-tests.yml
@@ -99,26 +99,38 @@ stages:
         - name: essentials
           desc: Essentials
           androidApiLevelsExclude: [25] # Ignore for now API25 since the runs's are not stable
+          windowsPackageId: 'com.microsoft.maui.essentials.devicetests'
           android: $(System.DefaultWorkingDirectory)/src/Essentials/test/DeviceTests/Essentials.DeviceTests.csproj
           ios: $(System.DefaultWorkingDirectory)/src/Essentials/test/DeviceTests/Essentials.DeviceTests.csproj
+          windows: $(System.DefaultWorkingDirectory)/src/Essentials/test/DeviceTests/Essentials.DeviceTests.csproj
         - name: graphics
           desc: Graphics
           androidApiLevelsExclude: [25] # Ignore for now API25 since the runs's are not stable
+          windowsPackageId: 'com.microsoft.maui.graphics.devicetests'
           android: $(System.DefaultWorkingDirectory)/src/Graphics/tests/DeviceTests/Graphics.DeviceTests.csproj
           ios: $(System.DefaultWorkingDirectory)/src/Graphics/tests/DeviceTests/Graphics.DeviceTests.csproj
+          windows: $(System.DefaultWorkingDirectory)/src/Graphics/tests/DeviceTests/Graphics.DeviceTests.csproj
         - name: core
           desc: Core
           androidApiLevelsExclude: [25] # Ignore for now API25 since the runs's are not stable
+          windowsPackageId: 'com.microsoft.maui.core.devicetests'
           android: $(System.DefaultWorkingDirectory)/src/Core/tests/DeviceTests/Core.DeviceTests.csproj
           ios: $(System.DefaultWorkingDirectory)/src/Core/tests/DeviceTests/Core.DeviceTests.csproj
+          # Skip this one for Windows for now, it's crashing sometimes
+          windows: #$(System.DefaultWorkingDirectory)/src/Core/tests/DeviceTests/Core.DeviceTests.csproj
         - name: controls
           desc: Controls
           androidApiLevelsExclude: [25] # Ignore for now API25 since the runs's are not stable
+          windowsPackageId: 'com.microsoft.maui.controls.devicetests'
           android: $(System.DefaultWorkingDirectory)/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj
           ios: $(System.DefaultWorkingDirectory)/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj
+          # Skip this one for Windows for now, it's crashing
+          windows: #$(System.DefaultWorkingDirectory)/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj
         - name: blazorwebview
           desc: BlazorWebView
           androidApiLevelsExclude: [ 27, 26, 25, 24, 23, 22, 21 ] # BlazorWebView requires a recent version of Chrome
+          windowsPackageId: 'Microsoft.Maui.MauiBlazorWebView.DeviceTests'
           android: $(System.DefaultWorkingDirectory)/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj
           ios: $(System.DefaultWorkingDirectory)/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj
+          windows: $(System.DefaultWorkingDirectory)/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj
 
diff --git a/src/BlazorWebView/tests/MauiDeviceTests/Elements/BlazorWebViewTests.cs b/src/BlazorWebView/tests/MauiDeviceTests/Elements/BlazorWebViewTests.cs
index 4ec2c18b4c41..a9568fa26c60 100644
--- a/src/BlazorWebView/tests/MauiDeviceTests/Elements/BlazorWebViewTests.cs
+++ b/src/BlazorWebView/tests/MauiDeviceTests/Elements/BlazorWebViewTests.cs
@@ -59,7 +59,11 @@ await InvokeOnMainThreadAsync(async () =>
 			});
 		}
 
-		[Fact]
+		[Fact
+#if WINDOWS
+			(Skip = "Times out on CoreWebView2.DOMContentLoaded")
+#endif
+			]
 		public async Task BlazorWebViewLogsRequests()
 		{
 			var testLoggerProvider = new TestLoggerProvider();
@@ -104,7 +108,11 @@ await InvokeOnMainThreadAsync(async () =>
 		}
 
 
-		[Fact]
+		[Fact
+#if WINDOWS
+			(Skip= "Times out on CoreWebView2.DOMContentLoaded")
+#endif
+			]
 		public async Task BlazorWebViewUsesStartPath()
 		{
 			EnsureHandlerCreated(additionalCreationActions: appBuilder =>
diff --git a/src/Controls/tests/DeviceTests/Platforms/Windows/Package.appxmanifest b/src/Controls/tests/DeviceTests/Platforms/Windows/Package.appxmanifest
index e139a38d9c31..dc2a162aa35f 100644
--- a/src/Controls/tests/DeviceTests/Platforms/Windows/Package.appxmanifest
+++ b/src/Controls/tests/DeviceTests/Platforms/Windows/Package.appxmanifest
@@ -6,10 +6,7 @@
   xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
   IgnorableNamespaces="uap rescap">
 
-  <Identity
-    Name="2C0C8B63-C6D1-48CC-A934-5108983E28EE"
-    Publisher="CN=User Name"
-    Version="1.0.0.0" />
+  <Identity Publisher="CN=User Name" />
 
   <Properties>
     <DisplayName>Controls Tests</DisplayName>
diff --git a/src/Core/tests/DeviceTests/Platforms/Windows/Package.appxmanifest b/src/Core/tests/DeviceTests/Platforms/Windows/Package.appxmanifest
index d7f315417912..1c7dcf3401a9 100644
--- a/src/Core/tests/DeviceTests/Platforms/Windows/Package.appxmanifest
+++ b/src/Core/tests/DeviceTests/Platforms/Windows/Package.appxmanifest
@@ -7,7 +7,7 @@
   IgnorableNamespaces="uap rescap">
 
   <Identity
-    Name="2C0C8B63-C6D1-48CC-A934-5108983E28CB"
+    Name="maui-package-name-placeholder"
     Publisher="CN=User Name"
     Version="1.0.0.0" />
 
diff --git a/src/Essentials/test/DeviceTests/Tests/AppActions_Tests.cs b/src/Essentials/test/DeviceTests/Tests/AppActions_Tests.cs
index ff0e2e1b3773..bd360d2ac51d 100644
--- a/src/Essentials/test/DeviceTests/Tests/AppActions_Tests.cs
+++ b/src/Essentials/test/DeviceTests/Tests/AppActions_Tests.cs
@@ -16,7 +16,7 @@ public void IsSupported()
 
 #if __ANDROID__
 			expectSupported = OperatingSystem.IsAndroidVersionAtLeast(25);
-#elif __IOS__
+#elif __IOS__ || WINDOWS
 			expectSupported = true;
 #endif
 
diff --git a/src/Essentials/test/DeviceTests/Tests/AppInfo_Tests.cs b/src/Essentials/test/DeviceTests/Tests/AppInfo_Tests.cs
index 8fbba0b2c43b..50fafeddefe3 100644
--- a/src/Essentials/test/DeviceTests/Tests/AppInfo_Tests.cs
+++ b/src/Essentials/test/DeviceTests/Tests/AppInfo_Tests.cs
@@ -18,11 +18,7 @@ public void AppName_Is_Correct()
 		[Fact]
 		public void AppPackageName_Is_Correct()
 		{
-#if WINDOWS_UWP || WINDOWS
-			Assert.Equal("CD693923-B3C2-4043-B044-F070046D2DAF", AppInfo.PackageName);
-#elif __IOS__
-			Assert.Equal("com.microsoft.maui.essentials.devicetests", AppInfo.PackageName);
-#elif __ANDROID__
+#if WINDOWS_UWP || WINDOWS || __IOS__ || __ANDROID__
 			Assert.Equal("com.microsoft.maui.essentials.devicetests", AppInfo.PackageName);
 #else
 			throw new PlatformNotSupportedException();
diff --git a/src/Essentials/test/DeviceTests/Tests/Battery_Tests.cs b/src/Essentials/test/DeviceTests/Tests/Battery_Tests.cs
index ed81389eef90..d343cdd2502a 100644
--- a/src/Essentials/test/DeviceTests/Tests/Battery_Tests.cs
+++ b/src/Essentials/test/DeviceTests/Tests/Battery_Tests.cs
@@ -8,7 +8,11 @@ namespace Microsoft.Maui.Essentials.DeviceTests
 	[Category("Battery")]
 	public class Battery_Tests
 	{
-		[Fact]
+		[Fact
+#if WINDOWS
+			(Skip = "Somehow reports -1 on the CI test runner")
+#endif
+			]
 		[Trait(Traits.Hardware.Battery, Traits.FeatureSupport.Supported)]
 		public void Charge_Level()
 		{
diff --git a/src/Essentials/test/DeviceTests/Tests/Launcher_Tests.cs b/src/Essentials/test/DeviceTests/Tests/Launcher_Tests.cs
index 8e94872da743..8836b0463784 100644
--- a/src/Essentials/test/DeviceTests/Tests/Launcher_Tests.cs
+++ b/src/Essentials/test/DeviceTests/Tests/Launcher_Tests.cs
@@ -17,10 +17,26 @@ public class Launcher_Tests
 		[InlineData("http://www.example.com")]
 		[InlineData("http://example.com/?query=blah")]
 		[InlineData("https://example.com/?query=blah")]
-		[InlineData("mailto://someone@microsoft.com")]
-		[InlineData("mailto://someone@microsoft.com?subject=test")]
-		[InlineData("tel:+1 555 010 9999")]
-		[InlineData("sms:5550109999")]
+		[InlineData("mailto://someone@microsoft.com"
+#if WINDOWS
+			, Skip = "Doesn't work on Windows on CI"
+#endif
+			)]
+		[InlineData("mailto://someone@microsoft.com?subject=test"
+#if WINDOWS
+			, Skip = "Doesn't work on Windows on CI"
+#endif
+			)]
+		[InlineData("tel:+1 555 010 9999"
+#if WINDOWS
+			, Skip = "Doesn't work on Windows on CI"
+#endif
+			)]
+		[InlineData("sms:5550109999"
+#if WINDOWS
+			, Skip = "Doesn't work on Windows on CI"
+#endif
+			)]
 		[Trait(Traits.InteractionType, Traits.InteractionTypes.Human)]
 		public Task Open(string uri)
 		{
@@ -31,10 +47,26 @@ public Task Open(string uri)
 		[InlineData("http://www.example.com")]
 		[InlineData("http://example.com/?query=blah")]
 		[InlineData("https://example.com/?query=blah")]
-		[InlineData("mailto://someone@microsoft.com")]
-		[InlineData("mailto://someone@microsoft.com?subject=test")]
-		[InlineData("tel:+1 555 010 9999")]
-		[InlineData("sms:5550109999")]
+		[InlineData("mailto://someone@microsoft.com"
+#if WINDOWS
+			, Skip = "Doesn't work on Windows on CI"
+#endif
+			)]
+		[InlineData("mailto://someone@microsoft.com?subject=test"
+#if WINDOWS
+			, Skip = "Doesn't work on Windows on CI"
+#endif
+			)]
+		[InlineData("tel:+1 555 010 9999"
+#if WINDOWS
+			, Skip = "Doesn't work on Windows on CI"
+#endif
+			)]
+		[InlineData("sms:5550109999"
+#if WINDOWS
+			, Skip = "Doesn't work on Windows on CI"
+#endif
+			)]
 		public async Task CanOpen(string uri)
 		{
 #if __IOS__
@@ -52,10 +84,26 @@ public async Task CanOpen(string uri)
 		[InlineData("http://www.example.com")]
 		[InlineData("http://example.com/?query=blah")]
 		[InlineData("https://example.com/?query=blah")]
-		[InlineData("mailto://someone@microsoft.com")]
-		[InlineData("mailto://someone@microsoft.com?subject=test")]
-		[InlineData("tel:+1 555 010 9999")]
-		[InlineData("sms:5550109999")]
+		[InlineData("mailto://someone@microsoft.com"
+#if WINDOWS
+			, Skip = "Doesn't work on Windows on CI"
+#endif
+			)]
+		[InlineData("mailto://someone@microsoft.com?subject=test"
+#if WINDOWS
+			, Skip = "Doesn't work on Windows on CI"
+#endif
+			)]
+		[InlineData("tel:+1 555 010 9999"
+#if WINDOWS
+			, Skip = "Doesn't work on Windows on CI"
+#endif
+			)]
+		[InlineData("sms:5550109999"
+#if WINDOWS
+			, Skip = "Doesn't work on Windows on CI"
+#endif
+			)]
 		public async Task CanOpenUri(string uri)
 		{
 #if __IOS__
diff --git a/src/Essentials/test/DeviceTests/Tests/Vibration_Tests.cs b/src/Essentials/test/DeviceTests/Tests/Vibration_Tests.cs
index f8a29856bfe2..f787b9440bd7 100644
--- a/src/Essentials/test/DeviceTests/Tests/Vibration_Tests.cs
+++ b/src/Essentials/test/DeviceTests/Tests/Vibration_Tests.cs
@@ -7,7 +7,11 @@ namespace Microsoft.Maui.Essentials.DeviceTests
 	[Category("Vibration")]
 	public class Vibration_Tests
 	{
-		[Fact]
+		[Fact
+#if WINDOWS
+			(Skip = "Not supported on Windows? See Vibration implementation")
+#endif
+			]
 		public void Vibrate()
 		{
 #if __ANDROID__
@@ -25,7 +29,11 @@ public void Vibrate()
 			Vibration.Vibrate();
 		}
 
-		[Fact]
+		[Fact
+#if WINDOWS
+			(Skip = "Not supported on Windows? See Vibration implementation")
+#endif
+			]
 		public void Vibrate_Cancel()
 		{
 #if __ANDROID__
diff --git a/src/TestUtils/src/DeviceTests.Runners/AppHostBuilderExtensions.cs b/src/TestUtils/src/DeviceTests.Runners/AppHostBuilderExtensions.cs
index 1159069966c2..e0bc0731ffeb 100644
--- a/src/TestUtils/src/DeviceTests.Runners/AppHostBuilderExtensions.cs
+++ b/src/TestUtils/src/DeviceTests.Runners/AppHostBuilderExtensions.cs
@@ -30,7 +30,7 @@ public static MauiAppBuilder UseHeadlessRunner(this MauiAppBuilder appHostBuilde
 		{
 			appHostBuilder.Services.AddSingleton(options);
 
-#if __ANDROID__ || __IOS__ || MACCATALYST
+#if __ANDROID__ || __IOS__ || MACCATALYST || WINDOWS
 			appHostBuilder.Services.AddTransient(svc => new HeadlessTestRunner(
 					svc.GetRequiredService<HeadlessRunnerOptions>(),
 					svc.GetRequiredService<TestOptions>()));
diff --git a/src/TestUtils/src/DeviceTests.Runners/HeadlessRunner/TestDevice.cs b/src/TestUtils/src/DeviceTests.Runners/HeadlessRunner/TestDevice.cs
index 1a2907acd305..11b1c943d706 100644
--- a/src/TestUtils/src/DeviceTests.Runners/HeadlessRunner/TestDevice.cs
+++ b/src/TestUtils/src/DeviceTests.Runners/HeadlessRunner/TestDevice.cs
@@ -22,5 +22,7 @@ class TestDevice : IDevice
 		public string SystemVersion => DeviceInfo.VersionString;
 
 		public string Locale => CultureInfo.CurrentCulture.Name;
+
+		public static bool RunHeadless = false;
 	}
 }
\ No newline at end of file
diff --git a/src/TestUtils/src/DeviceTests.Runners/HeadlessRunner/Windows/HeadlessTestRunner.cs b/src/TestUtils/src/DeviceTests.Runners/HeadlessRunner/Windows/HeadlessTestRunner.cs
new file mode 100644
index 000000000000..16edbbecb486
--- /dev/null
+++ b/src/TestUtils/src/DeviceTests.Runners/HeadlessRunner/Windows/HeadlessTestRunner.cs
@@ -0,0 +1,114 @@
+#nullable enable
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.DotNet.XHarness.TestRunners.Common;
+using Microsoft.DotNet.XHarness.TestRunners.Xunit;
+using Windows.ApplicationModel;
+
+namespace Microsoft.Maui.TestUtils.DeviceTests.Runners.HeadlessRunner
+{
+	public class HeadlessTestRunner : AndroidApplicationEntryPoint
+	{
+		public static string? TestResultsFile;
+
+		readonly HeadlessRunnerOptions _runnerOptions;
+		readonly TestOptions _options;
+		readonly string? _resultsPath;
+		TestLogger _logger;
+
+		public HeadlessTestRunner(HeadlessRunnerOptions runnerOptions, TestOptions options)
+		{
+			_runnerOptions = runnerOptions;
+			_options = options;
+			_resultsPath = TestResultsFile;
+			_logger = new();
+		}
+
+		protected override bool LogExcludedTests => true;
+
+		public override TextWriter? Logger => _logger;
+
+		public override string TestsResultsFinalPath => _resultsPath!;
+
+		protected override int? MaxParallelThreads => System.Environment.ProcessorCount;
+
+		protected override IDevice Device { get; } = new TestDevice();
+
+		protected override IEnumerable<TestAssemblyInfo> GetTestAssemblies() =>
+			_options.Assemblies
+				.Distinct()
+				.Select(assembly => new TestAssemblyInfo(assembly, assembly.Location));
+
+		protected override void TerminateWithSuccess() {
+			Microsoft.UI.Xaml.Application.Current.Exit();
+		}
+
+		protected override TestRunner GetTestRunner(LogWriter logWriter)
+		{
+			var testRunner = base.GetTestRunner(logWriter);
+
+			if (_options.SkipCategories?.Count > 0)
+				testRunner.SkipCategories(_options.SkipCategories);
+
+			return testRunner;
+		}
+
+		public async Task<string?> RunTestsAsync()
+		{
+			TestsCompleted += OnTestsCompleted;
+
+			try
+			{
+				await RunAsync();
+			}
+			catch (System.Exception ex)
+			{
+				_logger.WriteLine(ex.ToString());
+			}
+			TestsCompleted -= OnTestsCompleted;
+
+			if (File.Exists(TestsResultsFinalPath))
+				return TestsResultsFinalPath;
+
+			return null;
+
+			void OnTestsCompleted(object? sender, TestRunResult results)
+			{
+				var message =
+					$"Tests run: {results.ExecutedTests} " +
+					$"Passed: {results.PassedTests} " +
+					$"Inconclusive: {results.InconclusiveTests} " +
+					$"Failed: {results.FailedTests} " +
+					$"Ignored: {results.SkippedTests}";
+
+				_logger.WriteLine("test-execution-summary" + message);
+				_logger.WriteLine("return-code " + (results.FailedTests == 0 ? 0 : 1));
+			}
+		}
+	}
+
+	public class TestLogger : System.IO.TextWriter
+	{
+		public TestLogger()
+		{
+		}
+
+		public override void Write(char value)
+		{
+			Console.Write(value);
+			System.Diagnostics.Debug.Write(value);
+		}
+
+		public override void WriteLine(string? value)
+		{
+			Console.WriteLine(value);
+			System.Diagnostics.Debug.WriteLine(value);
+		}
+
+		public override Encoding Encoding => Encoding.Default;
+	}
+}
\ No newline at end of file
diff --git a/src/TestUtils/src/DeviceTests.Runners/VisualRunner/Pages/HomePage.xaml.cs b/src/TestUtils/src/DeviceTests.Runners/VisualRunner/Pages/HomePage.xaml.cs
index b953cd598099..0b2b7259ac5c 100644
--- a/src/TestUtils/src/DeviceTests.Runners/VisualRunner/Pages/HomePage.xaml.cs
+++ b/src/TestUtils/src/DeviceTests.Runners/VisualRunner/Pages/HomePage.xaml.cs
@@ -1,5 +1,10 @@
 #nullable enable
+using System;
+using System.Diagnostics;
+using System.Linq;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Maui.Controls;
+using Microsoft.Maui.TestUtils.DeviceTests.Runners.HeadlessRunner;
 
 namespace Microsoft.Maui.TestUtils.DeviceTests.Runners.VisualRunner.Pages
 {
@@ -8,6 +13,31 @@ partial class HomePage : ContentPage
 		public HomePage()
 		{
 			InitializeComponent();
+
+			this.Loaded += HomePage_Loaded;
+		}
+
+		bool hasRunHeadless = false;
+
+		private async void HomePage_Loaded(object? sender, System.EventArgs e)
+		{
+			string? testResultsFile = null;
+
+#if WINDOWS
+			var cliArgs = Environment.GetCommandLineArgs();
+			if (cliArgs.Length > 1)
+				testResultsFile = HeadlessTestRunner.TestResultsFile = cliArgs.Skip(1).FirstOrDefault();
+#endif
+
+			if (!string.IsNullOrEmpty(testResultsFile) && !hasRunHeadless)
+			{
+				hasRunHeadless = true;
+
+				var headlessRunner = this.Handler!.MauiContext!.Services.GetRequiredService<HeadlessTestRunner>();
+				await headlessRunner.RunTestsAsync();
+
+				Process.GetCurrentProcess().Kill();
+			}
 		}
 
 		protected override void OnAppearing()

From cff457c0df0b4ead61bf0a37c40f097224fc94a8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jul 2023 12:17:37 +0000
Subject: [PATCH 093/105] Bump powershell from 7.3.5 to 7.3.6 (#16167)

Bumps [powershell](https://github.com/PowerShell/PowerShell) from 7.3.5 to 7.3.6.
- [Release notes](https://github.com/PowerShell/PowerShell/releases)
- [Commits](https://github.com/PowerShell/PowerShell/compare/v7.3.5...v7.3.6)

---
updated-dependencies:
- dependency-name: powershell
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .config/dotnet-tools.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 5940215622dc..3c6a925d182e 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -9,7 +9,7 @@
       ]
     },
     "powershell": {
-      "version": "7.3.5",
+      "version": "7.3.6",
       "commands": [
         "pwsh"
       ]

From 83dc41a75c007606db1f07382ff641c16b5c441c Mon Sep 17 00:00:00 2001
From: Eilon Lipton <Eilon@users.noreply.github.com>
Date: Mon, 17 Jul 2023 05:32:13 -0700
Subject: [PATCH 094/105] Add VS Feedback and VS Code links to bug report
 template list (#16121)

* Add VS Feedback link to bug report template list

Maybe this will help direct VS-specific issues to the most appropriate location.

* Add VS Code repo link

* Apply suggestions from code review

---------

Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com>
---
 .github/ISSUE_TEMPLATE/config.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index df61e234afd2..1618a51ae441 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,11 @@
 blank_issues_enabled: true
 contact_links:
   - name: .NET MAUI Community Support
-    url: https://docs.microsoft.com/answers/topics/dotnet-maui.html
+    url: https://learn.microsoft.com/answers/topics/dotnet-maui.html
     about: Please ask and answer questions here.
+  - name: Bug report or feature request for Visual Studio for Windows and Mac
+    url: https://learn.microsoft.com/visualstudio/ide/how-to-report-a-problem-with-visual-studio?view=vs-2022
+    about: Use Visual Studio's Report a Problem feature for issues and suggestions with Visual Studio tooling
+  - name: Bug report or feature request for Visual Studio Code (including C# Dev Kit)
+    url: https://github.com/microsoft/vscode-dotnettools/issues
+    about: Use the microsoft/vscode-dotnettools repo to report issues with Visual Studio Code

From c30da248d6621a5bc76808f247403e1deaec9948 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 17 Jul 2023 14:28:43 +0000
Subject: [PATCH 095/105] [create-pull-request] automated change (#16033)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .../Core/Handlers/Items/Android/ItemsSources/EmptySource.cs | 2 +-
 .../Elements/AlertDialog/AlertDialogTests.Android.cs        | 6 +++---
 .../Elements/CollectionView/CollectionViewTests.Android.cs  | 2 +-
 .../Elements/CollectionView/CollectionViewTests.cs          | 2 +-
 src/Core/src/Handlers/Picker/PickerHandler.Android.cs       | 2 +-
 src/Core/src/Platform/Windows/SearchBarExtensions.cs        | 4 ++--
 src/Core/src/Platform/iOS/MauiView.cs                       | 2 +-
 .../DeviceTests/Handlers/SearchBar/SearchBarHandlerTests.cs | 2 +-
 .../HeadlessRunner/Windows/HeadlessTestRunner.cs            | 3 ++-
 9 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/Controls/src/Core/Handlers/Items/Android/ItemsSources/EmptySource.cs b/src/Controls/src/Core/Handlers/Items/Android/ItemsSources/EmptySource.cs
index c85c3213cc93..b39c887c2329 100644
--- a/src/Controls/src/Core/Handlers/Items/Android/ItemsSources/EmptySource.cs
+++ b/src/Controls/src/Core/Handlers/Items/Android/ItemsSources/EmptySource.cs
@@ -3,7 +3,7 @@ namespace Microsoft.Maui.Controls.Handlers.Items
 {
 	sealed internal class EmptySource : IItemsViewSource
 	{
-		public int Count => (HasHeader? 1 : 0) + (HasFooter? 1 : 0);
+		public int Count => (HasHeader ? 1 : 0) + (HasFooter ? 1 : 0);
 
 		public bool HasHeader { get; set; }
 		public bool HasFooter { get; set; }
diff --git a/src/Controls/tests/DeviceTests/Elements/AlertDialog/AlertDialogTests.Android.cs b/src/Controls/tests/DeviceTests/Elements/AlertDialog/AlertDialogTests.Android.cs
index 4f541067ac8a..ea05c000895b 100644
--- a/src/Controls/tests/DeviceTests/Elements/AlertDialog/AlertDialogTests.Android.cs
+++ b/src/Controls/tests/DeviceTests/Elements/AlertDialog/AlertDialogTests.Android.cs
@@ -3,15 +3,15 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Android.Graphics;
+using AndroidX.AppCompat.App;
 using Microsoft.Maui.DeviceTests.Stubs;
 using Microsoft.Maui.Platform;
 using Xunit;
-using AndroidX.AppCompat.App;
-using Android.Graphics;
 
 namespace Microsoft.Maui.DeviceTests
 {
-	public partial class AlertDialogTests: ControlsHandlerTestBase
+	public partial class AlertDialogTests : ControlsHandlerTestBase
 	{
 
 		async Task<Color> GetDialogButtonTextColor(int nightMode)
diff --git a/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.Android.cs b/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.Android.cs
index ba3c607e4acc..2c7296d1db2d 100644
--- a/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.Android.cs
+++ b/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.Android.cs
@@ -52,7 +52,7 @@ await CreateHandlerAndAddToWindow<IWindowHandler>(rootPage,
 		}
 
 		[Fact]
-		public async Task NullItemsSourceDisplaysHeaderFooterAndEmptyView() 
+		public async Task NullItemsSourceDisplaysHeaderFooterAndEmptyView()
 		{
 			SetupBuilder();
 
diff --git a/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.cs b/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.cs
index 9e9725c879be..aa24faf6746f 100644
--- a/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.cs
@@ -179,7 +179,7 @@ await CreateHandlerAndAddToWindow<LayoutHandler>(layout, async handler =>
 		[InlineData(false, false, true)]
 		[InlineData(false, true, false)]
 		[InlineData(false, true, true)]
-		public async Task CollectionViewStructuralItems(bool hasHeader, bool hasFooter, bool hasData) 
+		public async Task CollectionViewStructuralItems(bool hasHeader, bool hasFooter, bool hasData)
 		{
 			SetupBuilder();
 
diff --git a/src/Core/src/Handlers/Picker/PickerHandler.Android.cs b/src/Core/src/Handlers/Picker/PickerHandler.Android.cs
index 7b087aaf5b14..27c742bd88e3 100644
--- a/src/Core/src/Handlers/Picker/PickerHandler.Android.cs
+++ b/src/Core/src/Handlers/Picker/PickerHandler.Android.cs
@@ -5,8 +5,8 @@
 using Android.Graphics.Drawables;
 using Android.Text;
 using Android.Text.Style;
-using AResource = Android.Resource;
 using AppCompatAlertDialog = AndroidX.AppCompat.App.AlertDialog;
+using AResource = Android.Resource;
 
 namespace Microsoft.Maui.Handlers
 {
diff --git a/src/Core/src/Platform/Windows/SearchBarExtensions.cs b/src/Core/src/Platform/Windows/SearchBarExtensions.cs
index 42f66c9f8680..93e69667f358 100644
--- a/src/Core/src/Platform/Windows/SearchBarExtensions.cs
+++ b/src/Core/src/Platform/Windows/SearchBarExtensions.cs
@@ -140,9 +140,9 @@ public static void UpdateIsTextPredictionEnabled(this AutoSuggestBox platformCon
 
 		public static void UpdateIsSpellCheckEnabled(this AutoSuggestBox platformControl, ISearchBar searchBar)
 		{
-			var textBox = platformControl.GetFirstDescendant<TextBox> ();
+			var textBox = platformControl.GetFirstDescendant<TextBox>();
 
-			if (textBox is null) 
+			if (textBox is null)
 				return;
 
 			textBox.UpdateIsSpellCheckEnabled(searchBar);
diff --git a/src/Core/src/Platform/iOS/MauiView.cs b/src/Core/src/Platform/iOS/MauiView.cs
index 94aae52ad420..83375f185e38 100644
--- a/src/Core/src/Platform/iOS/MauiView.cs
+++ b/src/Core/src/Platform/iOS/MauiView.cs
@@ -68,7 +68,7 @@ public override void SafeAreaInsetsDidChange()
 				isav2.SafeAreaInsets = this.SafeAreaInsets.ToThickness();
 		}
 
-   		public ICrossPlatformLayout? CrossPlatformLayout
+		public ICrossPlatformLayout? CrossPlatformLayout
 		{
 			get => _crossPlatformLayoutReference != null && _crossPlatformLayoutReference.TryGetTarget(out var v) ? v : null;
 			set => _crossPlatformLayoutReference = value == null ? null : new WeakReference<ICrossPlatformLayout>(value);
diff --git a/src/Core/tests/DeviceTests/Handlers/SearchBar/SearchBarHandlerTests.cs b/src/Core/tests/DeviceTests/Handlers/SearchBar/SearchBarHandlerTests.cs
index 5b7e6d84e80d..a3404280b621 100644
--- a/src/Core/tests/DeviceTests/Handlers/SearchBar/SearchBarHandlerTests.cs
+++ b/src/Core/tests/DeviceTests/Handlers/SearchBar/SearchBarHandlerTests.cs
@@ -69,7 +69,7 @@ await ValidatePropertyUpdatesValue(
 		[InlineData(false)]
 		public async Task IsTextPredictionEnabledInitializesCorrectly(bool isEnabled)
 		{
-			var searchBar = new SearchBarStub() 
+			var searchBar = new SearchBarStub()
 			{
 				IsTextPredictionEnabled = isEnabled
 			};
diff --git a/src/TestUtils/src/DeviceTests.Runners/HeadlessRunner/Windows/HeadlessTestRunner.cs b/src/TestUtils/src/DeviceTests.Runners/HeadlessRunner/Windows/HeadlessTestRunner.cs
index 16edbbecb486..df37445ee86e 100644
--- a/src/TestUtils/src/DeviceTests.Runners/HeadlessRunner/Windows/HeadlessTestRunner.cs
+++ b/src/TestUtils/src/DeviceTests.Runners/HeadlessRunner/Windows/HeadlessTestRunner.cs
@@ -43,7 +43,8 @@ protected override IEnumerable<TestAssemblyInfo> GetTestAssemblies() =>
 				.Distinct()
 				.Select(assembly => new TestAssemblyInfo(assembly, assembly.Location));
 
-		protected override void TerminateWithSuccess() {
+		protected override void TerminateWithSuccess()
+		{
 			Microsoft.UI.Xaml.Application.Current.Exit();
 		}
 

From 19c441d00d0989ecc0a92ece1b7dbbbcc4e35536 Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Mon, 17 Jul 2023 11:06:29 -0500
Subject: [PATCH 096/105] Enable WinUI Core Tests on CI (#15885)

* Fix WinUI test issues

* - enable core tests

* - core test fixes

* - ignore semantics tests

* - fix

* - syntax errors
---
 eng/pipelines/device-tests.yml                       |  2 +-
 .../tests/DeviceTests/ControlsHandlerTestBase.cs     |  7 -------
 .../HandlerTests/HandlerTestBaseOfT.Tests.cs         |  4 ++--
 .../DeviceTests.Shared/HandlerTests/TestBase.cs      |  8 ++++++++
 .../HandlerTests/TextInput/TextInputHandlerTests.cs  |  6 +++++-
 .../ActivityIndicatorHandlerTests.Windows.cs         | 12 ++++++++++++
 .../ActivityIndicatorHandlerTests.cs                 |  6 +++++-
 .../Handlers/SwipeView/SwipeViewHandlerTests.cs      |  6 ++++--
 .../Handlers/Switch/SwitchHandlerTests.cs            |  6 +++++-
 .../Handlers/WebView/WebViewHandlerTests.Windows.cs  |  2 +-
 src/Core/tests/DeviceTests/Stubs/BorderStub.cs       | 12 ++++++++++++
 11 files changed, 55 insertions(+), 16 deletions(-)

diff --git a/eng/pipelines/device-tests.yml b/eng/pipelines/device-tests.yml
index f855e5ecc101..bbeff7164ebd 100644
--- a/eng/pipelines/device-tests.yml
+++ b/eng/pipelines/device-tests.yml
@@ -117,7 +117,7 @@ stages:
           android: $(System.DefaultWorkingDirectory)/src/Core/tests/DeviceTests/Core.DeviceTests.csproj
           ios: $(System.DefaultWorkingDirectory)/src/Core/tests/DeviceTests/Core.DeviceTests.csproj
           # Skip this one for Windows for now, it's crashing sometimes
-          windows: #$(System.DefaultWorkingDirectory)/src/Core/tests/DeviceTests/Core.DeviceTests.csproj
+          windows: $(System.DefaultWorkingDirectory)/src/Core/tests/DeviceTests/Core.DeviceTests.csproj
         - name: controls
           desc: Controls
           androidApiLevelsExclude: [25] # Ignore for now API25 since the runs's are not stable
diff --git a/src/Controls/tests/DeviceTests/ControlsHandlerTestBase.cs b/src/Controls/tests/DeviceTests/ControlsHandlerTestBase.cs
index 726705ba3777..85f64df0839a 100644
--- a/src/Controls/tests/DeviceTests/ControlsHandlerTestBase.cs
+++ b/src/Controls/tests/DeviceTests/ControlsHandlerTestBase.cs
@@ -17,13 +17,6 @@
 
 namespace Microsoft.Maui.DeviceTests
 {
-	// Uncomment these sections if you hit issues with parallel executions
-	//[CollectionDefinition("Non-Parallel Collection", DisableParallelization = true)]
-	//public class NonParallelCollectionDefinitionClass
-	//{
-	//}
-
-	//[Collection("Non-Parallel Collection")]
 	public partial class ControlsHandlerTestBase : HandlerTestBase, IDisposable
 	{
 		// In order to run any page level tests android needs to add itself to the decor view inside a new fragment
diff --git a/src/Core/tests/DeviceTests.Shared/HandlerTests/HandlerTestBaseOfT.Tests.cs b/src/Core/tests/DeviceTests.Shared/HandlerTests/HandlerTestBaseOfT.Tests.cs
index 9efa02013836..ace1ed02aa23 100644
--- a/src/Core/tests/DeviceTests.Shared/HandlerTests/HandlerTestBaseOfT.Tests.cs
+++ b/src/Core/tests/DeviceTests.Shared/HandlerTests/HandlerTestBaseOfT.Tests.cs
@@ -79,7 +79,7 @@ public virtual async Task SetVisibility(Visibility visibility)
 		}
 
 		[Fact(DisplayName = "Setting Semantic Description makes element accessible")]
-		public async Task SettingSemanticDescriptionMakesElementAccessible()
+		public async virtual Task SettingSemanticDescriptionMakesElementAccessible()
 		{
 			var view = new TStub();
 			MockAccessibilityExpectations(view);
@@ -91,7 +91,7 @@ public async Task SettingSemanticDescriptionMakesElementAccessible()
 		}
 
 		[Fact(DisplayName = "Setting Semantic Hint makes element accessible")]
-		public async Task SettingSemanticHintMakesElementAccessible()
+		public async virtual Task SettingSemanticHintMakesElementAccessible()
 		{
 			var view = new TStub();
 			MockAccessibilityExpectations(view);
diff --git a/src/Core/tests/DeviceTests.Shared/HandlerTests/TestBase.cs b/src/Core/tests/DeviceTests.Shared/HandlerTests/TestBase.cs
index d5eaf4fe5b59..3cf52b08fc16 100644
--- a/src/Core/tests/DeviceTests.Shared/HandlerTests/TestBase.cs
+++ b/src/Core/tests/DeviceTests.Shared/HandlerTests/TestBase.cs
@@ -2,9 +2,17 @@
 using System.Threading.Tasks;
 using Microsoft.Maui.Dispatching;
 using Microsoft.Maui.TestUtils.DeviceTests.Runners;
+using Xunit;
 
 namespace Microsoft.Maui.DeviceTests
 {
+	//// Uncomment these sections if you hit issues with parallel executions
+	//[CollectionDefinition("Non-Parallel Collection", DisableParallelization = true)]
+	//public class NonParallelCollectionDefinitionClass
+	//{
+	//}
+
+	[Collection("Non-Parallel Collection")]
 	public partial class TestBase
 	{
 		public const int EmCoefficientPrecision = 4;
diff --git a/src/Core/tests/DeviceTests.Shared/HandlerTests/TextInput/TextInputHandlerTests.cs b/src/Core/tests/DeviceTests.Shared/HandlerTests/TextInput/TextInputHandlerTests.cs
index b2c4e0f2a8e2..3f50b6588436 100644
--- a/src/Core/tests/DeviceTests.Shared/HandlerTests/TextInput/TextInputHandlerTests.cs
+++ b/src/Core/tests/DeviceTests.Shared/HandlerTests/TextInput/TextInputHandlerTests.cs
@@ -56,7 +56,11 @@ public async Task TextChangedEventsFireCorrectly(string initialText, string newT
 				Assert.Equal(0, eventFiredCount);
 		}
 
-		[Fact]
+		[Fact
+#if WINDOWS
+			(Skip = "Failing on Windows")
+#endif
+			]
 		public async Task CursorPositionDoesntResetWhenNativeTextValueChanges()
 		{
 			var textInput = new TStub()
diff --git a/src/Core/tests/DeviceTests/Handlers/ActivityIndicator/ActivityIndicatorHandlerTests.Windows.cs b/src/Core/tests/DeviceTests/Handlers/ActivityIndicator/ActivityIndicatorHandlerTests.Windows.cs
index 0f9043211ea5..88424a0bc7b6 100644
--- a/src/Core/tests/DeviceTests/Handlers/ActivityIndicator/ActivityIndicatorHandlerTests.Windows.cs
+++ b/src/Core/tests/DeviceTests/Handlers/ActivityIndicator/ActivityIndicatorHandlerTests.Windows.cs
@@ -13,5 +13,17 @@ ProgressRing GetNativeActivityIndicator(ActivityIndicatorHandler activityIndicat
 
 		bool GetNativeIsRunning(ActivityIndicatorHandler activityIndicatorHandler) =>
 			GetNativeActivityIndicator(activityIndicatorHandler).IsActive;
+
+		[Fact(Skip = "Failing on Windows")]
+		public override Task SettingSemanticDescriptionMakesElementAccessible()
+		{
+			return base.SettingSemanticDescriptionMakesElementAccessible();
+		}
+
+		[Fact(Skip = "Failing on Windows")]
+		public override Task SettingSemanticHintMakesElementAccessible()
+		{
+			return base.SettingSemanticHintMakesElementAccessible();
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Handlers/ActivityIndicator/ActivityIndicatorHandlerTests.cs b/src/Core/tests/DeviceTests/Handlers/ActivityIndicator/ActivityIndicatorHandlerTests.cs
index 75940ca3eeea..72e78166f0d3 100644
--- a/src/Core/tests/DeviceTests/Handlers/ActivityIndicator/ActivityIndicatorHandlerTests.cs
+++ b/src/Core/tests/DeviceTests/Handlers/ActivityIndicator/ActivityIndicatorHandlerTests.cs
@@ -22,7 +22,11 @@ public async Task IsRunningInitializesCorrectly(bool isRunning)
 			await ValidatePropertyInitValue(activityIndicator, () => activityIndicator.IsRunning, GetNativeIsRunning, activityIndicator.IsRunning);
 		}
 
-		[Fact(DisplayName = "Background Updates Correctly")]
+		[Fact(DisplayName = "Background Updates Correctly"
+#if WINDOWS
+			, Skip = "Failing on Windows"
+#endif
+			)]
 		public async Task BackgroundUpdatesCorrectly()
 		{
 			var activityIndicator = new ActivityIndicatorStub()
diff --git a/src/Core/tests/DeviceTests/Handlers/SwipeView/SwipeViewHandlerTests.cs b/src/Core/tests/DeviceTests/Handlers/SwipeView/SwipeViewHandlerTests.cs
index 84403a366a01..db8b65cc6220 100644
--- a/src/Core/tests/DeviceTests/Handlers/SwipeView/SwipeViewHandlerTests.cs
+++ b/src/Core/tests/DeviceTests/Handlers/SwipeView/SwipeViewHandlerTests.cs
@@ -1,10 +1,12 @@
-using Microsoft.Maui.DeviceTests.Stubs;
+using System.Threading.Tasks;
+using Microsoft.Maui.DeviceTests.Stubs;
 
 namespace Microsoft.Maui.DeviceTests
 {
+#if !WINDOWS
 	[Category(TestCategory.SwipeView)]
 	public partial class SwipeViewHandlerTests : CoreHandlerTestBase<SwipeViewHandler, SwipeViewStub>
 	{
-
 	}
+#endif
 }
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Handlers/Switch/SwitchHandlerTests.cs b/src/Core/tests/DeviceTests/Handlers/Switch/SwitchHandlerTests.cs
index 47801f695a39..fba9e3b4e50e 100644
--- a/src/Core/tests/DeviceTests/Handlers/Switch/SwitchHandlerTests.cs
+++ b/src/Core/tests/DeviceTests/Handlers/Switch/SwitchHandlerTests.cs
@@ -95,7 +95,11 @@ public async Task NullThumbColorDoesntCrash()
 			await CreateHandlerAsync(switchStub);
 		}
 
-		[Fact(DisplayName = "Thumb Color Updates Correctly")]
+		[Fact(DisplayName = "Thumb Color Updates Correctly"
+#if WINDOWS
+			, Skip = "Failing on Windows"
+#endif
+			)]
 		public async Task ThumbColorUpdatesCorrectly()
 		{
 			var switchStub = new SwitchStub()
diff --git a/src/Core/tests/DeviceTests/Handlers/WebView/WebViewHandlerTests.Windows.cs b/src/Core/tests/DeviceTests/Handlers/WebView/WebViewHandlerTests.Windows.cs
index 58f495fa3148..0b10fb3f91d6 100644
--- a/src/Core/tests/DeviceTests/Handlers/WebView/WebViewHandlerTests.Windows.cs
+++ b/src/Core/tests/DeviceTests/Handlers/WebView/WebViewHandlerTests.Windows.cs
@@ -78,13 +78,13 @@ await InvokeOnMainThreadAsync(async () =>
 				handler.PlatformView.NavigationCompleted += (_, _) =>
 				{
 					navigationComplete?.SetResult();
-					navigationComplete = null;
 				};
 
 				await AttachAndRun(webView, async (handler) =>
 				{
 					await handler.PlatformView.OnLoadedAsync();
 					await navigationComplete.Task;
+					navigationComplete = null;
 				});
 			});
 		}
diff --git a/src/Core/tests/DeviceTests/Stubs/BorderStub.cs b/src/Core/tests/DeviceTests/Stubs/BorderStub.cs
index 530a0bd0916a..23f7a0dc49a4 100644
--- a/src/Core/tests/DeviceTests/Stubs/BorderStub.cs
+++ b/src/Core/tests/DeviceTests/Stubs/BorderStub.cs
@@ -26,6 +26,7 @@ public partial class BorderStub : StubBase, IBorderView
 
 		public float StrokeMiterLimit { get; set; }
 
+#if !WINDOWS
 		public Size CrossPlatformArrange(Rect bounds)
 		{
 			return Size.Zero;
@@ -35,5 +36,16 @@ public Size CrossPlatformMeasure(double widthConstraint, double heightConstraint
 		{
 			return Size.Zero;
 		}
+#else
+		public Size CrossPlatformMeasure(double widthConstraint, double heightConstraint)
+		{
+			return (PresentedContent ?? (Content as IView))?.Measure(widthConstraint, heightConstraint) ?? Size.Zero;
+		}
+
+		public Size CrossPlatformArrange(Rect bounds)
+		{
+			return (PresentedContent ?? (Content as IView))?.Arrange(bounds) ?? Size.Zero;
+		}
+#endif
 	}
 }
\ No newline at end of file

From 443d3a028b7766a7e53a63f9aad7c8f8e62e197e Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Mon, 17 Jul 2023 20:37:07 -0500
Subject: [PATCH 097/105] [controls] fix memory leak with Grid
 Row/ColumnDefinitions (#16145)

Context: https://github.com/dotnet/maui/issues/15860

In a customer's app, they have the setup:

    <!-- Resources/Styles/Styles.xaml -->
    <Style TargetType="Grid" x:Key="GridStyleWithColumnDefinitions">
        <Setter Property="ColumnDefinitions" Value="18,*"/>
    </Style>

Then a page with:

    <Grid Style="{StaticResource GridStyleWithColumnDefinitions}" />

Navigating forward & back from this page would show that the entire
`Page` would live forever! What is interesting, is simply removing the
Grid's `Style` solved the problem?!?

I narrowed this down to a unit test:

    [Fact]
    public async Task ColumnDefinitionDoesNotLeak()
    {
        // Long-lived column, like from a Style in App.Resources
        var column = new ColumnDefinition();
        WeakReference reference;

        {
            var grid = new Grid();
            grid.ColumnDefinitions.Add(column);
            reference = new(grid);
        }

        await Task.Yield();
        GC.Collect();
        GC.WaitForPendingFinalizers();

        Assert.False(reference.IsAlive, "Grid should not be alive!");
    }

https://github.com/dotnet/maui/blob/cda3eb3381cfb686567ed05e3eb8e8f26c02d785/src/Controls/src/Core/Layout/Grid.cs#L20

`Grid` subscribes to `DefinitionCollection<T>.ItemSizeChanged`, and in
this case the `DefinitionCollection<T>` lived indefinitely in an
application-wide `ResourceDictionary`.

The simplest solution is to make the `ItemSizeChanged` event use
`WeakEventManager` as was done for other events like
`Application.RequestedThemeChanged`:

https://github.com/dotnet/maui/blob/cda3eb3381cfb686567ed05e3eb8e8f26c02d785/src/Controls/src/Core/Application/Application.cs#L221-L225

Since MAUI owns the property, we can use the simple solution here.

This is one issue solved in the customer app, but I will need to retest
the app in #15860 to see if there are further issues.
---
 src/Controls/src/Core/DefinitionCollection.cs | 11 +++--
 .../Core.UnitTests/Layouts/GridLayoutTests.cs | 44 ++++++++++++++++++-
 2 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/src/Controls/src/Core/DefinitionCollection.cs b/src/Controls/src/Core/DefinitionCollection.cs
index 1afc4215de9b..02e34c7d5bf0 100644
--- a/src/Controls/src/Core/DefinitionCollection.cs
+++ b/src/Controls/src/Core/DefinitionCollection.cs
@@ -7,6 +7,7 @@ namespace Microsoft.Maui.Controls
 {
 	public class DefinitionCollection<T> : IList<T>, ICollection<T> where T : IDefinition
 	{
+		readonly WeakEventManager _weakEventManager = new WeakEventManager();
 		readonly List<T> _internalList;
 
 		internal DefinitionCollection() => _internalList = new List<T>();
@@ -101,13 +102,15 @@ public void RemoveAt(int index)
 			OnItemSizeChanged(this, EventArgs.Empty);
 		}
 
-		public event EventHandler ItemSizeChanged;
+		public event EventHandler ItemSizeChanged
+		{
+			add => _weakEventManager.AddEventHandler(value);
+			remove => _weakEventManager.RemoveEventHandler(value);
+		}
 
 		void OnItemSizeChanged(object sender, EventArgs e)
 		{
-			EventHandler eh = ItemSizeChanged;
-			if (eh != null)
-				eh(this, EventArgs.Empty);
+			_weakEventManager.HandleEvent(this, e, nameof(ItemSizeChanged));
 		}
 	}
 }
diff --git a/src/Controls/tests/Core.UnitTests/Layouts/GridLayoutTests.cs b/src/Controls/tests/Core.UnitTests/Layouts/GridLayoutTests.cs
index c87a85c04be9..77cb5f9c6a66 100644
--- a/src/Controls/tests/Core.UnitTests/Layouts/GridLayoutTests.cs
+++ b/src/Controls/tests/Core.UnitTests/Layouts/GridLayoutTests.cs
@@ -1,4 +1,6 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 using NSubstitute;
 using Xunit;
 
@@ -184,5 +186,45 @@ public void ColumnDefinitionsGetBindingContext()
 
 			Assert.Equal(def2.BindingContext, context);
 		}
+
+		[Fact]
+		public async Task ColumnDefinitionDoesNotLeak()
+		{
+			// Long-lived column, like from a Style in App.Resources
+			var column = new ColumnDefinition();
+			WeakReference reference;
+
+			{
+				var grid = new Grid();
+				grid.ColumnDefinitions.Add(column);
+				reference = new(grid);
+			}
+
+			await Task.Yield();
+			GC.Collect();
+			GC.WaitForPendingFinalizers();
+
+			Assert.False(reference.IsAlive, "Grid should not be alive!");
+		}
+
+		[Fact]
+		public async Task RowDefinitionDoesNotLeak()
+		{
+			// Long-lived row, like from a Style in App.Resources
+			var row = new RowDefinition();
+			WeakReference reference;
+
+			{
+				var grid = new Grid();
+				grid.RowDefinitions.Add(row);
+				reference = new(grid);
+			}
+
+			await Task.Yield();
+			GC.Collect();
+			GC.WaitForPendingFinalizers();
+
+			Assert.False(reference.IsAlive, "Grid should not be alive!");
+		}
 	}
 }

From ea5af2a2e542f2c32d5346d04bc043e79d7b5b6b Mon Sep 17 00:00:00 2001
From: moljac <mcvjetko@holisticware.net>
Date: Tue, 18 Jul 2023 18:33:13 +0200
Subject: [PATCH 098/105] Android Ecosystem 20230714 net7.0 nuget bumps fix
 issue 16074 type renaming (#16176)

* android ecosystem package version bumps after alignment publish

* Update Directory.Build.targets
---
 eng/AndroidX.targets                          | 26 +++++++++----------
 eng/Versions.props                            |  8 +++---
 ...ompatibility.ControlGallery.Android.csproj | 12 ++++-----
 .../Embedding.Droid/Directory.Build.targets   |  8 +++---
 .../Android/Compatibility.Maps.Android.csproj |  6 ++---
 .../Compatibility.Material.Android.csproj     |  4 +--
 .../Foldable/src/Controls.Foldable.csproj     |  6 ++---
 src/Core/src/Core.csproj                      | 16 ++++++------
 src/Essentials/src/Essentials.csproj          |  6 ++---
 9 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/eng/AndroidX.targets b/eng/AndroidX.targets
index 93a74336d158..55eafa6a0869 100644
--- a/eng/AndroidX.targets
+++ b/eng/AndroidX.targets
@@ -2,47 +2,47 @@
   <ItemGroup>
     <PackageReference
         Update="Xamarin.AndroidX.AppCompat.AppCompatResources"
-        Version="1.6.1.2"
+        Version="1.6.1.3"
     />
     <PackageReference
         Update="Xamarin.AndroidX.Browser"
-        Version="1.5.0.2"
+        Version="1.5.0.3"
     />
     <PackageReference
         Update="Xamarin.AndroidX.SwipeRefreshLayout"
-        Version="1.1.0.13"
+        Version="1.1.0.14"
     />
     <PackageReference
         Update="Xamarin.AndroidX.Lifecycle.LiveData"
-        Version="2.6.1.2"
+        Version="2.6.1.3"
     />
     <PackageReference
         Update="Xamarin.AndroidX.Navigation.UI"
-        Version="2.6.0"
+        Version="2.6.0.1"
     />
     <PackageReference
         Update="Xamarin.AndroidX.Navigation.Fragment"
-        Version="2.6.0"
+        Version="2.6.0.1"
     />
     <PackageReference
         Update="Xamarin.AndroidX.Navigation.Runtime"
-        Version="2.6.0"
+        Version="2.6.0.1"
     />
     <PackageReference
         Update="Xamarin.AndroidX.Navigation.Common"
-        Version="2.6.0"
+        Version="2.6.0.1"
     />
     <PackageReference
         Update="Xamarin.AndroidX.MediaRouter"
-        Version="1.4.0.1"
+        Version="1.4.0.2"
     />
     <PackageReference
         Update="Xamarin.AndroidX.Palette"
-        Version="1.0.0.18"
+        Version="1.0.0.19"
     />
     <PackageReference
         Update="Xamarin.AndroidX.RecyclerView"
-        Version="1.3.0.2"
+        Version="1.3.0.3"
     />
     <PackageReference
         Update="Xamarin.Build.Download"
@@ -50,7 +50,7 @@
     />
     <PackageReference
         Update="Xamarin.Google.Android.Material"
-        Version="1.9.0.1"
+        Version="1.9.0.2"
     />
     <PackageReference
         Update="Xamarin.AndroidX.Migration"
@@ -59,7 +59,7 @@
     />
     <PackageReference
         Update="Xamarin.AndroidX.Window.WindowJava"
-        Version="1.1.0"
+        Version="1.1.0.1"
     />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/eng/Versions.props b/eng/Versions.props
index aa5e58b98f66..e3cb7f2cecce 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -54,11 +54,11 @@
     <_MicrosoftWebWebView2Version>1.0.1823.32</_MicrosoftWebWebView2Version>
     <!-- GLIDE - the android maven artifact in /src/Core/AndroidNative/maui/build.gradle -->
     <!-- must be kept in sync with the binding library version to it here: -->
-    <_XamarinAndroidGlideVersion>4.15.1</_XamarinAndroidGlideVersion>
-    <_XamarinAndroidXSecurityVersion>1.1.0-alpha06</_XamarinAndroidXSecurityVersion>
-    <_XamarinGoogleCryptoTinkAndroidVersion>1.9.0.1</_XamarinGoogleCryptoTinkAndroidVersion>
+    <_XamarinAndroidGlideVersion>4.15.1.2</_XamarinAndroidGlideVersion>
+    <_XamarinAndroidXSecurityVersion>1.1.0.1-alpha06</_XamarinAndroidXSecurityVersion>
+    <_XamarinGoogleCryptoTinkAndroidVersion>1.9.0.2</_XamarinGoogleCryptoTinkAndroidVersion>
     <!-- Android Maps -->
-    <XamarinGooglePlayServicesMaps>118.1.0.2</XamarinGooglePlayServicesMaps>
+    <XamarinGooglePlayServicesMaps>118.1.0.3</XamarinGooglePlayServicesMaps>
     <!--
       SKIASHARP & HARFBUZZSHARP - the various things must be kept in sync with maui graphics:
        - NuGet versions below
diff --git a/src/Compatibility/ControlGallery/src/Android/Compatibility.ControlGallery.Android.csproj b/src/Compatibility/ControlGallery/src/Android/Compatibility.ControlGallery.Android.csproj
index bb2b63d001e3..ab5b11249183 100644
--- a/src/Compatibility/ControlGallery/src/Android/Compatibility.ControlGallery.Android.csproj
+++ b/src/Compatibility/ControlGallery/src/Android/Compatibility.ControlGallery.Android.csproj
@@ -36,14 +36,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="Xam.Plugin.DeviceInfo" Version="4.1.1" />
-    <PackageReference Include="Xamarin.Build.Download" />
-    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" />
-    <PackageReference Include="Xamarin.AndroidX.Browser" />
-    <PackageReference Include="Xamarin.AndroidX.Palette" />
-    <PackageReference Include="Xamarin.Google.Android.Material" />
+    <PackageReference Include="Xamarin.Build.Download" Version="0.11.4" />
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.6.1.3" />
+    <PackageReference Include="Xamarin.AndroidX.Browser" Version="1.5.0.3" />
+    <PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.19" />
+    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.9.0.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Compatibility/ControlGallery/src/EmbeddingTestBeds/Embedding.Droid/Directory.Build.targets b/src/Compatibility/ControlGallery/src/EmbeddingTestBeds/Embedding.Droid/Directory.Build.targets
index a87f08edf37a..2d25e44567b4 100644
--- a/src/Compatibility/ControlGallery/src/EmbeddingTestBeds/Embedding.Droid/Directory.Build.targets
+++ b/src/Compatibility/ControlGallery/src/EmbeddingTestBeds/Embedding.Droid/Directory.Build.targets
@@ -1,9 +1,9 @@
 <Project>
   <ItemGroup>
-    <PackageReference Include="Xamarin.AndroidX.Browser" />
-    <PackageReference Include="Xamarin.AndroidX.Palette" />
-    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" />
-    <PackageReference Include="Xamarin.Google.Android.Material" />
+    <PackageReference Include="Xamarin.AndroidX.Browser" Version="1.5.0.2" />
+    <PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.19" />
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.6.1.3" />
+    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.9.0.2" />
   </ItemGroup>
   <Import Project="..\..\..\..\..\eng\AndroidX.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/Compatibility/Maps/src/Android/Compatibility.Maps.Android.csproj b/src/Compatibility/Maps/src/Android/Compatibility.Maps.Android.csproj
index e733fcd97117..4ab2727cce78 100644
--- a/src/Compatibility/Maps/src/Android/Compatibility.Maps.Android.csproj
+++ b/src/Compatibility/Maps/src/Android/Compatibility.Maps.Android.csproj
@@ -9,9 +9,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" />
-    <PackageReference Include="Xamarin.Google.Android.Material" />
-    <PackageReference Include="Xamarin.GooglePlayServices.Maps" Version="118.1.0.2" />
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.6.1.3" />
+    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.9.0.2" />
+    <PackageReference Include="Xamarin.GooglePlayServices.Maps" Version="118.1.0.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Compatibility/Material/src/Android/Compatibility.Material.Android.csproj b/src/Compatibility/Material/src/Android/Compatibility.Material.Android.csproj
index daf993da89d3..238570163d4c 100644
--- a/src/Compatibility/Material/src/Android/Compatibility.Material.Android.csproj
+++ b/src/Compatibility/Material/src/Android/Compatibility.Material.Android.csproj
@@ -15,8 +15,8 @@
     <AndroidResource Include="Resources\**\*" />
   </ItemGroup>
   <ItemGroup Condition=" $(TargetFramework.StartsWith('MonoAndroid')) " >
-    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" />
-    <PackageReference Include="Xamarin.Google.Android.Material" />
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.6.1.3" />
+    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.9.0.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj">
diff --git a/src/Controls/Foldable/src/Controls.Foldable.csproj b/src/Controls/Foldable/src/Controls.Foldable.csproj
index 05d41821f0c9..306e657a8a9d 100644
--- a/src/Controls/Foldable/src/Controls.Foldable.csproj
+++ b/src/Controls/Foldable/src/Controls.Foldable.csproj
@@ -30,11 +30,11 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
   </ItemGroup>
   <ItemGroup Condition=" '$(UseMaui)' != 'true' and '$(TargetPlatformIdentifier)' == 'android' ">
-    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" />
-    <PackageReference Include="Xamarin.Google.Android.Material" />
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.6.1.3" />
+    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.9.0.2" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetPlatformIdentifier)' == 'android' ">
-    <PackageReference Include="Xamarin.AndroidX.Window.WindowJava" />
+    <PackageReference Include="Xamarin.AndroidX.Window.WindowJava" Version="1.1.0.1" />
   </ItemGroup>
 
   <!-- Add icon for NuGet -->
diff --git a/src/Core/src/Core.csproj b/src/Core/src/Core.csproj
index 528380a59919..b37dfc2aee93 100644
--- a/src/Core/src/Core.csproj
+++ b/src/Core/src/Core.csproj
@@ -29,14 +29,14 @@
     <ProjectReference Include="..\..\Graphics\src\Graphics.Win2D\Graphics.Win2D.csproj" />
   </ItemGroup>
   <ItemGroup Condition="$(TargetFramework.Contains('-android'))">
-    <PackageReference Include="Xamarin.Android.Glide" />
-    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" />
-    <PackageReference Include="Xamarin.Google.Android.Material" />
-    <PackageReference Include="Xamarin.AndroidX.SwipeRefreshLayout" />
-    <PackageReference Include="Xamarin.AndroidX.Navigation.UI" />
-    <PackageReference Include="Xamarin.AndroidX.Navigation.Fragment" />
-    <PackageReference Include="Xamarin.AndroidX.Navigation.Runtime" />
-    <PackageReference Include="Xamarin.AndroidX.Navigation.Common" />
+    <PackageReference Include="Xamarin.Android.Glide" Version="4.15.1.2" />
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.6.1.3" />
+    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.9.0.2" />
+    <PackageReference Include="Xamarin.AndroidX.SwipeRefreshLayout" Version="1.1.0.14" />
+    <PackageReference Include="Xamarin.AndroidX.Navigation.UI" Version="2.6.0.1" />
+    <PackageReference Include="Xamarin.AndroidX.Navigation.Fragment" Version="2.6.0.1" />
+    <PackageReference Include="Xamarin.AndroidX.Navigation.Runtime" Version="2.6.0.1" />
+    <PackageReference Include="Xamarin.AndroidX.Navigation.Common" Version="2.6.0.1" />
   </ItemGroup>
   <ItemGroup Condition="$(TargetFramework.Contains('-tizen'))">
     <PackageReference Include="Tizen.UIExtensions.NUI" />
diff --git a/src/Essentials/src/Essentials.csproj b/src/Essentials/src/Essentials.csproj
index 4c0542d4d7db..d4f49ccc8051 100644
--- a/src/Essentials/src/Essentials.csproj
+++ b/src/Essentials/src/Essentials.csproj
@@ -36,9 +36,9 @@
     <Compile Include="**\*.android.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
     <Compile Include="**\*.android.*.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
     <AndroidResource Include="Resources\xml\*.xml" />
-    <PackageReference Include="Xamarin.AndroidX.Browser" />
-    <PackageReference Include="Xamarin.AndroidX.Security.SecurityCrypto" />
-    <PackageReference Include="Xamarin.Google.Crypto.Tink.Android" />
+    <PackageReference Include="Xamarin.AndroidX.Browser" Version="1.5.0.3" />
+    <PackageReference Include="Xamarin.AndroidX.Security.SecurityCrypto" Version="1.1.0.1-alpha06" />
+    <PackageReference Include="Xamarin.Google.Crypto.Tink.Android" Version="1.9.0.2" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetPlatformIdentifier)' == 'ios' Or '$(TargetPlatformIdentifier)' == 'maccatalyst' ">
     <Compile Include="**\*.ios.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />

From 63c4638f20a62b1ab5fe04c5fd16d2875e0bf62a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Jul 2023 17:48:24 +0100
Subject: [PATCH 099/105] Bump the xunit group with 3 updates (#16113)

* Bump the xunit group with 3 updates

Bumps the xunit group with 3 updates: [xunit](https://github.com/xunit/xunit), [xunit.runner.visualstudio](https://github.com/xunit/visualstudio.xunit) and [xunit.runner.utility](https://github.com/xunit/xunit).


Updates `xunit` from 2.4.2 to 2.5.0
- [Commits](https://github.com/xunit/xunit/compare/2.4.2...2.5.0)

Updates `xunit.runner.visualstudio` from 2.4.5 to 2.5.0
- [Release notes](https://github.com/xunit/visualstudio.xunit/releases)
- [Commits](https://github.com/xunit/visualstudio.xunit/compare/v2.4.5...2.5.0)

Updates `xunit.runner.utility` from 2.4.2 to 2.5.0
- [Commits](https://github.com/xunit/xunit/compare/2.4.2...2.5.0)

---
updated-dependencies:
- dependency-name: xunit
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: xunit
- dependency-name: xunit.runner.visualstudio
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: xunit
- dependency-name: xunit.runner.utility
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: xunit
...

Signed-off-by: dependabot[bot] <support@github.com>

* Fix API changes

* More APIs

* more APIs

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
---
 .../Controls.Core.Design.UnitTests.csproj     |  4 ++--
 .../tests/Core.UnitTests/ApplicationTests.cs  |  4 ++--
 .../Core.UnitTests/BindableObjectUnitTests.cs |  8 +++----
 .../Core.UnitTests/ContentFormUnitTests.cs    |  2 +-
 .../Core.UnitTests/ContentViewUnitTest.cs     |  2 +-
 .../Controls.Core.UnitTests.csproj            |  4 ++--
 .../Core.UnitTests/FormattedStringTests.cs    |  4 ++--
 .../Gestures/PointerGestureRecognizerTests.cs |  2 +-
 .../tests/Core.UnitTests/GridTests.cs         |  6 ++---
 src/Controls/tests/Core.UnitTests/MapTests.cs |  8 +++----
 .../Core.UnitTests/MessagingCenterTests.cs    |  2 +-
 .../tests/Core.UnitTests/PageTests.cs         |  2 +-
 .../tests/Core.UnitTests/PickerTests.cs       | 14 ++++++------
 .../Core.UnitTests/PlatformBindingTests.cs    |  2 +-
 .../Core.UnitTests/ResourceDictionaryTests.cs | 16 +++++++-------
 .../tests/Core.UnitTests/ShellModalTests.cs   | 22 +++++++++----------
 .../Core.UnitTests/ShellNavigatingTests.cs    |  2 +-
 .../ShellParameterPassingTests.cs             |  2 +-
 .../tests/Core.UnitTests/ShellTests.cs        | 16 +++++++-------
 .../tests/Core.UnitTests/StyleTests.cs        |  4 ++--
 .../Core.UnitTests/TemplatedItemsListTests.cs |  2 +-
 .../Core.UnitTests/TemplatedPageUnitTests.cs  |  2 +-
 .../Core.UnitTests/TemplatedViewUnitTests.cs  |  2 +-
 .../Core.UnitTests/VisualStateManagerTests.cs |  6 ++---
 .../Core.UnitTests/VisualTreeHelperTests.cs   |  6 ++---
 .../tests/Core.UnitTests/WindowsTests.cs      |  2 +-
 .../CollectionViewTests.Android.cs            |  2 +-
 .../DeviceTests/Elements/Modal/ModalTests.cs  |  6 ++---
 .../Elements/Modal/ModalTests.iOS.cs          |  2 +-
 .../Elements/ScrollView/ScrollViewTests.cs    |  2 +-
 .../Elements/Shell/ShellFlyoutTests.cs        | 15 +++----------
 .../Elements/Shell/ShellTests.iOS.cs          |  4 ++--
 .../Elements/VisualElementTreeTests.cs        |  9 +++-----
 .../Core.DeviceTests.Shared.csproj            |  4 ++--
 .../TextStyleHandlerTests.Android.cs          |  2 +-
 .../TextStyle/TextStyleHandlerTests.iOS.cs    |  2 +-
 .../Handlers/Image/ImageHandlerTests.cs       | 18 +++++++++++----
 .../Handlers/Layout/LayoutHandlerTests.cs     | 10 ++++-----
 .../tests/DeviceTests/Memory/MemoryTests.cs   |  2 +-
 .../ImageSourceServiceTests.Android.cs        | 16 +++++++-------
 .../ImageSourceServiceTests.iOS.cs            |  8 +++----
 .../tests/UnitTests/Core.UnitTests.csproj     |  4 ++--
 .../UnitTests/Essentials.UnitTests.csproj     |  4 ++--
 .../Graphics.Tests/Graphics.Tests.csproj      |  4 ++--
 .../UnitTests/Resizetizer.UnitTests.csproj    |  4 ++--
 .../TestUtils.DeviceTests.Runners.csproj      |  6 ++---
 .../AssertionExtensions.Windows.cs            |  8 +++----
 .../src/DeviceTests/AssertionExtensions.cs    | 14 +-----------
 .../DeviceTests/TestUtils.DeviceTests.csproj  |  6 ++---
 src/TestUtils/src/TestUtils/TestUtils.csproj  |  2 +-
 50 files changed, 143 insertions(+), 157 deletions(-)

diff --git a/src/Controls/tests/Core.Design.UnitTests/Controls.Core.Design.UnitTests.csproj b/src/Controls/tests/Core.Design.UnitTests/Controls.Core.Design.UnitTests.csproj
index 3c983d9d8306..3439a55964e8 100644
--- a/src/Controls/tests/Core.Design.UnitTests/Controls.Core.Design.UnitTests.csproj
+++ b/src/Controls/tests/Core.Design.UnitTests/Controls.Core.Design.UnitTests.csproj
@@ -8,8 +8,8 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System.Xaml" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="xunit" Version="2.5.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/src/Controls/tests/Core.UnitTests/ApplicationTests.cs b/src/Controls/tests/Core.UnitTests/ApplicationTests.cs
index 428c581cba0e..1e4735dce5be 100644
--- a/src/Controls/tests/Core.UnitTests/ApplicationTests.cs
+++ b/src/Controls/tests/Core.UnitTests/ApplicationTests.cs
@@ -41,7 +41,7 @@ public void CreateWindowUsesMainPage()
 
 			Assert.Equal(page, app.MainPage);
 			Assert.NotEmpty(app.Windows);
-			Assert.Equal(1, app.Windows.Count);
+			Assert.Single(app.Windows);
 			Assert.Equal(window, app.Windows[0]);
 			Assert.Equal(page, app.Windows[0].Page);
 		}
@@ -61,7 +61,7 @@ public void SettingMainPageUpdatesWindow()
 
 			Assert.Equal(page2, app.MainPage);
 			Assert.NotEmpty(app.Windows);
-			Assert.Equal(1, app.Windows.Count);
+			Assert.Single(app.Windows);
 			Assert.Equal(window, app.Windows[0]);
 			Assert.Equal(page2, app.Windows[0].Page);
 		}
diff --git a/src/Controls/tests/Core.UnitTests/BindableObjectUnitTests.cs b/src/Controls/tests/Core.UnitTests/BindableObjectUnitTests.cs
index 9817d1e27729..76aeacb24b00 100644
--- a/src/Controls/tests/Core.UnitTests/BindableObjectUnitTests.cs
+++ b/src/Controls/tests/Core.UnitTests/BindableObjectUnitTests.cs
@@ -299,7 +299,7 @@ public void PropertyChangingSameValue()
 
 			var mock = new MockBindable();
 			mock.SetValue(MockBindable.TextProperty, value);
-			mock.PropertyChanging += (s, e) => { throw new XunitException(); };
+			mock.PropertyChanging += (s, e) => { throw new XunitException("Property should not have triggered a change event."); };
 
 			mock.SetValue(MockBindable.TextProperty, value);
 		}
@@ -310,7 +310,7 @@ public void PropertyChangingDefaultValue()
 			var prop = BindableProperty.Create(nameof(MockBindable.Foo), typeof(string), typeof(MockBindable), "DefaultValue");
 
 			var mock = new MockBindable();
-			mock.PropertyChanging += (s, e) => { throw new XunitException(); };
+			mock.PropertyChanging += (s, e) => { throw new XunitException("Property should not have triggered a change event."); };
 			mock.SetValue(prop, prop.DefaultValue);
 		}
 
@@ -343,7 +343,7 @@ public void PropertyChangedSameValue()
 
 			var mock = new MockBindable();
 			mock.SetValue(MockBindable.TextProperty, value);
-			mock.PropertyChanged += (s, e) => { throw new XunitException(); };
+			mock.PropertyChanged += (s, e) => { throw new XunitException("Property should not have triggered a change event."); };
 
 			mock.SetValue(MockBindable.TextProperty, value);
 		}
@@ -354,7 +354,7 @@ public void PropertyChangedDefaultValue()
 			var prop = BindableProperty.Create(nameof(MockBindable.Foo), typeof(string), typeof(MockBindable), "DefaultValue");
 
 			var mock = new MockBindable();
-			mock.PropertyChanged += (s, e) => { throw new XunitException(); };
+			mock.PropertyChanged += (s, e) => { throw new XunitException("Property should not have triggered a change event."); };
 
 			mock.SetValue(prop, prop.DefaultValue);
 		}
diff --git a/src/Controls/tests/Core.UnitTests/ContentFormUnitTests.cs b/src/Controls/tests/Core.UnitTests/ContentFormUnitTests.cs
index 65a24428ff3d..3a43337818a7 100644
--- a/src/Controls/tests/Core.UnitTests/ContentFormUnitTests.cs
+++ b/src/Controls/tests/Core.UnitTests/ContentFormUnitTests.cs
@@ -78,7 +78,7 @@ public void ContentPage_should_have_the_InternalChildren_correctly_when_Content_
 			var expected = new View();
 			sut.Content = expected;
 
-			Assert.Equal(1, internalChildren.Count);
+			Assert.Single(internalChildren);
 			Assert.Same(expected, internalChildren[0]);
 		}
 	}
diff --git a/src/Controls/tests/Core.UnitTests/ContentViewUnitTest.cs b/src/Controls/tests/Core.UnitTests/ContentViewUnitTest.cs
index b39fe181d445..b2fe9e869cdc 100644
--- a/src/Controls/tests/Core.UnitTests/ContentViewUnitTest.cs
+++ b/src/Controls/tests/Core.UnitTests/ContentViewUnitTest.cs
@@ -381,7 +381,7 @@ public void ContentView_should_have_the_InternalChildren_correctly_when_Content_
 			var expected = new View();
 			sut.Content = expected;
 
-			Assert.Equal(1, internalChildren.Count);
+			Assert.Single(internalChildren);
 			Assert.Same(expected, internalChildren[0]);
 		}
 	}
diff --git a/src/Controls/tests/Core.UnitTests/Controls.Core.UnitTests.csproj b/src/Controls/tests/Core.UnitTests/Controls.Core.UnitTests.csproj
index fa2897b514a5..16c67fe84a8b 100644
--- a/src/Controls/tests/Core.UnitTests/Controls.Core.UnitTests.csproj
+++ b/src/Controls/tests/Core.UnitTests/Controls.Core.UnitTests.csproj
@@ -21,8 +21,8 @@
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" />
     <PackageReference Include="NSubstitute" Version="4.3.0" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="xunit" Version="2.5.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/src/Controls/tests/Core.UnitTests/FormattedStringTests.cs b/src/Controls/tests/Core.UnitTests/FormattedStringTests.cs
index e32533e6be7e..83157fc43e3d 100644
--- a/src/Controls/tests/Core.UnitTests/FormattedStringTests.cs
+++ b/src/Controls/tests/Core.UnitTests/FormattedStringTests.cs
@@ -85,7 +85,7 @@ public void ImplicitStringConversion()
 			string original = "fubar";
 			FormattedString fs = original;
 			Assert.NotNull(fs);
-			Assert.Equal(1, fs.Spans.Count);
+			Assert.Single(fs.Spans);
 			Assert.NotNull(fs.Spans[0]);
 			Assert.Equal(fs.Spans[0].Text, original);
 		}
@@ -96,7 +96,7 @@ public void ImplicitStringConversionNull()
 			string original = null;
 			FormattedString fs = original;
 			Assert.NotNull(fs);
-			Assert.Equal(1, fs.Spans.Count);
+			Assert.Single(fs.Spans);
 			Assert.NotNull(fs.Spans[0]);
 			Assert.Equal(fs.Spans[0].Text, original);
 		}
diff --git a/src/Controls/tests/Core.UnitTests/Gestures/PointerGestureRecognizerTests.cs b/src/Controls/tests/Core.UnitTests/Gestures/PointerGestureRecognizerTests.cs
index 5019c8e0b9a0..c33b41df3f0c 100644
--- a/src/Controls/tests/Core.UnitTests/Gestures/PointerGestureRecognizerTests.cs
+++ b/src/Controls/tests/Core.UnitTests/Gestures/PointerGestureRecognizerTests.cs
@@ -57,7 +57,7 @@ public void ClearingGestureRecognizers()
 			Assert.Equal(2, (view as IGestureController).CompositeGestureRecognizers.Count);
 
 			view.GestureRecognizers.Clear();
-			Assert.Equal(1, (view as IGestureController).CompositeGestureRecognizers.Count);
+			Assert.Single((view as IGestureController).CompositeGestureRecognizers);
 			Assert.Null(gestureRecognizer.Parent);
 		}
 
diff --git a/src/Controls/tests/Core.UnitTests/GridTests.cs b/src/Controls/tests/Core.UnitTests/GridTests.cs
index b0e101532f87..140664c242a7 100644
--- a/src/Controls/tests/Core.UnitTests/GridTests.cs
+++ b/src/Controls/tests/Core.UnitTests/GridTests.cs
@@ -1921,10 +1921,10 @@ public void BothChildrenPropertiesUseTheSameBackendStore()
 		{
 			var view = new View();
 			var grid = new Grid();
-			Assert.Equal(0, grid.Children.Count);
+			Assert.Empty(grid.Children);
 			(grid as Compatibility.Layout<View>).Children.Add(view);
-			Assert.Equal(1, grid.Children.Count);
-			Assert.Equal(1, (grid as Compatibility.Layout<View>).Children.Count);
+			Assert.Single(grid.Children);
+			Assert.Single((grid as Compatibility.Layout<View>).Children);
 			Assert.Same(view, (grid as Compatibility.Layout<View>).Children.First());
 			Assert.Same(view, grid.Children.First());
 		}
diff --git a/src/Controls/tests/Core.UnitTests/MapTests.cs b/src/Controls/tests/Core.UnitTests/MapTests.cs
index 2baa799811a5..7007b50f9ef8 100644
--- a/src/Controls/tests/Core.UnitTests/MapTests.cs
+++ b/src/Controls/tests/Core.UnitTests/MapTests.cs
@@ -28,7 +28,7 @@ public void AddPin()
 
 			map.Pins.Add(home);
 
-			Assert.Equal(1, map.Pins.Count);
+			Assert.Single(map.Pins);
 			Assert.Equal("Home", map.Pins[0].Label);
 			var mall = new Pin
 			{
@@ -71,7 +71,7 @@ public void AddPinWithoutAddress()
 			};
 
 			map.Pins.Add(noAddressPin);
-			Assert.Equal(1, map.Pins.Count);
+			Assert.Single(map.Pins);
 			Assert.Equal("I have no address", map.Pins[0].Label);
 			Assert.Null(map.Pins[0].Address);
 		}
@@ -97,13 +97,13 @@ public void RemovePin()
 			};
 
 			map.Pins.Add(genericPlace);
-			Assert.Equal(1, map.Pins.Count);
+			Assert.Single(map.Pins);
 
 			map.Pins.Add(mall);
 			Assert.Equal(2, map.Pins.Count);
 
 			map.Pins.Remove(genericPlace);
-			Assert.Equal(1, map.Pins.Count);
+			Assert.Single(map.Pins);
 
 			Assert.True(map.Pins.Contains(mall));
 			Assert.False(map.Pins.Contains(genericPlace));
diff --git a/src/Controls/tests/Core.UnitTests/MessagingCenterTests.cs b/src/Controls/tests/Core.UnitTests/MessagingCenterTests.cs
index b4cec3f5ef7a..c0d2f7f49e88 100644
--- a/src/Controls/tests/Core.UnitTests/MessagingCenterTests.cs
+++ b/src/Controls/tests/Core.UnitTests/MessagingCenterTests.cs
@@ -199,7 +199,7 @@ public void SubscriberShouldBeCollected()
 			new Action(() =>
 			{
 				var subscriber = new TestSubcriber();
-				MessagingCenter.Subscribe<TestPublisher>(subscriber, "test", p => throw new XunitException());
+				MessagingCenter.Subscribe<TestPublisher>(subscriber, "test", p => throw new XunitException("The subscriber should have been collected."));
 			})();
 
 			GC.Collect();
diff --git a/src/Controls/tests/Core.UnitTests/PageTests.cs b/src/Controls/tests/Core.UnitTests/PageTests.cs
index 49d32ccac2a5..2430d32cda13 100644
--- a/src/Controls/tests/Core.UnitTests/PageTests.cs
+++ b/src/Controls/tests/Core.UnitTests/PageTests.cs
@@ -28,7 +28,7 @@ public void TestConstructor()
 
 			Assert.Equal(root, child.Parent);
 
-			Assert.Equal(1, ((IElementController)root).LogicalChildren.Count);
+			Assert.Single(((IElementController)root).LogicalChildren);
 			Assert.Same(((IElementController)root).LogicalChildren.First(), child);
 
 			((ContentPage)root).Content = null;
diff --git a/src/Controls/tests/Core.UnitTests/PickerTests.cs b/src/Controls/tests/Core.UnitTests/PickerTests.cs
index cfdf53d8d158..510d23b89d47 100644
--- a/src/Controls/tests/Core.UnitTests/PickerTests.cs
+++ b/src/Controls/tests/Core.UnitTests/PickerTests.cs
@@ -160,11 +160,11 @@ public void TestUnsubscribeINotifyCollectionChanged()
 			{
 				ItemsSource = list
 			};
-			Assert.Equal(0, picker.Items.Count);
+			Assert.Empty(picker.Items);
 			var newList = new ObservableCollection<string>();
 			picker.ItemsSource = newList;
 			list.Add("item");
-			Assert.Equal(0, picker.Items.Count);
+			Assert.Empty(picker.Items);
 		}
 
 		[Fact]
@@ -182,7 +182,7 @@ public void TestEmptyCollectionResetItems()
 			};
 			Assert.Equal(3, picker.Items.Count);
 			picker.ItemsSource = new ObservableCollection<string>();
-			Assert.Equal(0, picker.Items.Count);
+			Assert.Empty(picker.Items);
 		}
 
 		[Fact]
@@ -262,7 +262,7 @@ public void TestItemsSourceCollectionChangedClear()
 			};
 			Assert.Equal(3, picker.Items.Count);
 			items.Clear();
-			Assert.Equal(0, picker.Items.Count);
+			Assert.Empty(picker.Items);
 		}
 
 		[Fact]
@@ -371,7 +371,7 @@ public void TestSelectedItemDefault()
 			};
 			picker.SetBinding(Picker.ItemsSourceProperty, "Items");
 			picker.SetBinding(Picker.SelectedItemProperty, "SelectedItem");
-			Assert.Equal(1, picker.Items.Count);
+			Assert.Single(picker.Items);
 			Assert.Equal(-1, picker.SelectedIndex);
 			Assert.Equal(bindingContext.SelectedItem, picker.SelectedItem);
 		}
@@ -443,7 +443,7 @@ public void TestSelectedItemSet()
 			};
 			picker.SetBinding(Picker.ItemsSourceProperty, "Items");
 			picker.SetBinding(Picker.SelectedItemProperty, "SelectedItem");
-			Assert.Equal(1, picker.Items.Count);
+			Assert.Single(picker.Items);
 			Assert.Equal(0, picker.SelectedIndex);
 			Assert.Equal(obj, picker.SelectedItem);
 		}
@@ -466,7 +466,7 @@ public void TestSelectedItemChangeSelectedIndex()
 			};
 			picker.SetBinding(Picker.ItemsSourceProperty, "Items");
 			picker.SetBinding(Picker.SelectedItemProperty, "SelectedItem");
-			Assert.Equal(1, picker.Items.Count);
+			Assert.Single(picker.Items);
 			Assert.Equal(-1, picker.SelectedIndex);
 			Assert.Null(picker.SelectedItem);
 			picker.SelectedItem = obj;
diff --git a/src/Controls/tests/Core.UnitTests/PlatformBindingTests.cs b/src/Controls/tests/Core.UnitTests/PlatformBindingTests.cs
index 3f373067d940..ec11d8fba18e 100644
--- a/src/Controls/tests/Core.UnitTests/PlatformBindingTests.cs
+++ b/src/Controls/tests/Core.UnitTests/PlatformBindingTests.cs
@@ -370,7 +370,7 @@ public void ProxiesAreCollected()
 
 				PlatformBindingHelpers.BindableObjectProxy<MockPlatformView> proxy;
 				if (!PlatformBindingHelpers.BindableObjectProxy<MockPlatformView>.BindableObjectProxies.TryGetValue(platformView, out proxy))
-					throw new XunitException();
+					throw new XunitException("Proxy should have been collected.");
 
 				wr = new WeakReference(proxy);
 				platformView = null;
diff --git a/src/Controls/tests/Core.UnitTests/ResourceDictionaryTests.cs b/src/Controls/tests/Core.UnitTests/ResourceDictionaryTests.cs
index 93083143b443..93e6ea2269b8 100644
--- a/src/Controls/tests/Core.UnitTests/ResourceDictionaryTests.cs
+++ b/src/Controls/tests/Core.UnitTests/ResourceDictionaryTests.cs
@@ -43,7 +43,7 @@ public void ResourceDictionaryTriggersValueChangedOnAdd()
 
 			if (!passed)
 			{
-				throw new XunitException();
+				throw new XunitException("Changing the value in the dictionary did not fire the changed event.");
 			}
 		}
 
@@ -65,7 +65,7 @@ public void ResourceDictionaryTriggersValueChangedOnChange()
 
 			if (!passed)
 			{
-				throw new XunitException();
+				throw new XunitException("Changing the value in the dictionary did not fire the changed event.");
 			}
 		}
 
@@ -163,7 +163,7 @@ public void AddingToParentTriggersValuesChanged()
 
 			if (!passed)
 			{
-				throw new XunitException();
+				throw new XunitException("Changing the value in the dictionary did not fire the changed event.");
 			}
 		}
 
@@ -186,7 +186,7 @@ public void ResourcesChangedNotRaisedIfKeyExistsInCurrent()
 
 			elt.Parent = parent;
 
-			((IElementDefinition)elt).AddResourcesChangedListener((sender, e) => throw new XunitException());
+			((IElementDefinition)elt).AddResourcesChangedListener((sender, e) => throw new XunitException("Changing the value in the dictionary should not fire the changed event."));
 			parent.Resources["bar"] = "BAZ";
 		}
 
@@ -222,7 +222,7 @@ public void SettingParentTriggersValuesChanged()
 
 			if (!passed)
 			{
-				throw new XunitException();
+				throw new XunitException("Changing the value in the dictionary did not fire the changed event.");
 			}
 		}
 
@@ -255,7 +255,7 @@ public void SettingResourcesTriggersResourcesChanged()
 
 			if (!passed)
 			{
-				throw new XunitException();
+				throw new XunitException("Changing the value in the dictionary did not fire the changed event.");
 			}
 		}
 
@@ -304,7 +304,7 @@ public void MultiLevelMerge()
 
 			if (!passed)
 			{
-				throw new XunitException();
+				throw new XunitException("Changing the value in the dictionary did not fire the changed event.");
 			}
 		}
 
@@ -397,7 +397,7 @@ public void ClearMergedDictionaries()
 
 			rd.MergedDictionaries.Clear();
 
-			Assert.Equal(0, rd.MergedDictionaries.Count);
+			Assert.Empty(rd.MergedDictionaries);
 		}
 
 		[Fact]
diff --git a/src/Controls/tests/Core.UnitTests/ShellModalTests.cs b/src/Controls/tests/Core.UnitTests/ShellModalTests.cs
index 76b02eaeedc8..554c1990b04c 100644
--- a/src/Controls/tests/Core.UnitTests/ShellModalTests.cs
+++ b/src/Controls/tests/Core.UnitTests/ShellModalTests.cs
@@ -66,7 +66,7 @@ public async Task BasicModalBehaviorTest()
 
 			var navStack = shell.Items[0].Items[0].Navigation;
 
-			Assert.Equal(1, navStack.ModalStack.Count);
+			Assert.Single(navStack.ModalStack);
 			Assert.Equal(typeof(ModalTestPage), navStack.ModalStack[0].GetType());
 		}
 
@@ -85,7 +85,7 @@ public async Task ModalPopsWhenSwitchingShellItem()
 			await shell.GoToAsync("///NewRoute");
 
 			var navStack = shell.Items[0].Items[0].Navigation;
-			Assert.Equal(0, navStack.ModalStack.Count);
+			Assert.Empty(navStack.ModalStack);
 		}
 
 		[Fact]
@@ -101,7 +101,7 @@ public async Task ModalPopsWhenSwitchingShellSection()
 			// Navigates to different Shell Item
 			await shell.GoToAsync("///NewRoute");
 			var navStack = shell.Items[0].Items[0].Navigation;
-			Assert.Equal(0, navStack.ModalStack.Count);
+			Assert.Empty(navStack.ModalStack);
 		}
 
 		[Fact]
@@ -116,7 +116,7 @@ public async Task AbsoluteRoutingToRootPopsModalPages()
 
 			await shell.GoToAsync($"///MainContent");
 			navStack = shell.Items[0].Items[0].Navigation;
-			Assert.Equal(0, navStack.ModalStack.Count);
+			Assert.Empty(navStack.ModalStack);
 		}
 
 		[Fact]
@@ -161,7 +161,7 @@ public async Task ModalPopsWhenSwitchingShellContent()
 			await shell.GoToAsync("///NewRoute");
 
 			var navStack = shell.Items[0].Items[0].Navigation;
-			Assert.Equal(0, navStack.ModalStack.Count);
+			Assert.Empty(navStack.ModalStack);
 		}
 
 		[Fact]
@@ -177,7 +177,7 @@ public async Task ModalPopsWhenNavigatingWithoutModalRoute()
 			await shell.GoToAsync("///NewRoute");
 
 			var navStack = shell.Items[0].Items[0].Navigation;
-			Assert.Equal(0, navStack.ModalStack.Count);
+			Assert.Empty(navStack.ModalStack);
 		}
 
 
@@ -194,7 +194,7 @@ public async Task ModalPopsWhenNavigatingToNewModalRoute()
 			await shell.GoToAsync("///NewRoute/ModalTestPage2");
 
 			var navStack = shell.Items[0].Items[0].Navigation;
-			Assert.Equal(1, navStack.ModalStack.Count);
+			Assert.Single(navStack.ModalStack);
 			Assert.Equal(typeof(ModalTestPage2), navStack.ModalStack[0].GetType());
 		}
 
@@ -449,9 +449,9 @@ public async Task PopModalWithDots()
 			await shell.CurrentPage.Navigation.PushModalAsync(new ContentPage());
 			await shell.CurrentPage.Navigation.PushModalAsync(new ContentPage());
 			await shell.GoToAsync("..");
-			Assert.Equal(1, shell.Navigation.ModalStack.Count);
+			Assert.Single(shell.Navigation.ModalStack);
 			await shell.GoToAsync("..");
-			Assert.Equal(0, shell.Navigation.ModalStack.Count);
+			Assert.Empty(shell.Navigation.ModalStack);
 		}
 
 		[Fact]
@@ -469,7 +469,7 @@ public async Task CanCancelGoToModalAsync()
 			};
 
 			await shell.GoToAsync("ModalTestPage");
-			Assert.Equal(0, shell.Navigation.ModalStack.Count);
+			Assert.Empty(shell.Navigation.ModalStack);
 		}
 
 		[Fact]
@@ -487,7 +487,7 @@ public async Task CanCancelPushModalAsync()
 			};
 
 			await shell.CurrentPage.Navigation.PushModalAsync(new ContentPage());
-			Assert.Equal(0, shell.Navigation.ModalStack.Count);
+			Assert.Empty(shell.Navigation.ModalStack);
 		}
 
 		[Fact]
diff --git a/src/Controls/tests/Core.UnitTests/ShellNavigatingTests.cs b/src/Controls/tests/Core.UnitTests/ShellNavigatingTests.cs
index 4cd4af12c635..21c9954e2bc0 100644
--- a/src/Controls/tests/Core.UnitTests/ShellNavigatingTests.cs
+++ b/src/Controls/tests/Core.UnitTests/ShellNavigatingTests.cs
@@ -194,7 +194,7 @@ public async Task DeferPopNavigation(string testCase)
 			{
 				await shell.Navigation.PopToRootAsync();
 				await source.Task;
-				Assert.Equal(1, shell.Navigation.NavigationStack.Count);
+				Assert.Single(shell.Navigation.NavigationStack);
 			}
 		}
 
diff --git a/src/Controls/tests/Core.UnitTests/ShellParameterPassingTests.cs b/src/Controls/tests/Core.UnitTests/ShellParameterPassingTests.cs
index 0e2f31b61a09..b19296cead87 100644
--- a/src/Controls/tests/Core.UnitTests/ShellParameterPassingTests.cs
+++ b/src/Controls/tests/Core.UnitTests/ShellParameterPassingTests.cs
@@ -448,7 +448,7 @@ public async Task ExtraParametersDontGetRetained()
 			// ensure that AppliedQueryAttributes is called with correct parameters each time
 			Assert.Equal(2, testPage.AppliedQueryAttributes.Count);
 			Assert.Equal(3, testPage.AppliedQueryAttributes[0].Count);
-			Assert.Equal(1, testPage.AppliedQueryAttributes[1].Count);
+			Assert.Single(testPage.AppliedQueryAttributes[1]);
 			Assert.Equal($"{nameof(ShellTestPage.SomeQueryParameter)}", testPage.AppliedQueryAttributes[1].Keys.First());
 		}
 
diff --git a/src/Controls/tests/Core.UnitTests/ShellTests.cs b/src/Controls/tests/Core.UnitTests/ShellTests.cs
index e110a56a4f83..b71ba795fa59 100644
--- a/src/Controls/tests/Core.UnitTests/ShellTests.cs
+++ b/src/Controls/tests/Core.UnitTests/ShellTests.cs
@@ -93,10 +93,10 @@ public void SettingCurrentItemOnShellViaContentPage()
 			};
 
 			shell.CurrentItem = page2;
-			Assert.Equal(1, shell.Items.Count);
+			Assert.Single(shell.Items);
 			Assert.Equal(2, shell.Items[0].Items.Count);
-			Assert.Equal(1, shell.Items[0].Items[0].Items.Count);
-			Assert.Equal(1, shell.Items[0].Items[1].Items.Count);
+			Assert.Single(shell.Items[0].Items[0].Items);
+			Assert.Single(shell.Items[0].Items[1].Items);
 			Assert.Equal(shell.CurrentItem.CurrentItem, shell.Items[0].Items[1]);
 		}
 
@@ -516,7 +516,7 @@ public async Task OnBackbuttonPressedPageReturnsFalse()
 			await shell.GoToAsync($"OnBackbuttonPressedFiresOnPage?CancelNavigationOnBackButtonPressed=false");
 
 			shell.SendBackButtonPressed();
-			Assert.Equal(1, shell.Navigation.NavigationStack.Count);
+			Assert.Single(shell.Navigation.NavigationStack);
 		}
 
 		[Fact]
@@ -885,7 +885,7 @@ public async Task TabBarAutoCreation()
 			shell.Items.Add(ShellItem.CreateFromShellSection(CreateShellSection<Tab>()));
 			shell.Items.Add(ShellItem.CreateFromShellSection(CreateShellSection<Tab>()));
 
-			Assert.Equal(1, shell.Items.Count);
+			Assert.Single(shell.Items);
 			Assert.Equal(3, shell.Items[0].Items.Count);
 
 			Assert.Equal(FlyoutBehavior.Disabled, shell.GetEffectiveFlyoutBehavior());
@@ -898,7 +898,7 @@ public async Task TabBarAutoCreation()
 			shell.Items.Add(ShellItem.CreateFromShellSection(CreateShellSection<Tab>()));
 
 			Assert.Equal(2, shell.Items.Count);
-			Assert.Equal(0, shell.Items[0].Items.Count);
+			Assert.Empty(shell.Items[0].Items);
 			Assert.Equal(3, shell.Items[1].Items.Count);
 
 
@@ -913,7 +913,7 @@ public async Task TabBarAutoCreation()
 
 			Assert.Equal(3, shell.Items.Count);
 			Assert.Equal(3, shell.Items[0].Items.Count);
-			Assert.Equal(0, shell.Items[1].Items.Count);
+			Assert.Empty(shell.Items[1].Items);
 			Assert.Equal(3, shell.Items[0].Items.Count);
 		}
 
@@ -1374,7 +1374,7 @@ public void VisualTreeHelperCount()
 			shell.CurrentItem.CurrentItem.Items.Add(CreateShellContent());
 			var shellCount = (shell as IVisualTreeElement).GetVisualChildren();
 			var shellItemCount = (shell.CurrentItem as IVisualTreeElement).GetVisualChildren();
-			Assert.Equal(1, shellCount.Count);
+			Assert.Single(shellCount);
 			Assert.Equal(2, shellItemCount.Count);
 		}
 
diff --git a/src/Controls/tests/Core.UnitTests/StyleTests.cs b/src/Controls/tests/Core.UnitTests/StyleTests.cs
index 9cd3b9c09304..ee8192206455 100644
--- a/src/Controls/tests/Core.UnitTests/StyleTests.cs
+++ b/src/Controls/tests/Core.UnitTests/StyleTests.cs
@@ -902,7 +902,7 @@ public void MismatchTargetTypeLogsWarningMessage1()
 
 			t.Style = s;
 
-			Assert.Equal(1, MockApplication.MockLogger.Messages.Count);
+			Assert.Single(MockApplication.MockLogger.Messages);
 			Assert.Equal($"Style TargetType Microsoft.Maui.Controls.Button is not compatible with element target type Microsoft.Maui.Controls.View", MockApplication.MockLogger.Messages.FirstOrDefault());
 		}
 
@@ -914,7 +914,7 @@ public void MismatchTargetTypeLogsWarningMessage2()
 
 			t.Style = s;
 
-			Assert.Equal(1, MockApplication.MockLogger.Messages.Count);
+			Assert.Single(MockApplication.MockLogger.Messages);
 			Assert.Equal($"Style TargetType Microsoft.Maui.Controls.Button is not compatible with element target type Microsoft.Maui.Controls.Label", MockApplication.MockLogger.Messages.FirstOrDefault());
 		}
 
diff --git a/src/Controls/tests/Core.UnitTests/TemplatedItemsListTests.cs b/src/Controls/tests/Core.UnitTests/TemplatedItemsListTests.cs
index 1778b4fb6e4f..e29369101af8 100644
--- a/src/Controls/tests/Core.UnitTests/TemplatedItemsListTests.cs
+++ b/src/Controls/tests/Core.UnitTests/TemplatedItemsListTests.cs
@@ -177,7 +177,7 @@ public void PassThroughChanges()
 			Assert.Equal(NotifyCollectionChangedAction.Add, args.Action);
 			Assert.Equal(0, args.NewStartingIndex);
 			Assert.NotNull(args.NewItems);
-			Assert.Equal(1, args.NewItems.Count);
+			Assert.Single(args.NewItems);
 			Assert.Same(str, ((Cell)args.NewItems[0]).BindingContext);
 		}
 
diff --git a/src/Controls/tests/Core.UnitTests/TemplatedPageUnitTests.cs b/src/Controls/tests/Core.UnitTests/TemplatedPageUnitTests.cs
index 8800664ad8a7..63e04e472e4b 100644
--- a/src/Controls/tests/Core.UnitTests/TemplatedPageUnitTests.cs
+++ b/src/Controls/tests/Core.UnitTests/TemplatedPageUnitTests.cs
@@ -17,7 +17,7 @@ public void TemplatedPage_should_have_the_InternalChildren_correctly_when_Contro
 
 			sut.ControlTemplate = new ControlTemplate(typeof(ExpectedView));
 
-			Assert.Equal(1, internalChildren.Count);
+			Assert.Single(internalChildren);
 			Assert.IsType<ExpectedView>(internalChildren[0]);
 		}
 
diff --git a/src/Controls/tests/Core.UnitTests/TemplatedViewUnitTests.cs b/src/Controls/tests/Core.UnitTests/TemplatedViewUnitTests.cs
index baa06db36941..45e26828ed4e 100644
--- a/src/Controls/tests/Core.UnitTests/TemplatedViewUnitTests.cs
+++ b/src/Controls/tests/Core.UnitTests/TemplatedViewUnitTests.cs
@@ -18,7 +18,7 @@ public void TemplatedView_should_have_the_InternalChildren_correctly_when_Contro
 
 			sut.ControlTemplate = new ControlTemplate(typeof(ExpectedView));
 
-			Assert.Equal(1, internalChildren.Count);
+			Assert.Single(internalChildren);
 			Assert.IsType<ExpectedView>(internalChildren[0]);
 		}
 
diff --git a/src/Controls/tests/Core.UnitTests/VisualStateManagerTests.cs b/src/Controls/tests/Core.UnitTests/VisualStateManagerTests.cs
index b44b847c27dd..f8f7fe3f7a1f 100644
--- a/src/Controls/tests/Core.UnitTests/VisualStateManagerTests.cs
+++ b/src/Controls/tests/Core.UnitTests/VisualStateManagerTests.cs
@@ -460,9 +460,9 @@ public void VSMFromStyleAreUnApplied()
 			};
 
 			Assert.NotNull(VisualStateManager.GetVisualStateGroups(label));
-			Assert.Equal(1, VisualStateManager.GetVisualStateGroups(label).Count); //the list applied by style has one group			
+			Assert.Single(VisualStateManager.GetVisualStateGroups(label)); //the list applied by style has one group			
 			label.ClearValue(Label.StyleProperty); //clear the style
-			Assert.Equal(0, VisualStateManager.GetVisualStateGroups(label).Count); //default style (created by defaultValueCreator) has no groups
+			Assert.Empty(VisualStateManager.GetVisualStateGroups(label)); //default style (created by defaultValueCreator) has no groups
 		}
 
 		[Fact]
@@ -486,7 +486,7 @@ public void UnapplyingVSMShouldUnapplySetters()
 			VisualStateManager.GoToState(label, SelectedStateName);
 			Assert.Equal(label.TextColor, Colors.HotPink);
 			label.ClearValue(VisualStateManager.VisualStateGroupsProperty);
-			Assert.Equal(0, VisualStateManager.GetVisualStateGroups(label).Count); //default style (created by defaultValueCreator) has no groups
+			Assert.Empty(VisualStateManager.GetVisualStateGroups(label)); //default style (created by defaultValueCreator) has no groups
 			Assert.False(label.TextColor == Colors.HotPink); //setter should be unapplied
 		}
 
diff --git a/src/Controls/tests/Core.UnitTests/VisualTreeHelperTests.cs b/src/Controls/tests/Core.UnitTests/VisualTreeHelperTests.cs
index 1f25a5ffbfc0..c05c37ae33d9 100644
--- a/src/Controls/tests/Core.UnitTests/VisualTreeHelperTests.cs
+++ b/src/Controls/tests/Core.UnitTests/VisualTreeHelperTests.cs
@@ -114,11 +114,11 @@ public void ApplicationChildren()
 			var windowChildren = ((IVisualTreeElement)window).GetVisualChildren();
 			var pageChildren = ((IVisualTreeElement)page).GetVisualChildren();
 
-			Assert.Equal(1, appChildren.Count);
+			Assert.Single(appChildren);
 			Assert.Equal(window, appChildren[0]);
-			Assert.Equal(1, windowChildren.Count);
+			Assert.Single(windowChildren);
 			Assert.Equal(page, windowChildren[0]);
-			Assert.Equal(0, pageChildren.Count);
+			Assert.Empty(pageChildren);
 		}
 
 		[Fact]
diff --git a/src/Controls/tests/Core.UnitTests/WindowsTests.cs b/src/Controls/tests/Core.UnitTests/WindowsTests.cs
index 997c217a12d7..57723186319f 100644
--- a/src/Controls/tests/Core.UnitTests/WindowsTests.cs
+++ b/src/Controls/tests/Core.UnitTests/WindowsTests.cs
@@ -420,7 +420,7 @@ void ValidateSetup(Application app, Page page = null)
 			// Validate all the parent hierarchies are correct
 			Assert.Equal(app, window.Parent);
 			Assert.Equal(window, window.Page.Parent);
-			Assert.Equal(1, app.Windows.Count);
+			Assert.Single(app.Windows);
 			Assert.Equal(app.LogicalChildrenInternal[0], window);
 			Assert.Equal(window.LogicalChildrenInternal[0], page);
 			Assert.Single(app.LogicalChildrenInternal);
diff --git a/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.Android.cs b/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.Android.cs
index 2c7296d1db2d..85f861d20ed3 100644
--- a/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.Android.cs
+++ b/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.Android.cs
@@ -48,7 +48,7 @@ await CreateHandlerAndAddToWindow<IWindowHandler>(rootPage,
 
 
 			// Without Exceptions here, the test has passed.
-			Assert.Equal(0, (rootPage as IPageContainer<Page>).CurrentPage.Navigation.ModalStack.Count);
+			Assert.Empty((rootPage as IPageContainer<Page>).CurrentPage.Navigation.ModalStack);
 		}
 
 		[Fact]
diff --git a/src/Controls/tests/DeviceTests/Elements/Modal/ModalTests.cs b/src/Controls/tests/DeviceTests/Elements/Modal/ModalTests.cs
index 3e9479f334ad..b74ffd24f80d 100644
--- a/src/Controls/tests/DeviceTests/Elements/Modal/ModalTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Modal/ModalTests.cs
@@ -441,7 +441,7 @@ await CreateHandlerAndAddToWindow<IWindowHandler>(window,
 					window.Page = nextPage;
 					await OnUnloadedAsync(modalPage.Content);
 					await OnLoadedAsync(nextPage.Content);
-					Assert.Equal(0, window.Navigation.ModalStack.Count);
+					Assert.Empty(window.Navigation.ModalStack);
 				});
 		}
 
@@ -510,13 +510,13 @@ await CreateHandlerAndAddToWindow<IWindowHandler>(rootPage,
 
 					await currentPage.Navigation.PushModalAsync(modalPage);
 					await OnLoadedAsync(modalPage);
-					Assert.Equal(1, currentPage.Navigation.ModalStack.Count);
+					Assert.Single(currentPage.Navigation.ModalStack);
 					await currentPage.Navigation.PopModalAsync();
 					await OnUnloadedAsync(modalPage);
 				});
 
 
-			Assert.Equal(0, rootPage.GetCurrentPage().Navigation.ModalStack.Count);
+			Assert.Empty(rootPage.GetCurrentPage().Navigation.ModalStack);
 		}
 
 		class PageTypes : IEnumerable<object[]>
diff --git a/src/Controls/tests/DeviceTests/Elements/Modal/ModalTests.iOS.cs b/src/Controls/tests/DeviceTests/Elements/Modal/ModalTests.iOS.cs
index 94eebec53075..ea1f92154cfe 100644
--- a/src/Controls/tests/DeviceTests/Elements/Modal/ModalTests.iOS.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Modal/ModalTests.iOS.cs
@@ -27,7 +27,7 @@ await CreateHandlerAndAddToWindow<IWindowHandler>(rootPage,
 					var currentPage = rootPage.GetCurrentPage();
 					await currentPage.Navigation.PushModalAsync(modalPage);
 					await OnLoadedAsync(modalPage);
-					Assert.Equal(1, currentPage.Navigation.ModalStack.Count);
+					Assert.Single(currentPage.Navigation.ModalStack);
 
 					var rootView = handler.PlatformView;
 					Assert.NotNull(rootView);
diff --git a/src/Controls/tests/DeviceTests/Elements/ScrollView/ScrollViewTests.cs b/src/Controls/tests/DeviceTests/Elements/ScrollView/ScrollViewTests.cs
index 9dd3c8e77488..651a2fce9da3 100644
--- a/src/Controls/tests/DeviceTests/Elements/ScrollView/ScrollViewTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/ScrollView/ScrollViewTests.cs
@@ -207,7 +207,7 @@ static async Task WaitAssert(Func<bool> predicate, int interval = 100, int timeo
 
 			if (!success)
 			{
-				Assert.False(true, message);
+				Assert.Fail(message);
 			}
 		}
 	}
diff --git a/src/Controls/tests/DeviceTests/Elements/Shell/ShellFlyoutTests.cs b/src/Controls/tests/DeviceTests/Elements/Shell/ShellFlyoutTests.cs
index e5b24352e3df..e5d5b1afde08 100644
--- a/src/Controls/tests/DeviceTests/Elements/Shell/ShellFlyoutTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Shell/ShellFlyoutTests.cs
@@ -118,10 +118,7 @@ await RunShellTest(shell =>
 				}
 				else
 				{
-					AssertionExtensions.AssertWithMessage(() =>
-						Assert.True(flyoutFrame.Height < 56),
-						$"Expected < 56 Actual: {flyoutFrame.Height}"
-					);
+					Assert.True(flyoutFrame.Height < 56, $"Expected < 56 Actual: {flyoutFrame.Height}");
 				}
 			});
 		}
@@ -288,15 +285,9 @@ await RunShellTest(shell =>
 				else
 					verticalDiff = Math.Abs(Math.Abs(frameWithMargin.Top - (frameWithoutMargin.Top - GetSafeArea().Top)) - 30);
 
-				AssertionExtensions.AssertWithMessage(() =>
-					Assert.True(leftDiff < 0.2),
-					$"{partTesting} Left Margin Incorrect. Frame w/ margin: {frameWithMargin}. Frame w/o margin : {frameWithoutMargin}"
-				);
+				Assert.True(leftDiff < 0.2, $"{partTesting} Left Margin Incorrect. Frame w/ margin: {frameWithMargin}. Frame w/o margin : {frameWithoutMargin}");
 
-				AssertionExtensions.AssertWithMessage(() =>
-					Assert.True(verticalDiff < 0.2),
-					$"{partTesting} Top Margin Incorrect. Frame w/ margin: {frameWithMargin}. Frame w/o margin : {frameWithoutMargin}"
-				);
+				Assert.True(verticalDiff < 0.2, $"{partTesting} Top Margin Incorrect. Frame w/ margin: {frameWithMargin}. Frame w/o margin : {frameWithoutMargin}");
 			});
 		}
 
diff --git a/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.iOS.cs b/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.iOS.cs
index ccf8e0f68113..0036037ba333 100644
--- a/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.iOS.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.iOS.cs
@@ -98,7 +98,7 @@ await CreateHandlerAndAddToWindow<ShellRenderer>(shell, async (handler) =>
 				Assert.Equal(1, navigatedFired);
 				Assert.Equal(ShellNavigationSource.PopToRoot, shellNavigationSource.Value);
 
-				Assert.Equal(0, shell.Navigation.ModalStack.Count);
+				Assert.Empty(shell.Navigation.ModalStack);
 
 				void ShellNavigated(object sender, ShellNavigatedEventArgs e)
 				{
@@ -141,7 +141,7 @@ await CreateHandlerAndAddToWindow<ShellRenderer>(shell, async (handler) =>
 				await finishedNavigation.Task.WaitAsync(TimeSpan.FromSeconds(2));
 				Assert.Equal(1, navigatedFired);
 				Assert.Equal(ShellNavigationSource.PopToRoot, shellNavigationSource.Value);
-				Assert.Equal(0, shell.Navigation.ModalStack.Count);
+				Assert.Empty(shell.Navigation.ModalStack);
 
 				void ShellNavigated(object sender, ShellNavigatedEventArgs e)
 				{
diff --git a/src/Controls/tests/DeviceTests/Elements/VisualElementTreeTests.cs b/src/Controls/tests/DeviceTests/Elements/VisualElementTreeTests.cs
index 37bc1bc3ec7e..9eaefc87f183 100644
--- a/src/Controls/tests/DeviceTests/Elements/VisualElementTreeTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/VisualElementTreeTests.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Maui.Controls;
 using Microsoft.Maui.Controls.Handlers;
@@ -72,18 +73,14 @@ await CreateHandlerAndAddToWindow<IWindowHandler>(rootPage, async handler =>
 				// Find label at the top left corner
 				var topLeft = new Graphics.Point(locationOnScreen.X + 1, locationOnScreen.Y + 1);
 
-				AssertionExtensions.AssertWithMessage(
-					() => Assert.Contains(label, window.GetVisualTreeElements(topLeft)),
-					$"Unable to find label using top left coordinate: {topLeft} with label location: {label.GetBoundingBox()}");
+				Assert.True(window.GetVisualTreeElements(topLeft).Contains(label), $"Unable to find label using top left coordinate: {topLeft} with label location: {label.GetBoundingBox()}");
 
 				// find label at the bottom right corner
 				var bottomRight = new Graphics.Point(
 					locationOnScreen.X + labelFrame.Width - 1,
 					locationOnScreen.Y + labelFrame.Height - 1);
 
-				AssertionExtensions.AssertWithMessage(
-					() => Assert.Contains(label, window.GetVisualTreeElements(bottomRight)),
-					$"Unable to find label using bottom right coordinate: {bottomRight} with label location: {label.GetBoundingBox()}");
+				Assert.True(window.GetVisualTreeElements(bottomRight).Contains(label), $"Unable to find label using bottom right coordinate: {bottomRight} with label location: {label.GetBoundingBox()}");
 
 				// Ensure that the point directly outside the bounds of the label doesn't
 				// return the label
diff --git a/src/Core/tests/DeviceTests.Shared/Core.DeviceTests.Shared.csproj b/src/Core/tests/DeviceTests.Shared/Core.DeviceTests.Shared.csproj
index f9cede43f7d2..1b17e0018724 100644
--- a/src/Core/tests/DeviceTests.Shared/Core.DeviceTests.Shared.csproj
+++ b/src/Core/tests/DeviceTests.Shared/Core.DeviceTests.Shared.csproj
@@ -12,8 +12,8 @@
   <Import Project="$(MauiSrcDirectory)MultiTargeting.targets" />
 
   <ItemGroup>
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.utility" Version="2.4.2" />
+    <PackageReference Include="xunit" Version="2.5.0" />
+    <PackageReference Include="xunit.runner.utility" Version="2.5.0" />
     <PackageReference Include="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21558.2" />
   </ItemGroup>
 
diff --git a/src/Core/tests/DeviceTests.Shared/HandlerTests/TextStyle/TextStyleHandlerTests.Android.cs b/src/Core/tests/DeviceTests.Shared/HandlerTests/TextStyle/TextStyleHandlerTests.Android.cs
index 9afde87f098f..ba982976f8c9 100644
--- a/src/Core/tests/DeviceTests.Shared/HandlerTests/TextStyle/TextStyleHandlerTests.Android.cs
+++ b/src/Core/tests/DeviceTests.Shared/HandlerTests/TextStyle/TextStyleHandlerTests.Android.cs
@@ -72,7 +72,7 @@ protected TextView GetNativeTextView(ElementHandler handler)
 				case SearchView sv:
 					return sv.GetFirstChildOfType<EditText>();
 				default:
-					Assert.True(false, $"I don't know how to get the TextView from here {handler.PlatformView}");
+					Assert.Fail($"I don't know how to get the TextView from here {handler.PlatformView}");
 					return null;
 
 			}
diff --git a/src/Core/tests/DeviceTests.Shared/HandlerTests/TextStyle/TextStyleHandlerTests.iOS.cs b/src/Core/tests/DeviceTests.Shared/HandlerTests/TextStyle/TextStyleHandlerTests.iOS.cs
index 5e64306bea0b..43c25dbabe31 100644
--- a/src/Core/tests/DeviceTests.Shared/HandlerTests/TextStyle/TextStyleHandlerTests.iOS.cs
+++ b/src/Core/tests/DeviceTests.Shared/HandlerTests/TextStyle/TextStyleHandlerTests.iOS.cs
@@ -88,7 +88,7 @@ protected UIFont GetNativeFont(ElementHandler handler)
 				case UITextView tv:
 					return tv.Font;
 				default:
-					Assert.True(false, $"I don't know how to get the UIFont from here {handler.PlatformView}");
+					Assert.Fail($"I don't know how to get the UIFont from here {handler.PlatformView}");
 					return null;
 
 			}
diff --git a/src/Core/tests/DeviceTests/Handlers/Image/ImageHandlerTests.cs b/src/Core/tests/DeviceTests/Handlers/Image/ImageHandlerTests.cs
index 4846aab8c253..e159819e1857 100644
--- a/src/Core/tests/DeviceTests/Handlers/Image/ImageHandlerTests.cs
+++ b/src/Core/tests/DeviceTests/Handlers/Image/ImageHandlerTests.cs
@@ -197,7 +197,12 @@ await InvokeOnMainThreadAsync(async () =>
 		}
 
 		[Fact]
-		public async Task<List<(string Member, object Value)>> ImageLoadSequenceIsCorrect()
+		public async Task ImageLoadSequenceIsCorrect()
+		{
+			await ImageLoadSequenceIsCorrectImplementation();
+		}
+
+		async Task<List<(string Member, object Value)>> ImageLoadSequenceIsCorrectImplementation()
 		{
 			var image = new TStub
 			{
@@ -255,7 +260,12 @@ await InvokeOnMainThreadAsync(async () =>
 		}
 
 		[Fact]
-		public async Task<List<(string Member, object Value)>> InterruptingLoadCancelsAndStartsOver()
+		public async Task InterruptingLoadCancelsAndStartsOver()
+		{
+			await InterruptingLoadCancelsAndStartsOverImplementation();
+		}
+
+		async Task<List<(string Member, object Value)>> InterruptingLoadCancelsAndStartsOverImplementation()
 		{
 			var image = new TStub
 			{
@@ -413,7 +423,7 @@ await InvokeOnMainThreadAsync(async () =>
 		[Fact]
 		public async Task ImageLoadSequenceIsCorrectWithChecks()
 		{
-			var events = await ImageLoadSequenceIsCorrect();
+			var events = await ImageLoadSequenceIsCorrectImplementation();
 
 			Assert.Single(events);
 			Assert.Equal(ImageEventCustomMemberName, events[0].Member);
@@ -430,7 +440,7 @@ public async Task ImageLoadSequenceIsCorrectWithChecks()
 		[Fact]
 		public async Task InterruptingLoadCancelsAndStartsOverWithChecks()
 		{
-			var events = await InterruptingLoadCancelsAndStartsOver();
+			var events = await InterruptingLoadCancelsAndStartsOverImplementation();
 
 			Assert.Single(events);
 			Assert.Equal(ImageEventCustomMemberName, events[0].Member);
diff --git a/src/Core/tests/DeviceTests/Handlers/Layout/LayoutHandlerTests.cs b/src/Core/tests/DeviceTests/Handlers/Layout/LayoutHandlerTests.cs
index e91c8decc7c8..f4c77b61c469 100644
--- a/src/Core/tests/DeviceTests/Handlers/Layout/LayoutHandlerTests.cs
+++ b/src/Core/tests/DeviceTests/Handlers/Layout/LayoutHandlerTests.cs
@@ -63,7 +63,7 @@ public async Task HandlerRemovesChildFromNativeLayout()
 				return GetNativeChildren(handler);
 			});
 
-			Assert.Equal(1, children.Count);
+			Assert.Single(children);
 			Assert.Same(slider.Handler.PlatformView, children[0]);
 
 			var count = await InvokeOnMainThreadAsync(() =>
@@ -140,7 +140,7 @@ public async Task InsertAddsChildToPlatformLayout()
 				return GetNativeChildren(handler);
 			});
 
-			Assert.Equal(1, children.Count);
+			Assert.Single(children);
 			Assert.Same(slider.Handler.PlatformView, children[0]);
 
 			children = await InvokeOnMainThreadAsync(() =>
@@ -171,7 +171,7 @@ public async Task UpdateNativeLayout()
 				return GetNativeChildren(handler);
 			});
 
-			Assert.Equal(1, children.Count);
+			Assert.Single(children);
 			Assert.Same(slider.Handler.PlatformView, children[0]);
 
 			children = await InvokeOnMainThreadAsync(() =>
@@ -181,7 +181,7 @@ public async Task UpdateNativeLayout()
 				return GetNativeChildren(handler);
 			});
 
-			Assert.Equal(1, children.Count);
+			Assert.Single(children);
 			Assert.Same(button.Handler.PlatformView, children[0]);
 		}
 
@@ -201,7 +201,7 @@ public async Task ContainerViewAddedToLayout()
 				return GetNativeChildren(handler);
 			});
 
-			Assert.Equal(1, children.Count);
+			Assert.Single(children);
 			Assert.Same(addedSlider.Handler.ContainerView, children[0]);
 
 			children = await InvokeOnMainThreadAsync(() =>
diff --git a/src/Core/tests/DeviceTests/Memory/MemoryTests.cs b/src/Core/tests/DeviceTests/Memory/MemoryTests.cs
index 6f0d06c70aa0..854bc10520bc 100644
--- a/src/Core/tests/DeviceTests/Memory/MemoryTests.cs
+++ b/src/Core/tests/DeviceTests/Memory/MemoryTests.cs
@@ -87,7 +87,7 @@ await AssertionExtensions.Wait(() =>
 
 			if (_fixture.DoReferencesStillExist(data.HandlerType))
 			{
-				Assert.True(false, $"{data.HandlerType} failed to collect.");
+				Assert.Fail($"{data.HandlerType} failed to collect.");
 			}
 		}
 	}
diff --git a/src/Core/tests/DeviceTests/Services/ImageSource/ImageSourceServiceTests.Android.cs b/src/Core/tests/DeviceTests/Services/ImageSource/ImageSourceServiceTests.Android.cs
index 829e6ea60496..1e6379d5df01 100644
--- a/src/Core/tests/DeviceTests/Services/ImageSource/ImageSourceServiceTests.Android.cs
+++ b/src/Core/tests/DeviceTests/Services/ImageSource/ImageSourceServiceTests.Android.cs
@@ -105,12 +105,12 @@ public async Task CustomTheSameImageSourceReturnsTheSameBitmap()
 
 			// get an image
 			var result1 = await service.GetDrawableAsync(imageSource, MauiProgram.DefaultContext);
-			Assert.Equal(1, cache.Cache.Count);
+			Assert.Single(cache.Cache);
 			Assert.Equal(1, cache.Cache[imageSource.Color].Count);
 
 			// get the image again
 			var result2 = await service.GetDrawableAsync(imageSource, MauiProgram.DefaultContext);
-			Assert.Equal(1, cache.Cache.Count);
+			Assert.Single(cache.Cache);
 			Assert.Equal(2, cache.Cache[imageSource.Color].Count);
 
 			// make sure it was NOT collected and we got the same image
@@ -131,7 +131,7 @@ public async Task CustomReleasingImageSourceReturnsDifferentBitmap()
 			// get an image
 			var result1 = await service.GetDrawableAsync(imageSource, MauiProgram.DefaultContext);
 			var drawable1 = result1.Value;
-			Assert.Equal(1, cache.Cache.Count);
+			Assert.Single(cache.Cache);
 			Assert.Equal(1, cache.Cache[imageSource.Color].Count);
 
 			// release
@@ -140,7 +140,7 @@ public async Task CustomReleasingImageSourceReturnsDifferentBitmap()
 			// get the image again
 			var result2 = await service.GetDrawableAsync(imageSource, MauiProgram.DefaultContext);
 			var drawable2 = result2.Value;
-			Assert.Equal(1, cache.Cache.Count);
+			Assert.Single(cache.Cache);
 			Assert.Equal(1, cache.Cache[imageSource.Color].Count);
 
 			// make sure it WAS collected and we got a new image
@@ -161,12 +161,12 @@ public async Task LoadDrawableAsyncCorrectlyFetchesDrawable()
 
 			// get an image
 			var result1 = await service.GetDrawableAsync(imageSource, MauiProgram.DefaultContext);
-			Assert.Equal(1, cache.Cache.Count);
+			Assert.Single(cache.Cache);
 			Assert.Equal(1, cache.Cache[imageSource.Color].Count);
 
 			// get the image again as a load
 			var result2 = await service.LoadDrawableAsync(imageSource, imageView);
-			Assert.Equal(1, cache.Cache.Count);
+			Assert.Single(cache.Cache);
 			Assert.Equal(2, cache.Cache[imageSource.Color].Count);
 
 			// make sure it was NOT collected and we got the same image
@@ -193,7 +193,7 @@ public async Task DisposingLoadDrawableAsyncDoesNotDisposeRealBitmap()
 			result2.Dispose();
 
 			// ensure the count went down
-			Assert.Equal(1, cache.Cache.Count);
+			Assert.Single(cache.Cache);
 			Assert.Equal(1, cache.Cache[imageSource.Color].Count);
 
 			result1.Dispose();
@@ -216,7 +216,7 @@ public async Task DisposingLoadDrawableAsyncBaseDoesNotDisposeRealBitmap()
 			result1.Dispose();
 
 			// ensure the count went down
-			Assert.Equal(1, cache.Cache.Count);
+			Assert.Single(cache.Cache);
 			Assert.Equal(1, cache.Cache[imageSource.Color].Count);
 
 			result2.Dispose();
diff --git a/src/Core/tests/DeviceTests/Services/ImageSource/ImageSourceServiceTests.iOS.cs b/src/Core/tests/DeviceTests/Services/ImageSource/ImageSourceServiceTests.iOS.cs
index 96faefe3f9c4..f603d770b8b4 100644
--- a/src/Core/tests/DeviceTests/Services/ImageSource/ImageSourceServiceTests.iOS.cs
+++ b/src/Core/tests/DeviceTests/Services/ImageSource/ImageSourceServiceTests.iOS.cs
@@ -81,12 +81,12 @@ public async Task CustomTheSameImageSourceReturnsTheSameBitmap()
 
 			// get an image
 			var result1 = await service.GetImageAsync(imageSource);
-			Assert.Equal(1, cache.Cache.Count);
+			Assert.Single(cache.Cache);
 			Assert.Equal(1, cache.Cache[imageSource.Color].Count);
 
 			// get the image again
 			var result2 = await service.GetImageAsync(imageSource);
-			Assert.Equal(1, cache.Cache.Count);
+			Assert.Single(cache.Cache);
 			Assert.Equal(2, cache.Cache[imageSource.Color].Count);
 
 			// make sure it was NOT collected and we got the same image
@@ -106,7 +106,7 @@ public async Task CustomReleasingImageSourceReturnsDifferentBitmap()
 
 			// get an image
 			var result1 = await service.GetImageAsync(imageSource);
-			Assert.Equal(1, cache.Cache.Count);
+			Assert.Single(cache.Cache);
 			Assert.Equal(1, cache.Cache[imageSource.Color].Count);
 
 			// release
@@ -114,7 +114,7 @@ public async Task CustomReleasingImageSourceReturnsDifferentBitmap()
 
 			// get the image again
 			var result2 = await service.GetImageAsync(imageSource);
-			Assert.Equal(1, cache.Cache.Count);
+			Assert.Single(cache.Cache);
 			Assert.Equal(1, cache.Cache[imageSource.Color].Count);
 
 			// make sure it WAS collected and we got a new image
diff --git a/src/Core/tests/UnitTests/Core.UnitTests.csproj b/src/Core/tests/UnitTests/Core.UnitTests.csproj
index b86589d737c5..5ae191db21aa 100644
--- a/src/Core/tests/UnitTests/Core.UnitTests.csproj
+++ b/src/Core/tests/UnitTests/Core.UnitTests.csproj
@@ -29,8 +29,8 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="NSubstitute" Version="4.3.0" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="xunit" Version="2.5.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/src/Essentials/test/UnitTests/Essentials.UnitTests.csproj b/src/Essentials/test/UnitTests/Essentials.UnitTests.csproj
index 9f1296f54d27..77943cbd9068 100644
--- a/src/Essentials/test/UnitTests/Essentials.UnitTests.csproj
+++ b/src/Essentials/test/UnitTests/Essentials.UnitTests.csproj
@@ -14,8 +14,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
+    <PackageReference Include="xunit" Version="2.5.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Graphics/tests/Graphics.Tests/Graphics.Tests.csproj b/src/Graphics/tests/Graphics.Tests/Graphics.Tests.csproj
index fea509e9055a..d293e6b25bfd 100644
--- a/src/Graphics/tests/Graphics.Tests/Graphics.Tests.csproj
+++ b/src/Graphics/tests/Graphics.Tests/Graphics.Tests.csproj
@@ -11,8 +11,8 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
-		<PackageReference Include="xunit" Version="2.4.2" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+		<PackageReference Include="xunit" Version="2.5.0" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
diff --git a/src/SingleProject/Resizetizer/test/UnitTests/Resizetizer.UnitTests.csproj b/src/SingleProject/Resizetizer/test/UnitTests/Resizetizer.UnitTests.csproj
index 5d31b3ad1229..4b083e78bf99 100644
--- a/src/SingleProject/Resizetizer/test/UnitTests/Resizetizer.UnitTests.csproj
+++ b/src/SingleProject/Resizetizer/test/UnitTests/Resizetizer.UnitTests.csproj
@@ -13,8 +13,8 @@
     <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.7.0" PrivateAssets="all" />
     <PackageReference Include="SkiaSharp" Version="$(_SkiaSharpVersion)" />
     <PackageReference Include="SkiaSharp.Extended" Version="2.0.0-preview.61" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
+    <PackageReference Include="xunit" Version="2.5.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0" />
     <PackageReference Include="coverlet.collector" Version="6.0.0" />
     <PackageReference Include="Svg.Skia" />
   </ItemGroup>
diff --git a/src/TestUtils/src/DeviceTests.Runners/TestUtils.DeviceTests.Runners.csproj b/src/TestUtils/src/DeviceTests.Runners/TestUtils.DeviceTests.Runners.csproj
index c687c939a06e..b7734ea93080 100644
--- a/src/TestUtils/src/DeviceTests.Runners/TestUtils.DeviceTests.Runners.csproj
+++ b/src/TestUtils/src/DeviceTests.Runners/TestUtils.DeviceTests.Runners.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>$(MauiDeviceTestsPlatforms)</TargetFrameworks>
@@ -14,8 +14,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.utility" Version="2.4.2" />
+    <PackageReference Include="xunit" Version="2.5.0" />
+    <PackageReference Include="xunit.runner.utility" Version="2.5.0" />
     <PackageReference Include="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21558.2" />
   </ItemGroup>
 
diff --git a/src/TestUtils/src/DeviceTests/AssertionExtensions.Windows.cs b/src/TestUtils/src/DeviceTests/AssertionExtensions.Windows.cs
index ebcb6b9fc2fc..b010db0dd6ff 100644
--- a/src/TestUtils/src/DeviceTests/AssertionExtensions.Windows.cs
+++ b/src/TestUtils/src/DeviceTests/AssertionExtensions.Windows.cs
@@ -322,7 +322,7 @@ public static async Task<CanvasBitmap> AssertContainsColor(this CanvasBitmap bit
 			if (imageRect.Width == 0 || imageRect.Height == 0)
 			{
 				// Detect this case and give a better message instead of letting GetPixelColors throw an IndexOutOfRangeException
-				Assert.True(false, $"Bitmap must have non-zero width and height.  Width = {(int)imageRect.Width} Height = {(int)imageRect.Height}.");
+				Assert.Fail($"Bitmap must have non-zero width and height.  Width = {(int)imageRect.Width} Height = {(int)imageRect.Height}.");
 				return bitmap;
 			}
 
@@ -336,7 +336,7 @@ public static async Task<CanvasBitmap> AssertContainsColor(this CanvasBitmap bit
 				}
 			}
 
-			Assert.True(false, await CreateColorError(bitmap, $"Color {expectedColor} not found."));
+			Assert.Fail(await CreateColorError(bitmap, $"Color {expectedColor} not found."));
 			return bitmap;
 		}
 
@@ -362,7 +362,7 @@ public static async Task<CanvasBitmap> AssertDoesNotContainColor(this CanvasBitm
 			if (imageRect.Width == 0 || imageRect.Height == 0)
 			{
 				// Detect this case and give a better message instead of letting GetPixelColors throw an IndexOutOfRangeException
-				Assert.True(false, $"Bitmap must have non-zero width and height.  Width = {(int)imageRect.Width} Height = {(int)imageRect.Height}.");
+				Assert.Fail($"Bitmap must have non-zero width and height.  Width = {(int)imageRect.Width} Height = {(int)imageRect.Height}.");
 				return bitmap;
 			}
 
@@ -372,7 +372,7 @@ public static async Task<CanvasBitmap> AssertDoesNotContainColor(this CanvasBitm
 			{
 				if (c.IsEquivalent(unexpectedColor))
 				{
-					Assert.True(false, await CreateColorError(bitmap, $"Color {unexpectedColor} was found."));
+					Assert.Fail(await CreateColorError(bitmap, $"Color {unexpectedColor} was found."));
 				}
 			}
 
diff --git a/src/TestUtils/src/DeviceTests/AssertionExtensions.cs b/src/TestUtils/src/DeviceTests/AssertionExtensions.cs
index f3dfe112c3c4..55decfbb7dc8 100644
--- a/src/TestUtils/src/DeviceTests/AssertionExtensions.cs
+++ b/src/TestUtils/src/DeviceTests/AssertionExtensions.cs
@@ -32,19 +32,7 @@ public static void AssertHasFlag(this Enum self, Enum flag)
 			var hasFlag = self.HasFlag(flag);
 
 			if (!hasFlag)
-				throw new ContainsException(flag, self);
-		}
-
-		public static void AssertWithMessage(Action assertion, string message)
-		{
-			try
-			{
-				assertion();
-			}
-			catch (Exception e)
-			{
-				Assert.True(false, $"Message: {message} Failure: {e}");
-			}
+				throw ContainsException.ForSetItemNotFound(flag.ToString(), self.ToString());
 		}
 
 		public static void CloseEnough(double expected, double actual, double epsilon = 0.2, string? message = null)
diff --git a/src/TestUtils/src/DeviceTests/TestUtils.DeviceTests.csproj b/src/TestUtils/src/DeviceTests/TestUtils.DeviceTests.csproj
index c4b46624200f..066079faa909 100644
--- a/src/TestUtils/src/DeviceTests/TestUtils.DeviceTests.csproj
+++ b/src/TestUtils/src/DeviceTests/TestUtils.DeviceTests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>$(MauiDeviceTestsPlatforms)</TargetFrameworks>
@@ -10,8 +10,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.utility" Version="2.4.2" />
+    <PackageReference Include="xunit" Version="2.5.0" />
+    <PackageReference Include="xunit.runner.utility" Version="2.5.0" />
     <PackageReference Include="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21558.2" />
   </ItemGroup>
 
diff --git a/src/TestUtils/src/TestUtils/TestUtils.csproj b/src/TestUtils/src/TestUtils/TestUtils.csproj
index e1cb0147e68f..b901383fd4d1 100644
--- a/src/TestUtils/src/TestUtils/TestUtils.csproj
+++ b/src/TestUtils/src/TestUtils/TestUtils.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit" Version="2.5.0" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file

From d6c11050be7a575f88be883c77375b7850150f51 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 18 Jul 2023 17:48:45 +0100
Subject: [PATCH 100/105] [main] Update dependencies from dotnet/xharness
 (#16065)

* Update dependencies from https://github.com/dotnet/xharness build 20230710.1

Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit
 From Version 8.0.0-prerelease.23326.1 -> To Version 8.0.0-prerelease.23360.1

* Update dependencies from https://github.com/dotnet/xharness build 20230713.3

Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit
 From Version 8.0.0-prerelease.23326.1 -> To Version 8.0.0-prerelease.23363.3

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---
 .config/dotnet-tools.json |  2 +-
 eng/Version.Details.xml   | 12 ++++++------
 eng/Versions.props        |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 3c6a925d182e..e436a778b3e2 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -15,7 +15,7 @@
       ]
     },
     "microsoft.dotnet.xharness.cli": {
-      "version": "8.0.0-prerelease.23326.1",
+      "version": "8.0.0-prerelease.23363.3",
       "commands": [
         "xharness"
       ]
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index fc8569485ed0..7db7d4c0b93c 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -51,17 +51,17 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>3f4da9ced34942d83054e647f3b1d9d7dde281e8</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.23326.1">
+    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.23363.3">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>747cfb23923a644ee43b012c5bcd7b738a485b8e</Sha>
+      <Sha>b0548ed270ed98fa14ab0fcc5ef7af99fad00237</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="8.0.0-prerelease.23326.1">
+    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="8.0.0-prerelease.23363.3">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>747cfb23923a644ee43b012c5bcd7b738a485b8e</Sha>
+      <Sha>b0548ed270ed98fa14ab0fcc5ef7af99fad00237</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.23326.1">
+    <Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.23363.3">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>747cfb23923a644ee43b012c5bcd7b738a485b8e</Sha>
+      <Sha>b0548ed270ed98fa14ab0fcc5ef7af99fad00237</Sha>
     </Dependency>
   </ProductDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index e3cb7f2cecce..b6cf9a364ef8 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -69,9 +69,9 @@
     <_HarfBuzzSharpVersion>2.8.2.2</_HarfBuzzSharpVersion>
     <_SkiaSharpNativeAssetsVersion>0.0.0-commit.193b587552cb0ed39372a049d7e6c692db98c267.483</_SkiaSharpNativeAssetsVersion>
     <MicrosoftTemplateEngineTasksVersion>7.0.100-preview.5.22226.1</MicrosoftTemplateEngineTasksVersion>
-    <MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.23326.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
-    <MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.23326.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
-    <MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.23326.1</MicrosoftDotNetXHarnessCLIVersion>
+    <MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.23363.3</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
+    <MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.23363.3</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
+    <MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.23363.3</MicrosoftDotNetXHarnessCLIVersion>
     <TizenUIExtensionsVersion>0.9.0</TizenUIExtensionsVersion>
     <SvgSkiaPackageVersion>0.5.13</SvgSkiaPackageVersion>
     <FizzlerPackageVersion>1.2.0</FizzlerPackageVersion>

From d1c07b8ce09bfadbf58ac1b5ea588142146cdc05 Mon Sep 17 00:00:00 2001
From: "E.Z. Hart" <hartez@users.noreply.github.com>
Date: Tue, 18 Jul 2023 10:50:16 -0600
Subject: [PATCH 101/105] Stop DispatcherTimer after Tick fires if IsRepeating
 is false (#16173)

Fixes #16171
---
 .../src/Dispatching/Dispatcher.Android.cs     |  2 ++
 src/Core/src/Dispatching/Dispatcher.iOS.cs    | 13 +++++++++--
 .../Services/Dispatching/DispatcherTests.cs   | 22 +++++++++++++++++++
 3 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/src/Core/src/Dispatching/Dispatcher.Android.cs b/src/Core/src/Dispatching/Dispatcher.Android.cs
index 647902a8a6cc..dd705f3b88ce 100644
--- a/src/Core/src/Dispatching/Dispatcher.Android.cs
+++ b/src/Core/src/Dispatching/Dispatcher.Android.cs
@@ -87,6 +87,8 @@ void OnTimerTick()
 
 			if (IsRepeating)
 				_handler.PostDelayed(OnTimerTick, (long)Interval.TotalMilliseconds);
+			else
+				Stop();
 		}
 	}
 
diff --git a/src/Core/src/Dispatching/Dispatcher.iOS.cs b/src/Core/src/Dispatching/Dispatcher.iOS.cs
index 1ac70fdff595..a4c3092ad74f 100644
--- a/src/Core/src/Dispatching/Dispatcher.iOS.cs
+++ b/src/Core/src/Dispatching/Dispatcher.iOS.cs
@@ -91,8 +91,17 @@ void OnTimerTick()
 
 			Tick?.Invoke(this, EventArgs.Empty);
 
-			if (IsRepeating && _dispatchBlock is not null)
-				_dispatchQueue.DispatchAfter(new DispatchTime(DispatchTime.Now, Interval), _dispatchBlock);
+			if (IsRepeating)
+			{
+				if (_dispatchBlock is not null)
+				{
+					_dispatchQueue.DispatchAfter(new DispatchTime(DispatchTime.Now, Interval), _dispatchBlock);
+				}
+			}
+			else
+			{
+				Stop();
+			}
 		}
 	}
 
diff --git a/src/Core/tests/DeviceTests/Services/Dispatching/DispatcherTests.cs b/src/Core/tests/DeviceTests/Services/Dispatching/DispatcherTests.cs
index ed9e2ab659f7..96062dbf0697 100644
--- a/src/Core/tests/DeviceTests/Services/Dispatching/DispatcherTests.cs
+++ b/src/Core/tests/DeviceTests/Services/Dispatching/DispatcherTests.cs
@@ -211,6 +211,28 @@ public Task CreateTimerRepeatingRepeats() =>
 				Assert.True(ticks > 1, $"# of Ticks: {ticks}, expected > 1");
 			});
 
+		[Fact]
+		public async Task NonRepeatingTimerIsStoppedAfterFiring()
+		{
+			await InvokeOnMainThreadAsync(async () =>
+			{
+				var dispatcher = Dispatcher.GetForCurrentThread();
+				var timer = dispatcher.CreateTimer();
+				using var disposer = new TimerDisposer(timer);
+				
+				Assert.False(timer.IsRunning);
+				
+				timer.Interval = TimeSpan.FromMilliseconds(200);
+				timer.IsRepeating = false;
+				
+				timer.Tick += (_, _) => { };
+				timer.Start();
+
+				await Task.Delay(TimeSpan.FromSeconds(1));
+				Assert.False(timer.IsRunning, "The timer is not repeating, so it should no longer be marked as running after the first tick.");
+			});
+		}
+
 		class TimerDisposer : IDisposable
 		{
 			IDispatcherTimer _timer;

From bcffd04ca71f9cbca7c21075fd58b2745d92fdf4 Mon Sep 17 00:00:00 2001
From: Stephane Delcroix <stephane@delcroix.org>
Date: Tue, 18 Jul 2023 18:52:46 +0200
Subject: [PATCH 102/105] [X] Compiled Bindings to Array (#15944)

emit ldelem opcodes for accessing arrays elements in compiled bindings
---
 .../src/Build.Tasks/SetPropertiesVisitor.cs   | 54 +++++++++++------
 .../Build.Tasks/TypeReferenceExtensions.cs    |  1 +
 src/Controls/src/Core/TypedBinding.cs         | 12 +++-
 .../Xaml.UnitTests/Issues/Maui10396.xaml      | 18 ++++++
 .../Xaml.UnitTests/Issues/Maui10396.xaml.cs   | 59 +++++++++++++++++++
 .../Xaml.UnitTests/Issues/Maui10396Card.xaml  |  8 +++
 .../Issues/Maui10396Card.xaml.cs              | 20 +++++++
 7 files changed, 154 insertions(+), 18 deletions(-)
 create mode 100644 src/Controls/tests/Xaml.UnitTests/Issues/Maui10396.xaml
 create mode 100644 src/Controls/tests/Xaml.UnitTests/Issues/Maui10396.xaml.cs
 create mode 100644 src/Controls/tests/Xaml.UnitTests/Issues/Maui10396Card.xaml
 create mode 100644 src/Controls/tests/Xaml.UnitTests/Issues/Maui10396Card.xaml.cs

diff --git a/src/Controls/src/Build.Tasks/SetPropertiesVisitor.cs b/src/Controls/src/Build.Tasks/SetPropertiesVisitor.cs
index c004232aaa40..9cf853688b4f 100644
--- a/src/Controls/src/Build.Tasks/SetPropertiesVisitor.cs
+++ b/src/Controls/src/Build.Tasks/SetPropertiesVisitor.cs
@@ -428,7 +428,10 @@ static IEnumerable<Instruction> CompileBindingPath(ElementNode node, ILContext c
 			if (properties != null && properties.Count > 0)
 			{
 				var lastProp = properties[properties.Count - 1];
-				tPropertyRef = lastProp.property.PropertyType.ResolveGenericParameters(lastProp.propDeclTypeRef);
+				if (lastProp.property != null)
+					tPropertyRef = lastProp.property.PropertyType.ResolveGenericParameters(lastProp.propDeclTypeRef);
+				else //array type
+					tPropertyRef = lastProp.propDeclTypeRef.ResolveCached(context.Cache);
 			}
 			tPropertyRef = module.ImportReference(tPropertyRef);
 			var valuetupleRef = context.Module.ImportReference(module.ImportReference(context.Cache, ("mscorlib", "System", "ValueTuple`2")).MakeGenericInstanceType(new[] { tPropertyRef, module.TypeSystem.Boolean }));
@@ -533,10 +536,16 @@ static IEnumerable<Instruction> CompileBindingPath(ElementNode node, ILContext c
 																			&& pd.GetMethod.IsPublic, out indexerDeclTypeRef);
 
 					properties.Add((indexer, indexerDeclTypeRef, indexArg));
-					var indexType = indexer.GetMethod.Parameters[0].ParameterType.ResolveGenericParameters(indexerDeclTypeRef);
-					if (!TypeRefComparer.Default.Equals(indexType, module.TypeSystem.String) && !TypeRefComparer.Default.Equals(indexType, module.TypeSystem.Int32))
-						throw new BuildException(BuildExceptionCode.BindingIndexerTypeUnsupported, lineInfo, null, indexType.FullName);
-					previousPartTypeRef = indexer.PropertyType.ResolveGenericParameters(indexerDeclTypeRef);
+					if (indexer != null) //the case when we index on an array, not a list
+					{
+						var indexType = indexer.GetMethod.Parameters[0].ParameterType.ResolveGenericParameters(indexerDeclTypeRef);
+						if (!TypeRefComparer.Default.Equals(indexType, module.TypeSystem.String) && !TypeRefComparer.Default.Equals(indexType, module.TypeSystem.Int32))
+							throw new BuildException(BuildExceptionCode.BindingIndexerTypeUnsupported, lineInfo, null, indexType.FullName);
+						previousPartTypeRef = indexer.PropertyType.ResolveGenericParameters(indexerDeclTypeRef);
+					}
+					else
+						previousPartTypeRef.ResolveCached(context.Cache);
+					
 				}
 			}
 			return properties;
@@ -570,22 +579,31 @@ static IEnumerable<Instruction> DigProperties(IEnumerable<(PropertyDefinition pr
 
 				if (indexArg != null)
 				{
-					var indexType = property.GetMethod.Parameters[0].ParameterType.ResolveGenericParameters(propDeclTypeRef);
-					if (TypeRefComparer.Default.Equals(indexType, module.TypeSystem.String))
-						yield return Create(Ldstr, indexArg);
-					else if (TypeRefComparer.Default.Equals(indexType, module.TypeSystem.Int32) && int.TryParse(indexArg, out int index))
-						yield return Create(Ldc_I4, index);
+					if (property == null && int.TryParse(indexArg, out int index)) //array
+						yield return Create(Ldc_I4, index);							
 					else
-						throw new BuildException(BindingIndexerParse, lineInfo, null, indexArg, property.Name);
+					{
+						var indexType = property.GetMethod.Parameters[0].ParameterType.ResolveGenericParameters(propDeclTypeRef);
+						if (TypeRefComparer.Default.Equals(indexType, module.TypeSystem.String))
+							yield return Create(Ldstr, indexArg);
+						else if (TypeRefComparer.Default.Equals(indexType, module.TypeSystem.Int32) && int.TryParse(indexArg, out index))
+							yield return Create(Ldc_I4, index);
+						else
+							throw new BuildException(BindingIndexerParse, lineInfo, null, indexArg, property.Name);
+					}
 				}
 
-				var getMethod = module.ImportReference((module.ImportReference(property.GetMethod)).ResolveGenericParameters(propDeclTypeRef, module));
-
-				if (property.GetMethod.IsVirtual)
-					yield return Create(Callvirt, getMethod);
+				if (indexArg != null && property == null)
+					yield return Create(Ldelem_Ref);
 				else
-					yield return Create(Call, getMethod);
+				{
+					var getMethod = module.ImportReference((module.ImportReference(property.GetMethod)).ResolveGenericParameters(propDeclTypeRef, module));
 
+					if (property.GetMethod.IsVirtual)
+						yield return Create(Callvirt, getMethod);
+					else
+						yield return Create(Call, getMethod);
+				}
 				first = false;
 			}
 		}
@@ -719,7 +737,7 @@ static IEnumerable<Instruction> CompiledBindingGetSetter(TypeReference tSourceRe
 			setter.Body.InitLocals = true;
 
 			var il = setter.Body.GetILProcessor();
-			if (!properties.Any() || properties.Last().property.SetMethod == null)
+			if (!properties.Any() || properties.Last().property == null || properties.Last().property.SetMethod == null)
 			{
 				yield return Create(Ldnull); //throw or not ?
 				yield break;
@@ -910,6 +928,8 @@ static IEnumerable<Instruction> CompiledBindingGetHandlers(TypeReference tSource
 
 			for (var i = 0; i < properties.Count; i++)
 			{
+				if (properties[i].property == null)
+					continue;
 				yield return Create(Dup);
 				yield return Create(Ldc_I4, i);
 				yield return Create(Ldnull);
diff --git a/src/Controls/src/Build.Tasks/TypeReferenceExtensions.cs b/src/Controls/src/Build.Tasks/TypeReferenceExtensions.cs
index ce88f7059b2a..1b8535e2041e 100644
--- a/src/Controls/src/Build.Tasks/TypeReferenceExtensions.cs
+++ b/src/Controls/src/Build.Tasks/TypeReferenceExtensions.cs
@@ -424,5 +424,6 @@ public static GenericInstanceType ResolveGenericParameters(this GenericInstanceT
 		}
 
 		public static TypeDefinition ResolveCached(this TypeReference typeReference, XamlCache cache) => cache.Resolve(typeReference);
+	
 	}
 }
diff --git a/src/Controls/src/Core/TypedBinding.cs b/src/Controls/src/Core/TypedBinding.cs
index 48dd2c104594..47ddb550cfb4 100644
--- a/src/Controls/src/Core/TypedBinding.cs
+++ b/src/Controls/src/Core/TypedBinding.cs
@@ -85,7 +85,11 @@ public TypedBinding(Func<TSource, (TProperty value, bool success)> getter, Actio
 
 			_handlers = new PropertyChangedProxy[handlers.Length];
 			for (var i = 0; i < handlers.Length; i++)
+			{
+				if (handlers[i] is null)
+					continue;
 				_handlers[i] = new PropertyChangedProxy(handlers[i].Item1, handlers[i].Item2, this);
+			}
 		}
 
 		readonly WeakReference<object> _weakSource = new WeakReference<object>(null);
@@ -145,7 +149,11 @@ internal override BindingBase Clone()
 			if (handlers != null)
 			{
 				for (var i = 0; i < _handlers.Length; i++)
+				{
+					if (_handlers[i] == null)
+						continue;
 					handlers[i] = new Tuple<Func<TSource, object>, string>(_handlers[i].PartGetter, _handlers[i].PropertyName);
+				}
 			}
 			return new TypedBinding<TSource, TProperty>(_getter, _setter, handlers)
 			{
@@ -301,6 +309,8 @@ void Subscribe(TSource sourceObject)
 		{
 			for (var i = 0; i < _handlers.Length; i++)
 			{
+				if (_handlers[i] == null)
+					continue;
 				var part = _handlers[i].PartGetter(sourceObject);
 				if (part == null)
 					break;
@@ -314,7 +324,7 @@ void Subscribe(TSource sourceObject)
 		void Unsubscribe()
 		{
 			for (var i = 0; i < _handlers.Length; i++)
-				_handlers[i].Listener.Unsubscribe();
+				_handlers[i]?.Listener.Unsubscribe();
 		}
 	}
 }
diff --git a/src/Controls/tests/Xaml.UnitTests/Issues/Maui10396.xaml b/src/Controls/tests/Xaml.UnitTests/Issues/Maui10396.xaml
new file mode 100644
index 000000000000..cd87b7edbdd8
--- /dev/null
+++ b/src/Controls/tests/Xaml.UnitTests/Issues/Maui10396.xaml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:local="clr-namespace:Microsoft.Maui.Controls.Xaml.UnitTests"
+             x:Class="Microsoft.Maui.Controls.Xaml.UnitTests.Maui10396"
+             x:DataType="local:Maui10396VM">
+    <StackLayout>
+        <local:Maui10396Card x:Name="card0" BindingContext="{Binding Cards[0]}"/>
+        <local:Maui10396Card x:Name="card1" BindingContext="{Binding Cards[1]}"/>
+        <local:Maui10396Card x:Name="card2" BindingContext="{Binding Cards[2]}"/>
+        <local:Maui10396Card x:Name="card3" BindingContext="{Binding Cards[3]}"/>
+        <local:Maui10396Card x:Name="card4" BindingContext="{Binding Cards[4]}"/>
+        <local:Maui10396Card x:Name="card5" BindingContext="{Binding Cards[5]}"/>
+
+    </StackLayout>
+       
+    
+</ContentView>
\ No newline at end of file
diff --git a/src/Controls/tests/Xaml.UnitTests/Issues/Maui10396.xaml.cs b/src/Controls/tests/Xaml.UnitTests/Issues/Maui10396.xaml.cs
new file mode 100644
index 000000000000..2b511bb56c74
--- /dev/null
+++ b/src/Controls/tests/Xaml.UnitTests/Issues/Maui10396.xaml.cs
@@ -0,0 +1,59 @@
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.Maui.ApplicationModel;
+using Microsoft.Maui.Controls.Core.UnitTests;
+using Microsoft.Maui.Controls.Shapes;
+using Microsoft.Maui.Devices;
+using NUnit.Framework;
+
+namespace Microsoft.Maui.Controls.Xaml.UnitTests;
+
+public partial class Maui10396 : ContentView
+{
+
+	public Maui10396() => InitializeComponent();
+
+	public Maui10396(bool useCompiledXaml)
+	{
+		//this stub will be replaced at compile time
+	}
+
+	[TestFixture]
+	class Test
+	{
+		[SetUp] public void Setup() => AppInfo.SetCurrent(new MockAppInfo());
+		[TearDown] public void TearDown() => AppInfo.SetCurrent(null);
+
+		[Test]
+		public void CompiledBindingToArray([Values(false, true)] bool useCompiledXaml)
+		{
+			if (useCompiledXaml)
+				MockCompiler.Compile(typeof(Maui10396));
+
+			var page = new Maui10396(useCompiledXaml) { BindingContext = new Maui10396VM() };
+
+			Assert.AreEqual("1", page.card0.label.Text);
+			Assert.AreEqual("2", page.card1.label.Text);
+			Assert.AreEqual("3", page.card2.label.Text);
+			Assert.AreEqual("4", page.card3.label.Text);
+			Assert.AreEqual("5", page.card4.label.Text);
+			Assert.AreEqual("6", page.card5.label.Text);
+		}
+	}
+}
+
+public class Maui10396VM
+{
+	//public List<Maui10396CardVM> Cards { get; } = Enumerable.Range(1, 6).Select(i => new Maui10396CardVM(i)).ToList();
+	public Maui10396CardVM[] Cards { get; } = Enumerable.Range(1, 6).Select(i => new Maui10396CardVM(i)).ToArray();
+}
+
+public class Maui10396CardVM
+{
+	public int Number { get; set; }
+
+	public Maui10396CardVM(int number)
+	{
+		Number = number;
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/tests/Xaml.UnitTests/Issues/Maui10396Card.xaml b/src/Controls/tests/Xaml.UnitTests/Issues/Maui10396Card.xaml
new file mode 100644
index 000000000000..e38b29d47d91
--- /dev/null
+++ b/src/Controls/tests/Xaml.UnitTests/Issues/Maui10396Card.xaml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:local="clr-namespace:Microsoft.Maui.Controls.Xaml.UnitTests"
+             x:Class="Microsoft.Maui.Controls.Xaml.UnitTests.Maui10396Card"
+             x:DataType="local:Maui10396CardVM">
+    <Label Text="{Binding Number}" x:FieldModifier="public" x:Name="label"/>
+</ContentView>
\ No newline at end of file
diff --git a/src/Controls/tests/Xaml.UnitTests/Issues/Maui10396Card.xaml.cs b/src/Controls/tests/Xaml.UnitTests/Issues/Maui10396Card.xaml.cs
new file mode 100644
index 000000000000..2f8e32e9e0a2
--- /dev/null
+++ b/src/Controls/tests/Xaml.UnitTests/Issues/Maui10396Card.xaml.cs
@@ -0,0 +1,20 @@
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.Maui.ApplicationModel;
+using Microsoft.Maui.Controls.Core.UnitTests;
+using Microsoft.Maui.Controls.Shapes;
+using Microsoft.Maui.Devices;
+using NUnit.Framework;
+
+namespace Microsoft.Maui.Controls.Xaml.UnitTests;
+
+public partial class Maui10396Card : ContentView
+{
+
+	public Maui10396Card() => InitializeComponent();
+
+	public Maui10396Card(bool useCompiledXaml)
+	{
+		//this stub will be replaced at compile time
+	}
+}

From b5204f03f90046deb0d76af60fac3f4439531a5c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Jul 2023 19:12:27 +0100
Subject: [PATCH 103/105] Bump the aspnetcore group with 7 updates (#16114)

* Bump the aspnetcore group with 7 updates

Bumps the aspnetcore group with 7 updates:

| Package | Update |
| --- | --- |
| [Microsoft.AspNetCore.Authorization](https://github.com/dotnet/aspnetcore) | 7.0.8 to 7.0.9 |
| [Microsoft.AspNetCore.Components.WebView](https://github.com/dotnet/aspnetcore) | 7.0.8 to 7.0.9 |
| [Microsoft.JSInterop](https://github.com/dotnet/aspnetcore) | 7.0.8 to 7.0.9 |
| [Microsoft.AspNetCore.Components.Web](https://github.com/dotnet/aspnetcore) | 7.0.8 to 7.0.9 |
| [Microsoft.AspNetCore.Authentication.Facebook](https://github.com/dotnet/aspnetcore) | 7.0.8 to 7.0.9 |
| [Microsoft.AspNetCore.Authentication.Google](https://github.com/dotnet/aspnetcore) | 7.0.8 to 7.0.9 |
| [Microsoft.AspNetCore.Authentication.MicrosoftAccount](https://github.com/dotnet/aspnetcore) | 7.0.8 to 7.0.9 |


Updates `Microsoft.AspNetCore.Authorization` from 7.0.8 to 7.0.9
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Changelog](https://github.com/dotnet/aspnetcore/blob/main/docs/ReleasePlanning.md)
- [Commits](https://github.com/dotnet/aspnetcore/compare/v7.0.8...v7.0.9)

Updates `Microsoft.AspNetCore.Components.WebView` from 7.0.8 to 7.0.9
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Changelog](https://github.com/dotnet/aspnetcore/blob/main/docs/ReleasePlanning.md)
- [Commits](https://github.com/dotnet/aspnetcore/compare/v7.0.8...v7.0.9)

Updates `Microsoft.JSInterop` from 7.0.8 to 7.0.9
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Changelog](https://github.com/dotnet/aspnetcore/blob/main/docs/ReleasePlanning.md)
- [Commits](https://github.com/dotnet/aspnetcore/compare/v7.0.8...v7.0.9)

Updates `Microsoft.AspNetCore.Components.Web` from 7.0.8 to 7.0.9
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Changelog](https://github.com/dotnet/aspnetcore/blob/main/docs/ReleasePlanning.md)
- [Commits](https://github.com/dotnet/aspnetcore/compare/v7.0.8...v7.0.9)

Updates `Microsoft.AspNetCore.Authentication.Facebook` from 7.0.8 to 7.0.9
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Changelog](https://github.com/dotnet/aspnetcore/blob/main/docs/ReleasePlanning.md)
- [Commits](https://github.com/dotnet/aspnetcore/compare/v7.0.8...v7.0.9)

Updates `Microsoft.AspNetCore.Authentication.Google` from 7.0.8 to 7.0.9
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Changelog](https://github.com/dotnet/aspnetcore/blob/main/docs/ReleasePlanning.md)
- [Commits](https://github.com/dotnet/aspnetcore/compare/v7.0.8...v7.0.9)

Updates `Microsoft.AspNetCore.Authentication.MicrosoftAccount` from 7.0.8 to 7.0.9
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Changelog](https://github.com/dotnet/aspnetcore/blob/main/docs/ReleasePlanning.md)
- [Commits](https://github.com/dotnet/aspnetcore/compare/v7.0.8...v7.0.9)

---
updated-dependencies:
- dependency-name: Microsoft.AspNetCore.Authorization
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: aspnetcore
- dependency-name: Microsoft.AspNetCore.Components.WebView
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: aspnetcore
- dependency-name: Microsoft.JSInterop
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: aspnetcore
- dependency-name: Microsoft.AspNetCore.Components.Web
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: aspnetcore
- dependency-name: Microsoft.AspNetCore.Authentication.Facebook
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: aspnetcore
- dependency-name: Microsoft.AspNetCore.Authentication.Google
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: aspnetcore
- dependency-name: Microsoft.AspNetCore.Authentication.MicrosoftAccount
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: aspnetcore
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update Versions.props

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
---
 eng/Versions.props | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index b6cf9a364ef8..42614e5ab0b2 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -26,18 +26,17 @@
     <MicrosoftWindowsSDKBuildToolsPackageVersion>10.0.22621.756</MicrosoftWindowsSDKBuildToolsPackageVersion>
     <MicrosoftGraphicsWin2DPackageVersion>1.0.5.1</MicrosoftGraphicsWin2DPackageVersion>
     <!-- Everything else -->
-    <MicrosoftAspNetCoreAuthorizationPackageVersion>7.0.8</MicrosoftAspNetCoreAuthorizationPackageVersion>
-    <MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>7.0.8</MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>
-    <MicrosoftAspNetCoreAuthorizationPackageVersion>7.0.8</MicrosoftAspNetCoreAuthorizationPackageVersion>
-    <MicrosoftAspNetCoreAuthenticationGooglePackageVersion>7.0.8</MicrosoftAspNetCoreAuthenticationGooglePackageVersion>
-    <MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>7.0.8</MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>
+    <MicrosoftAspNetCoreAuthorizationPackageVersion>7.0.9</MicrosoftAspNetCoreAuthorizationPackageVersion>
+    <MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>7.0.9</MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>
+    <MicrosoftAspNetCoreAuthenticationGooglePackageVersion>7.0.9</MicrosoftAspNetCoreAuthenticationGooglePackageVersion>
+    <MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>7.0.9</MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>
     <MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>7.0.1</MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>
     <MicrosoftAspNetCoreComponentsFormsPackageVersion>7.0.1</MicrosoftAspNetCoreComponentsFormsPackageVersion>
     <MicrosoftAspNetCoreComponentsPackageVersion>7.0.1</MicrosoftAspNetCoreComponentsPackageVersion>
-    <MicrosoftAspNetCoreComponentsWebPackageVersion>7.0.8</MicrosoftAspNetCoreComponentsWebPackageVersion>
-    <MicrosoftAspNetCoreComponentsWebViewPackageVersion>7.0.8</MicrosoftAspNetCoreComponentsWebViewPackageVersion>
+    <MicrosoftAspNetCoreComponentsWebPackageVersion>7.0.9</MicrosoftAspNetCoreComponentsWebPackageVersion>
+    <MicrosoftAspNetCoreComponentsWebViewPackageVersion>7.0.9</MicrosoftAspNetCoreComponentsWebViewPackageVersion>
     <MicrosoftAspNetCoreMetadataPackageVersion>7.0.1</MicrosoftAspNetCoreMetadataPackageVersion>
-    <MicrosoftJSInteropPackageVersion>7.0.8</MicrosoftJSInteropPackageVersion>
+    <MicrosoftJSInteropPackageVersion>7.0.9</MicrosoftJSInteropPackageVersion>
     <!-- Other packages -->
     <MicrosoftCodeAnalysisNetAnalyzersVersion>7.0.3</MicrosoftCodeAnalysisNetAnalyzersVersion>
     <MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.3.4</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>

From 6136a8ad90d699589216230223e59b1cc8bee952 Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Tue, 18 Jul 2023 18:06:45 -0500
Subject: [PATCH 104/105] Make Add/Remove Logical public (#16046)

* Make Add/Remove Logical public

* -fix xaml unit test errors

* - remove workarounds and fix up tests

* - apply style sheets to visual children

* - fix issues

* - fix test paths that don't use Element

* - fix merge conflicts

* - add public APIs

* - add comments

* - add additional tests

* - additional cleanup

* - fix loaded/loaded timings

* - add longer wait for android

* - fix usage of LogicalChildren

* - if no index is specifiied add items at the end

* - fix added event to properly set _watchingPlatformLoaded

* - cleanup

* - ensure that loaded/unloaded have time to fire

* - change name to index

* - remove collection changed comment

* - remove shadowed methods and add docs
---
 .../Microsoft.Maui.Controls/ItemsView.xml     |  44 ------
 .../src/Core/Application/Application.cs       |   4 +-
 src/Controls/src/Core/BindableObject.cs       |   7 +-
 .../src/Core/BindableObjectExtensions.cs      |  12 ++
 src/Controls/src/Core/Border/Border.cs        |  10 +-
 src/Controls/src/Core/Cells/Cell.cs           |   2 +-
 src/Controls/src/Core/Cells/ViewCell.cs       |   4 +-
 .../Handlers/TabbedPage/iOS/TabbedRenderer.cs |   6 +-
 src/Controls/src/Core/Element/Element.cs      | 145 ++++++++----------
 .../src/Core/Element/Element_StyleSheets.cs   |  10 +-
 src/Controls/src/Core/FormattedString.cs      |   4 +-
 src/Controls/src/Core/Items/ItemsView.cs      |   8 -
 src/Controls/src/Core/Layout/Layout.cs        |  56 +++----
 src/Controls/src/Core/ListView/ListView.cs    |  15 +-
 src/Controls/src/Core/Menu/FlyoutBase.cs      |   7 +-
 src/Controls/src/Core/Menu/MenuBarItem.cs     |   8 +-
 src/Controls/src/Core/Menu/MenuBarTracker.cs  |  10 +-
 src/Controls/src/Core/Menu/MenuFlyout.cs      |   8 +-
 .../src/Core/Menu/MenuFlyoutSubItem.cs        |   8 +-
 .../src/Core/NavigationPage/NavigationPage.cs |   8 +-
 src/Controls/src/Core/Page/Page.cs            |  63 +++-----
 .../ModalNavigationManager.cs                 |   6 +-
 .../net-android/PublicAPI.Unshipped.txt       |  10 +-
 .../PublicAPI/net-ios/PublicAPI.Unshipped.txt |  10 +-
 .../net-maccatalyst/PublicAPI.Unshipped.txt   |  10 +-
 .../net-tizen/PublicAPI.Unshipped.txt         |   8 +
 .../net-windows/PublicAPI.Unshipped.txt       |  12 +-
 .../PublicAPI/net/PublicAPI.Unshipped.txt     |  10 +-
 .../netstandard/PublicAPI.Unshipped.txt       |  10 +-
 src/Controls/src/Core/Shell/BaseShellItem.cs  |  40 +----
 src/Controls/src/Core/Shell/Shell.cs          |  96 ++----------
 src/Controls/src/Core/Shell/ShellItem.cs      |   2 +-
 src/Controls/src/Core/Shell/ShellSection.cs   |   4 +-
 src/Controls/src/Core/StyleSheets/Style.cs    |   2 +-
 src/Controls/src/Core/SwipeView/SwipeView.cs  |   2 +-
 .../VisualElement/VisualElement.Platform.cs   |   4 +-
 .../src/Core/VisualElement/VisualElement.cs   |  40 +++--
 src/Controls/src/Core/Window/Window.cs        |  17 +-
 .../tests/Core.UnitTests/ListViewTests.cs     |   4 +-
 .../tests/Core.UnitTests/PageTests.cs         |  20 +++
 .../tests/Core.UnitTests/ShellTests.cs        |   4 +-
 .../Core.UnitTests/TabbedFormUnitTests.cs     |  17 ++
 .../Core.UnitTests/VisualTreeHelperTests.cs   |   2 +-
 .../tests/Core.UnitTests/WindowsTests.cs      |   1 +
 .../DeviceTests/ControlsHandlerTestBase.cs    |  16 +-
 .../CollectionView/CollectionViewTests.cs     |   2 +-
 .../Elements/VisualElementTests.cs            |   3 +-
 .../Xaml.UnitTests/FontImageExtension.xaml.cs |   4 +-
 48 files changed, 349 insertions(+), 446 deletions(-)

diff --git a/src/Controls/docs/Microsoft.Maui.Controls/ItemsView.xml b/src/Controls/docs/Microsoft.Maui.Controls/ItemsView.xml
index 6000f868b8ba..ca97036c131f 100644
--- a/src/Controls/docs/Microsoft.Maui.Controls/ItemsView.xml
+++ b/src/Controls/docs/Microsoft.Maui.Controls/ItemsView.xml
@@ -31,28 +31,6 @@
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
-    <Member MemberName="AddLogicalChild">
-      <MemberSignature Language="C#" Value="public void AddLogicalChild (Microsoft.Maui.Controls.Element element);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance void AddLogicalChild(class Microsoft.Maui.Controls.Element element) cil managed" />
-      <MemberSignature Language="DocId" Value="M:Microsoft.Maui.Controls.ItemsView.AddLogicalChild(Microsoft.Maui.Controls.Element)" />
-      <MemberSignature Language="F#" Value="member this.AddLogicalChild : Microsoft.Maui.Controls.Element -&gt; unit" Usage="itemsView.AddLogicalChild element" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyName>Microsoft.Maui.Controls.Core</AssemblyName>
-        <AssemblyVersion>2.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="element" Type="Microsoft.Maui.Controls.Element" />
-      </Parameters>
-      <Docs>
-        <param name="element">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="EmptyView">
       <MemberSignature Language="C#" Value="public object EmptyView { get; set; }" />
       <MemberSignature Language="ILAsm" Value=".property instance object EmptyView" />
@@ -530,28 +508,6 @@
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
-    <Member MemberName="RemoveLogicalChild">
-      <MemberSignature Language="C#" Value="public void RemoveLogicalChild (Microsoft.Maui.Controls.Element element);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance void RemoveLogicalChild(class Microsoft.Maui.Controls.Element element) cil managed" />
-      <MemberSignature Language="DocId" Value="M:Microsoft.Maui.Controls.ItemsView.RemoveLogicalChild(Microsoft.Maui.Controls.Element)" />
-      <MemberSignature Language="F#" Value="member this.RemoveLogicalChild : Microsoft.Maui.Controls.Element -&gt; unit" Usage="itemsView.RemoveLogicalChild element" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyName>Microsoft.Maui.Controls.Core</AssemblyName>
-        <AssemblyVersion>2.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="element" Type="Microsoft.Maui.Controls.Element" />
-      </Parameters>
-      <Docs>
-        <param name="element">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="Scrolled">
       <MemberSignature Language="C#" Value="public event EventHandler&lt;Microsoft.Maui.Controls.ItemsViewScrolledEventArgs&gt; Scrolled;" />
       <MemberSignature Language="ILAsm" Value=".event class System.EventHandler`1&lt;class Microsoft.Maui.Controls.ItemsViewScrolledEventArgs&gt; Scrolled" />
diff --git a/src/Controls/src/Core/Application/Application.cs b/src/Controls/src/Core/Application/Application.cs
index 7783a8403a35..53b7d3b9674d 100644
--- a/src/Controls/src/Core/Application/Application.cs
+++ b/src/Controls/src/Core/Application/Application.cs
@@ -464,7 +464,7 @@ internal void RemoveWindow(Window window)
 
 			if (window is Element windowElement)
 			{
-				RemoveLogicalChildInternal(windowElement);
+				RemoveLogicalChild(windowElement);
 			}
 
 			_windows.Remove(window);
@@ -518,7 +518,7 @@ void AddWindow(Window window)
 
 			if (window is Element windowElement)
 			{
-				AddLogicalChildInternal(windowElement);
+				AddLogicalChild(windowElement);
 			}
 
 			if (window is NavigableElement ne)
diff --git a/src/Controls/src/Core/BindableObject.cs b/src/Controls/src/Core/BindableObject.cs
index add82a38d079..628833ba160e 100644
--- a/src/Controls/src/Core/BindableObject.cs
+++ b/src/Controls/src/Core/BindableObject.cs
@@ -264,17 +264,12 @@ public static void SetInheritedBindingContext(BindableObject bindable, object va
 		protected virtual void OnBindingContextChanged()
 		{
 			BindingContextChanged?.Invoke(this, EventArgs.Empty);
+
 			if (Shell.GetBackButtonBehavior(this) is BackButtonBehavior buttonBehavior)
 				SetInheritedBindingContext(buttonBehavior, BindingContext);
 
 			if (Shell.GetSearchHandler(this) is SearchHandler searchHandler)
 				SetInheritedBindingContext(searchHandler, BindingContext);
-
-			if (Shell.GetTitleView(this) is View titleView)
-				SetInheritedBindingContext(titleView, BindingContext);
-
-			if (FlyoutBase.GetContextFlyout(this) is BindableObject contextFlyout)
-				SetInheritedBindingContext(contextFlyout, BindingContext);
 		}
 
 		protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
diff --git a/src/Controls/src/Core/BindableObjectExtensions.cs b/src/Controls/src/Core/BindableObjectExtensions.cs
index 3adbbb5ed109..67be12f5ca75 100644
--- a/src/Controls/src/Core/BindableObjectExtensions.cs
+++ b/src/Controls/src/Core/BindableObjectExtensions.cs
@@ -85,6 +85,18 @@ internal static bool TrySetDynamicThemeColor(
 			return false;
 		}
 
+		internal static void AddRemoveLogicalChildren(this BindableObject bindable, object oldValue, object newValue)
+		{
+			if (!(bindable is Element owner))
+				return;
+			
+			if (oldValue is Element oldView)
+				owner.RemoveLogicalChild(oldView);
+
+			if (newValue is Element newView)
+				owner.AddLogicalChild(newView);
+		}
+
 		internal static bool TrySetAppTheme(
 			this BindableObject self,
 			string lightResourceKey,
diff --git a/src/Controls/src/Core/Border/Border.cs b/src/Controls/src/Core/Border/Border.cs
index 013827e80a05..1411fe4c4636 100644
--- a/src/Controls/src/Core/Border/Border.cs
+++ b/src/Controls/src/Core/Border/Border.cs
@@ -64,8 +64,7 @@ void NotifyStrokeShapeChanges()
 
 			if (strokeShape is VisualElement visualElement)
 			{
-				SetInheritedBindingContext(visualElement, BindingContext);
-				visualElement.Parent = this;
+				AddLogicalChild(visualElement);
 				_strokeShapeChanged ??= (sender, e) => OnPropertyChanged(nameof(StrokeShape));
 				_strokeShapeProxy ??= new();
 				_strokeShapeProxy.Subscribe(visualElement, _strokeShapeChanged);
@@ -78,8 +77,7 @@ void StopNotifyingStrokeShapeChanges()
 
 			if (strokeShape is VisualElement visualElement)
 			{
-				SetInheritedBindingContext(visualElement, null);
-				visualElement.Parent = null;
+				RemoveLogicalChild(visualElement);
 				_strokeShapeProxy?.Unsubscribe();
 			}
 		}
@@ -268,12 +266,12 @@ public static void ContentChanged(BindableObject bindable, object oldValue, obje
 			{
 				if (oldValue is Element oldElement)
 				{
-					border.RemoveLogicalChildInternal(oldElement);
+					border.RemoveLogicalChild(oldElement);
 				}
 
 				if (newValue is Element newElement)
 				{
-					border.AddLogicalChildInternal(newElement);
+					border.AddLogicalChild(newElement);
 				}
 			}
 
diff --git a/src/Controls/src/Core/Cells/Cell.cs b/src/Controls/src/Core/Cells/Cell.cs
index 4dcaa1416d70..c63c4a94d386 100644
--- a/src/Controls/src/Core/Cells/Cell.cs
+++ b/src/Controls/src/Core/Cells/Cell.cs
@@ -243,7 +243,7 @@ public void SendDisappearing()
 
 		void IPropertyPropagationController.PropagatePropertyChanged(string propertyName)
 		{
-			PropertyPropagationExtensions.PropagatePropertyChanged(propertyName, this, ((IElementController)this).LogicalChildren);
+			PropertyPropagationExtensions.PropagatePropertyChanged(propertyName, this, ((IVisualTreeElement)this).GetVisualChildren());
 		}
 
 		void OnContextActionsChanged(object sender, NotifyCollectionChangedEventArgs e)
diff --git a/src/Controls/src/Core/Cells/ViewCell.cs b/src/Controls/src/Core/Cells/ViewCell.cs
index e45ea9ba2d42..052a60d55340 100644
--- a/src/Controls/src/Core/Cells/ViewCell.cs
+++ b/src/Controls/src/Core/Cells/ViewCell.cs
@@ -23,7 +23,7 @@ public View View
 
 				if (_view != null)
 				{
-					RemoveLogicalChildInternal(_view);
+					RemoveLogicalChild(_view);
 					_view.ComputedConstraint = LayoutConstraint.None;
 				}
 
@@ -32,7 +32,7 @@ public View View
 				if (_view != null)
 				{
 					_view.ComputedConstraint = LayoutConstraint.Fixed;
-					AddLogicalChildInternal(_view);
+					AddLogicalChild(_view);
 				}
 
 				ForceUpdateSize();
diff --git a/src/Controls/src/Core/Compatibility/Handlers/TabbedPage/iOS/TabbedRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/TabbedPage/iOS/TabbedRenderer.cs
index 54ecabf566d1..3494df3abe9d 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/TabbedPage/iOS/TabbedRenderer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/TabbedPage/iOS/TabbedRenderer.cs
@@ -284,10 +284,10 @@ void Reset()
 		void SetControllers()
 		{
 			var list = new List<UIViewController>();
-			var logicalChildren = ((IElementController)Element).LogicalChildren;
-			for (var i = 0; i < logicalChildren.Count; i++)
+			var pages = Tabbed.InternalChildren;
+			for (var i = 0; i < pages.Count; i++)
 			{
-				var child = logicalChildren[i];
+				var child = pages[i];
 				var v = child as Page;
 				if (v == null)
 					continue;
diff --git a/src/Controls/src/Core/Element/Element.cs b/src/Controls/src/Core/Element/Element.cs
index fea1bd729e7d..e53cdf1e686c 100644
--- a/src/Controls/src/Core/Element/Element.cs
+++ b/src/Controls/src/Core/Element/Element.cs
@@ -146,7 +146,12 @@ void SetupChildren()
 			_logicalChildrenReadonly ??= new ReadOnlyCollection<Element>(LogicalChildrenInternalBackingStore);
 		}
 
-		internal void InsertLogicalChildInternal(int index, Element element)
+		/// <summary>
+		/// Inserts an <see cref="Element"/> to the logical children at the specified index.
+		/// </summary>
+		/// <param name="index">The zero-based index at which <see cref="Element"/> should be inserted.</param>
+		/// <param name="element">The <see cref="Element"/> to insert into the logical children.</param>
+		public void InsertLogicalChild(int index, Element element)
 		{
 			if (element is null)
 			{
@@ -159,7 +164,11 @@ internal void InsertLogicalChildInternal(int index, Element element)
 			OnChildAdded(element);
 		}
 
-		internal void AddLogicalChildInternal(Element element)
+		/// <summary>
+		/// Adds an <see cref="Element"/> to the logical children.
+		/// </summary>
+		/// <param name="element">The <see cref="Element"/> to add to the logical children.</param>
+		public void AddLogicalChild(Element element)
 		{
 			if (element is null)
 			{
@@ -172,7 +181,15 @@ internal void AddLogicalChildInternal(Element element)
 			OnChildAdded(element);
 		}
 
-		internal bool RemoveLogicalChildInternal(Element element)
+		/// <summary>
+		/// Removes the first occurrence of a specific <see cref="Element"/> from the logical children.
+		/// </summary>
+		/// <param name="element">The <see cref="Element"/> to remove.</param>
+		/// <returns>
+		///	true if item was successfully removed from the logical children;
+		/// otherwise, false. This method also returns false if <see cref="Element"/> is not found.
+		///	</returns>
+		public bool RemoveLogicalChild(Element element)
 		{
 			if (element is null)
 			{
@@ -182,16 +199,19 @@ internal bool RemoveLogicalChildInternal(Element element)
 			if (LogicalChildrenInternalBackingStore is null)
 				return false;
 
-			var oldLogicalIndex = LogicalChildrenInternalBackingStore.IndexOf(element);
-			if (oldLogicalIndex < 0)
+			var index = LogicalChildrenInternalBackingStore.IndexOf(element);
+			if (index < 0)
 				return false;
 
-			RemoveLogicalChildInternal(element, oldLogicalIndex);
+			RemoveLogicalChild(element, index);
 
 			return true;
 		}
 
-		internal void ClearLogicalChildren()
+		/// <summary>
+		///  Removes all <see cref="Element"/>s.
+		/// </summary>
+		public void ClearLogicalChildren()
 		{
 			if (LogicalChildrenInternalBackingStore is null)
 				return;
@@ -202,41 +222,18 @@ internal void ClearLogicalChildren()
 			// Reverse for-loop, so children can be removed while iterating
 			for (int i = LogicalChildrenInternalBackingStore.Count - 1; i >= 0; i--)
 			{
-				RemoveLogicalChildInternal(LogicalChildrenInternalBackingStore[i], i);
+				RemoveLogicalChild(LogicalChildrenInternalBackingStore[i], i);
 			}
 		}
 
-		/// <summary>
-		/// This doesn't validate that the oldLogicalIndex is correct, so be sure you're passing in the
-		/// correct index
-		/// </summary>
-		internal bool RemoveLogicalChildInternal(Element element, int oldLogicalIndex)
+		internal bool RemoveLogicalChild(Element element, int index)
 		{
 			LogicalChildrenInternalBackingStore.Remove(element);
-			OnChildRemoved(element, oldLogicalIndex);
+			OnChildRemoved(element, index);
 
 			return true;
 		}
 
-		internal IEnumerable<Element> AllChildren
-		{
-			get
-			{
-				foreach (var child in LogicalChildrenInternal)
-					yield return child;
-
-				var childrenNotDrawnByThisElement = ChildrenNotDrawnByThisElement;
-				if (childrenNotDrawnByThisElement is not null)
-				{
-					foreach (var child in childrenNotDrawnByThisElement)
-						yield return child;
-				}
-			}
-		}
-
-		// return null by default so we don't need to foreach over an empty collection in OnPropertyChanged
-		internal virtual IEnumerable<Element> ChildrenNotDrawnByThisElement => null;
-
 		internal bool Owned { get; set; }
 
 		internal Element ParentOverride
@@ -286,48 +283,50 @@ void IElementDefinition.AddResourcesChangedListener(Action<object, ResourcesChan
 		public Element Parent
 		{
 			get { return _parentOverride ?? RealParent; }
-			set
-			{
-				if (RealParent == value)
-					return;
+			set => SetParent(value);
+		}
 
-				OnPropertyChanging();
+		void SetParent(Element value)
+		{
+			if (RealParent == value)
+				return;
 
-				if (_parentOverride == null)
-					OnParentChangingCore(Parent, value);
+			OnPropertyChanging(nameof(Parent));
 
-				if (RealParent != null)
-				{
-					((IElementDefinition)RealParent).RemoveResourcesChangedListener(OnParentResourcesChanged);
+			if (_parentOverride == null)
+				OnParentChangingCore(Parent, value);
 
-					if (value != null && (RealParent is Layout || RealParent is IControlTemplated))
-						Application.Current?.FindMauiContext()?.CreateLogger<Element>()?.LogWarning($"{this} is already a child of {RealParent}. Remove {this} from {RealParent} before adding to {value}.");
-				}
+			if (RealParent != null)
+			{
+				((IElementDefinition)RealParent).RemoveResourcesChangedListener(OnParentResourcesChanged);
 
-				RealParent = value;
-				if (RealParent != null)
-				{
-					OnParentResourcesChanged(RealParent.GetMergedResources());
-					((IElementDefinition)RealParent).AddResourcesChangedListener(OnParentResourcesChanged);
-				}
+				if (value != null && (RealParent is Layout || RealParent is IControlTemplated))
+					Application.Current?.FindMauiContext()?.CreateLogger<Element>()?.LogWarning($"{this} is already a child of {RealParent}. Remove {this} from {RealParent} before adding to {value}.");
+			}
 
-				object context = value?.BindingContext;
-				if (value != null)
-				{
-					value.SetChildInheritedBindingContext(this, context);
-				}
-				else
-				{
-					SetInheritedBindingContext(this, null);
-				}
+			RealParent = value;
+			if (RealParent != null)
+			{
+				OnParentResourcesChanged(RealParent.GetMergedResources());
+				((IElementDefinition)RealParent).AddResourcesChangedListener(OnParentResourcesChanged);
+			}
 
-				OnParentSet();
+			object context = value?.BindingContext;
+			if (value != null)
+			{
+				value.SetChildInheritedBindingContext(this, context);
+			}
+			else
+			{
+				SetInheritedBindingContext(this, null);
+			}
 
-				if (_parentOverride == null)
-					OnParentChangedCore();
+			OnParentSet();
 
-				OnPropertyChanged();
-			}
+			if (_parentOverride == null)
+				OnParentChangedCore();
+
+			OnPropertyChanged(nameof(Parent));
 		}
 
 		internal bool IsTemplateRoot { get; set; }
@@ -456,7 +455,7 @@ protected override void OnBindingContextChanged()
 
 		protected virtual void OnChildAdded(Element child)
 		{
-			child.Parent = this;
+			child.SetParent(this);
 
 			child.ApplyBindings(skipBindingContext: false, fromBindingContextChanged: true);
 
@@ -471,7 +470,7 @@ protected virtual void OnChildAdded(Element child)
 
 		protected virtual void OnChildRemoved(Element child, int oldLogicalIndex)
 		{
-			child.Parent = null;
+			child.SetParent(null);
 
 			ChildRemoved?.Invoke(this, new ElementEventArgs(child));
 
@@ -495,16 +494,6 @@ protected override void OnPropertyChanged([CallerMemberName] string propertyName
 
 			Handler?.UpdateValue(propertyName);
 
-			var childrenNotDrawnByThisElement = ChildrenNotDrawnByThisElement;
-			if (childrenNotDrawnByThisElement is not null)
-			{
-				foreach (var logicalChildren in childrenNotDrawnByThisElement)
-				{
-					if (logicalChildren is IPropertyPropagationController controller)
-						PropertyPropagationExtensions.PropagatePropertyChanged(propertyName, this, new[] { logicalChildren });
-				}
-			}
-
 			if (_effects?.Count > 0)
 			{
 				var args = new PropertyChangedEventArgs(propertyName);
diff --git a/src/Controls/src/Core/Element/Element_StyleSheets.cs b/src/Controls/src/Core/Element/Element_StyleSheets.cs
index 7f10b4e74db7..19a4967d1458 100644
--- a/src/Controls/src/Core/Element/Element_StyleSheets.cs
+++ b/src/Controls/src/Core/Element/Element_StyleSheets.cs
@@ -54,17 +54,15 @@ internal void ApplyStyleSheets()
 			ApplyStyleSheets(sheets, this);
 		}
 
-		void ApplyStyleSheets(List<StyleSheet> sheets, Element element)
+		void ApplyStyleSheets(List<StyleSheet> sheets, IVisualTreeElement element)
 		{
-			if (element == null)
-				return;
-
 			for (var i = (sheets?.Count ?? 0) - 1; i >= 0; i--)
 			{
-				((IStyle)sheets[i]).Apply(element);
+				if (element is BindableObject bo)
+					((IStyle)sheets[i]).Apply(bo);
 			}
 
-			foreach (Element child in element.AllChildren)
+			foreach (var child in element.GetVisualChildren())
 			{
 				var mergedSheets = sheets;
 				var resourceProvider = child as IResourcesProvider;
diff --git a/src/Controls/src/Core/FormattedString.cs b/src/Controls/src/Core/FormattedString.cs
index 03a3e5c5e266..da9198be4628 100644
--- a/src/Controls/src/Core/FormattedString.cs
+++ b/src/Controls/src/Core/FormattedString.cs
@@ -44,7 +44,7 @@ void OnCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
 					var bo = item as Span;
 					if (bo != null)
 					{
-						bo.Parent = null;
+						bo.Parent?.RemoveLogicalChild(bo);
 						bo.PropertyChanging -= OnItemPropertyChanging;
 						bo.PropertyChanged -= OnItemPropertyChanged;
 					}
@@ -59,7 +59,7 @@ void OnCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
 					var bo = item as Span;
 					if (bo != null)
 					{
-						bo.Parent = this;
+						this.AddLogicalChild(bo);
 						bo.PropertyChanging += OnItemPropertyChanging;
 						bo.PropertyChanged += OnItemPropertyChanged;
 					}
diff --git a/src/Controls/src/Core/Items/ItemsView.cs b/src/Controls/src/Core/Items/ItemsView.cs
index 405addd738d6..fc2a3ce343bb 100644
--- a/src/Controls/src/Core/Items/ItemsView.cs
+++ b/src/Controls/src/Core/Items/ItemsView.cs
@@ -108,14 +108,6 @@ public int RemainingItemsThreshold
 			set => SetValue(RemainingItemsThresholdProperty, value);
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/ItemsView.xml" path="//Member[@MemberName='AddLogicalChild']/Docs/*" />
-		public void AddLogicalChild(Element element) =>
-			AddLogicalChildInternal(element);
-
-		/// <include file="../../../docs/Microsoft.Maui.Controls/ItemsView.xml" path="//Member[@MemberName='RemoveLogicalChild']/Docs/*" />
-		public void RemoveLogicalChild(Element element)
-			=> RemoveLogicalChildInternal(element);
-
 		internal static readonly BindableProperty InternalItemsLayoutProperty =
 			BindableProperty.Create(nameof(ItemsLayout), typeof(IItemsLayout), typeof(ItemsView),
 				LinearItemsLayout.Vertical, propertyChanged: OnInternalItemsLayoutPropertyChanged);
diff --git a/src/Controls/src/Core/Layout/Layout.cs b/src/Controls/src/Core/Layout/Layout.cs
index 6acd909886d0..7d903547105e 100644
--- a/src/Controls/src/Core/Layout/Layout.cs
+++ b/src/Controls/src/Core/Layout/Layout.cs
@@ -59,16 +59,16 @@ public IView this[int index]
 
 				if (old is Element oldElement)
 				{
-					oldElement.Parent = null;
-					VisualDiagnostics.OnChildRemoved(this, oldElement, index);
+					RemoveLogicalChild(oldElement, index);
 				}
 
-				_children[index] = value;
-
 				if (value is Element newElement)
 				{
-					newElement.Parent = this;
-					VisualDiagnostics.OnChildAdded(this, newElement);
+					InsertLogicalChild(index, newElement);
+				}
+				else
+				{
+					_children[index] = value;
 				}
 
 				OnUpdate(index, value, old);
@@ -132,22 +132,18 @@ public void Add(IView child)
 				return;
 
 			var index = _children.Count;
-			_children.Add(child);
+
+			if (child is Element element)
+				InsertLogicalChild(index, element);
+			else
+				_children.Add(child);
 
 			OnAdd(index, child);
 		}
 
 		public void Clear()
 		{
-			for (var index = Count - 1; index >= 0; index--)
-			{
-				if (this[index] is Element element)
-				{
-					OnChildRemoved(element, index);
-				}
-			}
-
-			_children.Clear();
+			ClearLogicalChildren();
 			OnClear();
 		}
 
@@ -171,7 +167,10 @@ public void Insert(int index, IView child)
 			if (child == null)
 				return;
 
-			_children.Insert(index, child);
+			if (child is Element element)
+				InsertLogicalChild(index, element);
+			else 
+				_children.Insert(index, child);
 
 			OnInsert(index, child);
 		}
@@ -202,7 +201,10 @@ public void RemoveAt(int index)
 
 			var child = _children[index];
 
-			_children.RemoveAt(index);
+			if (child is Element element)
+				RemoveLogicalChild(element, index);
+			else
+				_children.RemoveAt(index);
 
 			OnRemove(index, child);
 		}
@@ -210,12 +212,6 @@ public void RemoveAt(int index)
 		protected virtual void OnAdd(int index, IView view)
 		{
 			NotifyHandler(nameof(ILayoutHandler.Add), index, view);
-
-			// Take care of the Element internal bookkeeping
-			if (view is Element element)
-			{
-				OnChildAdded(element);
-			}
 		}
 
 		protected virtual void OnClear()
@@ -226,23 +222,11 @@ protected virtual void OnClear()
 		protected virtual void OnRemove(int index, IView view)
 		{
 			NotifyHandler(nameof(ILayoutHandler.Remove), index, view);
-
-			// Take care of the Element internal bookkeeping
-			if (view is Element element)
-			{
-				OnChildRemoved(element, index);
-			}
 		}
 
 		protected virtual void OnInsert(int index, IView view)
 		{
 			NotifyHandler(nameof(ILayoutHandler.Insert), index, view);
-
-			// Take care of the Element internal bookkeeping
-			if (view is Element element)
-			{
-				OnChildAdded(element);
-			}
 		}
 
 		protected virtual void OnUpdate(int index, IView view, IView oldView)
diff --git a/src/Controls/src/Core/ListView/ListView.cs b/src/Controls/src/Core/ListView/ListView.cs
index 43806fb90eae..feeaf23ce456 100644
--- a/src/Controls/src/Core/ListView/ListView.cs
+++ b/src/Controls/src/Core/ListView/ListView.cs
@@ -17,10 +17,11 @@ namespace Microsoft.Maui.Controls
 	/// <include file="../../docs/Microsoft.Maui.Controls/ListView.xml" path="Type[@FullName='Microsoft.Maui.Controls.ListView']/Docs/*" />
 	public class ListView : ItemsView<Cell>, IListViewController, IElementConfiguration<ListView>, IVisualTreeElement
 	{
-		readonly List<Element> _logicalChildren = new List<Element>();
-		IReadOnlyList<IVisualTreeElement> IVisualTreeElement.GetVisualChildren() => _logicalChildren;
-
-		internal override IEnumerable<Element> ChildrenNotDrawnByThisElement => _logicalChildren;
+		// The ListViewRenderer has some odd behavior with LogicalChildren
+		// https://github.com/xamarin/Xamarin.Forms/pull/12057
+		// Ideally we'd fix the ListViewRenderer so we don't have this separation
+		readonly List<Element> _visualChildren = new List<Element>();
+		IReadOnlyList<IVisualTreeElement> IVisualTreeElement.GetVisualChildren() => _visualChildren;
 
 		/// <summary>Bindable property for <see cref="IsPullToRefreshEnabled"/>.</summary>
 		public static readonly BindableProperty IsPullToRefreshEnabledProperty = BindableProperty.Create("IsPullToRefreshEnabled", typeof(bool), typeof(ListView), false);
@@ -445,7 +446,7 @@ protected override void SetupContent(Cell content, int index)
 
 			if (content != null)
 			{
-				_logicalChildren.Add(content);
+				_visualChildren.Add(content);
 				content.Parent = this;
 				VisualDiagnostics.OnChildAdded(this, content);
 			}
@@ -457,10 +458,10 @@ protected override void UnhookContent(Cell content)
 
 			if (content == null)
 				return;
-			var index = _logicalChildren.IndexOf(content);
+			var index = _visualChildren.IndexOf(content);
 			if (index == -1)
 				return;
-			_logicalChildren.RemoveAt(index);
+			_visualChildren.RemoveAt(index);
 			content.Parent = null;
 			VisualDiagnostics.OnChildRemoved(this, content, index);
 
diff --git a/src/Controls/src/Core/Menu/FlyoutBase.cs b/src/Controls/src/Core/Menu/FlyoutBase.cs
index 8e1e1a1e7b58..2dd9b5b5aa13 100644
--- a/src/Controls/src/Core/Menu/FlyoutBase.cs
+++ b/src/Controls/src/Core/Menu/FlyoutBase.cs
@@ -7,12 +7,7 @@ public abstract class FlyoutBase : Element, IFlyout
 		public static readonly BindableProperty ContextFlyoutProperty = BindableProperty.CreateAttached("ContextFlyout", typeof(FlyoutBase), typeof(FlyoutBase), null,
 			propertyChanged: (bo, oldV, newV) =>
 			{
-				if (oldV is BindableObject oldMenu)
-					VisualElement.SetInheritedBindingContext(oldMenu, null);
-
-				if (newV is BindableObject newMenu)
-					VisualElement.SetInheritedBindingContext(newMenu, bo.BindingContext);
-
+				bo.AddRemoveLogicalChildren(oldV, newV);
 			});
 
 		public static void SetContextFlyout(BindableObject b, FlyoutBase value)
diff --git a/src/Controls/src/Core/Menu/MenuBarItem.cs b/src/Controls/src/Core/Menu/MenuBarItem.cs
index 4dffe30b430d..2e9e700b3fe9 100644
--- a/src/Controls/src/Core/Menu/MenuBarItem.cs
+++ b/src/Controls/src/Core/Menu/MenuBarItem.cs
@@ -59,7 +59,7 @@ public IMenuElement this[int index]
 		public void Add(IMenuElement item)
 		{
 			var index = _menus.Count;
-			AddLogicalChildInternal((Element)item);
+			AddLogicalChild((Element)item);
 			NotifyHandler(nameof(IMenuBarItemHandler.Add), index, item);
 		}
 
@@ -91,14 +91,14 @@ public int IndexOf(IMenuElement item)
 
 		public void Insert(int index, IMenuElement item)
 		{
-			InsertLogicalChildInternal(index, (Element)item);
+			InsertLogicalChild(index, (Element)item);
 			NotifyHandler(nameof(IMenuBarItemHandler.Insert), index, item);
 		}
 
 		public bool Remove(IMenuElement item)
 		{
 			var index = _menus.IndexOf(item);
-			var result = RemoveLogicalChildInternal((Element)item, index);
+			var result = RemoveLogicalChild((Element)item, index);
 			NotifyHandler(nameof(IMenuFlyoutHandler.Remove), index, item);
 
 			return result;
@@ -107,7 +107,7 @@ public bool Remove(IMenuElement item)
 		public void RemoveAt(int index)
 		{
 			var item = _menus[index];
-			RemoveLogicalChildInternal((Element)item, index);
+			RemoveLogicalChild((Element)item, index);
 			NotifyHandler(nameof(IMenuFlyoutHandler.Remove), index, item);
 		}
 
diff --git a/src/Controls/src/Core/Menu/MenuBarTracker.cs b/src/Controls/src/Core/Menu/MenuBarTracker.cs
index 46391e1017a6..6ef49c05f252 100644
--- a/src/Controls/src/Core/Menu/MenuBarTracker.cs
+++ b/src/Controls/src/Core/Menu/MenuBarTracker.cs
@@ -18,7 +18,6 @@ public MenuBarTracker() : this(null, null)
 		public MenuBarTracker(Element parent, string handlerProperty)
 		{
 			_menuBar = new MenuBar();
-			_menuBar.Parent = parent;
 			_parent = parent;
 			_handlerProperty = handlerProperty;
 			CollectionChanged += OnMenuBarItemCollectionChanged;
@@ -28,6 +27,15 @@ void OnMenuBarItemCollectionChanged(object sender, EventArgs e)
 		{
 			_menuBar.SyncMenuBarItemsFromPages(ToolbarItems);
 
+			if (_menuBar.Count == 0)
+			{
+				_menuBar.Parent?.RemoveLogicalChild(_menuBar);
+			}
+			else if (_menuBar.Parent != _parent)
+			{
+				_parent.AddLogicalChild(_menuBar);
+			}
+
 			if (_handlerProperty != null)
 			{
 				_parent?.Handler?.UpdateValue(_handlerProperty);
diff --git a/src/Controls/src/Core/Menu/MenuFlyout.cs b/src/Controls/src/Core/Menu/MenuFlyout.cs
index 94d4788b3f49..70c72eaddee4 100644
--- a/src/Controls/src/Core/Menu/MenuFlyout.cs
+++ b/src/Controls/src/Core/Menu/MenuFlyout.cs
@@ -31,7 +31,7 @@ public IMenuElement this[int index]
 		public void Add(IMenuElement item)
 		{
 			var index = _menus.Count;
-			AddLogicalChildInternal((Element)item);
+			AddLogicalChild((Element)item);
 			NotifyHandler(nameof(IMenuFlyoutHandler.Add), index, item);
 
 			// Take care of the Element internal bookkeeping
@@ -69,14 +69,14 @@ public int IndexOf(IMenuElement item)
 
 		public void Insert(int index, IMenuElement item)
 		{
-			InsertLogicalChildInternal(index, (Element)item);
+			InsertLogicalChild(index, (Element)item);
 			NotifyHandler(nameof(IMenuFlyoutHandler.Insert), index, item);
 		}
 
 		public bool Remove(IMenuElement item)
 		{
 			var index = _menus.IndexOf(item);
-			var result = RemoveLogicalChildInternal((Element)item, index);
+			var result = RemoveLogicalChild((Element)item, index);
 			NotifyHandler(nameof(IMenuFlyoutHandler.Remove), index, item);
 
 			return result;
@@ -85,7 +85,7 @@ public bool Remove(IMenuElement item)
 		public void RemoveAt(int index)
 		{
 			var item = _menus[index];
-			RemoveLogicalChildInternal((Element)item, index);
+			RemoveLogicalChild((Element)item, index);
 			NotifyHandler(nameof(IMenuFlyoutHandler.Remove), index, item);
 		}
 
diff --git a/src/Controls/src/Core/Menu/MenuFlyoutSubItem.cs b/src/Controls/src/Core/Menu/MenuFlyoutSubItem.cs
index 50229af2d5d5..4b417c308582 100644
--- a/src/Controls/src/Core/Menu/MenuFlyoutSubItem.cs
+++ b/src/Controls/src/Core/Menu/MenuFlyoutSubItem.cs
@@ -34,7 +34,7 @@ public IMenuElement this[int index]
 		public void Add(IMenuElement item)
 		{
 			var index = _menus.Count;
-			AddLogicalChildInternal((Element)item);
+			AddLogicalChild((Element)item);
 			NotifyHandler(nameof(IMenuBarItemHandler.Add), index, item);
 		}
 
@@ -66,14 +66,14 @@ public int IndexOf(IMenuElement item)
 
 		public void Insert(int index, IMenuElement item)
 		{
-			InsertLogicalChildInternal(index, (Element)item);
+			InsertLogicalChild(index, (Element)item);
 			NotifyHandler(nameof(IMenuFlyoutSubItemHandler.Insert), index, item);
 		}
 
 		public bool Remove(IMenuElement item)
 		{
 			var index = _menus.IndexOf(item);
-			var result = RemoveLogicalChildInternal((Element)item, index);
+			var result = RemoveLogicalChild((Element)item, index);
 			NotifyHandler(nameof(IMenuFlyoutHandler.Remove), index, item);
 
 			return result;
@@ -82,7 +82,7 @@ public bool Remove(IMenuElement item)
 		public void RemoveAt(int index)
 		{
 			var item = _menus[index];
-			RemoveLogicalChildInternal((Element)item, index);
+			RemoveLogicalChild((Element)item, index);
 			NotifyHandler(nameof(IMenuFlyoutHandler.Remove), index, item);
 		}
 
diff --git a/src/Controls/src/Core/NavigationPage/NavigationPage.cs b/src/Controls/src/Core/NavigationPage/NavigationPage.cs
index 8550e3cba743..7dcf97e50b0d 100644
--- a/src/Controls/src/Core/NavigationPage/NavigationPage.cs
+++ b/src/Controls/src/Core/NavigationPage/NavigationPage.cs
@@ -40,7 +40,8 @@ public partial class NavigationPage : Page, IPageContainer<Page>, IBarElement, I
 		public static readonly BindableProperty IconColorProperty = BindableProperty.CreateAttached("IconColor", typeof(Color), typeof(NavigationPage), null);
 
 		/// <summary>Bindable property for attached property <c>TitleView</c>.</summary>
-		public static readonly BindableProperty TitleViewProperty = BindableProperty.CreateAttached("TitleView", typeof(View), typeof(NavigationPage), null, propertyChanging: TitleViewPropertyChanging);
+		public static readonly BindableProperty TitleViewProperty = BindableProperty.CreateAttached("TitleView", typeof(View), typeof(NavigationPage), null,
+			propertyChanging: TitleViewPropertyChanging, propertyChanged: (bo, oldV, newV) => bo.AddRemoveLogicalChildren(oldV, newV));
 
 		static readonly BindablePropertyKey CurrentPagePropertyKey = BindableProperty.CreateReadOnly("CurrentPage", typeof(Page), typeof(NavigationPage), null, propertyChanged: OnCurrentPageChanged);
 
@@ -158,11 +159,6 @@ static void TitleViewPropertyChanging(BindableObject bindable, object oldValue,
 			{
 				page.SetTitleView((View)oldValue, (View)newValue);
 			}
-			else if (oldValue != null)
-			{
-				var oldElem = (View)oldValue;
-				oldElem.Parent = null;
-			}
 		}
 
 		/// <include file="../../docs/Microsoft.Maui.Controls/NavigationPage.xml" path="//Member[@MemberName='GetBackButtonTitle']/Docs/*" />
diff --git a/src/Controls/src/Core/Page/Page.cs b/src/Controls/src/Core/Page/Page.cs
index 2d096190e3fc..982ca26b5b4d 100644
--- a/src/Controls/src/Core/Page/Page.cs
+++ b/src/Controls/src/Core/Page/Page.cs
@@ -156,26 +156,6 @@ public bool IgnoresContainerArea
 		[EditorBrowsable(EditorBrowsableState.Never)]
 		public ObservableCollection<Element> InternalChildren { get; } = new ObservableCollection<Element>();
 
-		// Todo rework Page to use AddLogical/RemoveLogical.
-		// Rework all the related parts of the code that interact with the `Page` InternalChildren
-		private protected override IList<Element> LogicalChildrenInternalBackingStore =>
-			InternalChildren;
-
-		internal override IEnumerable<Element> ChildrenNotDrawnByThisElement
-		{
-			get
-			{
-				var titleviewPart1TheShell = Shell.GetTitleView(this);
-				var titleViewPart2TheNavBar = NavigationPage.GetTitleView(this);
-
-				if (titleviewPart1TheShell != null)
-					yield return titleviewPart1TheShell;
-
-				if (titleViewPart2TheNavBar != null)
-					yield return titleViewPart2TheNavBar;
-			}
-		}
-
 		bool ISafeAreaView.IgnoreSafeArea => !On<PlatformConfiguration.iOS>().UsingSafeArea();
 
 		Thickness ISafeAreaView2.SafeAreaInsets
@@ -309,7 +289,7 @@ protected virtual void LayoutChildren(double x, double y, double width, double h
 				area.Height = Math.Max(0, area.Height);
 			}
 
-			List<Element> elements = ((IElementController)this).LogicalChildren.ToList();
+			IList<Element> elements = this.InternalChildren;
 			foreach (Element element in elements)
 			{
 				var child = element as VisualElement;
@@ -395,7 +375,7 @@ protected void UpdateChildrenLayout()
 			if (!ShouldLayoutChildren())
 				return;
 
-			var logicalChildren = ((IElementController)this).LogicalChildren;
+			var logicalChildren = this.InternalChildren;
 			var startingLayout = new List<Rect>(logicalChildren.Count);
 			foreach (Element el in logicalChildren)
 			{
@@ -435,7 +415,7 @@ internal virtual void OnChildMeasureInvalidated(VisualElement child, Invalidatio
 			}
 			else
 			{
-				var logicalChildren = ((IElementController)this).LogicalChildren;
+				var logicalChildren = this.InternalChildren;
 				for (var i = 0; i < logicalChildren.Count; i++)
 				{
 					var v = logicalChildren[i] as VisualElement;
@@ -548,30 +528,37 @@ void InternalChildrenOnCollectionChanged(object sender, NotifyCollectionChangedE
 					var item = (Element)e.OldItems[i];
 					if (item is VisualElement visual)
 						visual.MeasureInvalidated -= OnChildMeasureInvalidated;
-					OnChildRemoved(item, e.OldStartingIndex + i);
+
+					RemoveLogicalChild(item);
 				}
 			}
 
 			if (e.NewItems != null)
 			{
+				int index = e.NewStartingIndex;
+
 				foreach (Element item in e.NewItems)
 				{
+					int insertIndex = index;
+					if (insertIndex < 0)
+						insertIndex = InternalChildren.IndexOf(item);
+
 					if (item is VisualElement visual)
-						OnInternalAdded(visual);
+					{
+						visual.MeasureInvalidated += OnChildMeasureInvalidated;
+
+						InsertLogicalChild(insertIndex, visual);
+						InvalidateMeasureInternal(InvalidationTrigger.MeasureChanged);
+					}
 					else
-						OnChildAdded(item);
+						InsertLogicalChild(insertIndex, item);
+
+					if (index >= 0)
+						index++;
 				}
 			}
 		}
 
-		void OnInternalAdded(VisualElement view)
-		{
-			view.MeasureInvalidated += OnChildMeasureInvalidated;
-
-			OnChildAdded(view);
-			InvalidateMeasureInternal(InvalidationTrigger.MeasureChanged);
-		}
-
 		void OnPageBusyChanged()
 		{
 			if (!_hasAppeared)
@@ -598,7 +585,7 @@ void OnToolbarItemsCollectionChanged(object sender, NotifyCollectionChangedEvent
 
 		bool ShouldLayoutChildren()
 		{
-			var logicalChildren = ((IElementController)this).LogicalChildren;
+			var logicalChildren = this.InternalChildren;
 			if (logicalChildren.Count == 0 || Width <= 0 || Height <= 0 || !IsPlatformStateConsistent)
 				return false;
 
@@ -631,12 +618,6 @@ public IPlatformElementConfiguration<T, Page> On<T>() where T : IConfigPlatform
 
 		internal void SetTitleView(View oldTitleView, View newTitleView)
 		{
-			if (oldTitleView != null)
-				oldTitleView.Parent = null;
-
-			if (newTitleView != null)
-				newTitleView.Parent = this;
-
 			_titleView = newTitleView;
 		}
 
diff --git a/src/Controls/src/Core/Platform/ModalNavigationManager/ModalNavigationManager.cs b/src/Controls/src/Core/Platform/ModalNavigationManager/ModalNavigationManager.cs
index 4c9fc490b87f..04067f4eace0 100644
--- a/src/Controls/src/Core/Platform/ModalNavigationManager/ModalNavigationManager.cs
+++ b/src/Controls/src/Core/Platform/ModalNavigationManager/ModalNavigationManager.cs
@@ -157,7 +157,7 @@ async Task SyncPlatformModalStackAsync()
 					}
 
 					var page = await PopModalPlatformAsync(animated);
-					page.Parent = null;
+					page.Parent?.RemoveLogicalChild(page);
 					syncAgain = true;
 				}
 
@@ -234,7 +234,7 @@ async Task SyncPlatformModalStackAsync()
 				(isPlatformReady && !syncing) ? PopModalPlatformAsync(animated) : Task.CompletedTask;
 
 			await popTask;
-			modal.Parent = null;
+			modal.Parent?.RemoveLogicalChild(modal);
 			_window.OnModalPopped(modal);
 
 			if (FireLifeCycleEvents)
@@ -255,7 +255,7 @@ public async Task PushModalAsync(Page modal, bool animated)
 
 			var previousPage = CurrentPage;
 			_modalPages.Add(new NavigationStepRequest(modal, true, animated));
-			modal.Parent = _window;
+			_window.AddLogicalChild(modal);
 
 			if (FireLifeCycleEvents)
 			{
diff --git a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
index 9440ba3acf61..ae1e7154d328 100644
--- a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -106,6 +106,10 @@ Microsoft.Maui.Controls.IValueConverter.Convert(object? value, System.Type! targ
 Microsoft.Maui.Controls.IValueConverter.ConvertBack(object? value, System.Type! targetType, object? parameter, System.Globalization.CultureInfo! culture) -> object?
 ~static Microsoft.Maui.Controls.GridExtensions.Add(this Microsoft.Maui.Controls.Grid grid, Microsoft.Maui.IView view, int left, int right, int top, int bottom) -> void
 ~static Microsoft.Maui.Controls.GridExtensions.AddWithSpan(this Microsoft.Maui.Controls.Grid grid, Microsoft.Maui.IView view, int row = 0, int column = 0, int rowSpan = 1, int columnSpan = 1) -> void
+~Microsoft.Maui.Controls.Element.AddLogicalChild(Microsoft.Maui.Controls.Element element) -> void
+~Microsoft.Maui.Controls.Element.InsertLogicalChild(int index, Microsoft.Maui.Controls.Element element) -> void
+~Microsoft.Maui.Controls.Element.RemoveLogicalChild(Microsoft.Maui.Controls.Element element) -> bool
+Microsoft.Maui.Controls.Element.ClearLogicalChildren() -> void
 Microsoft.Maui.Controls.ShellNavigationQueryParameters
 Microsoft.Maui.Controls.ShellNavigationQueryParameters.Add(string! key, object! value) -> void
 Microsoft.Maui.Controls.ShellNavigationQueryParameters.Add(System.Collections.Generic.KeyValuePair<string!, object!> item) -> void
@@ -127,4 +131,8 @@ Microsoft.Maui.Controls.ShellNavigationQueryParameters.this[string! key].set ->
 Microsoft.Maui.Controls.ShellNavigationQueryParameters.TryGetValue(string! key, out object! value) -> bool
 Microsoft.Maui.Controls.ShellNavigationQueryParameters.Values.get -> System.Collections.Generic.ICollection<object!>!
 ~Microsoft.Maui.Controls.Shell.GoToAsync(Microsoft.Maui.Controls.ShellNavigationState state, bool animate, Microsoft.Maui.Controls.ShellNavigationQueryParameters shellNavigationQueryParameters) -> System.Threading.Tasks.Task
-~Microsoft.Maui.Controls.Shell.GoToAsync(Microsoft.Maui.Controls.ShellNavigationState state, Microsoft.Maui.Controls.ShellNavigationQueryParameters shellNavigationQueryParameters) -> System.Threading.Tasks.Task
\ No newline at end of file
+~Microsoft.Maui.Controls.Shell.GoToAsync(Microsoft.Maui.Controls.ShellNavigationState state, Microsoft.Maui.Controls.ShellNavigationQueryParameters shellNavigationQueryParameters) -> System.Threading.Tasks.Task
+*REMOVED*~Microsoft.Maui.Controls.ItemsView.AddLogicalChild(Microsoft.Maui.Controls.Element element) -> void
+*REMOVED*~Microsoft.Maui.Controls.ItemsView.RemoveLogicalChild(Microsoft.Maui.Controls.Element element) -> void
+*REMOVED*~Microsoft.Maui.Controls.Shell.AddLogicalChild(Microsoft.Maui.Controls.Element element) -> void
+*REMOVED*~Microsoft.Maui.Controls.Shell.RemoveLogicalChild(Microsoft.Maui.Controls.Element element) -> void
\ No newline at end of file
diff --git a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index f8f1f0acb145..d03deaa0ff6e 100644
--- a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -108,6 +108,10 @@ Microsoft.Maui.Controls.IValueConverter.ConvertBack(object? value, System.Type!
 *REMOVED*override Microsoft.Maui.Controls.Handlers.Compatibility.PhoneFlyoutPageRenderer.WillRotate(UIKit.UIInterfaceOrientation toInterfaceOrientation, double duration) -> void
 ~virtual Microsoft.Maui.Controls.Handlers.Items.ItemsViewController<TItemsView>.DetermineCellReuseId(Foundation.NSIndexPath indexPath) -> string
 override Microsoft.Maui.Controls.Handlers.Items.ItemsViewHandler<TItemsView>.GetDesiredSize(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
+~Microsoft.Maui.Controls.Element.AddLogicalChild(Microsoft.Maui.Controls.Element element) -> void
+~Microsoft.Maui.Controls.Element.InsertLogicalChild(int index, Microsoft.Maui.Controls.Element element) -> void
+~Microsoft.Maui.Controls.Element.RemoveLogicalChild(Microsoft.Maui.Controls.Element element) -> bool
+Microsoft.Maui.Controls.Element.ClearLogicalChildren() -> void
 Microsoft.Maui.Controls.ShellNavigationQueryParameters
 Microsoft.Maui.Controls.ShellNavigationQueryParameters.Add(string! key, object! value) -> void
 Microsoft.Maui.Controls.ShellNavigationQueryParameters.Add(System.Collections.Generic.KeyValuePair<string!, object!> item) -> void
@@ -129,4 +133,8 @@ Microsoft.Maui.Controls.ShellNavigationQueryParameters.this[string! key].set ->
 Microsoft.Maui.Controls.ShellNavigationQueryParameters.TryGetValue(string! key, out object! value) -> bool
 Microsoft.Maui.Controls.ShellNavigationQueryParameters.Values.get -> System.Collections.Generic.ICollection<object!>!
 ~Microsoft.Maui.Controls.Shell.GoToAsync(Microsoft.Maui.Controls.ShellNavigationState state, bool animate, Microsoft.Maui.Controls.ShellNavigationQueryParameters shellNavigationQueryParameters) -> System.Threading.Tasks.Task
-~Microsoft.Maui.Controls.Shell.GoToAsync(Microsoft.Maui.Controls.ShellNavigationState state, Microsoft.Maui.Controls.ShellNavigationQueryParameters shellNavigationQueryParameters) -> System.Threading.Tasks.Task
\ No newline at end of file
+~Microsoft.Maui.Controls.Shell.GoToAsync(Microsoft.Maui.Controls.ShellNavigationState state, Microsoft.Maui.Controls.ShellNavigationQueryParameters shellNavigationQueryParameters) -> System.Threading.Tasks.Task
+*REMOVED*~Microsoft.Maui.Controls.ItemsView.AddLogicalChild(Microsoft.Maui.Controls.Element element) -> void
+*REMOVED*~Microsoft.Maui.Controls.ItemsView.RemoveLogicalChild(Microsoft.Maui.Controls.Element element) -> void
+*REMOVED*~Microsoft.Maui.Controls.Shell.AddLogicalChild(Microsoft.Maui.Controls.Element element) -> void
+*REMOVED*~Microsoft.Maui.Controls.Shell.RemoveLogicalChild(Microsoft.Maui.Controls.Element element) -> void
\ No newline at end of file
diff --git a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index f8f1f0acb145..d03deaa0ff6e 100644
--- a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -108,6 +108,10 @@ Microsoft.Maui.Controls.IValueConverter.ConvertBack(object? value, System.Type!
 *REMOVED*override Microsoft.Maui.Controls.Handlers.Compatibility.PhoneFlyoutPageRenderer.WillRotate(UIKit.UIInterfaceOrientation toInterfaceOrientation, double duration) -> void
 ~virtual Microsoft.Maui.Controls.Handlers.Items.ItemsViewController<TItemsView>.DetermineCellReuseId(Foundation.NSIndexPath indexPath) -> string
 override Microsoft.Maui.Controls.Handlers.Items.ItemsViewHandler<TItemsView>.GetDesiredSize(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
+~Microsoft.Maui.Controls.Element.AddLogicalChild(Microsoft.Maui.Controls.Element element) -> void
+~Microsoft.Maui.Controls.Element.InsertLogicalChild(int index, Microsoft.Maui.Controls.Element element) -> void
+~Microsoft.Maui.Controls.Element.RemoveLogicalChild(Microsoft.Maui.Controls.Element element) -> bool
+Microsoft.Maui.Controls.Element.ClearLogicalChildren() -> void
 Microsoft.Maui.Controls.ShellNavigationQueryParameters
 Microsoft.Maui.Controls.ShellNavigationQueryParameters.Add(string! key, object! value) -> void
 Microsoft.Maui.Controls.ShellNavigationQueryParameters.Add(System.Collections.Generic.KeyValuePair<string!, object!> item) -> void
@@ -129,4 +133,8 @@ Microsoft.Maui.Controls.ShellNavigationQueryParameters.this[string! key].set ->
 Microsoft.Maui.Controls.ShellNavigationQueryParameters.TryGetValue(string! key, out object! value) -> bool
 Microsoft.Maui.Controls.ShellNavigationQueryParameters.Values.get -> System.Collections.Generic.ICollection<object!>!
 ~Microsoft.Maui.Controls.Shell.GoToAsync(Microsoft.Maui.Controls.ShellNavigationState state, bool animate, Microsoft.Maui.Controls.ShellNavigationQueryParameters shellNavigationQueryParameters) -> System.Threading.Tasks.Task
-~Microsoft.Maui.Controls.Shell.GoToAsync(Microsoft.Maui.Controls.ShellNavigationState state, Microsoft.Maui.Controls.ShellNavigationQueryParameters shellNavigationQueryParameters) -> System.Threading.Tasks.Task
\ No newline at end of file
+~Microsoft.Maui.Controls.Shell.GoToAsync(Microsoft.Maui.Controls.ShellNavigationState state, Microsoft.Maui.Controls.ShellNavigationQueryParameters shellNavigationQueryParameters) -> System.Threading.Tasks.Task
+*REMOVED*~Microsoft.Maui.Controls.ItemsView.AddLogicalChild(Microsoft.Maui.Controls.Element element) -> void
+*REMOVED*~Microsoft.Maui.Controls.ItemsView.RemoveLogicalChild(Microsoft.Maui.Controls.Element element) -> void
+*REMOVED*~Microsoft.Maui.Controls.Shell.AddLogicalChild(Microsoft.Maui.Controls.Element element) -> void
+*REMOVED*~Microsoft.Maui.Controls.Shell.RemoveLogicalChild(Microsoft.Maui.Controls.Element element) -> void
\ No newline at end of file
diff --git a/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
index 41e62a8610f3..fca94df92b88 100644
--- a/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
@@ -113,3 +113,11 @@ Microsoft.Maui.Controls.ShellNavigationQueryParameters.Values.get -> System.Coll
 ~Microsoft.Maui.Controls.Shell.GoToAsync(Microsoft.Maui.Controls.ShellNavigationState state, bool animate, Microsoft.Maui.Controls.ShellNavigationQueryParameters shellNavigationQueryParameters) -> System.Threading.Tasks.Task
 ~Microsoft.Maui.Controls.Shell.GoToAsync(Microsoft.Maui.Controls.ShellNavigationState state, Microsoft.Maui.Controls.ShellNavigationQueryParameters shellNavigationQueryParameters) -> System.Threading.Tasks.Task
 ~static readonly Microsoft.Maui.Controls.InputView.IsTextPredictionEnabledProperty -> Microsoft.Maui.Controls.BindableProperty
+~Microsoft.Maui.Controls.Element.AddLogicalChild(Microsoft.Maui.Controls.Element element) -> void
+~Microsoft.Maui.Controls.Element.InsertLogicalChild(int index, Microsoft.Maui.Controls.Element element) -> void
+~Microsoft.Maui.Controls.Element.RemoveLogicalChild(Microsoft.Maui.Controls.Element element) -> bool
+Microsoft.Maui.Controls.Element.ClearLogicalChildren() -> void
+*REMOVED*~Microsoft.Maui.Controls.ItemsView.AddLogicalChild(Microsoft.Maui.Controls.Element element) -> void
+*REMOVED*~Microsoft.Maui.Controls.ItemsView.RemoveLogicalChild(Microsoft.Maui.Controls.Element element) -> void
+*REMOVED*~Microsoft.Maui.Controls.Shell.AddLogicalChild(Microsoft.Maui.Controls.Element element) -> void
+*REMOVED*~Microsoft.Maui.Controls.Shell.RemoveLogicalChild(Microsoft.Maui.Controls.Element element) -> void
\ No newline at end of file
diff --git a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index c14625882eef..24a36e892306 100644
--- a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -107,6 +107,10 @@ Microsoft.Maui.Controls.IValueConverter.Convert(object? value, System.Type! targ
 Microsoft.Maui.Controls.IValueConverter.ConvertBack(object? value, System.Type! targetType, object? parameter, System.Globalization.CultureInfo! culture) -> object?
 ~static Microsoft.Maui.Controls.GridExtensions.Add(this Microsoft.Maui.Controls.Grid grid, Microsoft.Maui.IView view, int left, int right, int top, int bottom) -> void
 ~static Microsoft.Maui.Controls.GridExtensions.AddWithSpan(this Microsoft.Maui.Controls.Grid grid, Microsoft.Maui.IView view, int row = 0, int column = 0, int rowSpan = 1, int columnSpan = 1) -> void
+~Microsoft.Maui.Controls.Element.AddLogicalChild(Microsoft.Maui.Controls.Element element) -> void
+~Microsoft.Maui.Controls.Element.InsertLogicalChild(int index, Microsoft.Maui.Controls.Element element) -> void
+~Microsoft.Maui.Controls.Element.RemoveLogicalChild(Microsoft.Maui.Controls.Element element) -> bool
+Microsoft.Maui.Controls.Element.ClearLogicalChildren() -> void
 Microsoft.Maui.Controls.ShellNavigationQueryParameters
 Microsoft.Maui.Controls.ShellNavigationQueryParameters.Add(string! key, object! value) -> void
 Microsoft.Maui.Controls.ShellNavigationQueryParameters.Add(System.Collections.Generic.KeyValuePair<string!, object!> item) -> void
@@ -127,4 +131,10 @@ Microsoft.Maui.Controls.ShellNavigationQueryParameters.this[string! key].get ->
 Microsoft.Maui.Controls.ShellNavigationQueryParameters.this[string! key].set -> void
 Microsoft.Maui.Controls.ShellNavigationQueryParameters.Values.get -> System.Collections.Generic.ICollection<object!>!
 ~Microsoft.Maui.Controls.Shell.GoToAsync(Microsoft.Maui.Controls.ShellNavigationState state, bool animate, Microsoft.Maui.Controls.ShellNavigationQueryParameters shellNavigationQueryParameters) -> System.Threading.Tasks.Task
-~Microsoft.Maui.Controls.Shell.GoToAsync(Microsoft.Maui.Controls.ShellNavigationState state, Microsoft.Maui.Controls.ShellNavigationQueryParameters shellNavigationQueryParameters) -> System.Threading.Tasks.Task
\ No newline at end of file
+~Microsoft.Maui.Controls.Shell.GoToAsync(Microsoft.Maui.Controls.ShellNavigationState state, Microsoft.Maui.Controls.ShellNavigationQueryParameters shellNavigationQueryParameters) -> System.Threading.Tasks.Task
+*REMOVED*~Microsoft.Maui.Controls.ItemsView.AddLogicalChild(Microsoft.Maui.Controls.Element element) -> void
+*REMOVED*~Microsoft.Maui.Controls.ItemsView.RemoveLogicalChild(Microsoft.Maui.Controls.Element element) -> void
+*REMOVED*~Microsoft.Maui.Controls.Shell.AddLogicalChild(Microsoft.Maui.Controls.Element element) -> void
+*REMOVED*~Microsoft.Maui.Controls.Shell.RemoveLogicalChild(Microsoft.Maui.Controls.Element element) -> void
+*REMOVED*~Microsoft.Maui.Controls.Shell.AddLogicalChild(Microsoft.Maui.Controls.Element element) -> void
+*REMOVED*~Microsoft.Maui.Controls.Shell.RemoveLogicalChild(Microsoft.Maui.Controls.Element element) -> void
\ No newline at end of file
diff --git a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
index 0b86d15a5581..8a0d3b8c5b95 100644
--- a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -94,6 +94,10 @@ Microsoft.Maui.Controls.IValueConverter.Convert(object? value, System.Type! targ
 Microsoft.Maui.Controls.IValueConverter.ConvertBack(object? value, System.Type! targetType, object? parameter, System.Globalization.CultureInfo! culture) -> object?
 ~static Microsoft.Maui.Controls.GridExtensions.Add(this Microsoft.Maui.Controls.Grid grid, Microsoft.Maui.IView view, int left, int right, int top, int bottom) -> void
 ~static Microsoft.Maui.Controls.GridExtensions.AddWithSpan(this Microsoft.Maui.Controls.Grid grid, Microsoft.Maui.IView view, int row = 0, int column = 0, int rowSpan = 1, int columnSpan = 1) -> void
+~Microsoft.Maui.Controls.Element.AddLogicalChild(Microsoft.Maui.Controls.Element element) -> void
+~Microsoft.Maui.Controls.Element.InsertLogicalChild(int index, Microsoft.Maui.Controls.Element element) -> void
+~Microsoft.Maui.Controls.Element.RemoveLogicalChild(Microsoft.Maui.Controls.Element element) -> bool
+Microsoft.Maui.Controls.Element.ClearLogicalChildren() -> void
 Microsoft.Maui.Controls.ShellNavigationQueryParameters
 Microsoft.Maui.Controls.ShellNavigationQueryParameters.Add(string! key, object! value) -> void
 Microsoft.Maui.Controls.ShellNavigationQueryParameters.Add(System.Collections.Generic.KeyValuePair<string!, object!> item) -> void
@@ -115,4 +119,8 @@ Microsoft.Maui.Controls.ShellNavigationQueryParameters.this[string! key].set ->
 Microsoft.Maui.Controls.ShellNavigationQueryParameters.TryGetValue(string! key, out object! value) -> bool
 Microsoft.Maui.Controls.ShellNavigationQueryParameters.Values.get -> System.Collections.Generic.ICollection<object!>!
 ~Microsoft.Maui.Controls.Shell.GoToAsync(Microsoft.Maui.Controls.ShellNavigationState state, bool animate, Microsoft.Maui.Controls.ShellNavigationQueryParameters shellNavigationQueryParameters) -> System.Threading.Tasks.Task
-~Microsoft.Maui.Controls.Shell.GoToAsync(Microsoft.Maui.Controls.ShellNavigationState state, Microsoft.Maui.Controls.ShellNavigationQueryParameters shellNavigationQueryParameters) -> System.Threading.Tasks.Task
\ No newline at end of file
+~Microsoft.Maui.Controls.Shell.GoToAsync(Microsoft.Maui.Controls.ShellNavigationState state, Microsoft.Maui.Controls.ShellNavigationQueryParameters shellNavigationQueryParameters) -> System.Threading.Tasks.Task
+*REMOVED*~Microsoft.Maui.Controls.ItemsView.AddLogicalChild(Microsoft.Maui.Controls.Element element) -> void
+*REMOVED*~Microsoft.Maui.Controls.ItemsView.RemoveLogicalChild(Microsoft.Maui.Controls.Element element) -> void
+*REMOVED*~Microsoft.Maui.Controls.Shell.AddLogicalChild(Microsoft.Maui.Controls.Element element) -> void
+*REMOVED*~Microsoft.Maui.Controls.Shell.RemoveLogicalChild(Microsoft.Maui.Controls.Element element) -> void
diff --git a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
index 4752cffc98ec..e7cdaebd6c32 100644
--- a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -1,6 +1,7 @@
 #nullable enable
 *REMOVED*~Microsoft.Maui.Controls.Accelerator.Modifiers.set -> void
 *REMOVED*~Microsoft.Maui.Controls.Accelerator.Keys.set -> void
+Microsoft.Maui.Controls.Element.ClearLogicalChildren() -> void
 ~Microsoft.Maui.Controls.Accelerator.Key.get -> string
 *REMOVED*override Microsoft.Maui.Controls.RefreshView.MeasureOverride(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
 Microsoft.Maui.Controls.Border.~Border() -> void
@@ -65,6 +66,9 @@ Microsoft.Maui.Controls.VisualElement.RefreshIsEnabledProperty() -> void
 override Microsoft.Maui.Controls.Button.IsEnabledCore.get -> bool
 override Microsoft.Maui.Controls.ImageButton.IsEnabledCore.get -> bool
 override Microsoft.Maui.Controls.SearchBar.IsEnabledCore.get -> bool
+~Microsoft.Maui.Controls.Element.AddLogicalChild(Microsoft.Maui.Controls.Element element) -> void
+~Microsoft.Maui.Controls.Element.InsertLogicalChild(int index, Microsoft.Maui.Controls.Element element) -> void
+~Microsoft.Maui.Controls.Element.RemoveLogicalChild(Microsoft.Maui.Controls.Element element) -> bool
 ~Microsoft.Maui.Controls.Shell.GoToAsync(Microsoft.Maui.Controls.ShellNavigationState state, bool animate, Microsoft.Maui.Controls.ShellNavigationQueryParameters shellNavigationQueryParameters) -> System.Threading.Tasks.Task
 ~Microsoft.Maui.Controls.Shell.GoToAsync(Microsoft.Maui.Controls.ShellNavigationState state, Microsoft.Maui.Controls.ShellNavigationQueryParameters shellNavigationQueryParameters) -> System.Threading.Tasks.Task
 ~Microsoft.Maui.Controls.WebView.UserAgent.get -> string
@@ -109,4 +113,8 @@ override Microsoft.Maui.Controls.SearchBar.IsEnabledCore.get -> bool
 Microsoft.Maui.Controls.IValueConverter.Convert(object? value, System.Type! targetType, object? parameter, System.Globalization.CultureInfo! culture) -> object?
 Microsoft.Maui.Controls.IValueConverter.ConvertBack(object? value, System.Type! targetType, object? parameter, System.Globalization.CultureInfo! culture) -> object?
 ~static Microsoft.Maui.Controls.GridExtensions.Add(this Microsoft.Maui.Controls.Grid grid, Microsoft.Maui.IView view, int left, int right, int top, int bottom) -> void
-~static Microsoft.Maui.Controls.GridExtensions.AddWithSpan(this Microsoft.Maui.Controls.Grid grid, Microsoft.Maui.IView view, int row = 0, int column = 0, int rowSpan = 1, int columnSpan = 1) -> void
\ No newline at end of file
+~static Microsoft.Maui.Controls.GridExtensions.AddWithSpan(this Microsoft.Maui.Controls.Grid grid, Microsoft.Maui.IView view, int row = 0, int column = 0, int rowSpan = 1, int columnSpan = 1) -> void
+*REMOVED*~Microsoft.Maui.Controls.ItemsView.AddLogicalChild(Microsoft.Maui.Controls.Element element) -> void
+*REMOVED*~Microsoft.Maui.Controls.ItemsView.RemoveLogicalChild(Microsoft.Maui.Controls.Element element) -> void
+*REMOVED*~Microsoft.Maui.Controls.Shell.AddLogicalChild(Microsoft.Maui.Controls.Element element) -> void
+*REMOVED*~Microsoft.Maui.Controls.Shell.RemoveLogicalChild(Microsoft.Maui.Controls.Element element) -> void
\ No newline at end of file
diff --git a/src/Controls/src/Core/Shell/BaseShellItem.cs b/src/Controls/src/Core/Shell/BaseShellItem.cs
index b2855e9ce086..b429f7b07453 100644
--- a/src/Controls/src/Core/Shell/BaseShellItem.cs
+++ b/src/Controls/src/Core/Shell/BaseShellItem.cs
@@ -26,10 +26,6 @@ public class BaseShellItem : NavigableElement, IPropertyPropagationController, I
 		const string DefaultFlyoutItemLayoutStyle = "Default_FlyoutItemLayoutStyle";
 
 		protected private ObservableCollection<Element> DeclaredChildren { get; } = new ObservableCollection<Element>();
-		readonly ObservableCollection<Element> _logicalChildren = new ObservableCollection<Element>();
-
-		private protected override IList<Element> LogicalChildrenInternalBackingStore
-			=> _logicalChildren;
 
 		#region PropertyKeys
 
@@ -262,43 +258,9 @@ internal static void Propagate(BindableProperty property, BindableObject from, B
 				to.SetValue(property, from.GetValue(property));
 		}
 
-		internal void AddLogicalChild(Element element)
-		{
-			if (element == null)
-			{
-				return;
-			}
-
-			if (_logicalChildren.Contains(element))
-				return;
-
-			_logicalChildren.Add(element);
-			element.Parent = this;
-			OnChildAdded(element);
-			VisualDiagnostics.OnChildAdded(this, element);
-		}
-
-		internal void RemoveLogicalChild(Element element)
-		{
-			if (element == null)
-			{
-				return;
-			}
-
-			element.Parent = null;
-
-			if (!_logicalChildren.Contains(element))
-				return;
-
-			var oldLogicalIndex = _logicalChildren.IndexOf(element);
-			_logicalChildren.Remove(element);
-			OnChildRemoved(element, oldLogicalIndex);
-			VisualDiagnostics.OnChildRemoved(this, element, oldLogicalIndex);
-		}
-
 		void IPropertyPropagationController.PropagatePropertyChanged(string propertyName)
 		{
-			PropertyPropagationExtensions.PropagatePropertyChanged(propertyName, this, ((IElementController)this).LogicalChildren);
+			PropertyPropagationExtensions.PropagatePropertyChanged(propertyName, this, ((IVisualTreeElement)this).GetVisualChildren());
 		}
 
 		EffectiveFlowDirection _effectiveFlowDirection = default(EffectiveFlowDirection);
diff --git a/src/Controls/src/Core/Shell/Shell.cs b/src/Controls/src/Core/Shell/Shell.cs
index 1f3f93756796..9c40a8755ff8 100644
--- a/src/Controls/src/Core/Shell/Shell.cs
+++ b/src/Controls/src/Core/Shell/Shell.cs
@@ -714,40 +714,6 @@ public Task GoToAsync(ShellNavigationState state, bool animate, ShellNavigationQ
 			return _navigationManager.GoToAsync(state, animate, false, parameters: new ShellRouteParameters(shellNavigationQueryParameters));
 		}
 
-		public void AddLogicalChild(Element element)
-		{
-			if (element == null)
-			{
-				return;
-			}
-
-			if (_logicalChildren.Contains(element))
-				return;
-
-			_logicalChildren.Add(element);
-			element.Parent = this;
-			OnChildAdded(element);
-			VisualDiagnostics.OnChildAdded(this, element);
-		}
-
-		public void RemoveLogicalChild(Element element)
-		{
-			if (element == null)
-			{
-				return;
-			}
-
-			element.Parent = null;
-
-			var oldLogicalIndex = _logicalChildren.IndexOf(element);
-			if (oldLogicalIndex == -1)
-				return;
-
-			_logicalChildren.RemoveAt(oldLogicalIndex);
-			OnChildRemoved(element, oldLogicalIndex);
-			VisualDiagnostics.OnChildRemoved(this, element, oldLogicalIndex);
-		}
-
 		/// <summary>Bindable property for <see cref="CurrentItem"/>.</summary>
 		public static readonly BindableProperty CurrentItemProperty =
 			BindableProperty.Create(nameof(CurrentItem), typeof(ShellItem), typeof(Shell), null, BindingMode.TwoWay,
@@ -818,12 +784,6 @@ public void RemoveLogicalChild(Element element)
 		ShellFlyoutItemsManager _flyoutManager;
 		Page _previousPage;
 
-		ObservableCollection<Element> _logicalChildren
-			= new ObservableCollection<Element>();
-
-		private protected override IList<Element> LogicalChildrenInternalBackingStore
-			=> _logicalChildren;
-
 		/// <include file="../../../docs/Microsoft.Maui.Controls/Shell.xml" path="//Member[@MemberName='.ctor']/Docs/*" />
 		public Shell()
 		{
@@ -837,7 +797,6 @@ public Shell()
 			Navigation = new NavigationImpl(this);
 			Route = Routing.GenerateImplicitRoute("shell");
 			Initialize();
-			InternalChildren.CollectionChanged += OnInternalChildrenCollectionChanged;
 
 			if (Application.Current != null)
 			{
@@ -1336,27 +1295,8 @@ static void OnFlyoutFooterTemplateChanging(BindableObject bindable, object oldVa
 			shell.OnFlyoutFooterTemplateChanged((DataTemplate)oldValue, (DataTemplate)newValue);
 		}
 
-		static void OnTitleViewChanged(BindableObject bindable, object oldValue, object newValue)
-		{
-			if (!(bindable is Element owner))
-				return;
-
-			var oldView = (View)oldValue;
-			var newView = (View)newValue;
-			var shell = bindable as Shell;
-
-			if (oldView != null)
-			{
-				shell?.RemoveLogicalChild(oldView);
-				oldView.Parent = null;
-			}
-
-			if (newView != null)
-			{
-				newView.Parent = owner;
-				shell?.AddLogicalChild(newView);
-			}
-		}
+		static void OnTitleViewChanged(BindableObject bindable, object oldValue, object newValue) =>
+			bindable.AddRemoveLogicalChildren(oldValue, newValue);
 
 		internal FlyoutBehavior GetEffectiveFlyoutBehavior()
 		{
@@ -1468,18 +1408,6 @@ ShellAppearance GetAppearanceForPivot(Element pivot)
 			return null;
 		}
 
-
-		void OnInternalChildrenCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
-		{
-			if (e.NewItems != null)
-				foreach (Element element in e.NewItems)
-					AddLogicalChild(element);
-
-			if (e.OldItems != null)
-				foreach (Element element in e.OldItems)
-					RemoveLogicalChild(element);
-		}
-
 		void NotifyFlyoutBehaviorObservers()
 		{
 			if (CurrentItem == null || GetVisiblePage() == null)
@@ -1498,7 +1426,7 @@ void OnFlyoutHeaderChanged(object oldVal, object newVal)
 				FlyoutHeaderTemplate,
 				ref _flyoutHeaderView,
 				newVal,
-				RemoveLogicalChild,
+				(element) => RemoveLogicalChild(element),
 				AddLogicalChild);
 		}
 
@@ -1508,7 +1436,7 @@ void OnFlyoutHeaderTemplateChanged(DataTemplate oldValue, DataTemplate newValue)
 				newValue,
 				ref _flyoutHeaderView,
 				FlyoutHeader,
-				RemoveLogicalChild,
+				(element) => RemoveLogicalChild(element),
 				AddLogicalChild,
 				this);
 		}
@@ -1519,7 +1447,7 @@ void OnFlyoutFooterChanged(object oldVal, object newVal)
 				FlyoutFooterTemplate,
 				ref _flyoutFooterView,
 				newVal,
-				RemoveLogicalChild,
+				(element) => RemoveLogicalChild(element),
 				AddLogicalChild);
 		}
 
@@ -1529,7 +1457,7 @@ void OnFlyoutFooterTemplateChanged(DataTemplate oldValue, DataTemplate newValue)
 				newValue,
 				ref _flyoutFooterView,
 				FlyoutFooter,
-				RemoveLogicalChild,
+				(element) => RemoveLogicalChild(element),
 				AddLogicalChild,
 				this);
 		}
@@ -1589,13 +1517,7 @@ Element WalkToPage(Element element)
 
 		void IPropertyPropagationController.PropagatePropertyChanged(string propertyName)
 		{
-			PropertyPropagationExtensions.PropagatePropertyChanged(propertyName, this, ((IElementController)this).LogicalChildren);
-			if (FlyoutHeaderView != null)
-				PropertyPropagationExtensions.PropagatePropertyChanged(propertyName, this, new[] { FlyoutHeaderView });
-			if (FlyoutFooterView != null)
-				PropertyPropagationExtensions.PropagatePropertyChanged(propertyName, this, new[] { FlyoutFooterView });
-			if (FlyoutContentView != null)
-				PropertyPropagationExtensions.PropagatePropertyChanged(propertyName, this, new[] { FlyoutContentView });
+			PropertyPropagationExtensions.PropagatePropertyChanged(propertyName, this, ((IVisualTreeElement)this).GetVisualChildren());
 		}
 
 		protected override void LayoutChildren(double x, double y, double width, double height)
@@ -1663,7 +1585,7 @@ void OnFlyoutContentChanged(object oldVal, object newVal)
 				FlyoutContentTemplate,
 				ref _flyoutContentView,
 				newVal,
-				RemoveLogicalChild,
+				(element) => RemoveLogicalChild(element),
 				AddLogicalChild);
 		}
 
@@ -1673,7 +1595,7 @@ void OnFlyoutContentTemplateChanged(DataTemplate oldValue, DataTemplate newValue
 				newValue,
 				ref _flyoutContentView,
 				FlyoutContent,
-				RemoveLogicalChild,
+				(element) => RemoveLogicalChild(element),
 				AddLogicalChild,
 				this);
 		}
diff --git a/src/Controls/src/Core/Shell/ShellItem.cs b/src/Controls/src/Core/Shell/ShellItem.cs
index 0f13e7d41277..65c7d92a9ec2 100644
--- a/src/Controls/src/Core/Shell/ShellItem.cs
+++ b/src/Controls/src/Core/Shell/ShellItem.cs
@@ -132,7 +132,7 @@ bool IShellItemController.ShowTabs
 		#region IPropertyPropagationController
 		void IPropertyPropagationController.PropagatePropertyChanged(string propertyName)
 		{
-			PropertyPropagationExtensions.PropagatePropertyChanged(propertyName, this, Items);
+			PropertyPropagationExtensions.PropagatePropertyChanged(propertyName, this, ((IVisualTreeElement)this).GetVisualChildren());
 		}
 		#endregion
 
diff --git a/src/Controls/src/Core/Shell/ShellSection.cs b/src/Controls/src/Core/Shell/ShellSection.cs
index 8201e545891a..5b3723b6c5e2 100644
--- a/src/Controls/src/Core/Shell/ShellSection.cs
+++ b/src/Controls/src/Core/Shell/ShellSection.cs
@@ -194,7 +194,7 @@ event NotifyCollectionChangedEventHandler IShellSectionController.ItemsCollectio
 		#region IPropertyPropagationController
 		void IPropertyPropagationController.PropagatePropertyChanged(string propertyName)
 		{
-			PropertyPropagationExtensions.PropagatePropertyChanged(propertyName, this, Items);
+			PropertyPropagationExtensions.PropagatePropertyChanged(propertyName, this, ((IVisualTreeElement)this).GetVisualChildren());
 		}
 		#endregion
 
@@ -1215,8 +1215,6 @@ ShellNavigationState GetUpdatedStatus(IReadOnlyList<Page> stack)
 			}
 		}
 
-		IReadOnlyList<Maui.IVisualTreeElement> IVisualTreeElement.GetVisualChildren() => AllChildren.ToList();
-
 #nullable enable
 		// This code only runs for shell bits that are running through a proper
 		// ShellHandler
diff --git a/src/Controls/src/Core/StyleSheets/Style.cs b/src/Controls/src/Core/StyleSheets/Style.cs
index aac7cec0b463..df0e8ab63b53 100644
--- a/src/Controls/src/Core/StyleSheets/Style.cs
+++ b/src/Controls/src/Core/StyleSheets/Style.cs
@@ -81,7 +81,7 @@ public void Apply(VisualElement styleable, bool inheriting = false)
 				}
 			}
 
-			foreach (var child in styleable.LogicalChildrenInternal)
+			foreach (var child in ((IVisualTreeElement)styleable).GetVisualChildren())
 			{
 				var ve = child as VisualElement;
 				if (ve == null)
diff --git a/src/Controls/src/Core/SwipeView/SwipeView.cs b/src/Controls/src/Core/SwipeView/SwipeView.cs
index f195e88f6edb..99fe3132d42b 100644
--- a/src/Controls/src/Core/SwipeView/SwipeView.cs
+++ b/src/Controls/src/Core/SwipeView/SwipeView.cs
@@ -419,7 +419,7 @@ void UpdateLogicalChildren()
 				return;
 
 			foreach (var swipeItem in swipeItems)
-				AddLogicalChildInternal((Element)swipeItem);
+				AddLogicalChild((Element)swipeItem);
 		}
 
 		SwipeItems? GetSwipeItemsByDirection(SwipeDirection? swipeDirection)
diff --git a/src/Controls/src/Core/VisualElement/VisualElement.Platform.cs b/src/Controls/src/Core/VisualElement/VisualElement.Platform.cs
index 07a3ecd8f7b7..5286c701323c 100644
--- a/src/Controls/src/Core/VisualElement/VisualElement.Platform.cs
+++ b/src/Controls/src/Core/VisualElement/VisualElement.Platform.cs
@@ -22,7 +22,7 @@ partial void HandlePlatformUnloadedLoaded()
 			_loadedUnloadedToken = null;
 
 			// Window and this VisualElement both have a handler to work with
-			if (Window?.Handler?.PlatformView != null &&
+			if (Window?.Handler?.PlatformView is not null &&
 				Handler?.PlatformView is PlatformView view)
 			{
 				if (view.IsLoaded())
@@ -40,7 +40,7 @@ partial void HandlePlatformUnloadedLoaded()
 			{
 				// My handler is still set but the window handler isn't set.
 				// This means I'm starting to detach from the platform window
-				// So we wait for the platform detatch events to fire before calling 
+				// So we wait for the platform detach events to fire before calling 
 				// OnUnloaded
 				if (Handler?.PlatformView is PlatformView detachingView &&
 					detachingView.IsLoaded())
diff --git a/src/Controls/src/Core/VisualElement/VisualElement.cs b/src/Controls/src/Core/VisualElement/VisualElement.cs
index 6d1a12d382ec..d52e6b57f0f4 100644
--- a/src/Controls/src/Core/VisualElement/VisualElement.cs
+++ b/src/Controls/src/Core/VisualElement/VisualElement.cs
@@ -1847,6 +1847,10 @@ void OnLoadedCore()
 
 			_isLoadedFired = true;
 			_loaded?.Invoke(this, EventArgs.Empty);
+
+			// If the user is also watching unloaded we need to verify
+			// unloaded is still correctly being watched for.
+			UpdatePlatformUnloadedLoadedWiring(Window);
 		}
 
 		void OnUnloadedCore()
@@ -1856,6 +1860,10 @@ void OnUnloadedCore()
 
 			_isLoadedFired = false;
 			_unloaded?.Invoke(this, EventArgs.Empty);
+
+			// If the user is also watching loaded we need to verify
+			// loaded is still correctly being watched for.
+			UpdatePlatformUnloadedLoadedWiring(Window);
 		}
 
 		static void OnWindowChanged(BindableObject bindable, object? oldValue, object? newValue)
@@ -1863,10 +1871,10 @@ static void OnWindowChanged(BindableObject bindable, object? oldValue, object? n
 			if (bindable is not VisualElement visualElement)
 				return;
 
-			if (visualElement._watchingPlatformLoaded && oldValue is Window oldWindow)
-				oldWindow.HandlerChanged -= visualElement.OnWindowHandlerChanged;
+			var newWindow = (Window?)newValue;
+			var oldWindow = (Window?)oldValue;
 
-			visualElement.UpdatePlatformUnloadedLoadedWiring(newValue as Window);
+			visualElement.UpdatePlatformUnloadedLoadedWiring(newWindow, oldWindow);
 			visualElement.InvalidateStateTriggers(newValue != null);
 			visualElement._windowChanged?.Invoke(visualElement, EventArgs.Empty);
 		}
@@ -1880,18 +1888,18 @@ void OnWindowHandlerChanged(object? sender, EventArgs e)
 		// if the user is watching for them. Otherwise
 		// this will get wired up for every single VE that's on 
 		// the screen
-		void UpdatePlatformUnloadedLoadedWiring(Window? window)
+		void UpdatePlatformUnloadedLoadedWiring(Window? newWindow, Window? oldWindow = null)
 		{
 			// If I'm not attached to a window and I haven't started watching any platform events
 			// then it's not useful to wire anything up. We will just wait until
 			// This VE gets connected to the xplat Window before wiring up any events
-			if (!_watchingPlatformLoaded && window == null)
+			if (!_watchingPlatformLoaded && newWindow is null)
 				return;
 
-			if (_unloaded == null && _loaded == null)
+			if (_unloaded is null && _loaded is null)
 			{
-				if (window is not null)
-					window.HandlerChanged -= OnWindowHandlerChanged;
+				if (newWindow is not null)
+					newWindow.HandlerChanged -= OnWindowHandlerChanged;
 
 #if PLATFORM
 				_loadedUnloadedToken?.Dispose();
@@ -1901,11 +1909,23 @@ void UpdatePlatformUnloadedLoadedWiring(Window? window)
 				_watchingPlatformLoaded = false;
 				return;
 			}
+			else if (oldWindow is not null)
+			{
+				oldWindow.HandlerChanged -= OnWindowHandlerChanged;
+				_watchingPlatformLoaded = false;
+
+				if (newWindow is null)
+				{
+					// This will take care of cleaning up any pending unloaded events
+					HandlePlatformUnloadedLoaded();
+					return;
+				}
+			}
 
 			if (!_watchingPlatformLoaded)
 			{
-				if (window is not null)
-					window.HandlerChanged += OnWindowHandlerChanged;
+				if (newWindow is not null)
+					newWindow.HandlerChanged += OnWindowHandlerChanged;
 
 				_watchingPlatformLoaded = true;
 			}
diff --git a/src/Controls/src/Core/Window/Window.cs b/src/Controls/src/Core/Window/Window.cs
index fb31d65d32cb..5bf70b1ea968 100644
--- a/src/Controls/src/Core/Window/Window.cs
+++ b/src/Controls/src/Core/Window/Window.cs
@@ -13,7 +13,7 @@
 namespace Microsoft.Maui.Controls
 {
 	[ContentProperty(nameof(Page))]
-	public partial class Window : NavigableElement, IWindow, IVisualTreeElement, IToolbarElement, IMenuBarElement, IFlowDirectionController, IWindowController
+	public partial class Window : NavigableElement, IWindow, IToolbarElement, IMenuBarElement, IFlowDirectionController, IWindowController
 	{
 		/// <summary>Bindable property for <see cref="Title"/>.</summary>
 		public static readonly BindableProperty TitleProperty = BindableProperty.Create(
@@ -367,7 +367,7 @@ static void FlowDirectionChanged(BindableObject bindable, object oldValue, objec
 			PropertyPropagationExtensions.PropagatePropertyChanged(
 				FlowDirectionProperty.PropertyName,
 				(Element)bindable,
-				((IElementController)bindable).LogicalChildren);
+				((IVisualTreeElement)bindable).GetVisualChildren());
 		}
 
 		bool IFlowDirectionController.ApplyEffectiveFlowDirectionToChildContainer => true;
@@ -412,8 +412,6 @@ internal void OnModalPopped(Page modalPage)
 			ModalPopped?.Invoke(this, args);
 			Application?.NotifyOfWindowModalEvent(args);
 
-			VisualDiagnostics.OnChildRemoved(this, modalPage, index);
-
 #if WINDOWS
 			this.Handler?.UpdateValue(nameof(IWindow.TitleBarDragRectangles));
 			this.Handler?.UpdateValue(nameof(ITitledElement.Title));
@@ -434,7 +432,6 @@ internal void OnModalPushed(Page modalPage)
 			var args = new ModalPushedEventArgs(modalPage);
 			ModalPushed?.Invoke(this, args);
 			Application?.NotifyOfWindowModalEvent(args);
-			VisualDiagnostics.OnChildAdded(this, modalPage);
 
 #if WINDOWS
 			this.Handler?.UpdateValue(nameof(IWindow.TitleBarDragRectangles));
@@ -570,12 +567,6 @@ private protected override void OnHandlerChangingCore(HandlerChangingEventArgs a
 			}
 		}
 
-		// Currently this returns MainPage + ModalStack
-		// Depending on how we want this to show up inside LVT
-		// we might want to change this to only return the currently visible page
-		IReadOnlyList<IVisualTreeElement> IVisualTreeElement.GetVisualChildren() =>
-			_visualChildren;
-
 		static void OnPageChanging(BindableObject bindable, object oldValue, object newValue)
 		{
 			if (oldValue is Page oldPage)
@@ -588,7 +579,7 @@ void OnPageChanged(Page? oldPage, Page? newPage)
 			{
 				_menuBarTracker.Target = null;
 				_visualChildren.Remove(oldPage);
-				RemoveLogicalChildInternal(oldPage);
+				RemoveLogicalChild(oldPage);
 				oldPage.HandlerChanged -= OnPageHandlerChanged;
 				oldPage.HandlerChanging -= OnPageHandlerChanging;
 			}
@@ -599,7 +590,7 @@ void OnPageChanged(Page? oldPage, Page? newPage)
 			if (newPage != null)
 			{
 				_visualChildren.Add(newPage);
-				AddLogicalChildInternal(newPage);
+				AddLogicalChild(newPage);
 				newPage.NavigationProxy.Inner = NavigationProxy;
 				_menuBarTracker.Target = newPage;
 
diff --git a/src/Controls/tests/Core.UnitTests/ListViewTests.cs b/src/Controls/tests/Core.UnitTests/ListViewTests.cs
index 83eaccad42ce..d1258346ddef 100644
--- a/src/Controls/tests/Core.UnitTests/ListViewTests.cs
+++ b/src/Controls/tests/Core.UnitTests/ListViewTests.cs
@@ -552,7 +552,7 @@ public void UncollectableHeaderReferences()
 			{
 				list.ItemsSource = i % 2 > 0 ? newList1 : newList2;
 
-				// grab a header just so we can be sure its reailized
+				// grab a header just so we can be sure its realized
 				var header = list.TemplatedItems.GetGroup(0).HeaderContent;
 			}
 
@@ -560,7 +560,7 @@ public void UncollectableHeaderReferences()
 			GC.WaitForPendingFinalizers();
 
 			// use less or equal because mono will keep the last header var alive no matter what
-			Assert.True(TestCell.NumberOfCells <= 6);
+			Assert.True(TestCell.NumberOfCells <= 6, $"{TestCell.NumberOfCells} <= 6");
 
 			var keepAlive = list.ToString();
 		}
diff --git a/src/Controls/tests/Core.UnitTests/PageTests.cs b/src/Controls/tests/Core.UnitTests/PageTests.cs
index 2430d32cda13..1eb2bcaacf1e 100644
--- a/src/Controls/tests/Core.UnitTests/PageTests.cs
+++ b/src/Controls/tests/Core.UnitTests/PageTests.cs
@@ -559,5 +559,25 @@ public void SendDisappearingToChildrenPageFirst()
 			Assert.True(sentNav);
 			Assert.True(sent);
 		}
+
+		[Fact]
+		public void LogicalChildrenDontAddToPagesInternalChildren()
+		{
+			var page = new ContentPage()
+			{
+				Content = new VerticalStackLayout()
+			};
+
+			var window = new TestWindow(page);
+
+			var customControl = new VerticalStackLayout();
+			Shell.SetTitleView(page, new VerticalStackLayout());
+			page.AddLogicalChild(customControl);
+
+			Assert.Equal(window, customControl.Window);
+			Assert.Single(page.InternalChildren);
+			Assert.Contains(customControl, page.LogicalChildrenInternal);
+			Assert.Contains(customControl, ((IVisualTreeElement)page).GetVisualChildren());
+		}
 	}
 }
diff --git a/src/Controls/tests/Core.UnitTests/ShellTests.cs b/src/Controls/tests/Core.UnitTests/ShellTests.cs
index b71ba795fa59..68045f920352 100644
--- a/src/Controls/tests/Core.UnitTests/ShellTests.cs
+++ b/src/Controls/tests/Core.UnitTests/ShellTests.cs
@@ -771,7 +771,9 @@ public async Task TitleViewLogicalChild()
 			Shell.SetTitleView(page, layout);
 
 
-			Assert.Contains(layout, page.ChildrenNotDrawnByThisElement);
+			Assert.Contains(layout, page.LogicalChildren);
+			Assert.DoesNotContain(layout, page.InternalChildren);
+			Assert.Contains(layout, ((IVisualTreeElement)page).GetVisualChildren());
 		}
 
 		[Fact]
diff --git a/src/Controls/tests/Core.UnitTests/TabbedFormUnitTests.cs b/src/Controls/tests/Core.UnitTests/TabbedFormUnitTests.cs
index a0dcbbfffcf4..bfe8c07ff224 100644
--- a/src/Controls/tests/Core.UnitTests/TabbedFormUnitTests.cs
+++ b/src/Controls/tests/Core.UnitTests/TabbedFormUnitTests.cs
@@ -28,5 +28,22 @@ public void TestConstructor()
 
 			Assert.Empty(page.Children);
 		}
+
+		[Fact]
+		public void LogicalAndInternalChildrenMaintainOrder()
+		{
+			TabbedPage tabbedPage = new TabbedPage();
+
+			ContentPage page1 = new ContentPage();
+			ContentPage page2 = new ContentPage();
+
+			tabbedPage.Children.Add(page2);
+			tabbedPage.Children.Insert(0, page1);
+			tabbedPage.Children.Remove(page1);
+			tabbedPage.Children.Insert(0, page1);
+
+			Assert.Equal(tabbedPage.LogicalChildren[0], tabbedPage.InternalChildren[0]);
+			Assert.Equal(tabbedPage.LogicalChildren[1], tabbedPage.InternalChildren[1]);
+		}
 	}
 }
diff --git a/src/Controls/tests/Core.UnitTests/VisualTreeHelperTests.cs b/src/Controls/tests/Core.UnitTests/VisualTreeHelperTests.cs
index c05c37ae33d9..1085d16a7639 100644
--- a/src/Controls/tests/Core.UnitTests/VisualTreeHelperTests.cs
+++ b/src/Controls/tests/Core.UnitTests/VisualTreeHelperTests.cs
@@ -26,7 +26,7 @@ public void Dispose()
 
 		void OnVisualTreeChanged(object? sender, VisualTreeChangeEventArgs e)
 		{
-			Assert.True(e.ChildIndex >= 0, "Visual Tree inaccurate when OnVisualTreeChanged called");
+			Assert.True(e.ChildIndex >= 0,$"Visual Tree inaccurate when OnVisualTreeChanged called. ChildIndex: {e.ChildIndex}");
 			_treeEvents.Add((sender as Element, e));
 			VisualTreeChanged?.Invoke(sender as Element, e);
 		}
diff --git a/src/Controls/tests/Core.UnitTests/WindowsTests.cs b/src/Controls/tests/Core.UnitTests/WindowsTests.cs
index 57723186319f..f45d5fb2d14f 100644
--- a/src/Controls/tests/Core.UnitTests/WindowsTests.cs
+++ b/src/Controls/tests/Core.UnitTests/WindowsTests.cs
@@ -425,6 +425,7 @@ void ValidateSetup(Application app, Page page = null)
 			Assert.Equal(window.LogicalChildrenInternal[0], page);
 			Assert.Single(app.LogicalChildrenInternal);
 			Assert.Single(window.LogicalChildrenInternal);
+			Assert.Single(window.LogicalChildrenInternal.OfType<Page>());
 			Assert.Equal(app.NavigationProxy, window.NavigationProxy.Inner);
 			Assert.Equal(window.NavigationProxy, page.NavigationProxy.Inner);
 		}
diff --git a/src/Controls/tests/DeviceTests/ControlsHandlerTestBase.cs b/src/Controls/tests/DeviceTests/ControlsHandlerTestBase.cs
index 85f64df0839a..655afc68cc8a 100644
--- a/src/Controls/tests/DeviceTests/ControlsHandlerTestBase.cs
+++ b/src/Controls/tests/DeviceTests/ControlsHandlerTestBase.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
@@ -121,7 +122,10 @@ protected Task CreateHandlerAndAddToWindow<THandler>(IElement view, Func<THandle
 		{
 			mauiContext ??= MauiContext;
 
-			timeOut ??= TimeSpan.FromSeconds(15);
+			if (System.Diagnostics.Debugger.IsAttached)
+				timeOut ??= TimeSpan.FromHours(1);
+			else
+				timeOut ??= TimeSpan.FromSeconds(15);
 
 			return InvokeOnMainThreadAsync(async () =>
 			{
@@ -355,12 +359,13 @@ async protected Task ValidatePropertyUpdatesAfterInitValue<TValue, THandler>(
 			Assert.Equal(expectedSetValue, nativeVal);
 		}
 
-		protected Task OnLoadedAsync(VisualElement frameworkElement, TimeSpan? timeOut = null)
+		protected async Task OnLoadedAsync(VisualElement frameworkElement, TimeSpan? timeOut = null)
 		{
 			timeOut = timeOut ?? TimeSpan.FromSeconds(2);
 			var source = new TaskCompletionSource();
 			if (frameworkElement.IsLoaded && frameworkElement.IsLoadedOnPlatform())
 			{
+				await Task.Yield();
 				source.TrySetResult();
 			}
 			else
@@ -378,15 +383,16 @@ protected Task OnLoadedAsync(VisualElement frameworkElement, TimeSpan? timeOut =
 				frameworkElement.Loaded += loaded;
 			}
 
-			return HandleLoadedUnloadedIssue(source.Task, timeOut.Value, () => frameworkElement.IsLoaded && frameworkElement.IsLoadedOnPlatform());
+			await HandleLoadedUnloadedIssue(source.Task, timeOut.Value, () => frameworkElement.IsLoaded && frameworkElement.IsLoadedOnPlatform());
 		}
 
-		protected Task OnUnloadedAsync(VisualElement frameworkElement, TimeSpan? timeOut = null)
+		protected async Task OnUnloadedAsync(VisualElement frameworkElement, TimeSpan? timeOut = null)
 		{
 			timeOut = timeOut ?? TimeSpan.FromSeconds(2);
 			var source = new TaskCompletionSource();
 			if (!frameworkElement.IsLoaded && !frameworkElement.IsLoadedOnPlatform())
 			{
+				await Task.Yield();
 				source.TrySetResult();
 			}
 			// in the xplat code we switch Loaded to Unloaded if the window property is removed.
@@ -411,7 +417,7 @@ protected Task OnUnloadedAsync(VisualElement frameworkElement, TimeSpan? timeOut
 				frameworkElement.Unloaded += unloaded;
 			}
 
-			return HandleLoadedUnloadedIssue(source.Task, timeOut.Value, () => !frameworkElement.IsLoaded && !frameworkElement.IsLoadedOnPlatform());
+			await HandleLoadedUnloadedIssue(source.Task, timeOut.Value, () => !frameworkElement.IsLoaded && !frameworkElement.IsLoadedOnPlatform());
 		}
 
 		// Modal Page's appear to currently not fire loaded/unloaded
diff --git a/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.cs b/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.cs
index aa24faf6746f..ca42415ebde0 100644
--- a/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.cs
@@ -143,7 +143,7 @@ await CreateHandlerAndAddToWindow<LayoutHandler>(layout, async handler =>
 					await WaitForUIUpdate(frame, collectionView);
 					frame = collectionView.Frame;
 
-#if WINDOWS
+#if WINDOWS || ANDROID
 					// On Windows, the ListView pops in and changes the frame, then actually
 					// loads in the data, which updates it again. So we need to wait for the second
 					// update before checking the size
diff --git a/src/Controls/tests/DeviceTests/Elements/VisualElementTests.cs b/src/Controls/tests/DeviceTests/Elements/VisualElementTests.cs
index 555571874f7f..9589b1bec7aa 100644
--- a/src/Controls/tests/DeviceTests/Elements/VisualElementTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/VisualElementTests.cs
@@ -106,7 +106,7 @@ await CreateHandlerAndAddToWindow<LayoutHandler>(parentLayout, async (handler) =
 					Assert.Equal(1, unloaded);
 				});
 
-				await Task.Delay(1000);
+				await AssertionExtensions.Wait(() => loaded == 2 && unloaded == 2);
 
 				Assert.Equal(2, loaded);
 				Assert.Equal(2, unloaded);
@@ -154,6 +154,7 @@ await CreateHandlerAndAddToWindow<NavigationViewHandler>(navPage, async (handler
 
 					await navPage.PopAsync();
 
+					await AssertionExtensions.Wait(() => loaded == 1 && unloaded == 1);
 					Assert.Equal(1, loaded);
 					Assert.Equal(1, unloaded);
 				});
diff --git a/src/Controls/tests/Xaml.UnitTests/FontImageExtension.xaml.cs b/src/Controls/tests/Xaml.UnitTests/FontImageExtension.xaml.cs
index 31d09768fe30..f21119b0ef3a 100644
--- a/src/Controls/tests/Xaml.UnitTests/FontImageExtension.xaml.cs
+++ b/src/Controls/tests/Xaml.UnitTests/FontImageExtension.xaml.cs
@@ -24,7 +24,7 @@ class Tests
 			public void FontImageExtension_Positive(bool useCompiledXaml)
 			{
 				var layout = new FontImageExtension(useCompiledXaml);
-				var tabs = layout.AllChildren;
+				var tabs = ((IVisualTreeElement)layout).GetVisualChildren();
 
 				int i = 0;
 				foreach (var tab in tabs)
@@ -53,7 +53,7 @@ public void FontImageExtension_Positive(bool useCompiledXaml)
 			public void FontImageExtension_Negative(bool useCompiledXaml)
 			{
 				var layout = new FontImageExtension(useCompiledXaml);
-				var tabs = layout.AllChildren;
+				var tabs = ((IVisualTreeElement)layout).GetVisualChildren();
 
 				foreach (var tab in tabs)
 				{

From 71e6bb5610dfd000cf63f48f03b259ae8dce51cd Mon Sep 17 00:00:00 2001
From: "E.Z. Hart" <hartez@users.noreply.github.com>
Date: Tue, 18 Jul 2023 21:19:36 -0600
Subject: [PATCH 105/105] Revert default for UseSafeAreaProperty to value from
 .NET 6 for iOS (#16093)

* Revert default for UseSafeAreaProperty to value from .NET 6 for iOS
Fixes #12823

* Update to ignore broken iOS test for now

* Fix shell tab test
---
 .../src/Core/PlatformConfiguration/iOSSpecific/Page.cs        | 4 ++++
 .../tests/DeviceTests/Elements/Shell/ShellTests.iOS.cs        | 3 +++
 .../tests/DeviceTests/Elements/TabbedPage/TabbedPageTests.cs  | 4 ++++
 3 files changed, 11 insertions(+)

diff --git a/src/Controls/src/Core/PlatformConfiguration/iOSSpecific/Page.cs b/src/Controls/src/Core/PlatformConfiguration/iOSSpecific/Page.cs
index 287117e4b465..79b0ce75e475 100644
--- a/src/Controls/src/Core/PlatformConfiguration/iOSSpecific/Page.cs
+++ b/src/Controls/src/Core/PlatformConfiguration/iOSSpecific/Page.cs
@@ -72,7 +72,11 @@ public static IPlatformElementConfiguration<iOS, FormsElement> SetPreferredStatu
 		}
 
 		/// <summary>Bindable property for attached property <c>UseSafeArea</c>.</summary>
+#if MACCATALYST
 		public static readonly BindableProperty UseSafeAreaProperty = BindableProperty.Create("UseSafeArea", typeof(bool), typeof(Page), true);
+#else
+		public static readonly BindableProperty UseSafeAreaProperty = BindableProperty.Create("UseSafeArea", typeof(bool), typeof(Page), false);
+#endif
 
 		/// <include file="../../../../docs/Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific/Page.xml" path="//Member[@MemberName='GetUseSafeArea']/Docs/*" />
 		public static bool GetUseSafeArea(BindableObject element)
diff --git a/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.iOS.cs b/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.iOS.cs
index 0036037ba333..288b499a5244 100644
--- a/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.iOS.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.iOS.cs
@@ -31,6 +31,9 @@ public async Task PageAdjustsWhenTopTabsArePresent()
 			var pageWithTopTabs = new ContentPage() { Content = new Label() { Text = "Page With Top Tabs" } };
 			var pageWithoutTopTabs = new ContentPage() { Content = new Label() { Text = "Page With Bottom Tabs" } };
 
+			pageWithTopTabs.On<iOS>().SetUseSafeArea(true);
+			pageWithoutTopTabs.On<iOS>().SetUseSafeArea(true);
+
 			var mainTab1 = new Tab()
 			{
 				Items =
diff --git a/src/Controls/tests/DeviceTests/Elements/TabbedPage/TabbedPageTests.cs b/src/Controls/tests/DeviceTests/Elements/TabbedPage/TabbedPageTests.cs
index 1d68386c25f4..d02b201999c4 100644
--- a/src/Controls/tests/DeviceTests/Elements/TabbedPage/TabbedPageTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/TabbedPage/TabbedPageTests.cs
@@ -251,7 +251,11 @@ await CreateHandlerAndAddToWindow<WindowHandlerStub>(new Window(tabbedPage), asy
 		}
 #endif
 
+#if IOS
+		[Theory(Skip = "Test doesn't work on iOS yet; probably because of https://github.com/dotnet/maui/issues/10591")]
+#else
 		[Theory]
+#endif
 #if ANDROID
 		[InlineData(true)]
 #endif