From 8e5fe275856fa274fc23207e42dbf41eee07dd57 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 30 Jun 2025 21:21:44 +0000
Subject: [PATCH 01/34] Initial plan


From 50b9fd02e4d2d39bf9e96af489864aaf2149336e Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Thu, 24 Jul 2025 13:40:55 -0500
Subject: [PATCH 02/34] Add Edge Support for SafeAreas and extend to ScrollView

---
 NuGet.config                                  |  12 +-
 .../Pages/Controls/TitleBarPage.xaml          |   9 +-
 .../Pages/Others/LargeTitlesPageiOS.cs        |   2 +-
 .../iOS/iOSSafeAreaPage.xaml                  |   3 +-
 .../iOS/iOSSafeAreaPage.xaml.cs               |   4 +-
 .../SafeAreaEdgesTypeDesignConverter.cs       |  41 ++
 src/Controls/src/Core/BindableProperty.cs     |   2 +-
 src/Controls/src/Core/Border/Border.cs        |  60 +-
 .../src/Core/ContentPage/ContentPage.cs       |  47 +-
 .../src/Core/ContentView/ContentView.cs       |  62 +-
 .../Handlers/Items/CarouselViewHandler.iOS.cs |  34 +-
 src/Controls/src/Core/ISafeAreaElement.cs     |  14 +
 src/Controls/src/Core/Layout/Layout.cs        |  67 +-
 .../src/Core/Layout/LayoutExtensions.cs       |   2 +
 src/Controls/src/Core/Page/Page.cs            |  26 +-
 .../PlatformConfiguration/iOSSpecific/Page.cs |  20 +
 src/Controls/src/Core/SafeAreaElement.cs      | 107 +++
 .../src/Core/ScrollView/ScrollView.cs         |  52 +-
 src/Controls/src/Core/Shell/BaseShellItem.cs  |   2 +
 src/Controls/src/Core/TitleBar/TitleBar.cs    |   2 +
 .../tests/Core.UnitTests/SafeAreaTests.cs     | 646 ++++++++++++++++++
 .../CollectionView/CollectionViewTests.cs     |  52 +-
 .../Elements/Page/PageTests.iOS.cs            |  32 +
 .../Elements/Shell/ShellTests.iOS.cs          |  65 ++
 .../TestCases.HostApp/Issues/Issue21325.xaml  |   5 +-
 .../TestCases.HostApp/Issues/Issue28986.xaml  | 306 +++++++++
 .../Issues/Issue28986.xaml.cs                 | 209 ++++++
 .../Issues/Issue28986_Border.xaml             | 158 +++++
 .../Issues/Issue28986_Border.xaml.cs          |  84 +++
 .../Issues/Issue28986_ContentPage.xaml        | 158 +++++
 .../Issues/Issue28986_ContentPage.xaml.cs     |  84 +++
 .../Issues/Issue28986_ContentView.xaml        | 157 +++++
 .../Issues/Issue28986_ContentView.xaml.cs     |  84 +++
 .../Issues/Issue28986_ScrollView.xaml         | 165 +++++
 .../Issues/Issue28986_ScrollView.xaml.cs      |  84 +++
 .../Tests/Issues/Issue22417.cs                |   2 +-
 .../Tests/Issues/Issue28986.cs                | 160 +++++
 .../Xaml.UnitTests/SafeAreaEdgesTests.xaml    |  33 +
 .../Xaml.UnitTests/SafeAreaEdgesTests.xaml.cs |  88 +++
 .../Converters/SafeAreaEdgesTypeConverter.cs  |  85 +++
 src/Core/src/Core/ISafeAreaView2.cs           |  14 +
 .../ScrollView/ScrollViewHandler.iOS.cs       |   9 +
 src/Core/src/Platform/iOS/MauiScrollView.cs   | 188 ++++-
 src/Core/src/Platform/iOS/MauiView.cs         | 258 +++++--
 src/Core/src/Platform/iOS/SafeAreaPadding.cs  |   3 +
 src/Core/src/Primitives/SafeAreaEdges.cs      | 175 +++++
 src/Core/src/Primitives/SafeAreaRegions.cs    |  37 +
 .../net-android/PublicAPI.Unshipped.txt       |  36 +
 .../net-tizen/PublicAPI.Unshipped.txt         |   6 +
 .../src/PublicAPI/net/PublicAPI.Unshipped.txt |  36 +
 .../netstandard/PublicAPI.Unshipped.txt       |  36 +
 .../netstandard2.0/PublicAPI.Unshipped.txt    |  36 +
 .../tests/DeviceTests/Stubs/LayoutStub.cs     |   9 +-
 53 files changed, 3956 insertions(+), 112 deletions(-)
 create mode 100644 src/Controls/src/Core.Design/SafeAreaEdgesTypeDesignConverter.cs
 create mode 100644 src/Controls/src/Core/ISafeAreaElement.cs
 create mode 100644 src/Controls/src/Core/SafeAreaElement.cs
 create mode 100644 src/Controls/tests/Core.UnitTests/SafeAreaTests.cs
 create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml
 create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml.cs
 create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue28986_Border.xaml
 create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue28986_Border.xaml.cs
 create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ContentPage.xaml
 create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ContentPage.xaml.cs
 create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ContentView.xaml
 create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ContentView.xaml.cs
 create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ScrollView.xaml
 create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ScrollView.xaml.cs
 create mode 100644 src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28986.cs
 create mode 100644 src/Controls/tests/Xaml.UnitTests/SafeAreaEdgesTests.xaml
 create mode 100644 src/Controls/tests/Xaml.UnitTests/SafeAreaEdgesTests.xaml.cs
 create mode 100644 src/Core/src/Converters/SafeAreaEdgesTypeConverter.cs
 create mode 100644 src/Core/src/Primitives/SafeAreaEdges.cs
 create mode 100644 src/Core/src/Primitives/SafeAreaRegions.cs

diff --git a/NuGet.config b/NuGet.config
index d7fb073a2b47..131e022afa45 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -10,19 +10,15 @@
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="local" value="LOCAL_PLACEHOLDER" />
     <add key="nuget-only" value="NUGET_ONLY_PLACEHOLDER" />
-    <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" protocolVersion="3" />
-    <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" protocolVersion="3" />
     <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" protocolVersion="3" />
     <add key="benchmark-dotnet-prerelease" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/benchmark-dotnet-prerelease/nuget/v3/index.json" />
-    <add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
-    <add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
-    <add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
-    <add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
     <add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
     <add key="dotnet10-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json" />
     <add key="skiasharp" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/SkiaSharp/nuget/v3/index.json" />
     <add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
     <add key="dotnet-libraries-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries-transport/nuget/v3/index.json" />
+    <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" protocolVersion="3" />
+    <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" protocolVersion="3" />
     <!-- Added manually for .NET 8 MAUI -->
     <add key="darc-pub-dotnet-maui-a33a875e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-maui-a33a875e/nuget/v3/index.json" />
     <!-- Added manually for dotnet/runtime 8.0.18 -->
@@ -35,6 +31,10 @@
     <add key="darc-pub-dotnet-android-cdb777a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-cdb777a0/nuget/v3/index.json" />
     <!-- Added manually for .NET 9 macios -->
     <add key="darc-pub-dotnet-macios-0e1a194" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-0e1a194f/nuget/v3/index.json" />
+    <add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
+    <add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
+    <add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
+    <add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
   </packageSources>
   <activePackageSource>
     <add key="All" value="(Aggregate source)" />
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/TitleBarPage.xaml b/src/Controls/samples/Controls.Sample/Pages/Controls/TitleBarPage.xaml
index 9a77c401124c..5f2a6c48f89c 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/TitleBarPage.xaml
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/TitleBarPage.xaml
@@ -2,16 +2,15 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Maui.Controls.Sample.Pages.TitleBarPage"
-             xmlns:ios="clr-namespace:Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;assembly=Microsoft.Maui.Controls"
-             ios:Page.UseSafeArea="False"
+             SafeAreaEdges="All"
              Shell.NavBarIsVisible="True"
              NavigationPage.HasNavigationBar="True"
              Title="TitleBarPage">
 
-    <Grid IgnoreSafeArea="True"
+    <Grid SafeAreaEdges="All"
           RowDefinitions="Auto,*"
         ColumnDefinitions="*,*">
-        <VerticalStackLayout IgnoreSafeArea="True"
+        <VerticalStackLayout SafeAreaEdges="All"
             Spacing="16"
             Margin="16"
             Grid.Column="0">
@@ -20,7 +19,7 @@
                 Text="Content Options"
                 FontSize="24"/>
 
-            <HorizontalStackLayout IgnoreSafeArea="True">
+            <HorizontalStackLayout SafeAreaEdges="All">
                 <CheckBox 
                     x:Name="SetIconCheckBox"
                     IsChecked="False"
diff --git a/src/Controls/samples/Controls.Sample/Pages/Others/LargeTitlesPageiOS.cs b/src/Controls/samples/Controls.Sample/Pages/Others/LargeTitlesPageiOS.cs
index 7b7fb2b22712..09152fbb5fa8 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Others/LargeTitlesPageiOS.cs
+++ b/src/Controls/samples/Controls.Sample/Pages/Others/LargeTitlesPageiOS.cs
@@ -57,7 +57,7 @@ public LargeTitlesPageiOS()
 							var navPage = (Parent as NavigationPage)!;
 							navPage.On<iOS>().SetPrefersLargeTitles(true);
 							var page = new ContentPage { Title = "New Title", BackgroundColor = Colors.Red };
-							page.On<iOS>().SetUseSafeArea(true);
+							SafeAreaElement.SetIgnore(page, SafeAreaEdges.None);
 							var listView = new ListView(ListViewCachingStrategy.RecycleElementAndDataTemplate)
 							{
 								HasUnevenRows = true,
diff --git a/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/iOS/iOSSafeAreaPage.xaml b/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/iOS/iOSSafeAreaPage.xaml
index 0a2a844fad9f..012f2d184663 100644
--- a/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/iOS/iOSSafeAreaPage.xaml
+++ b/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/iOS/iOSSafeAreaPage.xaml
@@ -2,10 +2,9 @@
 <ContentPage 
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:ios="clr-namespace:Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;assembly=Microsoft.Maui.Controls"
     x:Class="Maui.Controls.Sample.Pages.iOSSafeAreaPage"
     Title="Safe Area"
-    ios:Page.UseSafeArea="True">
+    SafeAreaEdges="None">
     <StackLayout>
         <Label Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quis enim redargueret? At modo dixeras nihil in istis rebus esse, quod interesset. Et quidem, inquit, vehementer errat; Semper enim ex eo, quod maximas partes continet latissimeque funditur, tota res appellatur. Equidem, sed audistine modo de Carneade? Duo Reges: constructio interrete." />
         <Button Text="Disable Use Safe Area"
diff --git a/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/iOS/iOSSafeAreaPage.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/iOS/iOSSafeAreaPage.xaml.cs
index d78b3c03fb59..369a874fe940 100644
--- a/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/iOS/iOSSafeAreaPage.xaml.cs
+++ b/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/iOS/iOSSafeAreaPage.xaml.cs
@@ -1,7 +1,5 @@
 using System;
 using Microsoft.Maui.Controls;
-using Microsoft.Maui.Controls.PlatformConfiguration;
-using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
 
 namespace Maui.Controls.Sample.Pages
 {
@@ -14,7 +12,7 @@ public iOSSafeAreaPage()
 
 		void OnButtonClicked(object sender, EventArgs e)
 		{
-			On<iOS>().SetUseSafeArea(false);
+			SafeAreaElement.SetIgnore(this, SafeAreaEdges.All);
 			(sender as Button)!.IsEnabled = false;
 		}
 	}
diff --git a/src/Controls/src/Core.Design/SafeAreaEdgesTypeDesignConverter.cs b/src/Controls/src/Core.Design/SafeAreaEdgesTypeDesignConverter.cs
new file mode 100644
index 000000000000..dacef5c1ce4f
--- /dev/null
+++ b/src/Controls/src/Core.Design/SafeAreaEdgesTypeDesignConverter.cs
@@ -0,0 +1,41 @@
+using System;
+using System.ComponentModel;
+using Controls.Core.Design;
+using Microsoft.Maui;
+
+namespace Microsoft.Maui.Controls.Design
+{
+	public class SafeAreaEdgesTypeDesignConverter : StringConverter
+	{
+		public override bool IsValid(ITypeDescriptorContext context, object value)
+		{
+			// MUST MATCH SafeAreaEdgesTypeConverter.ConvertFrom
+			string strValue = value?.ToString()?.Trim();
+			if (string.IsNullOrEmpty(strValue))
+				return false;
+
+			// Split by comma and check each part
+			string[] parts = strValue.Split(',');
+			
+			// Must have 1, 2, or 4 parts
+			if (parts.Length != 1 && parts.Length != 2 && parts.Length != 4)
+				return false;
+
+			// Each part must be a valid SafeAreaRegions value
+			foreach (string part in parts)
+			{
+				string trimmedPart = part.Trim();
+				if (!string.Equals(trimmedPart, "All", StringComparison.OrdinalIgnoreCase) &&
+					!string.Equals(trimmedPart, "None", StringComparison.OrdinalIgnoreCase) &&
+					!string.Equals(trimmedPart, "Default", StringComparison.OrdinalIgnoreCase) &&
+					!string.Equals(trimmedPart, "SoftInput", StringComparison.OrdinalIgnoreCase) &&
+					!string.Equals(trimmedPart, "Container", StringComparison.OrdinalIgnoreCase))
+				{
+					return false;
+				}
+			}
+
+			return true;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/src/Core/BindableProperty.cs b/src/Controls/src/Core/BindableProperty.cs
index 7044baea43d5..8990b7f8f4cc 100644
--- a/src/Controls/src/Core/BindableProperty.cs
+++ b/src/Controls/src/Core/BindableProperty.cs
@@ -45,7 +45,7 @@ public sealed class BindableProperty
 			{ typeof(Uri), new UriTypeConverter() },
 			{ typeof(Easing), new Maui.Converters.EasingTypeConverter() },
 			{ typeof(Maui.Graphics.Color), new ColorTypeConverter() },
-			{ typeof(ImageSource), new ImageSourceConverter() }
+			{ typeof(ImageSource), new ImageSourceConverter() },
 		};
 
 		internal static readonly Dictionary<Type, IValueConverter> KnownIValueConverters = new Dictionary<Type, IValueConverter>
diff --git a/src/Controls/src/Core/Border/Border.cs b/src/Controls/src/Core/Border/Border.cs
index f940f6422be5..7bb012fd1109 100644
--- a/src/Controls/src/Core/Border/Border.cs
+++ b/src/Controls/src/Core/Border/Border.cs
@@ -10,7 +10,7 @@
 namespace Microsoft.Maui.Controls
 {
 	[ContentProperty(nameof(Content))]
-	public class Border : View, IContentView, IBorderView, IPaddingElement
+	public class Border : View, IContentView, IBorderView, IPaddingElement, ISafeAreaElement, ISafeAreaView2
 	{
 		float[]? _strokeDashPattern;
 
@@ -32,6 +32,9 @@ public class Border : View, IContentView, IBorderView, IPaddingElement
 		/// <summary>Bindable property for <see cref="Padding"/>.</summary>
 		public static readonly BindableProperty PaddingProperty = PaddingElement.PaddingProperty;
 
+		/// <summary>Bindable property for <see cref="SafeAreaEdges"/>.</summary>
+		public static readonly BindableProperty SafeAreaEdgesProperty = SafeAreaElement.SafeAreaEdgesProperty;
+
 		public View? Content
 		{
 			get { return (View?)GetValue(ContentProperty); }
@@ -44,6 +47,21 @@ public Thickness Padding
 			set => SetValue(PaddingElement.PaddingProperty, value);
 		}
 
+		/// <summary>
+		/// Gets or sets the safe area edges to obey for this border.
+		/// The default value is SafeAreaEdges.Default (None - edge to edge).
+		/// </summary>
+		/// <remarks>
+		/// This property controls which edges of the border should obey safe area insets.
+		/// Use SafeAreaRegions.None for edge-to-edge content, SafeAreaRegions.All to obey all safe area insets, 
+		/// SafeAreaRegions.Container for content that flows under keyboard but stays out of bars/notch, or SafeAreaRegions.Keyboard for keyboard-aware behavior.
+		/// </remarks>
+		public SafeAreaEdges SafeAreaEdges
+		{
+			get => (SafeAreaEdges)GetValue(SafeAreaElement.SafeAreaEdgesProperty);
+			set => SetValue(SafeAreaElement.SafeAreaEdgesProperty, value);
+		}
+
 		/// <summary>Bindable property for <see cref="StrokeShape"/>.</summary>
 		public static readonly BindableProperty StrokeShapeProperty =
 			BindableProperty.Create(nameof(StrokeShape), typeof(IShape), typeof(Border), new Rectangle(),
@@ -332,5 +350,45 @@ void UpdateStrokeShape()
 				strokeShape.StrokeThickness = StrokeThickness;
 			}
 		}
+
+		/// <inheritdoc cref="ISafeAreaView2.GetSafeAreaRegionsForEdge"/>
+		SafeAreaRegions ISafeAreaView2.GetSafeAreaRegionsForEdge(int edge)
+		{
+			// Use direct property
+			var regionForEdge = SafeAreaEdges.GetEdge(edge);
+			
+			// For Border, return as-is
+			return regionForEdge;
+		}
+
+		/// <inheritdoc cref="ISafeAreaView2.SafeAreaInsets"/>
+		Thickness ISafeAreaView2.SafeAreaInsets { set { } } // Default no-op implementation for borders
+
+		/// <inheritdoc cref="ISafeAreaView2.IgnoreSafeAreaForEdge"/>
+		bool ISafeAreaView2.IgnoreSafeAreaForEdge(int edge)
+		{
+			// Use new SafeAreaEdges property with inverted logic (obey -> ignore conversion)
+			var regionForEdge = SafeAreaEdges.GetEdge(edge);
+			
+			// Convert from "obey" logic to "ignore" logic for backwards compatibility
+			switch (regionForEdge)
+			{
+				case SafeAreaRegions.None:
+					return true; // None means edge-to-edge, so ignore safe area
+				case SafeAreaRegions.All:
+				case SafeAreaRegions.Container:
+				case SafeAreaRegions.SoftInput:
+				case SafeAreaRegions.Default:
+					return false; // These obey safe area, so don't ignore
+				default:
+					// For Border, default to None behavior (edge-to-edge)
+					return true;
+			}
+		}
+
+		SafeAreaEdges ISafeAreaElement.SafeAreaEdgesDefaultValueCreator()
+		{
+			return SafeAreaEdges.Default;
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/src/Core/ContentPage/ContentPage.cs b/src/Controls/src/Core/ContentPage/ContentPage.cs
index e71bd13d22a0..e5958448cbec 100644
--- a/src/Controls/src/Core/ContentPage/ContentPage.cs
+++ b/src/Controls/src/Core/ContentPage/ContentPage.cs
@@ -12,7 +12,7 @@ namespace Microsoft.Maui.Controls
 	/// <include file="../../docs/Microsoft.Maui.Controls/ContentPage.xml" path="Type[@FullName='Microsoft.Maui.Controls.ContentPage']/Docs/*" />
 	[ContentProperty("Content")]
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
-	public partial class ContentPage : TemplatedPage, IContentView, HotReload.IHotReloadableView
+	public partial class ContentPage : TemplatedPage, IContentView, HotReload.IHotReloadableView, ISafeAreaElement, ISafeAreaView2
 	{
 		/// <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);
@@ -28,6 +28,9 @@ public View Content
 		public static readonly BindableProperty HideSoftInputOnTappedProperty
 			= BindableProperty.Create(nameof(HideSoftInputOnTapped), typeof(bool), typeof(ContentPage), false);
 
+		/// <summary>Bindable property for <see cref="SafeAreaEdges"/>.</summary>
+		public static readonly BindableProperty SafeAreaEdgesProperty = SafeAreaElement.SafeAreaEdgesProperty;
+
 		/// <summary>
 		/// Gets or sets a value that indicates whether tapping anywhere on the page will cause the soft input to hide.
 		/// </summary>
@@ -37,6 +40,21 @@ public bool HideSoftInputOnTapped
 			set { SetValue(HideSoftInputOnTappedProperty, value); }
 		}
 
+		/// <summary>
+		/// Gets or sets the safe area edges to obey for this content page.
+		/// The default value is SafeAreaEdges.Default (None - edge to edge).
+		/// </summary>
+		/// <remarks>
+		/// This property controls which edges of the content page should obey safe area insets.
+		/// Use SafeAreaRegions.None for edge-to-edge content, SafeAreaRegions.All to obey all safe area insets, 
+		/// SafeAreaRegions.Container for content that flows under keyboard but stays out of bars/notch, or SafeAreaRegions.SoftInput for keyboard-aware behavior.
+		/// </remarks>
+		public SafeAreaEdges SafeAreaEdges
+		{
+			get => (SafeAreaEdges)GetValue(SafeAreaElement.SafeAreaEdgesProperty);
+			set => SetValue(SafeAreaElement.SafeAreaEdgesProperty, value);
+		}
+
 		public ContentPage()
 		{
 			this.NavigatedTo += (_, _) => UpdateHideSoftInputOnTapped();
@@ -151,6 +169,33 @@ Size IContentView.CrossPlatformMeasure(double widthConstraint, double heightCons
 			return (this as ICrossPlatformLayout).CrossPlatformMeasure(widthConstraint, heightConstraint);
 		}
 
+		/// <inheritdoc cref="ISafeAreaView2.GetSafeAreaRegionsForEdge"/>
+		SafeAreaRegions ISafeAreaView2.GetSafeAreaRegionsForEdge(int edge)
+		{
+			// Check if the developer has explicitly set SafeAreaEdges
+			if (IsSet(SafeAreaEdgesProperty))
+			{
+				// Developer has explicitly set SafeAreaEdges, use it directly
+				return SafeAreaEdges.GetEdge(edge);
+			}
+			
+			// Developer hasn't set SafeAreaEdges, fall back to legacy IgnoreSafeArea behavior
+			var ignoreSafeArea = ((ISafeAreaView)this).IgnoreSafeArea;
+			if (ignoreSafeArea)
+			{
+				return SafeAreaRegions.None; // If legacy says "ignore", return None (edge-to-edge)
+			}
+			else
+			{
+				return SafeAreaRegions.Container; // If legacy says "don't ignore", return Container
+			}
+		}
+
+		SafeAreaEdges ISafeAreaElement.SafeAreaEdgesDefaultValueCreator()
+		{
+			return SafeAreaEdges.Default;
+		}
+
 		private protected override string GetDebuggerDisplay()
 		{
 			var contentText = DebuggerDisplayHelpers.GetDebugText(nameof(Content), Content);
diff --git a/src/Controls/src/Core/ContentView/ContentView.cs b/src/Controls/src/Core/ContentView/ContentView.cs
index b56663e0012b..39fe35d3c14e 100644
--- a/src/Controls/src/Core/ContentView/ContentView.cs
+++ b/src/Controls/src/Core/ContentView/ContentView.cs
@@ -1,6 +1,6 @@
 #nullable disable
 using System.Diagnostics;
-
+using Microsoft.Maui;
 using Microsoft.Maui.Graphics;
 using Microsoft.Maui.Layouts;
 
@@ -9,7 +9,7 @@ namespace Microsoft.Maui.Controls
 	/// <include file="../../docs/Microsoft.Maui.Controls/ContentView.xml" path="Type[@FullName='Microsoft.Maui.Controls.ContentView']/Docs/*" />
 	[ContentProperty("Content")]
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
-	public partial class ContentView : TemplatedView, IContentView
+	public partial class ContentView : TemplatedView, IContentView, ISafeAreaView2, ISafeAreaElement
 	{
 		/// <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);
@@ -21,6 +21,24 @@ public View Content
 			set { SetValue(ContentProperty, value); }
 		}
 
+		/// <summary>Bindable property for <see cref="SafeAreaEdges"/>.</summary>
+		public static readonly BindableProperty SafeAreaEdgesProperty = SafeAreaElement.SafeAreaEdgesProperty;
+
+		/// <summary>
+		/// Gets or sets the safe area edges to obey for this content view.
+		/// The default value is SafeAreaEdges.Default (None - edge to edge).
+		/// </summary>
+		/// <remarks>
+		/// This property controls which edges of the content view should obey safe area insets.
+		/// Use SafeAreaRegions.None for edge-to-edge content, SafeAreaRegions.All to obey all safe area insets, 
+		/// SafeAreaRegions.Container for content that flows under keyboard but stays out of bars/notch, or SafeAreaRegions.Keyboard for keyboard-aware behavior.
+		/// </remarks>
+		public SafeAreaEdges SafeAreaEdges
+		{
+			get => (SafeAreaEdges)GetValue(SafeAreaElement.SafeAreaEdgesProperty);
+			set => SetValue(SafeAreaElement.SafeAreaEdgesProperty, value);
+		}
+
 		protected override void OnBindingContextChanged()
 		{
 			base.OnBindingContextChanged();
@@ -50,10 +68,50 @@ internal override void SetChildInheritedBindingContext(Element child, object con
 
 		IView IContentView.PresentedContent => ((this as IControlTemplated).TemplateRoot as IView) ?? Content;
 
+		SafeAreaEdges ISafeAreaElement.SafeAreaEdgesDefaultValueCreator()
+		{
+			return SafeAreaEdges.Default;
+		}
+
 		private protected override string GetDebuggerDisplay()
 		{
 			var contentText = DebuggerDisplayHelpers.GetDebugText(nameof(Content), Content);
 			return $"{base.GetDebuggerDisplay()}, {contentText}";
 		}
+
+		/// <inheritdoc cref="ISafeAreaView2.SafeAreaInsets"/>
+		Thickness ISafeAreaView2.SafeAreaInsets { set { } } // Default no-op implementation for content views
+
+		/// <inheritdoc cref="ISafeAreaView2.IgnoreSafeAreaForEdge"/>
+		bool ISafeAreaView2.IgnoreSafeAreaForEdge(int edge)
+		{
+			// Use new SafeAreaEdges property with inverted logic (obey -> ignore conversion)
+			var regionForEdge = SafeAreaEdges.GetEdge(edge);
+			
+			// Convert from "obey" logic to "ignore" logic for backwards compatibility
+			switch (regionForEdge)
+			{
+				case SafeAreaRegions.None:
+					return true; // None means edge-to-edge, so ignore safe area
+				case SafeAreaRegions.All:
+				case SafeAreaRegions.Container:
+				case SafeAreaRegions.SoftInput:
+				case SafeAreaRegions.Default:
+					return false; // These obey safe area, so don't ignore
+				default:
+					// For ContentView, default to None behavior (edge-to-edge)
+					return true;
+			}
+		}
+
+		/// <inheritdoc cref="ISafeAreaView2.GetSafeAreaRegionsForEdge"/>
+		SafeAreaRegions ISafeAreaView2.GetSafeAreaRegionsForEdge(int edge)
+		{
+			// Use direct property
+			var regionForEdge = SafeAreaEdges.GetEdge(edge);
+			
+			// For ContentView, return the region directly
+			return regionForEdge;
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/src/Core/Handlers/Items/CarouselViewHandler.iOS.cs b/src/Controls/src/Core/Handlers/Items/CarouselViewHandler.iOS.cs
index cb1cf79cedd3..6bb17affbccc 100644
--- a/src/Controls/src/Core/Handlers/Items/CarouselViewHandler.iOS.cs
+++ b/src/Controls/src/Core/Handlers/Items/CarouselViewHandler.iOS.cs
@@ -71,7 +71,37 @@ public static void MapLoop(CarouselViewHandler handler, CarouselView carouselVie
 			(handler.Controller as CarouselViewController)?.UpdateLoop();
 		}
 
-		public override Size GetDesiredSize(double widthConstraint, double heightConstraint) =>
-			this.GetDesiredSizeFromHandler(widthConstraint, heightConstraint);
+		public override Size GetDesiredSize(double widthConstraint, double heightConstraint)
+		{
+			var size = this.GetDesiredSizeFromHandler(widthConstraint, heightConstraint);
+
+			if (OperatingSystem.IsMacCatalystVersionAtLeast(11))
+			{
+				// Ensure size never exceeds constraints.
+				// In the 22417 test sample on Mac, if widthConstraint is 1085, it becomes 1512 after the SizeThatFits call 
+				// inside ViewHandlerExtensions.iOS. This causes the view's width to appear larger on Mac.
+				// On iOS, the value remains correct — for example, if widthConstraint is 375, SizeThatFits also returns 375.
+				// This issue happened on Main also.
+
+				if (!double.IsInfinity(widthConstraint) && size.Width > widthConstraint)
+				{
+					size.Width = (float)widthConstraint;
+				}
+
+				if (!double.IsInfinity(heightConstraint) && size.Height > heightConstraint)
+				{
+					size.Height = (float)heightConstraint;
+				}
+
+			}
+
+			return size;
+		}
+
+		public override void PlatformArrange(Rect rect)
+		{
+			(Controller.Layout as CarouselViewLayout)?.UpdateConstraints(rect.Size);
+			base.PlatformArrange(rect);
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/src/Core/ISafeAreaElement.cs b/src/Controls/src/Core/ISafeAreaElement.cs
new file mode 100644
index 000000000000..d5fc3a009810
--- /dev/null
+++ b/src/Controls/src/Core/ISafeAreaElement.cs
@@ -0,0 +1,14 @@
+using System.ComponentModel;
+using Microsoft.Maui;
+
+namespace Microsoft.Maui.Controls
+{
+	[EditorBrowsable(EditorBrowsableState.Never)]
+	internal interface ISafeAreaElement
+	{
+		//note to implementor: implement this property publicly
+		SafeAreaEdges SafeAreaEdges { get; }
+
+		SafeAreaEdges SafeAreaEdgesDefaultValueCreator();
+	}
+}
\ 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 b54652f79184..285b72049fc3 100644
--- a/src/Controls/src/Core/Layout/Layout.cs
+++ b/src/Controls/src/Core/Layout/Layout.cs
@@ -5,6 +5,7 @@
 using System.Diagnostics;
 using System.Linq;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Maui;
 using Microsoft.Maui.Controls.Xaml.Diagnostics;
 using Microsoft.Maui.Graphics;
 using Microsoft.Maui.Layouts;
@@ -16,7 +17,7 @@ namespace Microsoft.Maui.Controls
 	/// </summary>
 	[ContentProperty(nameof(Children))]
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
-	public abstract partial class Layout : View, Maui.ILayout, IList<IView>, IBindableLayout, IPaddingElement, IVisualTreeElement, ISafeAreaView, IInputTransparentContainerElement
+	public abstract partial class Layout : View, Maui.ILayout, IList<IView>, IBindableLayout, IPaddingElement, IVisualTreeElement, ISafeAreaView, IInputTransparentContainerElement, ISafeAreaView2, ISafeAreaElement
 	{
 		protected ILayoutManager _layoutManager;
 
@@ -122,7 +123,29 @@ public Thickness Padding
 			set => SetValue(PaddingElement.PaddingProperty, value);
 		}
 
+		/// <summary>Bindable property for <see cref="SafeAreaEdges"/>.</summary>
+		public static readonly BindableProperty SafeAreaEdgesProperty = SafeAreaElement.SafeAreaEdgesProperty;
+
+		/// <summary>
+		/// Gets or sets the safe area edges to obey for this layout.
+		/// The default value is SafeAreaEdges.Default (None - edge to edge).
+		/// </summary>
+		/// <remarks>
+		/// This property controls which edges of the layout should obey safe area insets.
+		/// Use SafeAreaRegions.None for edge-to-edge content, SafeAreaRegions.All to obey all safe area insets, 
+		/// SafeAreaRegions.Container for content that flows under keyboard but stays out of bars/notch, or SafeAreaRegions.SoftInput for keyboard-aware behavior.
+		/// </remarks>
+		public SafeAreaEdges SafeAreaEdges
+		{
+			get => (SafeAreaEdges)GetValue(SafeAreaElement.SafeAreaEdgesProperty);
+			set => SetValue(SafeAreaElement.SafeAreaEdgesProperty, value);
+		}
+
 		/// <inheritdoc cref="ISafeAreaView.IgnoreSafeArea"/>
+		/// <remarks>
+		/// This property is deprecated. Use SafeAreaElement.IgnoreSafeArea attached property instead for per-edge safe area control.
+		/// </remarks>
+		[System.Obsolete("Use SafeAreaElement.IgnoreSafeArea attached property instead for per-edge safe area control.")]
 		public bool IgnoreSafeArea { get; set; }
 
 		/// <summary>
@@ -346,6 +369,11 @@ Thickness IPaddingElement.PaddingDefaultValueCreator()
 			return new Thickness(0);
 		}
 
+		SafeAreaEdges ISafeAreaElement.SafeAreaEdgesDefaultValueCreator()
+		{
+			return SafeAreaEdges.Default;
+		}
+
 		public Graphics.Size CrossPlatformMeasure(double widthConstraint, double heightConstraint)
 		{
 			return LayoutManager.Measure(widthConstraint, heightConstraint);
@@ -378,5 +406,42 @@ private protected override string GetDebuggerDisplay()
 		{
 			return $"{base.GetDebuggerDisplay()}, ChildCount = {Count}";
 		}
+
+
+		/// <inheritdoc cref="ISafeAreaView2.SafeAreaInsets"/>
+		Thickness ISafeAreaView2.SafeAreaInsets { set { } } // Default no-op implementation for layouts
+
+		/// <inheritdoc cref="ISafeAreaView2.IgnoreSafeAreaForEdge"/>
+		bool ISafeAreaView2.IgnoreSafeAreaForEdge(int edge)
+		{
+			// Use new SafeAreaEdges property with inverted logic (obey -> ignore conversion)
+			var regionForEdge = SafeAreaEdges.GetEdge(edge);
+			
+			// Convert from "obey" logic to "ignore" logic for backwards compatibility
+			switch (regionForEdge)
+			{
+				case SafeAreaRegions.None:
+					return true; // None means edge-to-edge, so ignore safe area
+				case SafeAreaRegions.All:
+				case SafeAreaRegions.Container:
+				case SafeAreaRegions.SoftInput:
+				case SafeAreaRegions.Default:
+					return false; // These obey safe area, so don't ignore
+				default:
+					// For Layout views, default to None behavior (edge-to-edge)
+					return true;
+			}
+		}
+
+		/// <inheritdoc cref="ISafeAreaView2.GetSafeAreaRegionsForEdge"/>
+		SafeAreaRegions ISafeAreaView2.GetSafeAreaRegionsForEdge(int edge)
+		{
+			// Use direct property first
+			var regionForEdge = SafeAreaEdges.GetEdge(edge);
+			
+			// For Layout views, never return the old Default - return None instead
+			// (since Default no longer exists in the new enum)
+			return regionForEdge;
+		}
 	}
 }
diff --git a/src/Controls/src/Core/Layout/LayoutExtensions.cs b/src/Controls/src/Core/Layout/LayoutExtensions.cs
index 88fb01166bf9..10a06a0b7323 100644
--- a/src/Controls/src/Core/Layout/LayoutExtensions.cs
+++ b/src/Controls/src/Core/Layout/LayoutExtensions.cs
@@ -4,7 +4,9 @@ internal static class LayoutExtensions
 {
 	internal static void IgnoreLayoutSafeArea(this Layout layout)
 	{
+#pragma warning disable CS0618 // Type or member is obsolete
 		layout.IgnoreSafeArea = true;
+#pragma warning restore CS0618 // Type or member is obsolete
 
 		foreach (var child in layout.Children)
 		{
diff --git a/src/Controls/src/Core/Page/Page.cs b/src/Controls/src/Core/Page/Page.cs
index d73749275fd8..045993ba0da3 100644
--- a/src/Controls/src/Core/Page/Page.cs
+++ b/src/Controls/src/Core/Page/Page.cs
@@ -8,9 +8,9 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Maui;
 using Microsoft.Maui.Controls.Internals;
 using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
-
 using Microsoft.Maui.Graphics;
 
 namespace Microsoft.Maui.Controls
@@ -21,7 +21,7 @@ namespace Microsoft.Maui.Controls
 	/// <remarks><see cref = "Page" /> is primarily a base class for more useful derived types. Objects that are derived from the <see cref="Page"/> class are most prominently used as the top level UI element in .NET MAUI applications. In addition to their role as the main pages of applications, <see cref="Page"/> objects and their descendants can be used with navigation classes, such as <see cref="NavigationPage"/> or <see cref="FlyoutPage"/>, among others, to provide rich user experiences that conform to the expected behaviors on each platform.
 	/// </remarks>
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
-	public partial class Page : VisualElement, ILayout, IPageController, IElementConfiguration<Page>, IPaddingElement, ISafeAreaView, ISafeAreaView2, IView, ITitledElement, IToolbarElement, IConstrainedView
+	public partial class Page : VisualElement, ILayout, IPageController, IElementConfiguration<Page>, IPaddingElement, ISafeAreaView2, IView, ITitledElement, IToolbarElement, ISafeAreaView, IConstrainedView
 #if IOS
 	,IiOSPageSpecifics
 #endif
@@ -141,6 +141,7 @@ public Thickness Padding
 			set { SetValue(PaddingElement.PaddingProperty, value); }
 		}
 
+
 		Thickness IPaddingElement.PaddingDefaultValueCreator()
 		{
 			return default(Thickness);
@@ -151,6 +152,8 @@ void IPaddingElement.OnPaddingPropertyChanged(Thickness oldValue, Thickness newV
 			(this as IView).InvalidateMeasure();
 		}
 
+
+
 		/// <summary>
 		/// Gets or sets the page's title.
 		/// </summary>
@@ -206,7 +209,9 @@ public bool IgnoresContainerArea
 		public ObservableCollection<Element> InternalChildren { get; } = new ObservableCollection<Element>();
 
 		/// <inheritdoc/>
+#pragma warning disable CS0618 // Type or member is obsolete
 		bool ISafeAreaView.IgnoreSafeArea => !On<PlatformConfiguration.iOS>().UsingSafeArea();
+#pragma warning restore CS0618 // Type or member is obsolete
 
 		bool IConstrainedView.HasFixedConstraints => true;
 
@@ -257,6 +262,23 @@ Thickness ISafeAreaView2.SafeAreaInsets
 			}
 		}
 
+		/// <inheritdoc cref="ISafeAreaView2.IgnoreSafeAreaForEdge"/>
+		bool ISafeAreaView2.IgnoreSafeAreaForEdge(int edge)
+		{
+			// Use new SafeAreaElement logic with inverted behavior
+			return !SafeAreaElement.ShouldObeySafeAreaForEdge(this, edge);
+		}
+
+		/// <inheritdoc cref="ISafeAreaView2.GetSafeAreaRegionsForEdge"/>
+		SafeAreaRegions ISafeAreaView2.GetSafeAreaRegionsForEdge(int edge)
+		{
+			// Use new SafeAreaElement method
+			var regionForEdge = SafeAreaElement.GetEdgeValue(this, edge);
+			
+			// For Page (but not ContentPage), return as-is
+			return regionForEdge;
+		}
+
 		/// <summary>
 		/// Raised when the children of this page, and thus potentially the layout, have changed.
 		/// </summary>
diff --git a/src/Controls/src/Core/PlatformConfiguration/iOSSpecific/Page.cs b/src/Controls/src/Core/PlatformConfiguration/iOSSpecific/Page.cs
index a31f5f0f4910..2eb7faf11a25 100644
--- a/src/Controls/src/Core/PlatformConfiguration/iOSSpecific/Page.cs
+++ b/src/Controls/src/Core/PlatformConfiguration/iOSSpecific/Page.cs
@@ -114,6 +114,10 @@ public static IPlatformElementConfiguration<iOS, FormsElement> SetPreferredStatu
 		/// <summary>
 		/// This iOS platform-specific controls whether padding values are overridden with the safe area insets.
 		/// </summary>
+		/// <remarks>
+		/// This API is deprecated. Use SafeArea.IgnoreSafeArea attached property instead for per-edge safe area control.
+		/// </remarks>
+		[System.Obsolete("Use SafeArea.IgnoreSafeArea attached property instead for per-edge safe area control.")]
 #if MACCATALYST
 		public static readonly BindableProperty UseSafeAreaProperty = BindableProperty.Create("UseSafeArea", typeof(bool), typeof(Page), true);
 #else
@@ -125,6 +129,10 @@ public static IPlatformElementConfiguration<iOS, FormsElement> SetPreferredStatu
 		/// </summary>
 		/// <param name="element">The element to get the safe area behavior from.</param>
 		/// <returns><see langword="true"/> if the padding values are overridden; otherwise, <see langword="false"/>.</returns>
+		/// <remarks>
+		/// This API is deprecated. Use SafeArea.IgnoreSafeArea attached property instead for per-edge safe area control.
+		/// </remarks>
+		[System.Obsolete("Use SafeArea.IgnoreSafeArea attached property instead for per-edge safe area control.")]
 		public static bool GetUseSafeArea(BindableObject element)
 		{
 			return (bool)element.GetValue(UseSafeAreaProperty);
@@ -135,6 +143,10 @@ public static bool GetUseSafeArea(BindableObject element)
 		/// </summary>
 		/// <param name="element">The element whose safe area use behavior to set.</param>
 		/// <param name="value"><see langword="true"/> to use the safe area inset behavior; otherwise, <see langword="false"/>.</param>
+		/// <remarks>
+		/// This API is deprecated. Use SafeArea.IgnoreSafeArea attached property instead for per-edge safe area control.
+		/// </remarks>
+		[System.Obsolete("Use SafeArea.IgnoreSafeArea attached property instead for per-edge safe area control.")]
 		public static void SetUseSafeArea(BindableObject element, bool value)
 		{
 			element.SetValue(UseSafeAreaProperty, value);
@@ -146,6 +158,10 @@ public static void SetUseSafeArea(BindableObject element, bool value)
 		/// <param name="config">The element whose safe area behavior to get.</param>
 		/// <param name="value"><see langword="true"/> to use the safe area inset behavior; otherwise, <see langword="false"/>.</param>
 		/// <returns>The updated configuration object on which developers can make successive method calls.</returns>
+		/// <remarks>
+		/// This API is deprecated. Use SafeArea.IgnoreSafeArea attached property instead for per-edge safe area control.
+		/// </remarks>
+		[System.Obsolete("Use SafeArea.IgnoreSafeArea attached property instead for per-edge safe area control.")]
 		public static IPlatformElementConfiguration<iOS, FormsElement> SetUseSafeArea(this IPlatformElementConfiguration<iOS, FormsElement> config, bool value)
 		{
 			SetUseSafeArea(config.Element, value);
@@ -157,6 +173,10 @@ public static IPlatformElementConfiguration<iOS, FormsElement> SetUseSafeArea(th
 		/// </summary>
 		/// <param name="config">The element whose safe area behavior to get.</param>
 		/// <returns><see langword="true"/> if the padding is overridden with the safe area; otherwise, <see langword="false"/>.</returns>
+		/// <remarks>
+		/// This API is deprecated. Use SafeArea.IgnoreSafeArea attached property instead for per-edge safe area control.
+		/// </remarks>
+		[System.Obsolete("Use SafeArea.IgnoreSafeArea attached property instead for per-edge safe area control.")]
 		public static bool UsingSafeArea(this IPlatformElementConfiguration<iOS, FormsElement> config)
 		{
 			return GetUseSafeArea(config.Element);
diff --git a/src/Controls/src/Core/SafeAreaElement.cs b/src/Controls/src/Core/SafeAreaElement.cs
new file mode 100644
index 000000000000..756ab880663b
--- /dev/null
+++ b/src/Controls/src/Core/SafeAreaElement.cs
@@ -0,0 +1,107 @@
+using System;
+using System.ComponentModel;
+using Microsoft.Maui;
+
+namespace Microsoft.Maui.Controls
+{
+	internal static class SafeAreaElement
+	{
+		/// <summary>
+		/// The backing store for the <see cref="ISafeAreaElement.SafeAreaEdges" /> bindable property.
+		/// </summary>
+		public static readonly BindableProperty SafeAreaEdgesProperty =
+			BindableProperty.Create("SafeAreaEdges", typeof(SafeAreaEdges), typeof(ISafeAreaElement), SafeAreaEdges.Default,
+									propertyChanged: OnSafeAreaEdgesChanged,
+									defaultValueCreator: SafeAreaEdgesDefaultValueCreator);
+		static void OnSafeAreaEdgesChanged(BindableObject bindable, object oldValue, object newValue)
+		{
+			// Centralized implementation - invalidate measure to trigger layout recalculation
+			if (bindable is IView view)
+			{
+				view.InvalidateMeasure();
+			}
+		}
+
+		static object SafeAreaEdgesDefaultValueCreator(BindableObject bindable)
+			=> ((ISafeAreaElement)bindable).SafeAreaEdgesDefaultValueCreator();
+
+		/// <summary>
+		/// Gets the effective safe area behavior for a specific edge.
+		/// </summary>
+		/// <param name="bindable">The bindable object to get the safe area behavior from.</param>
+		/// <param name="edge">The edge to get the behavior for (0=Left, 1=Top, 2=Right, 3=Bottom).</param>
+		/// <returns>The <see cref="SafeAreaRegions"/> for the specified edge.</returns>
+		internal static SafeAreaRegions GetEdgeValue(BindableObject bindable, int edge)
+		{
+			var edges = (SafeAreaEdges)bindable.GetValue(SafeAreaEdgesProperty);
+			return edges.GetEdge(edge);
+		}
+
+		/// <summary>
+		/// Gets the effective safe area behavior for a specific edge for elements that implement ISafeAreaView.
+		/// This method handles the logic for checking the new SafeAreaEdges property and falling back to legacy behavior.
+		/// </summary>
+		/// <param name="bindable">The bindable object that implements ISafeAreaView.</param>
+		/// <param name="edge">The edge to get the behavior for (0=Left, 1=Top, 2=Right, 3=Bottom).</param>
+		/// <returns>True if safe area should be obeyed for this edge, false otherwise.</returns>
+		internal static bool ShouldObeySafeAreaForEdge(BindableObject bindable, int edge)
+		{
+			// Check the SafeAreaEdges property
+			var regionForEdge = GetEdgeValue(bindable, edge);
+			
+			// Handle the new SafeAreaRegions behavior (now obey-based instead of ignore-based)
+			if (regionForEdge == SafeAreaRegions.All)
+			{
+				return true; // Obey all safe area insets - content positioned only in safe area
+			}
+
+			if (regionForEdge == SafeAreaRegions.Container)
+			{
+				// Content flows under keyboard but stays out of top and bottom bars and notch
+				// For now, treat this as obeying safe area (can be enhanced later for keyboard-specific behavior)
+				return true;
+			}
+
+			if (regionForEdge == SafeAreaRegions.SoftInput)
+			{
+				// Always pad so content doesn't go under the keyboard
+				// For now, treat this as obeying safe area
+				return true;
+			}
+
+			if (regionForEdge == SafeAreaRegions.Default)
+			{
+				// Default behavior - apply platform safe area insets
+				return true;
+			}
+
+			if (regionForEdge == SafeAreaRegions.None)
+			{
+				// Content goes edge to edge with no safe area padding
+				return false;
+			}
+
+			// Fall back to legacy behavior if available (but invert the logic since we now return "should obey")
+			if (bindable is ISafeAreaView legacySafeAreaView)
+			{
+				return !legacySafeAreaView.IgnoreSafeArea; // Invert: if legacy says "ignore", we say "don't obey"
+			}
+
+			// Default to false (don't obey safe area) since the new default is SafeAreaRegions.None (edge to edge)
+			return false;
+		}
+
+		/// <summary>
+		/// Gets whether safe area should be ignored for a specific edge (opposite of ShouldObeySafeAreaForEdge).
+		/// This is used by ISafeAreaView2.IgnoreSafeAreaForEdge implementations.
+		/// </summary>
+		/// <param name="bindable">The bindable object that implements ISafeAreaView.</param>
+		/// <param name="edge">The edge to get the behavior for (0=Left, 1=Top, 2=Right, 3=Bottom).</param>
+		/// <returns>True if safe area should be ignored for this edge, false otherwise.</returns>
+		internal static bool ShouldIgnoreSafeAreaForEdge(BindableObject bindable, int edge)
+		{
+			// This is simply the inverse of ShouldObeySafeAreaForEdge
+			return !ShouldObeySafeAreaForEdge(bindable, edge);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/src/Core/ScrollView/ScrollView.cs b/src/Controls/src/Core/ScrollView/ScrollView.cs
index 78e41c89b1a8..8c773d136051 100644
--- a/src/Controls/src/Core/ScrollView/ScrollView.cs
+++ b/src/Controls/src/Core/ScrollView/ScrollView.cs
@@ -13,7 +13,7 @@ namespace Microsoft.Maui.Controls
 	[ContentProperty(nameof(Content))]
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
 #pragma warning disable CS0618 // Type or member is obsolete
-	public partial class ScrollView : Compatibility.Layout, ILayout, ILayoutController, IPaddingElement, IView, IVisualTreeElement, IInputTransparentContainerElement, IScrollViewController, IElementConfiguration<ScrollView>, IFlowDirectionController, IScrollView, IContentView
+	public partial class ScrollView : Compatibility.Layout, ILayout, ILayoutController, IPaddingElement, IView, IVisualTreeElement, IInputTransparentContainerElement, IScrollViewController, IElementConfiguration<ScrollView>, IFlowDirectionController, IScrollView, IContentView, ISafeAreaElement, ISafeAreaView2
 #pragma warning restore CS0618 // Type or member is obsolete
 	{
 		#region IScrollViewController
@@ -137,6 +137,9 @@ public void SetScrolledPosition(double x, double y)
 		/// <summary>Bindable property for <see cref="VerticalScrollBarVisibility"/>.</summary>
 		public static readonly BindableProperty VerticalScrollBarVisibilityProperty = BindableProperty.Create(nameof(VerticalScrollBarVisibility), typeof(ScrollBarVisibility), typeof(ScrollView), ScrollBarVisibility.Default);
 
+		/// <summary>Bindable property for <see cref="SafeAreaEdges"/>.</summary>
+		public static readonly BindableProperty SafeAreaEdgesProperty = SafeAreaElement.SafeAreaEdgesProperty;
+
 		View _content;
 		TaskCompletionSource<bool> _scrollCompletionSource;
 		Rect _layoutAreaOverride;
@@ -252,6 +255,21 @@ public ScrollBarVisibility VerticalScrollBarVisibility
 			set { SetValue(VerticalScrollBarVisibilityProperty, value); }
 		}
 
+		/// <summary>
+		/// Gets or sets the safe area edges to obey for this scroll view.
+		/// The default value is SafeAreaEdges.Default (None - edge to edge).
+		/// </summary>
+		/// <remarks>
+		/// This property controls which edges of the scroll view should obey safe area insets.
+		/// Use SafeAreaRegions.None for edge-to-edge content, SafeAreaRegions.All to obey all safe area insets, 
+		/// SafeAreaRegions.Container for content that flows under keyboard but stays out of bars/notch, or SafeAreaRegions.SoftInput for keyboard-aware behavior.
+		/// </remarks>
+		public SafeAreaEdges SafeAreaEdges
+		{
+			get => (SafeAreaEdges)GetValue(SafeAreaElement.SafeAreaEdgesProperty);
+			set => SetValue(SafeAreaElement.SafeAreaEdgesProperty, value);
+		}
+
 		/// <include file="../../docs/Microsoft.Maui.Controls/ScrollView.xml" path="//Member[@MemberName='.ctor']/Docs/*" />
 		public ScrollView()
 		{
@@ -493,6 +511,38 @@ Size ICrossPlatformLayout.CrossPlatformArrange(Rect bounds)
 
 		Size IContentView.CrossPlatformArrange(Rect bounds) =>
 			((ICrossPlatformLayout)this).CrossPlatformArrange(bounds);
+			
+		SafeAreaEdges ISafeAreaElement.SafeAreaEdgesDefaultValueCreator()
+		{
+			return SafeAreaEdges.Default;
+		}
+
+		/// <inheritdoc cref="ISafeAreaView2.SafeAreaInsets"/>
+		Thickness ISafeAreaView2.SafeAreaInsets
+		{
+			set
+			{
+				// For ScrollView, we don't need to store the SafeAreaInsets
+				// The platform-specific MauiScrollView handles this
+			}
+		}
+
+		/// <inheritdoc cref="ISafeAreaView2.IgnoreSafeAreaForEdge"/>
+		bool ISafeAreaView2.IgnoreSafeAreaForEdge(int edge)
+		{
+			// Use direct property first, then fall back to attached property and legacy behavior
+			return SafeAreaElement.ShouldIgnoreSafeAreaForEdge(this, edge);
+		}
+
+		/// <inheritdoc cref="ISafeAreaView2.GetSafeAreaRegionsForEdge"/>
+		SafeAreaRegions ISafeAreaView2.GetSafeAreaRegionsForEdge(int edge)
+		{
+			// Use direct property 
+			var regionForEdge = SafeAreaEdges.GetEdge(edge);
+			
+			// For ScrollView, return Default behavior as-is (it's special)
+			return regionForEdge;
+		}
 
 		private protected override string GetDebuggerDisplay()
 		{
diff --git a/src/Controls/src/Core/Shell/BaseShellItem.cs b/src/Controls/src/Core/Shell/BaseShellItem.cs
index 1e6977079a1b..74f003f0dba3 100644
--- a/src/Controls/src/Core/Shell/BaseShellItem.cs
+++ b/src/Controls/src/Core/Shell/BaseShellItem.cs
@@ -355,7 +355,9 @@ internal static DataTemplate CreateDefaultFlyoutItemCell(BindableObject bo)
 			{
 				var grid = new Grid()
 				{
+#pragma warning disable CS0618 // Type or member is obsolete
 					IgnoreSafeArea = true
+#pragma warning restore CS0618 // Type or member is obsolete
 				};
 
 				if (OperatingSystem.IsWindows())
diff --git a/src/Controls/src/Core/TitleBar/TitleBar.cs b/src/Controls/src/Core/TitleBar/TitleBar.cs
index 4dbdacee871e..37eb60c04266 100644
--- a/src/Controls/src/Core/TitleBar/TitleBar.cs
+++ b/src/Controls/src/Core/TitleBar/TitleBar.cs
@@ -363,7 +363,9 @@ static View BuildDefaultTemplate()
 					new ColumnDefinition(150),             // Min drag region + padding for system buttons
 #endif
 				},
+#pragma warning disable CS0618 // Type or member is obsolete
 				IgnoreSafeArea = true,
+#pragma warning restore CS0618 // Type or member is obsolete
 			};
 
 			contentGrid.SetBinding(
diff --git a/src/Controls/tests/Core.UnitTests/SafeAreaTests.cs b/src/Controls/tests/Core.UnitTests/SafeAreaTests.cs
new file mode 100644
index 000000000000..d8bdbd2ebf4c
--- /dev/null
+++ b/src/Controls/tests/Core.UnitTests/SafeAreaTests.cs
@@ -0,0 +1,646 @@
+using System;
+using Microsoft.Maui.Converters;
+using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Layouts;
+using Xunit;
+
+namespace Microsoft.Maui.Controls.Core.UnitTests
+{
+	public class SafeAreaTests : BaseTestFixture
+	{
+		[Fact]
+		public void GetEdges_DefaultValue_ReturnsDefault()
+		{
+			var layout = new Grid();
+			
+			var result = layout.SafeAreaEdges;
+			
+			Assert.Equal(SafeAreaEdges.Default, result);
+		}
+
+		[Fact]
+		public void SetEdges_SingleValue_AppliedCorrectly()
+		{
+			var layout = new Grid();
+			var value = SafeAreaEdges.All;
+			
+			layout.SafeAreaEdges = value;
+			var result = layout.SafeAreaEdges;
+			
+			Assert.Equal(value, result);
+		}
+
+		[Fact]
+		public void GetEdgeValue_UniformValue_AppliesAllEdges()
+		{
+			var layout = new Grid();
+			layout.SafeAreaEdges = SafeAreaEdges.All;
+			
+			Assert.Equal(SafeAreaRegions.All, SafeAreaElement.GetEdgeValue(layout, 0)); // Left
+			Assert.Equal(SafeAreaRegions.All, SafeAreaElement.GetEdgeValue(layout, 1)); // Top
+			Assert.Equal(SafeAreaRegions.All, SafeAreaElement.GetEdgeValue(layout, 2)); // Right
+			Assert.Equal(SafeAreaRegions.All, SafeAreaElement.GetEdgeValue(layout, 3)); // Bottom
+		}
+
+		[Fact]
+		public void GetEdgeValue_TwoValues_AppliesCorrectly()
+		{
+			var layout = new Grid();
+			layout.SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.All, SafeAreaRegions.None);
+			
+			Assert.Equal(SafeAreaRegions.All, SafeAreaElement.GetEdgeValue(layout, 0)); // Left
+			Assert.Equal(SafeAreaRegions.None, SafeAreaElement.GetEdgeValue(layout, 1)); // Top
+			Assert.Equal(SafeAreaRegions.All, SafeAreaElement.GetEdgeValue(layout, 2)); // Right
+			Assert.Equal(SafeAreaRegions.None, SafeAreaElement.GetEdgeValue(layout, 3)); // Bottom
+		}
+
+		[Fact]
+		public void GetEdgeValue_FourValues_AppliesCorrectly()
+		{
+			var layout = new Grid();
+			layout.SafeAreaEdges = new SafeAreaEdges(
+				SafeAreaRegions.All,   // Left
+				SafeAreaRegions.None,  // Top
+				SafeAreaRegions.All,   // Right
+				SafeAreaRegions.None   // Bottom
+			);
+			
+			Assert.Equal(SafeAreaRegions.All, SafeAreaElement.GetEdgeValue(layout, 0)); // Left
+			Assert.Equal(SafeAreaRegions.None, SafeAreaElement.GetEdgeValue(layout, 1)); // Top
+			Assert.Equal(SafeAreaRegions.All, SafeAreaElement.GetEdgeValue(layout, 2)); // Right
+			Assert.Equal(SafeAreaRegions.None, SafeAreaElement.GetEdgeValue(layout, 3)); // Bottom
+		}
+
+		[Fact]
+		public void GetEdgeValue_InvalidEdgeIndex_ReturnsNone()
+		{
+			var layout = new Grid();
+			layout.SafeAreaEdges = SafeAreaEdges.All;
+			
+			Assert.Equal(SafeAreaRegions.None, SafeAreaElement.GetEdgeValue(layout, -1));
+			Assert.Equal(SafeAreaRegions.None, SafeAreaElement.GetEdgeValue(layout, 4));
+		}
+
+		[Fact]
+		public void SafeAreaEdges_DefaultConstructor_ReturnsNone()
+		{
+			var edges = new SafeAreaEdges();
+			
+			Assert.Equal(SafeAreaRegions.None, edges.Left);
+			Assert.Equal(SafeAreaRegions.None, edges.Top);
+			Assert.Equal(SafeAreaRegions.None, edges.Right);
+			Assert.Equal(SafeAreaRegions.None, edges.Bottom);
+		}
+
+		[Fact]
+		public void SafeAreaEdges_UniformConstructor_AppliesAllEdges()
+		{
+			var edges = new SafeAreaEdges(SafeAreaRegions.All);
+			
+			Assert.Equal(SafeAreaRegions.All, edges.Left);
+			Assert.Equal(SafeAreaRegions.All, edges.Top);
+			Assert.Equal(SafeAreaRegions.All, edges.Right);
+			Assert.Equal(SafeAreaRegions.All, edges.Bottom);
+		}
+
+		[Fact]
+		public void SafeAreaEdges_HorizontalVerticalConstructor_AppliesCorrectly()
+		{
+			var edges = new SafeAreaEdges(SafeAreaRegions.All, SafeAreaRegions.None);
+			
+			Assert.Equal(SafeAreaRegions.All, edges.Left);   // horizontal
+			Assert.Equal(SafeAreaRegions.None, edges.Top);   // vertical
+			Assert.Equal(SafeAreaRegions.All, edges.Right);  // horizontal
+			Assert.Equal(SafeAreaRegions.None, edges.Bottom); // vertical
+		}
+
+		[Fact]
+		public void SafeAreaEdges_IndividualConstructor_AppliesCorrectly()
+		{
+			var edges = new SafeAreaEdges(
+				SafeAreaRegions.All,   // Left
+				SafeAreaRegions.None,  // Top
+				SafeAreaRegions.All,   // Right
+				SafeAreaRegions.None   // Bottom
+			);
+			
+			Assert.Equal(SafeAreaRegions.All, edges.Left);
+			Assert.Equal(SafeAreaRegions.None, edges.Top);
+			Assert.Equal(SafeAreaRegions.All, edges.Right);
+			Assert.Equal(SafeAreaRegions.None, edges.Bottom);
+		}
+
+		[Fact]
+		public void SafeAreaEdges_GetEdge_ReturnsCorrectValues()
+		{
+			var edges = new SafeAreaEdges(
+				SafeAreaRegions.All,   // Left
+				SafeAreaRegions.None,  // Top
+				SafeAreaRegions.All,   // Right
+				SafeAreaRegions.None   // Bottom
+			);
+			
+			Assert.Equal(SafeAreaRegions.All, edges.GetEdge(0));   // Left
+			Assert.Equal(SafeAreaRegions.None, edges.GetEdge(1));  // Top
+			Assert.Equal(SafeAreaRegions.All, edges.GetEdge(2));   // Right
+			Assert.Equal(SafeAreaRegions.None, edges.GetEdge(3));  // Bottom
+			Assert.Equal(SafeAreaRegions.None, edges.GetEdge(-1)); // Invalid
+			Assert.Equal(SafeAreaRegions.None, edges.GetEdge(4));  // Invalid
+		}
+
+		[Fact]
+		public void SafeAreaEdges_SetEdge_UpdatesCorrectValues()
+		{
+			var edges = new SafeAreaEdges();
+			
+			edges.SetEdge(0, SafeAreaRegions.All); // Left
+			edges.SetEdge(1, SafeAreaRegions.None); // Top
+			edges.SetEdge(2, SafeAreaRegions.All); // Right
+			edges.SetEdge(3, SafeAreaRegions.None); // Bottom
+			
+			Assert.Equal(SafeAreaRegions.All, edges.Left);
+			Assert.Equal(SafeAreaRegions.None, edges.Top);
+			Assert.Equal(SafeAreaRegions.All, edges.Right);
+			Assert.Equal(SafeAreaRegions.None, edges.Bottom);
+		}
+
+		[Fact]
+		public void SafeAreaEdges_StaticProperties_ReturnCorrectValues()
+		{
+			Assert.Equal(new SafeAreaEdges(SafeAreaRegions.None), SafeAreaEdges.None);
+			Assert.Equal(new SafeAreaEdges(SafeAreaRegions.All), SafeAreaEdges.All);
+		}
+
+		[Fact]
+		public void SafeAreaEdges_Equality_WorksCorrectly()
+		{
+			var edges1 = new SafeAreaEdges(SafeAreaRegions.All, SafeAreaRegions.None, SafeAreaRegions.All, SafeAreaRegions.None);
+			var edges2 = new SafeAreaEdges(SafeAreaRegions.All, SafeAreaRegions.None, SafeAreaRegions.All, SafeAreaRegions.None);
+			var edges3 = new SafeAreaEdges(SafeAreaRegions.None);
+			
+			Assert.True(edges1 == edges2);
+			Assert.False(edges1 == edges3);
+			Assert.True(edges1 != edges3);
+			Assert.True(edges1.Equals(edges2));
+			Assert.False(edges1.Equals(edges3));
+		}
+
+		[Fact]
+		public void SafeAreaEdges_ToString_FormatsCorrectly()
+		{
+			var uniform = new SafeAreaEdges(SafeAreaRegions.All);
+			var twoValue = new SafeAreaEdges(SafeAreaRegions.All, SafeAreaRegions.None);
+			var fourValue = new SafeAreaEdges(SafeAreaRegions.All, SafeAreaRegions.None, SafeAreaRegions.All, SafeAreaRegions.None);
+			var asymmetric = new SafeAreaEdges(SafeAreaRegions.All, SafeAreaRegions.None, SafeAreaRegions.None, SafeAreaRegions.All);
+			
+			Assert.Equal("All", uniform.ToString());
+			Assert.Equal("All, None", twoValue.ToString());
+			Assert.Equal("All, None", fourValue.ToString()); // Optimized: Left==Right, Top==Bottom
+			Assert.Equal("All, None, None, All", asymmetric.ToString()); // No optimization possible
+		}
+
+		[Fact]
+		public void Layout_ImplementsISafeAreaView()
+		{
+			var layout = new Grid();
+			
+			Assert.IsAssignableFrom<ISafeAreaView>(layout);
+			Assert.IsAssignableFrom<ISafeAreaView2>(layout);
+		}
+
+		[Fact]
+		public void Layout_IgnoreSafeAreaForEdge_UsesDirectProperty()
+		{
+			var layout = new Grid();
+			layout.SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.None, SafeAreaRegions.All, SafeAreaRegions.None, SafeAreaRegions.All);
+
+			// Test via ISafeAreaView2 interface - inverted logic: None means edge-to-edge (ignore), All means obey
+			var safeAreaView2 = (ISafeAreaView2)layout;
+			
+			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(0));  // Left = None (edge-to-edge, so ignore)
+			Assert.False(safeAreaView2.IgnoreSafeAreaForEdge(1)); // Top = All (obey safe area, so don't ignore)  
+			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(2));  // Right = None (edge-to-edge, so ignore)
+			Assert.False(safeAreaView2.IgnoreSafeAreaForEdge(3)); // Bottom = All (obey safe area, so don't ignore)
+		}
+
+		[Fact]
+		public void Layout_IgnoreSafeAreaForEdge_FallsBackToLegacyProperty()
+		{
+			var layout = new Grid();
+			layout.IgnoreSafeArea = true; // Legacy property
+
+			// Should fall back to legacy property when no direct property is set
+			var safeAreaView2 = (ISafeAreaView2)layout;
+			
+			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(0));
+			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(1));
+			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(2));
+			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(3));
+		}
+
+		[Fact]
+		public void Page_ImplementsISafeAreaView()
+		{
+			var page = new ContentPage();
+			
+			Assert.IsAssignableFrom<ISafeAreaView>(page);
+			Assert.IsAssignableFrom<ISafeAreaView2>(page);
+		}
+
+		[Fact]
+		public void ContentView_ImplementsISafeAreaView()
+		{
+			var contentView = new ContentView();
+			
+			Assert.IsAssignableFrom<ISafeAreaView2>(contentView);
+		}
+
+		[Fact]
+		public void Page_IgnoreSafeAreaForEdge_UsesDirectProperty()
+		{
+			var page = new ContentPage();
+			page.SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.None, SafeAreaRegions.All, SafeAreaRegions.None, SafeAreaRegions.All);
+
+			// Test via ISafeAreaView2 interface - inverted logic: None means edge-to-edge (ignore), All means obey
+			var safeAreaView2 = (ISafeAreaView2)page;
+			
+			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(0));  // Left = None (edge-to-edge, so ignore)
+			Assert.False(safeAreaView2.IgnoreSafeAreaForEdge(1)); // Top = All (obey safe area, so don't ignore)  
+			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(2));  // Right = None (edge-to-edge, so ignore)
+			Assert.False(safeAreaView2.IgnoreSafeAreaForEdge(3)); // Bottom = All (obey safe area, so don't ignore)
+		}
+
+		[Fact]
+		public void ContentView_IgnoreSafeAreaForEdge_DefaultsToNoneWhenNoPropertySet()
+		{
+			var contentView = new ContentView(); // ContentView implements ISafeAreaView2
+
+			// Should default to true (ignore) when no property is set since default is SafeAreaRegions.None (edge-to-edge)
+			var safeAreaView2 = (ISafeAreaView2)contentView;
+			
+			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(0));
+			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(1));
+			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(2));
+			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(3));
+		}
+
+		[Fact]
+		public void Page_IgnoreSafeAreaForEdge_DefaultsToNoneForContentPage()
+		{
+			var page = new ContentPage(); // ContentPage returns All when SafeAreaRegions.None is specified for better UX
+
+			// ContentPage has special logic - when SafeAreaRegions.None is specified, it returns All for better UX
+			var safeAreaView2 = (ISafeAreaView2)page;
+			
+			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(0));
+			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(1));
+			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(2));
+			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(3));
+		}
+
+		// Tests based on existing iOS safe area usage patterns
+		[Fact]
+		public void SafeArea_CanReplaceUseSafeAreaScenario()
+		{
+			// This test mimics the usage pattern from Issue3809 and ShellTests.iOS
+			var contentView = new ContentView() 
+			{ 
+				Content = new Label() { Text = "Test Page" }
+			};
+
+			// Legacy approach: contentPage.On<iOS>().SetUseSafeArea(true);
+			// New approach: use SafeAreaEdges property to obey all safe areas
+			contentView.SafeAreaEdges = SafeAreaEdges.All; // Obey all safe areas
+
+			var safeAreaView2 = (ISafeAreaView2)contentView;
+			
+			// All edges should obey safe area (false = don't ignore)
+			Assert.False(safeAreaView2.IgnoreSafeAreaForEdge(0));
+			Assert.False(safeAreaView2.IgnoreSafeAreaForEdge(1));
+			Assert.False(safeAreaView2.IgnoreSafeAreaForEdge(2));
+			Assert.False(safeAreaView2.IgnoreSafeAreaForEdge(3));
+		}
+
+		[Fact]
+		public void SafeArea_SupportsPerEdgeControl_IgnoreTopAndBottom()
+		{
+			// Common use case: ignore safe area for top and bottom edges only (e.g., for full-width background)
+			var stackLayout = new VerticalStackLayout();
+			
+			// Edge-to-edge for top and bottom (None), obey for left and right (All)
+			stackLayout.SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.All, SafeAreaRegions.None, SafeAreaRegions.All, SafeAreaRegions.None);
+
+			var safeAreaView2 = (ISafeAreaView2)stackLayout;
+			
+			Assert.False(safeAreaView2.IgnoreSafeAreaForEdge(0)); // Left = All (obey safe area, so don't ignore)
+			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(1));  // Top = None (edge-to-edge, so ignore)
+			Assert.False(safeAreaView2.IgnoreSafeAreaForEdge(2)); // Right = All (obey safe area, so don't ignore)
+			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(3));  // Bottom = None (edge-to-edge, so ignore)
+		}
+
+		[Fact]
+		public void SafeArea_TwoValueShorthand_LeftRightTopBottom()
+		{
+			// Test two-value shorthand: first value for left/right, second for top/bottom
+			var grid = new Grid();
+			
+			grid.SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.None, SafeAreaRegions.All);
+
+			var safeAreaView2 = (ISafeAreaView2)grid;
+			
+			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(0));  // Left = None (edge-to-edge, so ignore)
+			Assert.False(safeAreaView2.IgnoreSafeAreaForEdge(1)); // Top = All (obey safe area, so don't ignore)
+			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(2));  // Right = None (edge-to-edge, so ignore)
+			Assert.False(safeAreaView2.IgnoreSafeAreaForEdge(3)); // Bottom = All (obey safe area, so don't ignore)
+		}
+
+		[Fact]
+		public void SafeAreaEdgesTypeConverter_CanConvertFromString()
+		{
+			var converter = new SafeAreaEdgesTypeConverter();
+			
+			Assert.True(converter.CanConvertFrom(null, typeof(string)));
+			Assert.False(converter.CanConvertFrom(null, typeof(int)));
+		}
+
+		[Fact]
+		public void SafeAreaEdgesTypeConverter_ConvertFromSingleValue()
+		{
+			var converter = new SafeAreaEdgesTypeConverter();
+			
+			var result = (SafeAreaEdges)converter.ConvertFrom(null, null, "All");
+			
+			Assert.Equal(SafeAreaEdges.All, result);
+		}
+
+		[Fact]
+		public void SafeAreaEdgesTypeConverter_ConvertFromTwoValues()
+		{
+			var converter = new SafeAreaEdgesTypeConverter();
+			
+			var result = (SafeAreaEdges)converter.ConvertFrom(null, null, "None,Container");
+			
+			Assert.Equal(new SafeAreaEdges(SafeAreaRegions.None, SafeAreaRegions.Container), result);
+		}
+
+		[Fact]
+		public void SafeAreaEdgesTypeConverter_ConvertFromFourValues()
+		{
+			var converter = new SafeAreaEdgesTypeConverter();
+			
+			var result = (SafeAreaEdges)converter.ConvertFrom(null, null, "None,All,Container,SoftInput");
+			
+			Assert.Equal(new SafeAreaEdges(SafeAreaRegions.None, SafeAreaRegions.All, SafeAreaRegions.Container, SafeAreaRegions.SoftInput), result);
+		}
+
+		[Fact]
+		public void SafeAreaEdgesTypeConverter_ConvertFromInvalidValue_ThrowsException()
+		{
+			var converter = new SafeAreaEdgesTypeConverter();
+			
+			Assert.Throws<FormatException>(() => 
+				converter.ConvertFrom(null, null, "InvalidValue"));
+		}
+
+		[Fact]
+		public void SafeAreaEdgesTypeConverter_ConvertFromInvalidLength_ThrowsException()
+		{
+			var converter = new SafeAreaEdgesTypeConverter();
+			
+			Assert.Throws<FormatException>(() => 
+				converter.ConvertFrom(null, null, "None,Container,All")); // 3 values not supported
+		}
+
+		[Fact]
+		public void SafeAreaEdgesTypeConverter_ConvertToString()
+		{
+			var converter = new SafeAreaEdgesTypeConverter();
+			var edges = new SafeAreaEdges(SafeAreaRegions.None, SafeAreaRegions.Container);
+			
+			var result = converter.ConvertTo(null, null, edges, typeof(string));
+			
+			Assert.Equal("None, Container", result);
+		}
+
+		[Fact]
+		public void SafeAreaEdges_AllEnumValues_WorkCorrectly()
+		{
+			// Test all individual enum values can be used
+			var noneEdges = new SafeAreaEdges(SafeAreaRegions.None);
+			var softInputEdges = new SafeAreaEdges(SafeAreaRegions.SoftInput);
+			var containerEdges = new SafeAreaEdges(SafeAreaRegions.Container);
+			var defaultEdges = new SafeAreaEdges(SafeAreaRegions.Default);
+			var allEdges = new SafeAreaEdges(SafeAreaRegions.All);
+
+			Assert.Equal(SafeAreaRegions.None, noneEdges.Left);
+			Assert.Equal(SafeAreaRegions.SoftInput, softInputEdges.Left);
+			Assert.Equal(SafeAreaRegions.Container, containerEdges.Left);
+			Assert.Equal(SafeAreaRegions.Default, defaultEdges.Left);
+			Assert.Equal(SafeAreaRegions.All, allEdges.Left);
+		}
+
+		[Fact]
+		public void SafeAreaEdgesTypeConverter_AllEnumValues_ConvertCorrectly()
+		{
+			var converter = new SafeAreaEdgesTypeConverter();
+
+			// Test all individual enum values can be parsed
+			var noneResult = (SafeAreaEdges)converter.ConvertFrom(null, null, "None");
+			var softInputResult = (SafeAreaEdges)converter.ConvertFrom(null, null, "SoftInput");
+			var containerResult = (SafeAreaEdges)converter.ConvertFrom(null, null, "Container");
+			var defaultResult = (SafeAreaEdges)converter.ConvertFrom(null, null, "Default");
+			var allResult = (SafeAreaEdges)converter.ConvertFrom(null, null, "All");
+
+			Assert.Equal(SafeAreaEdges.None, noneResult);
+			Assert.Equal(new SafeAreaEdges(SafeAreaRegions.SoftInput), softInputResult);
+			Assert.Equal(new SafeAreaEdges(SafeAreaRegions.Container), containerResult);
+			Assert.Equal(new SafeAreaEdges(SafeAreaRegions.Default), defaultResult);
+			Assert.Equal(SafeAreaEdges.All, allResult);
+		}
+
+		[Fact]
+		public void SafeAreaEdgesTypeConverter_MixedEnumValues_ConvertCorrectly()
+		{
+			var converter = new SafeAreaEdgesTypeConverter();
+
+			// Test mixed combinations of all enum values
+			var mixedTwoValues = (SafeAreaEdges)converter.ConvertFrom(null, null, "SoftInput,Container");
+			var mixedFourValues = (SafeAreaEdges)converter.ConvertFrom(null, null, "SoftInput,Default,Container,All");
+
+			Assert.Equal(new SafeAreaEdges(SafeAreaRegions.SoftInput, SafeAreaRegions.Container), mixedTwoValues);
+			Assert.Equal(new SafeAreaEdges(SafeAreaRegions.SoftInput, SafeAreaRegions.Default, SafeAreaRegions.Container, SafeAreaRegions.All), mixedFourValues);
+		}
+
+		[Fact]
+		public void SafeAreaEdges_EnumBitValues_AreUnique()
+		{
+			// Verify enum values use unique bit patterns
+			Assert.Equal(0, (int)SafeAreaRegions.None);
+			Assert.Equal(1, (int)SafeAreaRegions.SoftInput);
+			Assert.Equal(2, (int)SafeAreaRegions.Container);
+			Assert.Equal(4, (int)SafeAreaRegions.Default);
+			Assert.Equal(int.MaxValue, (int)SafeAreaRegions.All);
+		}
+
+		[Fact]
+		public void SafeAreaEdges_TypeConverterWithBinding_SimulatedConversion()
+		{
+			// Test that the type converter works as it would in a binding scenario
+			var converter = new SafeAreaEdgesTypeConverter();
+			
+			// Simulate what happens when binding encounters a string value
+			// and needs to convert it to SafeAreaEdges
+			
+			// Test single value conversion (what binding would do)
+			var allResult = converter.ConvertFrom(null, null, "All");
+			Assert.Equal(SafeAreaEdges.All, allResult);
+			
+			// Test two values conversion
+			var twoValueResult = converter.ConvertFrom(null, null, "SoftInput,Container");
+			Assert.Equal(new SafeAreaEdges(SafeAreaRegions.SoftInput, SafeAreaRegions.Container), twoValueResult);
+			
+			// Test four values conversion
+			var fourValueResult = converter.ConvertFrom(null, null, "None,SoftInput,Container,All");
+			Assert.Equal(new SafeAreaEdges(SafeAreaRegions.None, SafeAreaRegions.SoftInput, SafeAreaRegions.Container, SafeAreaRegions.All), fourValueResult);
+			
+			// Test that conversion back to string works (for two-way binding)
+			var backToString = converter.ConvertTo(null, null, SafeAreaEdges.All, typeof(string));
+			Assert.Equal("All", backToString);
+		}
+
+		[Fact]
+		public void SafeAreaEdges_PropertyAssignment_WorksDirectly()
+		{
+			// Test direct property assignment (what would happen after successful binding conversion)
+			var layout = new Grid();
+			
+			// Test setting from converted values (simulating what binding would do after conversion)
+			layout.SafeAreaEdges = SafeAreaEdges.All;
+			Assert.Equal(SafeAreaEdges.All, layout.SafeAreaEdges);
+			
+			layout.SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.SoftInput, SafeAreaRegions.Container);
+			Assert.Equal(new SafeAreaEdges(SafeAreaRegions.SoftInput, SafeAreaRegions.Container), layout.SafeAreaEdges);
+			
+			layout.SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.None, SafeAreaRegions.SoftInput, SafeAreaRegions.Container, SafeAreaRegions.All);
+			Assert.Equal(new SafeAreaEdges(SafeAreaRegions.None, SafeAreaRegions.SoftInput, SafeAreaRegions.Container, SafeAreaRegions.All), layout.SafeAreaEdges);
+		}
+
+		#region Stack Layout Automatic Safe Area Tests
+
+		[Fact]
+		public void HorizontalStackLayout_BehavesLikeRegularLayout()
+		{
+			var stackLayout = new HorizontalStackLayout();
+			
+			// Should behave like regular layout with default SafeAreaEdges.None (edge-to-edge)
+			var safeAreaView2 = (ISafeAreaView2)stackLayout;
+			
+			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(0)); // Left
+			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(1)); // Top  
+			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(2)); // Right
+			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(3)); // Bottom
+		}
+
+		[Fact]
+		public void HorizontalStackLayout_RespectsDirectProperty_RTL()
+		{
+			var stackLayout = new HorizontalStackLayout();
+			stackLayout.FlowDirection = FlowDirection.RightToLeft;
+			stackLayout.SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.None, SafeAreaRegions.All, SafeAreaRegions.All, SafeAreaRegions.All);
+			
+			// Should respect SafeAreaEdges direct property
+			var safeAreaView2 = (ISafeAreaView2)stackLayout;
+			
+			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(0));   // Left (set to None - edge-to-edge)
+			Assert.False(safeAreaView2.IgnoreSafeAreaForEdge(1));  // Top (set to All - obey)
+			Assert.False(safeAreaView2.IgnoreSafeAreaForEdge(2));  // Right (set to All - obey)
+			Assert.False(safeAreaView2.IgnoreSafeAreaForEdge(3));  // Bottom (set to All - obey)
+		}
+
+		[Fact]
+		public void VerticalStackLayout_BehavesLikeRegularLayout()
+		{
+			var stackLayout = new VerticalStackLayout();
+			
+			// Should behave like regular layout with default SafeAreaEdges.None (edge-to-edge)
+			var safeAreaView2 = (ISafeAreaView2)stackLayout;
+			
+			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(0)); // Left
+			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(1)); // Top  
+			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(2)); // Right
+			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(3)); // Bottom
+		}
+
+		[Fact]
+		public void StackLayout_HorizontalOrientation_BehavesLikeRegularLayout_LTR()
+		{
+			var stackLayout = new StackLayout { Orientation = StackOrientation.Horizontal };
+			
+			// Should behave like regular layout with default SafeAreaEdges.None (edge-to-edge)
+			var safeAreaView2 = (ISafeAreaView2)stackLayout;
+			
+			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(0)); // Left
+			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(1)); // Top  
+			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(2)); // Right
+			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(3)); // Bottom
+		}
+
+		[Fact]
+		public void StackLayout_HorizontalOrientation_RespectsDirectProperty_RTL()
+		{
+			var stackLayout = new StackLayout { Orientation = StackOrientation.Horizontal };
+			stackLayout.FlowDirection = FlowDirection.RightToLeft;
+			stackLayout.SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.None, SafeAreaRegions.All, SafeAreaRegions.All, SafeAreaRegions.All);
+			
+			// Should respect SafeAreaEdges direct property
+			var safeAreaView2 = (ISafeAreaView2)stackLayout;
+			
+			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(0));   // Left (set to None - edge-to-edge)
+			Assert.False(safeAreaView2.IgnoreSafeAreaForEdge(1));  // Top (set to All - obey)
+			Assert.False(safeAreaView2.IgnoreSafeAreaForEdge(2));  // Right (set to All - obey)
+			Assert.False(safeAreaView2.IgnoreSafeAreaForEdge(3));  // Bottom (set to All - obey)
+		}
+
+		[Fact]
+		public void StackLayout_VerticalOrientation_BehavesLikeRegularLayout()
+		{
+			var stackLayout = new StackLayout { Orientation = StackOrientation.Vertical };
+			
+			// Should behave like regular layout with default SafeAreaEdges.None (edge-to-edge)
+			var safeAreaView2 = (ISafeAreaView2)stackLayout;
+			
+			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(0)); // Left
+			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(1)); // Top  
+			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(2)); // Right
+			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(3)); // Bottom
+		}
+
+		[Fact]
+		public void StackLayouts_RespectUserSettings()
+		{
+			var verticalStackLayout = new VerticalStackLayout();
+			var horizontalStackLayout = new HorizontalStackLayout();
+			
+			// Set explicit SafeAreaEdges property - this should be respected
+			verticalStackLayout.SafeAreaEdges = SafeAreaEdges.All; // Obey all edges
+			horizontalStackLayout.SafeAreaEdges = SafeAreaEdges.None; // Edge-to-edge all edges
+			
+			var verticalSafeAreaView2 = (ISafeAreaView2)verticalStackLayout;
+			var horizontalSafeAreaView2 = (ISafeAreaView2)horizontalStackLayout;
+			
+			// VerticalStackLayout should respect user setting (All = obey safe area)
+			Assert.False(verticalSafeAreaView2.IgnoreSafeAreaForEdge(0)); // Left (obeys safe area)
+			Assert.False(verticalSafeAreaView2.IgnoreSafeAreaForEdge(1)); // Top (obeys safe area)
+			Assert.False(verticalSafeAreaView2.IgnoreSafeAreaForEdge(2)); // Right (obeys safe area)
+			Assert.False(verticalSafeAreaView2.IgnoreSafeAreaForEdge(3)); // Bottom (obeys safe area)
+			
+			// HorizontalStackLayout should respect user setting (None = edge-to-edge)
+			Assert.True(horizontalSafeAreaView2.IgnoreSafeAreaForEdge(0)); // Left (edge-to-edge)
+			Assert.True(horizontalSafeAreaView2.IgnoreSafeAreaForEdge(1)); // Top (edge-to-edge)
+			Assert.True(horizontalSafeAreaView2.IgnoreSafeAreaForEdge(2)); // Right (edge-to-edge)
+			Assert.True(horizontalSafeAreaView2.IgnoreSafeAreaForEdge(3)); // Bottom (edge-to-edge)
+		}
+
+		#endregion
+	}
+}
\ 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 a4d646438d67..6daeb96dd99b 100644
--- a/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.cs
@@ -369,7 +369,10 @@ public async Task CollectionViewCanSizeToContent(CollectionViewSizingTestCase te
 				collectionView.VerticalOptions = layoutOptions;
 			}
 
-			var layout = new Grid() { IgnoreSafeArea = true, HeightRequest = containerHeight, WidthRequest = containerWidth };
+			var layout = new Grid() { HeightRequest = containerHeight, WidthRequest = containerWidth };
+#pragma warning disable CS0618 // Type or member is obsolete
+			layout.IgnoreSafeArea = true;
+#pragma warning restore CS0618 // Type or member is obsolete
 			layout.Add(collectionView);
 
 			ObservableCollection<string> data = new();
@@ -443,7 +446,10 @@ public async Task CollectionViewStructuralItems(bool hasHeader, bool hasFooter,
 
 			double containerHeight = 500;
 			double containerWidth = 500;
-			var layout = new Grid() { IgnoreSafeArea = true, HeightRequest = containerHeight, WidthRequest = containerWidth };
+			var layout = new Grid() { HeightRequest = containerHeight, WidthRequest = containerWidth };
+#pragma warning disable CS0618 // Type or member is obsolete
+			layout.IgnoreSafeArea = true;
+#pragma warning restore CS0618 // Type or member is obsolete
 
 			Label headerLabel = hasHeader ? new Label { Text = "header" } : null;
 			Label footerLabel = hasFooter ? new Label { Text = "footer" } : null;
@@ -710,5 +716,47 @@ await vsl.AttachAndRun<LayoutHandler>(async (handler) =>
 				await WaitForUIUpdate(frame, collectionView);
 			}, MauiContext, (view) => CreateHandlerAsync<LayoutHandler>(view));
 		}
+
+		[Theory]
+		[InlineData(true)] // Use new SafeArea API
+		[InlineData(false)] // Use old IgnoreSafeArea API
+		public async Task SafeAreaBehaviorConsistency(bool useNewApi)
+		{
+			SetupBuilder();
+
+			double containerHeight = 500;
+			double containerWidth = 500;
+			var layout = new Grid() { HeightRequest = containerHeight, WidthRequest = containerWidth };
+
+			if (useNewApi)
+			{
+				SafeArea.SetIgnore(layout, SafeAreaEdges.All);
+			}
+			else
+			{
+#pragma warning disable CS0618 // Type or member is obsolete
+				layout.IgnoreSafeArea = true;
+#pragma warning restore CS0618 // Type or member is obsolete
+			}
+
+			var collectionView = new CollectionView
+			{
+				ItemsLayout = LinearItemsLayout.Vertical,
+				ItemTemplate = new DataTemplate(() => new Label() { HeightRequest = 20, WidthRequest = 20 }),
+				ItemsSource = new ObservableCollection<string> { "Item 1", "Item 2", "Item 3" }
+			};
+
+			layout.Add(collectionView);
+
+			await CreateHandlerAndAddToWindow<LayoutHandler>(layout, async handler =>
+			{
+				await Task.Delay(100);
+				
+				// Both APIs should result in the same layout behavior
+				// The layout should fill the container and ignore safe area
+				var layoutBounds = layout.GetPlatformViewBounds();
+				Assert.NotEqual(Rect.Zero, layoutBounds);
+			});
+		}
 	}
 }
diff --git a/src/Controls/tests/DeviceTests/Elements/Page/PageTests.iOS.cs b/src/Controls/tests/DeviceTests/Elements/Page/PageTests.iOS.cs
index b1f5f86f8c45..2c6fe0ac58d6 100644
--- a/src/Controls/tests/DeviceTests/Elements/Page/PageTests.iOS.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Page/PageTests.iOS.cs
@@ -45,6 +45,38 @@ await CreateHandlerAndAddToWindow<IWindowHandler>(shell, (handler) =>
 			});
 		}
 
+		[Theory("SafeArea behavior works with both old and new APIs")]
+		[InlineData(true)] // Use new SafeArea API
+		[InlineData(false)] // Use old UseSafeArea API
+		public async Task SafeAreaBehaviorConsistency(bool useNewApi)
+		{
+			SetupBuilder();
+
+			var page = new ContentPage { Background = Colors.Blue };
+
+			if (useNewApi)
+			{
+				SafeArea.SetIgnore(page, SafeAreaEdges.None);
+			}
+			else
+			{
+#pragma warning disable CS0618 // Type or member is obsolete
+				page.On<iOS>().SetUseSafeArea(true);
+#pragma warning restore CS0618 // Type or member is obsolete
+			}
+
+			var shell = new Shell() { CurrentItem = page };
+
+			await CreateHandlerAndAddToWindow<IWindowHandler>(shell, (handler) =>
+			{
+				if (handler.VirtualView is Window window && window.Page is Shell shellPage)
+				{
+					// Both APIs should result in safe area being respected (non-zero insets)
+					Assert.NotEqual(shellPage.CurrentPage.On<iOS>().SafeAreaInsets(), Thickness.Zero);
+				}
+			});
+		}
+
 		//src/Compatibility/Core/tests/iOS/EmbeddingTests.cs
 		[Fact(DisplayName = "Can Create Platform View From ContentPage")]
 		public async Task CanCreateViewControllerFromContentPage()
diff --git a/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.iOS.cs b/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.iOS.cs
index cf22edfab972..bb8376d2c1da 100644
--- a/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.iOS.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.iOS.cs
@@ -35,8 +35,10 @@ 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" } };
 
+#pragma warning disable CS0618 // Type or member is obsolete
 			pageWithTopTabs.On<iOS>().SetUseSafeArea(true);
 			pageWithoutTopTabs.On<iOS>().SetUseSafeArea(true);
+#pragma warning restore CS0618 // Type or member is obsolete
 
 			var mainTab1 = new Tab()
 			{
@@ -77,6 +79,69 @@ await CreateHandlerAndAddToWindow<ShellRenderer>(shell, async (handler) =>
 			});
 		}
 
+		[Theory(DisplayName = "SafeArea works with both old and new APIs")]
+		[InlineData(true)] // Use new SafeArea API
+		[InlineData(false)] // Use old UseSafeArea API
+		public async Task SafeAreaBehaviorConsistency(bool useNewApi)
+		{
+			SetupBuilder();
+			var pageWithTopTabs = new ContentPage() { Content = new Label() { Text = "Page With Top Tabs" } };
+			var pageWithoutTopTabs = new ContentPage() { Content = new Label() { Text = "Page With Bottom Tabs" } };
+
+			if (useNewApi)
+			{
+				SafeArea.SetIgnore(pageWithTopTabs, SafeAreaEdges.None);
+				SafeArea.SetIgnore(pageWithoutTopTabs, SafeAreaEdges.None);
+			}
+			else
+			{
+#pragma warning disable CS0618 // Type or member is obsolete
+				pageWithTopTabs.On<iOS>().SetUseSafeArea(true);
+				pageWithoutTopTabs.On<iOS>().SetUseSafeArea(true);
+#pragma warning restore CS0618 // Type or member is obsolete
+			}
+
+			var mainTab1 = new Tab()
+			{
+				Items =
+				{
+					new ShellContent() { Content = pageWithTopTabs, Title = "tab 1" },
+					new ShellContent() { Content = new ContentPage(), Title = "tab 2" }
+				}
+			};
+
+			var mainTab2 = new Tab()
+			{
+				Items =
+				{
+					new ShellContent() { Content = pageWithoutTopTabs, Title = "tab 3"  }
+				}
+			};
+
+			var shell = new Shell()
+			{
+				Items = { mainTab1, mainTab2 }
+			};
+
+			await CreateHandlerAndAddToWindow<ShellRenderer>(shell, async (handler) =>
+			{
+				await OnFrameSetToNotEmpty(pageWithTopTabs.Content);
+				var boundsWithTopTabs = pageWithTopTabs.Content.GetPlatformViewBounds();
+				shell.CurrentItem = mainTab2;
+				await OnFrameSetToNotEmpty(pageWithoutTopTabs.Content);
+				var boundsWithoutTopTabs = pageWithoutTopTabs.Content.GetPlatformViewBounds();
+				
+				// Both APIs should produce consistent results
+				Assert.Equal(ShellSectionRootRenderer.HeaderHeight, (boundsWithTopTabs.Top - boundsWithoutTopTabs.Top), 1);
+
+				shell.CurrentItem = mainTab1;
+				await OnFrameSetToNotEmpty(pageWithTopTabs.Content);
+
+				var boundsWithTopTabsNavigatedBack = pageWithTopTabs.Content.GetPlatformViewBounds();
+				Assert.Equal(boundsWithTopTabsNavigatedBack, boundsWithTopTabs);
+			});
+		}
+
 		[Fact(DisplayName = "Swiping Away Modal Propagates to Shell")]
 		public async Task SwipingAwayModalPropagatesToShell()
 		{
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue21325.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue21325.xaml
index 6f18f8b4d68a..0871671f6969 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue21325.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue21325.xaml
@@ -1,9 +1,8 @@
 <?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:ios="clr-namespace:Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;assembly=Microsoft.Maui.Controls"
-             ios:Page.UseSafeArea="True"
-             x:Class="Maui.Controls.Sample.Issues.Issue21325">
+             x:Class="Maui.Controls.Sample.Issues.Issue21325"
+             SafeAreaEdges="None">
 
     <Label Background="SlateGrey" AutomationId="greyShades" Text="Microsoft Label"/>
 
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml
new file mode 100644
index 000000000000..08b415fd4dc8
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml
@@ -0,0 +1,306 @@
+<?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.Issues.Issue28986"
+             x:Name="TestPage"
+             Title="SafeArea Test">
+    
+    <Grid x:Name="MainGrid" BackgroundColor="Red" SafeAreaEdges="None">
+        <!-- Single content grid that spans the entire screen -->
+        <Grid x:Name="ContentGrid">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            
+            <!-- Top test area - should move in/out of notch area -->
+            <Border Grid.Row="0" BackgroundColor="Yellow" Stroke="Orange" StrokeThickness="3" Padding="10">
+                <Label Text="TOP TEST AREA: This should move in/out of notch/status bar area when Top safe area is toggled"
+                       FontSize="14"
+                       FontAttributes="Bold"
+                       HorizontalOptions="Center"
+                       TextColor="DarkOrange" />
+            </Border>
+            
+            <!-- Middle content area with control panel -->
+            <ScrollView Grid.Row="1">
+                <StackLayout Spacing="15" Padding="20" VerticalOptions="Center">
+                    <Label Text="SafeArea Test Page" 
+                           FontSize="24" 
+                           FontAttributes="Bold"
+                           HorizontalOptions="Center"
+                           TextColor="White" />
+                    
+                    <Label Text="The red background shows areas outside safe area. Watch the yellow areas at top/bottom move when you toggle Page and Grid safe area settings."
+                           FontSize="14"
+                           HorizontalOptions="Center"
+                           TextColor="White" />
+                    
+                    <Label x:Name="CurrentSettingsLabel"
+                           Text="Current: Page and Grid settings will be shown here"
+                           FontSize="16"
+                           FontAttributes="Bold"
+                           HorizontalOptions="Center"
+                           TextColor="White"
+                           AutomationId="CurrentSettings" />
+                    
+                    <!-- Page-level control panel -->
+                    <Border BackgroundColor="LightBlue" Stroke="DarkBlue" StrokeThickness="2" Padding="15" Margin="10">
+                        <VerticalStackLayout Spacing="15">
+                            <Label Text="Page-Level Safe Area Control:" 
+                                   FontSize="18" 
+                                   FontAttributes="Bold"
+                                   HorizontalOptions="Center"
+                                   TextColor="DarkBlue" />
+                            
+                            <Label Text="Controls SafeArea on the ContentPage itself"
+                                   FontSize="12"
+                                   HorizontalOptions="Center"
+                                   TextColor="DarkBlue" />
+                            
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                </Grid.RowDefinitions>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="*" />
+                                </Grid.ColumnDefinitions>
+                                
+                                <!-- Top -->
+                                <StackLayout Grid.Row="0" Grid.Column="1" Orientation="Horizontal" HorizontalOptions="Center">
+                                    <Label Text="Top:" VerticalOptions="Center" />
+                                    <Picker x:Name="PageTopPicker" 
+                                            SelectedIndex="0" 
+                                            SelectedIndexChanged="OnPageEdgePickerChanged"
+                                            AutomationId="PageTopPicker">
+                                        <Picker.Items>
+                                            <x:String>None</x:String>
+                                            <x:String>SoftInput</x:String>
+                                            <x:String>Container</x:String>
+                                            <x:String>Default</x:String>
+                                            <x:String>All</x:String>
+                                        </Picker.Items>
+                                    </Picker>
+                                </StackLayout>
+                                
+                                <!-- Left and Right -->
+                                <StackLayout Grid.Row="1" Grid.Column="0" Orientation="Horizontal" HorizontalOptions="Center">
+                                    <Label Text="Left:" VerticalOptions="Center" />
+                                    <Picker x:Name="PageLeftPicker" 
+                                            SelectedIndex="0" 
+                                            SelectedIndexChanged="OnPageEdgePickerChanged"
+                                            AutomationId="PageLeftPicker">
+                                        <Picker.Items>
+                                            <x:String>None</x:String>
+                                            <x:String>SoftInput</x:String>
+                                            <x:String>Container</x:String>
+                                            <x:String>Default</x:String>
+                                            <x:String>All</x:String>
+                                        </Picker.Items>
+                                    </Picker>
+                                </StackLayout>
+                                
+                                <StackLayout Grid.Row="1" Grid.Column="2" Orientation="Horizontal" HorizontalOptions="Center">
+                                    <Label Text="Right:" VerticalOptions="Center" />
+                                    <Picker x:Name="PageRightPicker" 
+                                            SelectedIndex="0" 
+                                            SelectedIndexChanged="OnPageEdgePickerChanged"
+                                            AutomationId="PageRightPicker">
+                                        <Picker.Items>
+                                            <x:String>None</x:String>
+                                            <x:String>SoftInput</x:String>
+                                            <x:String>Container</x:String>
+                                            <x:String>Default</x:String>
+                                            <x:String>All</x:String>
+                                        </Picker.Items>
+                                    </Picker>
+                                </StackLayout>
+                                
+                                <!-- Bottom -->
+                                <StackLayout Grid.Row="2" Grid.Column="1" Orientation="Horizontal" HorizontalOptions="Center">
+                                    <Label Text="Bottom:" VerticalOptions="Center" />
+                                    <Picker x:Name="PageBottomPicker" 
+                                            SelectedIndex="0" 
+                                            SelectedIndexChanged="OnPageEdgePickerChanged"
+                                            AutomationId="PageBottomPicker">
+                                        <Picker.Items>
+                                            <x:String>None</x:String>
+                                            <x:String>SoftInput</x:String>
+                                            <x:String>Container</x:String>
+                                            <x:String>Default</x:String>
+                                            <x:String>All</x:String>
+                                        </Picker.Items>
+                                    </Picker>
+                                </StackLayout>
+                                
+                                <!-- SoftInput test area -->
+                                <StackLayout Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="3" Orientation="Horizontal" HorizontalOptions="Center">
+                                    <Label Text="Keyboard Test:" VerticalOptions="Center" />
+                                    <Entry x:Name="KeyboardTestEntry" 
+                                           Placeholder="Tap to show keyboard" 
+                                           WidthRequest="200"
+                                           AutomationId="KeyboardTestEntry" />
+                                </StackLayout>
+                            </Grid>
+                            
+                            <Button Text="Page: Reset All to None" 
+                                    Clicked="OnPageResetDefaultClicked"
+                                    AutomationId="PageResetDefaultButton" />
+                            <Button Text="Page: Reset All to None" 
+                                    Clicked="OnPageResetNoneClicked"
+                                    AutomationId="PageResetNoneButton" />
+                            <Button Text="Page: Reset All to All" 
+                                    Clicked="OnPageResetAllClicked"
+                                    AutomationId="PageResetAllButton" />
+                        </VerticalStackLayout>
+                    </Border>
+
+                    <!-- Grid-level control panel -->
+                    <Border BackgroundColor="White" Stroke="Gray" StrokeThickness="1" Padding="15" Margin="10">
+                        <VerticalStackLayout Spacing="15">
+                            <Label Text="Grid-Level Safe Area Control:" 
+                                   FontSize="18" 
+                                   FontAttributes="Bold"
+                                   HorizontalOptions="Center" />
+                            
+                            <Label Text="Controls SafeArea on the ContentGrid layout"
+                                   FontSize="12"
+                                   HorizontalOptions="Center"
+                                   TextColor="Gray" />
+                            
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                </Grid.RowDefinitions>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="*" />
+                                </Grid.ColumnDefinitions>
+                                
+                                <!-- Top -->
+                                <StackLayout Grid.Row="0" Grid.Column="1" Orientation="Horizontal" HorizontalOptions="Center">
+                                    <Label Text="Top:" VerticalOptions="Center" />
+                                    <Picker x:Name="GridTopPicker" 
+                                            SelectedIndex="0" 
+                                            SelectedIndexChanged="OnGridEdgePickerChanged"
+                                            AutomationId="GridTopPicker">
+                                        <Picker.Items>
+                                            <x:String>None</x:String>
+                                            <x:String>SoftInput</x:String>
+                                            <x:String>Container</x:String>
+                                            <x:String>Default</x:String>
+                                            <x:String>All</x:String>
+                                        </Picker.Items>
+                                    </Picker>
+                                </StackLayout>
+                                
+                                <!-- Left and Right -->
+                                <StackLayout Grid.Row="1" Grid.Column="0" Orientation="Horizontal" HorizontalOptions="Center">
+                                    <Label Text="Left:" VerticalOptions="Center" />
+                                    <Picker x:Name="GridLeftPicker" 
+                                            SelectedIndex="0" 
+                                            SelectedIndexChanged="OnGridEdgePickerChanged"
+                                            AutomationId="GridLeftPicker">
+                                        <Picker.Items>
+                                            <x:String>None</x:String>
+                                            <x:String>SoftInput</x:String>
+                                            <x:String>Container</x:String>
+                                            <x:String>Default</x:String>
+                                            <x:String>All</x:String>
+                                        </Picker.Items>
+                                    </Picker>
+                                </StackLayout>
+                                
+                                <StackLayout Grid.Row="1" Grid.Column="2" Orientation="Horizontal" HorizontalOptions="Center">
+                                    <Label Text="Right:" VerticalOptions="Center" />
+                                    <Picker x:Name="GridRightPicker" 
+                                            SelectedIndex="0" 
+                                            SelectedIndexChanged="OnGridEdgePickerChanged"
+                                            AutomationId="GridRightPicker">
+                                        <Picker.Items>
+                                            <x:String>None</x:String>
+                                            <x:String>SoftInput</x:String>
+                                            <x:String>Container</x:String>
+                                            <x:String>Default</x:String>
+                                            <x:String>All</x:String>
+                                        </Picker.Items>
+                                    </Picker>
+                                </StackLayout>
+                                
+                                <!-- Bottom -->
+                                <StackLayout Grid.Row="2" Grid.Column="1" Orientation="Horizontal" HorizontalOptions="Center">
+                                    <Label Text="Bottom:" VerticalOptions="Center" />
+                                    <Picker x:Name="GridBottomPicker" 
+                                            SelectedIndex="0" 
+                                            SelectedIndexChanged="OnGridEdgePickerChanged"
+                                            AutomationId="GridBottomPicker">
+                                        <Picker.Items>
+                                            <x:String>None</x:String>
+                                            <x:String>SoftInput</x:String>
+                                            <x:String>Container</x:String>
+                                            <x:String>Default</x:String>
+                                            <x:String>All</x:String>
+                                        </Picker.Items>
+                                    </Picker>
+                                </StackLayout>
+                                
+                                <!-- Legend -->
+                                <StackLayout Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="3" Spacing="5">
+                                    <Label Text="None = Edge-to-edge content (no safe area padding)" 
+                                           FontSize="10" 
+                                           TextColor="Blue"
+                                           HorizontalOptions="Center" />
+                                    <Label Text="SoftInput = Always pad for keyboard/soft input" 
+                                           FontSize="10" 
+                                           TextColor="Orange"
+                                           HorizontalOptions="Center" />
+                                    <Label Text="Container = Flow under keyboard, stay out of bars/notch" 
+                                           FontSize="10" 
+                                           TextColor="Red"
+                                           HorizontalOptions="Center" />
+                                    <Label Text="Default = Platform default behavior" 
+                                           FontSize="10" 
+                                           TextColor="Purple"
+                                           HorizontalOptions="Center" />
+                                    <Label Text="All = Obey all safe area insets" 
+                                           FontSize="10" 
+                                           TextColor="Green"
+                                           HorizontalOptions="Center" />
+                                </StackLayout>
+                            </Grid>
+                            
+                            <Button Text="Grid: Reset All to None" 
+                                    Clicked="OnGridResetDefaultClicked"
+                                    AutomationId="GridResetDefaultButton" />
+                            <Button Text="Grid: Reset All to None" 
+                                    Clicked="OnGridResetNoneClicked"
+                                    AutomationId="GridResetNoneButton" />
+                            <Button Text="Grid: Reset All to All" 
+                                    Clicked="OnGridResetAllClicked"
+                                    AutomationId="GridResetAllButton" />
+                        </VerticalStackLayout>
+                    </Border>
+                </StackLayout>
+            </ScrollView>
+            
+            <!-- Bottom test area - should move in/out of home indicator area -->
+            <Border Grid.Row="2" BackgroundColor="Yellow" Stroke="Orange" StrokeThickness="3" Padding="10">
+                <Label Text="BOTTOM TEST AREA: This should move in/out of home indicator/toolbar area when Bottom safe area is toggled"
+                       FontSize="14"
+                       FontAttributes="Bold"
+                       HorizontalOptions="Center"
+                       TextColor="DarkOrange" />
+            </Border>
+        </Grid>
+    </Grid>
+</ContentPage>
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml.cs
new file mode 100644
index 000000000000..b2d2ab429002
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml.cs
@@ -0,0 +1,209 @@
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 28986, "Test SafeArea attached property for per-edge safe area control", PlatformAffected.All)]
+public partial class Issue28986 : ContentPage
+{
+	public Issue28986()
+	{
+		InitializeComponent();
+		// Initialize page-level controls (start with all None)
+		PageLeftPicker.SelectedIndex = 0;   // None
+		PageTopPicker.SelectedIndex = 0;    // None
+		PageRightPicker.SelectedIndex = 0;  // None
+		PageBottomPicker.SelectedIndex = 0; // None
+		
+		// Initialize grid-level controls (start with all None)
+		GridLeftPicker.SelectedIndex = 0;   // None
+		GridTopPicker.SelectedIndex = 0;    // None
+		GridRightPicker.SelectedIndex = 0;  // None
+		GridBottomPicker.SelectedIndex = 0; // None
+		
+		UpdateSafeAreaSettings();
+	}
+
+	// Page-level event handlers
+	private void OnPageEdgePickerChanged(object sender, EventArgs e)
+	{
+		UpdateSafeAreaSettings();
+	}
+
+	private void OnPageResetDefaultClicked(object sender, EventArgs e)
+	{
+		PageLeftPicker.SelectedIndex = 3;   // Default
+		PageTopPicker.SelectedIndex = 3;    // Default
+		PageRightPicker.SelectedIndex = 3;  // Default
+		PageBottomPicker.SelectedIndex = 3; // Default
+		UpdateSafeAreaSettings();
+	}
+
+	private void OnPageResetNoneClicked(object sender, EventArgs e)
+	{
+		PageLeftPicker.SelectedIndex = 0;   // None
+		PageTopPicker.SelectedIndex = 0;    // None
+		PageRightPicker.SelectedIndex = 0;  // None
+		PageBottomPicker.SelectedIndex = 0; // None
+		UpdateSafeAreaSettings();
+	}
+
+	private void OnPageResetAllClicked(object sender, EventArgs e)
+	{
+		PageLeftPicker.SelectedIndex = 4;   // All
+		PageTopPicker.SelectedIndex = 4;    // All
+		PageRightPicker.SelectedIndex = 4;  // All
+		PageBottomPicker.SelectedIndex = 4; // All
+		UpdateSafeAreaSettings();
+	}
+
+	// Grid-level event handlers
+	private void OnGridEdgePickerChanged(object sender, EventArgs e)
+	{
+		UpdateSafeAreaSettings();
+	}
+
+	private void OnGridResetDefaultClicked(object sender, EventArgs e)
+	{
+		GridLeftPicker.SelectedIndex = 3;   // Default
+		GridTopPicker.SelectedIndex = 3;    // Default
+		GridRightPicker.SelectedIndex = 3;  // Default
+		GridBottomPicker.SelectedIndex = 3; // Default
+		UpdateSafeAreaSettings();
+	}
+
+	private void OnGridResetNoneClicked(object sender, EventArgs e)
+	{
+		GridLeftPicker.SelectedIndex = 0;   // None
+		GridTopPicker.SelectedIndex = 0;    // None
+		GridRightPicker.SelectedIndex = 0;  // None
+		GridBottomPicker.SelectedIndex = 0; // None
+		UpdateSafeAreaSettings();
+	}
+
+	private void OnGridResetAllClicked(object sender, EventArgs e)
+	{
+		GridLeftPicker.SelectedIndex = 4;   // All
+		GridTopPicker.SelectedIndex = 4;    // All
+		GridRightPicker.SelectedIndex = 4;  // All
+		GridBottomPicker.SelectedIndex = 4; // All
+		UpdateSafeAreaSettings();
+	}
+
+	private SafeAreaRegions GetSafeAreaRegionsFromPickerIndex(int index)
+	{
+		return index switch
+		{
+			0 => SafeAreaRegions.None,
+			1 => SafeAreaRegions.SoftInput,
+			2 => SafeAreaRegions.Container,
+			3 => SafeAreaRegions.Default,
+			4 => SafeAreaRegions.All,
+			_ => SafeAreaRegions.None
+		};
+	}
+
+	private void UpdateSafeAreaSettings()
+	{
+		// Create SafeAreaEdges for page-level settings
+		var pageSafeAreaSettings = new SafeAreaEdges(
+			GetSafeAreaRegionsFromPickerIndex(PageLeftPicker.SelectedIndex),   // Left
+			GetSafeAreaRegionsFromPickerIndex(PageTopPicker.SelectedIndex),    // Top  
+			GetSafeAreaRegionsFromPickerIndex(PageRightPicker.SelectedIndex),  // Right
+			GetSafeAreaRegionsFromPickerIndex(PageBottomPicker.SelectedIndex)  // Bottom
+		);
+
+		// Create SafeAreaEdges for grid-level settings
+		var gridSafeAreaSettings = new SafeAreaEdges(
+			GetSafeAreaRegionsFromPickerIndex(GridLeftPicker.SelectedIndex),   // Left
+			GetSafeAreaRegionsFromPickerIndex(GridTopPicker.SelectedIndex),    // Top  
+			GetSafeAreaRegionsFromPickerIndex(GridRightPicker.SelectedIndex),  // Right
+			GetSafeAreaRegionsFromPickerIndex(GridBottomPicker.SelectedIndex)  // Bottom
+		);
+
+		// Apply SafeAreaEdges property to the ContentPage
+		this.SafeAreaEdges = pageSafeAreaSettings;
+
+		// Apply SafeAreaEdges property to the main content grid
+		ContentGrid.SafeAreaEdges = gridSafeAreaSettings;
+
+		// Update the display label
+		var pageSettingsText = $"Page - Left: {GetSafeAreaRegionsFromPickerIndex(PageLeftPicker.SelectedIndex)}, " +
+		                      $"Top: {GetSafeAreaRegionsFromPickerIndex(PageTopPicker.SelectedIndex)}, " +
+		                      $"Right: {GetSafeAreaRegionsFromPickerIndex(PageRightPicker.SelectedIndex)}, " +
+		                      $"Bottom: {GetSafeAreaRegionsFromPickerIndex(PageBottomPicker.SelectedIndex)}";
+
+		var gridSettingsText = $"Grid - Left: {GetSafeAreaRegionsFromPickerIndex(GridLeftPicker.SelectedIndex)}, " +
+		                      $"Top: {GetSafeAreaRegionsFromPickerIndex(GridTopPicker.SelectedIndex)}, " +
+		                      $"Right: {GetSafeAreaRegionsFromPickerIndex(GridRightPicker.SelectedIndex)}, " +
+		                      $"Bottom: {GetSafeAreaRegionsFromPickerIndex(GridBottomPicker.SelectedIndex)}";
+		
+		CurrentSettingsLabel.Text = $"Current:\n{pageSettingsText}\n{gridSettingsText}";
+
+		// Test different syntax formats based on the current selections
+		ApplyOptimizedSyntax(pageSafeAreaSettings, gridSafeAreaSettings);
+	}
+
+	private void ApplyOptimizedSyntax(SafeAreaEdges pageSettings, SafeAreaEdges gridSettings)
+	{
+		// Optimize page-level syntax when possible to test different input formats
+		var pageLeft = pageSettings.Left;
+		var pageTop = pageSettings.Top; 
+		var pageRight = pageSettings.Right;
+		var pageBottom = pageSettings.Bottom;
+
+		SafeAreaEdges optimizedPageSettings;
+
+		// Test 1-value syntax (all edges same)
+		if (pageLeft == pageTop && pageTop == pageRight && pageRight == pageBottom)
+		{
+			optimizedPageSettings = new SafeAreaEdges(pageLeft);
+		}
+		// Test 2-value syntax (left/right same, top/bottom same)  
+		else if (pageLeft == pageRight && pageTop == pageBottom)
+		{
+			optimizedPageSettings = new SafeAreaEdges(pageLeft, pageTop);
+		}
+		// Use 4-value syntax
+		else
+		{
+			optimizedPageSettings = pageSettings;
+		}
+
+		// Optimize grid-level syntax when possible
+		var gridLeft = gridSettings.Left;
+		var gridTop = gridSettings.Top; 
+		var gridRight = gridSettings.Right;
+		var gridBottom = gridSettings.Bottom;
+
+		SafeAreaEdges optimizedGridSettings;
+
+		// Test 1-value syntax (all edges same)
+		if (gridLeft == gridTop && gridTop == gridRight && gridRight == gridBottom)
+		{
+			optimizedGridSettings = new SafeAreaEdges(gridLeft);
+		}
+		// Test 2-value syntax (left/right same, top/bottom same)  
+		else if (gridLeft == gridRight && gridTop == gridBottom)
+		{
+			optimizedGridSettings = new SafeAreaEdges(gridLeft, gridTop);
+		}
+		// Use 4-value syntax
+		else
+		{
+			optimizedGridSettings = gridSettings;
+		}
+
+		// Apply the optimized settings to test different syntax formats
+		this.SafeAreaEdges = optimizedPageSettings;
+		ContentGrid.SafeAreaEdges = optimizedGridSettings;
+
+		// Update the label to show which syntax is being used
+		var pageSyntaxInfo = (pageLeft == pageTop && pageTop == pageRight && pageRight == pageBottom) ? " (1-value)" :
+		                    (pageLeft == pageRight && pageTop == pageBottom) ? " (2-value)" : 
+		                    " (4-value)";
+
+		var gridSyntaxInfo = (gridLeft == gridTop && gridTop == gridRight && gridRight == gridBottom) ? " (1-value)" :
+		                    (gridLeft == gridRight && gridTop == gridBottom) ? " (2-value)" : 
+		                    " (4-value)";
+
+		CurrentSettingsLabel.Text += $"\nPage{pageSyntaxInfo}, Grid{gridSyntaxInfo}";
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_Border.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_Border.xaml
new file mode 100644
index 000000000000..158e187d1403
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_Border.xaml
@@ -0,0 +1,158 @@
+<?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.Issues.Issue28986_Border"
+             Title="SafeArea Border Test">
+    
+    <Grid BackgroundColor="Red">
+        <!-- Border with SafeAreaEdges property -->
+        <Border x:Name="TestBorder" SafeAreaEdges="All" BackgroundColor="LightPink" Stroke="Purple" StrokeThickness="5">
+            <ScrollView>
+                <StackLayout Spacing="20" Padding="20">
+                    <Label Text="SafeArea Border Test" 
+                           FontSize="24" 
+                           FontAttributes="Bold"
+                           HorizontalOptions="Center" />
+                    
+                    <Label Text="This Border has SafeAreaEdges='All' and should extend behind system UI areas. The red background shows areas outside safe area."
+                           FontSize="14"
+                           HorizontalOptions="Center" />
+                    
+                    <Label x:Name="CurrentSettingsLabel"
+                           Text="Current Border SafeAreaEdges: All"
+                           FontSize="16"
+                           FontAttributes="Bold"
+                           HorizontalOptions="Center"
+                           AutomationId="CurrentSettings" />
+                    
+                    <!-- Control panel for Border SafeAreaEdges -->
+                    <Border BackgroundColor="White" Stroke="Gray" StrokeThickness="2" Padding="15">
+                        <VerticalStackLayout Spacing="15">
+                            <Label Text="Border SafeAreaEdges Control:" 
+                                   FontSize="18" 
+                                   FontAttributes="Bold"
+                                   HorizontalOptions="Center" />
+                            
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                </Grid.RowDefinitions>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="*" />
+                                </Grid.ColumnDefinitions>
+                                
+                                <!-- Top -->
+                                <StackLayout Grid.Row="0" Grid.Column="1" Orientation="Horizontal" HorizontalOptions="Center">
+                                    <Label Text="Top:" VerticalOptions="Center" />
+                                    <Picker x:Name="TopPicker" 
+                                            SelectedIndex="0" 
+                                            SelectedIndexChanged="OnEdgePickerChanged"
+                                            AutomationId="TopPicker">
+                                        <Picker.Items>
+                                            <x:String>None</x:String>
+                                            <x:String>SoftInput</x:String>
+                                            <x:String>Container</x:String>
+                                            <x:String>Default</x:String>
+                                            <x:String>All</x:String>
+                                        </Picker.Items>
+                                    </Picker>
+                                </StackLayout>
+                                
+                                <!-- Left and Right -->
+                                <StackLayout Grid.Row="1" Grid.Column="0" Orientation="Horizontal" HorizontalOptions="Center">
+                                    <Label Text="Left:" VerticalOptions="Center" />
+                                    <Picker x:Name="LeftPicker" 
+                                            SelectedIndex="0" 
+                                            SelectedIndexChanged="OnEdgePickerChanged"
+                                            AutomationId="LeftPicker">
+                                        <Picker.Items>
+                                            <x:String>None</x:String>
+                                            <x:String>SoftInput</x:String>
+                                            <x:String>Container</x:String>
+                                            <x:String>Default</x:String>
+                                            <x:String>All</x:String>
+                                        </Picker.Items>
+                                    </Picker>
+                                </StackLayout>
+                                
+                                <StackLayout Grid.Row="1" Grid.Column="2" Orientation="Horizontal" HorizontalOptions="Center">
+                                    <Label Text="Right:" VerticalOptions="Center" />
+                                    <Picker x:Name="RightPicker" 
+                                            SelectedIndex="0" 
+                                            SelectedIndexChanged="OnEdgePickerChanged"
+                                            AutomationId="RightPicker">
+                                        <Picker.Items>
+                                            <x:String>None</x:String>
+                                            <x:String>SoftInput</x:String>
+                                            <x:String>Container</x:String>
+                                            <x:String>Default</x:String>
+                                            <x:String>All</x:String>
+                                        </Picker.Items>
+                                    </Picker>
+                                </StackLayout>
+                                
+                                <!-- Bottom -->
+                                <StackLayout Grid.Row="2" Grid.Column="1" Orientation="Horizontal" HorizontalOptions="Center">
+                                    <Label Text="Bottom:" VerticalOptions="Center" />
+                                    <Picker x:Name="BottomPicker" 
+                                            SelectedIndex="0" 
+                                            SelectedIndexChanged="OnEdgePickerChanged"
+                                            AutomationId="BottomPicker">
+                                        <Picker.Items>
+                                            <x:String>None</x:String>
+                                            <x:String>SoftInput</x:String>
+                                            <x:String>Container</x:String>
+                                            <x:String>Default</x:String>
+                                            <x:String>All</x:String>
+                                        </Picker.Items>
+                                    </Picker>
+                                </StackLayout>
+                                
+                                <!-- SoftInput test area -->
+                                <StackLayout Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="3" Orientation="Horizontal" HorizontalOptions="Center">
+                                    <Label Text="SoftInput Test:" VerticalOptions="Center" />
+                                    <Entry x:Name="SoftInputTestEntry" 
+                                           Placeholder="Tap to show keyboard" 
+                                           WidthRequest="200"
+                                           AutomationId="SoftInputTestEntry" />
+                                </StackLayout>
+                            </Grid>
+                            
+                            <Button Text="Reset All to Default" 
+                                    Clicked="OnResetDefaultClicked"
+                                    AutomationId="ResetDefaultButton" />
+                            <Button Text="Reset All to None" 
+                                    Clicked="OnResetNoneClicked"
+                                    AutomationId="ResetNoneButton" />
+                            <Button Text="Reset All to All" 
+                                    Clicked="OnResetAllClicked"
+                                    AutomationId="ResetAllButton" />
+                        </VerticalStackLayout>
+                    </Border>
+                    
+                    <!-- Sample content -->
+                    <Label Text="Border Sample Content" FontSize="18" FontAttributes="Bold" />
+                    <Label Text="This content is inside the Border that has SafeAreaEdges settings." />
+                    <Label Text="The Border should respect the SafeAreaEdges settings on each edge." />
+                    <Label Text="Notice the purple border around the entire content area." />
+                    <Label Text="Line 1" />
+                    <Label Text="Line 2" />
+                    <Label Text="Line 3" />
+                    <Label Text="Line 4" />
+                    <Label Text="Line 5" />
+                    <Label Text="Line 6" />
+                    <Label Text="Line 7" />
+                    <Label Text="Line 8" />
+                    <Label Text="Line 9" />
+                    <Label Text="Line 10" />
+                    <Label Text="End of Border Content" FontSize="18" FontAttributes="Bold" />
+                </StackLayout>
+            </ScrollView>
+        </Border>
+    </Grid>
+</ContentPage>
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_Border.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_Border.xaml.cs
new file mode 100644
index 000000000000..55a86f97e0cd
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_Border.xaml.cs
@@ -0,0 +1,84 @@
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 28986, "Test SafeArea Border for per-edge safe area control", PlatformAffected.All)]
+public partial class Issue28986_Border : ContentPage
+{
+	public Issue28986_Border()
+	{
+		InitializeComponent();
+		// Initialize controls (start with all All)
+		LeftPicker.SelectedIndex = 3;   // All
+		TopPicker.SelectedIndex = 3;    // All
+		RightPicker.SelectedIndex = 3;  // All
+		BottomPicker.SelectedIndex = 3; // All
+		
+		UpdateSafeAreaSettings();
+	}
+
+	private void OnEdgePickerChanged(object sender, EventArgs e)
+	{
+		UpdateSafeAreaSettings();
+	}
+
+	private void OnResetDefaultClicked(object sender, EventArgs e)
+	{
+		LeftPicker.SelectedIndex = 3;   // Default
+		TopPicker.SelectedIndex = 3;    // Default
+		RightPicker.SelectedIndex = 3;  // Default
+		BottomPicker.SelectedIndex = 3; // Default
+		UpdateSafeAreaSettings();
+	}
+
+	private void OnResetNoneClicked(object sender, EventArgs e)
+	{
+		LeftPicker.SelectedIndex = 0;   // None
+		TopPicker.SelectedIndex = 0;    // None
+		RightPicker.SelectedIndex = 0;  // None
+		BottomPicker.SelectedIndex = 0; // None
+		UpdateSafeAreaSettings();
+	}
+
+	private void OnResetAllClicked(object sender, EventArgs e)
+	{
+		LeftPicker.SelectedIndex = 4;   // All
+		TopPicker.SelectedIndex = 4;    // All
+		RightPicker.SelectedIndex = 4;  // All
+		BottomPicker.SelectedIndex = 4; // All
+		UpdateSafeAreaSettings();
+	}
+
+	private SafeAreaRegions GetSafeAreaRegionsFromPickerIndex(int index)
+	{
+		return index switch
+		{
+			0 => SafeAreaRegions.None,
+			1 => SafeAreaRegions.SoftInput,
+			2 => SafeAreaRegions.Container,
+			3 => SafeAreaRegions.Default,
+			4 => SafeAreaRegions.All,
+			_ => SafeAreaRegions.None
+		};
+	}
+
+	private void UpdateSafeAreaSettings()
+	{
+		// Create SafeAreaEdges for Border settings
+		var safeAreaSettings = new SafeAreaEdges(
+			GetSafeAreaRegionsFromPickerIndex(LeftPicker.SelectedIndex),   // Left
+			GetSafeAreaRegionsFromPickerIndex(TopPicker.SelectedIndex),    // Top  
+			GetSafeAreaRegionsFromPickerIndex(RightPicker.SelectedIndex),  // Right
+			GetSafeAreaRegionsFromPickerIndex(BottomPicker.SelectedIndex)  // Bottom
+		);
+
+		// Apply SafeAreaEdges to the Border
+		TestBorder.SafeAreaEdges = safeAreaSettings;
+
+		// Update the display label
+		var settingsText = $"Left: {GetSafeAreaRegionsFromPickerIndex(LeftPicker.SelectedIndex)}, " +
+		                  $"Top: {GetSafeAreaRegionsFromPickerIndex(TopPicker.SelectedIndex)}, " +
+		                  $"Right: {GetSafeAreaRegionsFromPickerIndex(RightPicker.SelectedIndex)}, " +
+		                  $"Bottom: {GetSafeAreaRegionsFromPickerIndex(BottomPicker.SelectedIndex)}";
+		
+		CurrentSettingsLabel.Text = $"Current Border SafeAreaEdges: {settingsText}";
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ContentPage.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ContentPage.xaml
new file mode 100644
index 000000000000..ca3e9bef5860
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ContentPage.xaml
@@ -0,0 +1,158 @@
+<?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.Issues.Issue28986_ContentPage"
+             x:Name="TestContentPage"
+             Title="SafeArea ContentPage Test"
+             SafeAreaEdges="All">
+    
+    <Grid BackgroundColor="Red">
+        <!-- Content that fills the entire ContentPage -->
+        <ScrollView BackgroundColor="LightYellow">
+            <StackLayout Spacing="20" Padding="20">
+                <Label Text="SafeArea ContentPage Test" 
+                       FontSize="24" 
+                       FontAttributes="Bold"
+                       HorizontalOptions="Center" />
+                
+                <Label Text="This ContentPage itself has SafeAreaEdges='All' and should extend behind system UI areas. The red background shows areas outside safe area."
+                       FontSize="14"
+                       HorizontalOptions="Center" />
+                
+                <Label x:Name="CurrentSettingsLabel"
+                       Text="Current ContentPage SafeAreaEdges: All"
+                       FontSize="16"
+                       FontAttributes="Bold"
+                       HorizontalOptions="Center"
+                       AutomationId="CurrentSettings" />
+                
+                <!-- Control panel for ContentPage SafeAreaEdges -->
+                <Border BackgroundColor="White" Stroke="Gray" StrokeThickness="2" Padding="15">
+                    <VerticalStackLayout Spacing="15">
+                        <Label Text="ContentPage SafeAreaEdges Control:" 
+                               FontSize="18" 
+                               FontAttributes="Bold"
+                               HorizontalOptions="Center" />
+                        
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="Auto" />
+                            </Grid.RowDefinitions>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            
+                            <!-- Top -->
+                            <StackLayout Grid.Row="0" Grid.Column="1" Orientation="Horizontal" HorizontalOptions="Center">
+                                <Label Text="Top:" VerticalOptions="Center" />
+                                <Picker x:Name="TopPicker" 
+                                        SelectedIndex="0" 
+                                        SelectedIndexChanged="OnEdgePickerChanged"
+                                        AutomationId="TopPicker">
+                                    <Picker.Items>
+                                        <x:String>None</x:String>
+                                        <x:String>SoftInput</x:String>
+                                        <x:String>Container</x:String>
+                                        <x:String>Default</x:String>
+                                        <x:String>All</x:String>
+                                    </Picker.Items>
+                                </Picker>
+                            </StackLayout>
+                            
+                            <!-- Left and Right -->
+                            <StackLayout Grid.Row="1" Grid.Column="0" Orientation="Horizontal" HorizontalOptions="Center">
+                                <Label Text="Left:" VerticalOptions="Center" />
+                                <Picker x:Name="LeftPicker" 
+                                        SelectedIndex="0" 
+                                        SelectedIndexChanged="OnEdgePickerChanged"
+                                        AutomationId="LeftPicker">
+                                    <Picker.Items>
+                                        <x:String>None</x:String>
+                                        <x:String>SoftInput</x:String>
+                                        <x:String>Container</x:String>
+                                        <x:String>Default</x:String>
+                                        <x:String>All</x:String>
+                                    </Picker.Items>
+                                </Picker>
+                            </StackLayout>
+                            
+                            <StackLayout Grid.Row="1" Grid.Column="2" Orientation="Horizontal" HorizontalOptions="Center">
+                                <Label Text="Right:" VerticalOptions="Center" />
+                                <Picker x:Name="RightPicker" 
+                                        SelectedIndex="0" 
+                                        SelectedIndexChanged="OnEdgePickerChanged"
+                                        AutomationId="RightPicker">
+                                    <Picker.Items>
+                                        <x:String>None</x:String>
+                                        <x:String>SoftInput</x:String>
+                                        <x:String>Container</x:String>
+                                        <x:String>Default</x:String>
+                                        <x:String>All</x:String>
+                                    </Picker.Items>
+                                </Picker>
+                            </StackLayout>
+                            
+                            <!-- Bottom -->
+                            <StackLayout Grid.Row="2" Grid.Column="1" Orientation="Horizontal" HorizontalOptions="Center">
+                                <Label Text="Bottom:" VerticalOptions="Center" />
+                                <Picker x:Name="BottomPicker" 
+                                        SelectedIndex="0" 
+                                        SelectedIndexChanged="OnEdgePickerChanged"
+                                        AutomationId="BottomPicker">
+                                    <Picker.Items>
+                                        <x:String>None</x:String>
+                                        <x:String>SoftInput</x:String>
+                                        <x:String>Container</x:String>
+                                        <x:String>Default</x:String>
+                                        <x:String>All</x:String>
+                                    </Picker.Items>
+                                </Picker>
+                            </StackLayout>
+                            
+                            <!-- SoftInput test area -->
+                            <StackLayout Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="3" Orientation="Horizontal" HorizontalOptions="Center">
+                                <Label Text="SoftInput Test:" VerticalOptions="Center" />
+                                <Entry x:Name="SoftInputTestEntry" 
+                                       Placeholder="Tap to show keyboard" 
+                                       WidthRequest="200"
+                                       AutomationId="SoftInputTestEntry" />
+                            </StackLayout>
+                        </Grid>
+                        
+                        <Button Text="Reset All to Default" 
+                                Clicked="OnResetDefaultClicked"
+                                AutomationId="ResetDefaultButton" />
+                        <Button Text="Reset All to None" 
+                                Clicked="OnResetNoneClicked"
+                                AutomationId="ResetNoneButton" />
+                        <Button Text="Reset All to All" 
+                                Clicked="OnResetAllClicked"
+                                AutomationId="ResetAllButton" />
+                    </VerticalStackLayout>
+                </Border>
+                
+                <!-- Sample content -->
+                <Label Text="ContentPage Sample Content" FontSize="18" FontAttributes="Bold" />
+                <Label Text="This content is directly in the ContentPage that has SafeAreaEdges settings." />
+                <Label Text="The ContentPage itself should respect the SafeAreaEdges settings on each edge." />
+                <Label Text="The entire page content should move based on the SafeAreaEdges settings." />
+                <Label Text="Line 1" />
+                <Label Text="Line 2" />
+                <Label Text="Line 3" />
+                <Label Text="Line 4" />
+                <Label Text="Line 5" />
+                <Label Text="Line 6" />
+                <Label Text="Line 7" />
+                <Label Text="Line 8" />
+                <Label Text="Line 9" />
+                <Label Text="Line 10" />
+                <Label Text="End of ContentPage Content" FontSize="18" FontAttributes="Bold" />
+            </StackLayout>
+        </ScrollView>
+    </Grid>
+</ContentPage>
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ContentPage.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ContentPage.xaml.cs
new file mode 100644
index 000000000000..f26483ae72ea
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ContentPage.xaml.cs
@@ -0,0 +1,84 @@
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 28986, "Test SafeArea ContentPage for per-edge safe area control", PlatformAffected.All)]
+public partial class Issue28986_ContentPage : ContentPage
+{
+	public Issue28986_ContentPage()
+	{
+		InitializeComponent();
+		// Initialize controls (start with all All)
+		LeftPicker.SelectedIndex = 3;   // All
+		TopPicker.SelectedIndex = 3;    // All
+		RightPicker.SelectedIndex = 3;  // All
+		BottomPicker.SelectedIndex = 3; // All
+		
+		UpdateSafeAreaSettings();
+	}
+
+	private void OnEdgePickerChanged(object sender, EventArgs e)
+	{
+		UpdateSafeAreaSettings();
+	}
+
+	private void OnResetDefaultClicked(object sender, EventArgs e)
+	{
+		LeftPicker.SelectedIndex = 3;   // Default
+		TopPicker.SelectedIndex = 3;    // Default
+		RightPicker.SelectedIndex = 3;  // Default
+		BottomPicker.SelectedIndex = 3; // Default
+		UpdateSafeAreaSettings();
+	}
+
+	private void OnResetNoneClicked(object sender, EventArgs e)
+	{
+		LeftPicker.SelectedIndex = 0;   // None
+		TopPicker.SelectedIndex = 0;    // None
+		RightPicker.SelectedIndex = 0;  // None
+		BottomPicker.SelectedIndex = 0; // None
+		UpdateSafeAreaSettings();
+	}
+
+	private void OnResetAllClicked(object sender, EventArgs e)
+	{
+		LeftPicker.SelectedIndex = 4;   // All
+		TopPicker.SelectedIndex = 4;    // All
+		RightPicker.SelectedIndex = 4;  // All
+		BottomPicker.SelectedIndex = 4; // All
+		UpdateSafeAreaSettings();
+	}
+
+	private SafeAreaRegions GetSafeAreaRegionsFromPickerIndex(int index)
+	{
+		return index switch
+		{
+			0 => SafeAreaRegions.None,
+			1 => SafeAreaRegions.SoftInput,
+			2 => SafeAreaRegions.Container,
+			3 => SafeAreaRegions.Default,
+			4 => SafeAreaRegions.All,
+			_ => SafeAreaRegions.None
+		};
+	}
+
+	private void UpdateSafeAreaSettings()
+	{
+		// Create SafeAreaEdges for ContentPage settings
+		var safeAreaSettings = new SafeAreaEdges(
+			GetSafeAreaRegionsFromPickerIndex(LeftPicker.SelectedIndex),   // Left
+			GetSafeAreaRegionsFromPickerIndex(TopPicker.SelectedIndex),    // Top  
+			GetSafeAreaRegionsFromPickerIndex(RightPicker.SelectedIndex),  // Right
+			GetSafeAreaRegionsFromPickerIndex(BottomPicker.SelectedIndex)  // Bottom
+		);
+
+		// Apply SafeAreaEdges to the ContentPage itself
+		this.SafeAreaEdges = safeAreaSettings;
+
+		// Update the display label
+		var settingsText = $"Left: {GetSafeAreaRegionsFromPickerIndex(LeftPicker.SelectedIndex)}, " +
+		                  $"Top: {GetSafeAreaRegionsFromPickerIndex(TopPicker.SelectedIndex)}, " +
+		                  $"Right: {GetSafeAreaRegionsFromPickerIndex(RightPicker.SelectedIndex)}, " +
+		                  $"Bottom: {GetSafeAreaRegionsFromPickerIndex(BottomPicker.SelectedIndex)}";
+		
+		CurrentSettingsLabel.Text = $"Current ContentPage SafeAreaEdges: {settingsText}";
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ContentView.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ContentView.xaml
new file mode 100644
index 000000000000..8a772d7312c8
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ContentView.xaml
@@ -0,0 +1,157 @@
+<?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.Issues.Issue28986_ContentView"
+             Title="SafeArea ContentView Test">
+    
+    <Grid BackgroundColor="Red">
+        <!-- ContentView with SafeAreaEdges property -->
+        <ContentView x:Name="TestContentView" SafeAreaEdges="All" BackgroundColor="LightGreen">
+            <ScrollView>
+                <StackLayout Spacing="20" Padding="20">
+                    <Label Text="SafeArea ContentView Test" 
+                           FontSize="24" 
+                           FontAttributes="Bold"
+                           HorizontalOptions="Center" />
+                    
+                    <Label Text="This ContentView has SafeAreaEdges='All' and should extend behind system UI areas. The red background shows areas outside safe area."
+                           FontSize="14"
+                           HorizontalOptions="Center" />
+                    
+                    <Label x:Name="CurrentSettingsLabel"
+                           Text="Current ContentView SafeAreaEdges: All"
+                           FontSize="16"
+                           FontAttributes="Bold"
+                           HorizontalOptions="Center"
+                           AutomationId="CurrentSettings" />
+                    
+                    <!-- Control panel for ContentView SafeAreaEdges -->
+                    <Border BackgroundColor="White" Stroke="Gray" StrokeThickness="2" Padding="15">
+                        <VerticalStackLayout Spacing="15">
+                            <Label Text="ContentView SafeAreaEdges Control:" 
+                                   FontSize="18" 
+                                   FontAttributes="Bold"
+                                   HorizontalOptions="Center" />
+                            
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                </Grid.RowDefinitions>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="*" />
+                                </Grid.ColumnDefinitions>
+                                
+                                <!-- Top -->
+                                <StackLayout Grid.Row="0" Grid.Column="1" Orientation="Horizontal" HorizontalOptions="Center">
+                                    <Label Text="Top:" VerticalOptions="Center" />
+                                    <Picker x:Name="TopPicker" 
+                                            SelectedIndex="0" 
+                                            SelectedIndexChanged="OnEdgePickerChanged"
+                                            AutomationId="TopPicker">
+                                        <Picker.Items>
+                                            <x:String>None</x:String>
+                                            <x:String>SoftInput</x:String>
+                                            <x:String>Container</x:String>
+                                            <x:String>Default</x:String>
+                                            <x:String>All</x:String>
+                                        </Picker.Items>
+                                    </Picker>
+                                </StackLayout>
+                                
+                                <!-- Left and Right -->
+                                <StackLayout Grid.Row="1" Grid.Column="0" Orientation="Horizontal" HorizontalOptions="Center">
+                                    <Label Text="Left:" VerticalOptions="Center" />
+                                    <Picker x:Name="LeftPicker" 
+                                            SelectedIndex="0" 
+                                            SelectedIndexChanged="OnEdgePickerChanged"
+                                            AutomationId="LeftPicker">
+                                        <Picker.Items>
+                                            <x:String>None</x:String>
+                                            <x:String>SoftInput</x:String>
+                                            <x:String>Container</x:String>
+                                            <x:String>Default</x:String>
+                                            <x:String>All</x:String>
+                                        </Picker.Items>
+                                    </Picker>
+                                </StackLayout>
+                                
+                                <StackLayout Grid.Row="1" Grid.Column="2" Orientation="Horizontal" HorizontalOptions="Center">
+                                    <Label Text="Right:" VerticalOptions="Center" />
+                                    <Picker x:Name="RightPicker" 
+                                            SelectedIndex="0" 
+                                            SelectedIndexChanged="OnEdgePickerChanged"
+                                            AutomationId="RightPicker">
+                                        <Picker.Items>
+                                            <x:String>None</x:String>
+                                            <x:String>SoftInput</x:String>
+                                            <x:String>Container</x:String>
+                                            <x:String>Default</x:String>
+                                            <x:String>All</x:String>
+                                        </Picker.Items>
+                                    </Picker>
+                                </StackLayout>
+                                
+                                <!-- Bottom -->
+                                <StackLayout Grid.Row="2" Grid.Column="1" Orientation="Horizontal" HorizontalOptions="Center">
+                                    <Label Text="Bottom:" VerticalOptions="Center" />
+                                    <Picker x:Name="BottomPicker" 
+                                            SelectedIndex="0" 
+                                            SelectedIndexChanged="OnEdgePickerChanged"
+                                            AutomationId="BottomPicker">
+                                        <Picker.Items>
+                                            <x:String>None</x:String>
+                                            <x:String>SoftInput</x:String>
+                                            <x:String>Container</x:String>
+                                            <x:String>Default</x:String>
+                                            <x:String>All</x:String>
+                                        </Picker.Items>
+                                    </Picker>
+                                </StackLayout>
+                                
+                                <!-- SoftInput test area -->
+                                <StackLayout Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="3" Orientation="Horizontal" HorizontalOptions="Center">
+                                    <Label Text="SoftInput Test:" VerticalOptions="Center" />
+                                    <Entry x:Name="SoftInputTestEntry" 
+                                           Placeholder="Tap to show keyboard" 
+                                           WidthRequest="200"
+                                           AutomationId="SoftInputTestEntry" />
+                                </StackLayout>
+                            </Grid>
+                            
+                            <Button Text="Reset All to Default" 
+                                    Clicked="OnResetDefaultClicked"
+                                    AutomationId="ResetDefaultButton" />
+                            <Button Text="Reset All to None" 
+                                    Clicked="OnResetNoneClicked"
+                                    AutomationId="ResetNoneButton" />
+                            <Button Text="Reset All to All" 
+                                    Clicked="OnResetAllClicked"
+                                    AutomationId="ResetAllButton" />
+                        </VerticalStackLayout>
+                    </Border>
+                    
+                    <!-- Sample content -->
+                    <Label Text="ContentView Sample Content" FontSize="18" FontAttributes="Bold" />
+                    <Label Text="This content is inside the ContentView that has SafeAreaEdges settings." />
+                    <Label Text="The ContentView should respect the SafeAreaEdges settings on each edge." />
+                    <Label Text="Line 1" />
+                    <Label Text="Line 2" />
+                    <Label Text="Line 3" />
+                    <Label Text="Line 4" />
+                    <Label Text="Line 5" />
+                    <Label Text="Line 6" />
+                    <Label Text="Line 7" />
+                    <Label Text="Line 8" />
+                    <Label Text="Line 9" />
+                    <Label Text="Line 10" />
+                    <Label Text="End of ContentView Content" FontSize="18" FontAttributes="Bold" />
+                </StackLayout>
+            </ScrollView>
+        </ContentView>
+    </Grid>
+</ContentPage>
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ContentView.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ContentView.xaml.cs
new file mode 100644
index 000000000000..f46ee1d3f430
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ContentView.xaml.cs
@@ -0,0 +1,84 @@
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 28986, "Test SafeArea ContentView for per-edge safe area control", PlatformAffected.All)]
+public partial class Issue28986_ContentView : ContentPage
+{
+	public Issue28986_ContentView()
+	{
+		InitializeComponent();
+		// Initialize controls (start with all All)
+		LeftPicker.SelectedIndex = 3;   // All
+		TopPicker.SelectedIndex = 3;    // All
+		RightPicker.SelectedIndex = 3;  // All
+		BottomPicker.SelectedIndex = 3; // All
+		
+		UpdateSafeAreaSettings();
+	}
+
+	private void OnEdgePickerChanged(object sender, EventArgs e)
+	{
+		UpdateSafeAreaSettings();
+	}
+
+	private void OnResetDefaultClicked(object sender, EventArgs e)
+	{
+		LeftPicker.SelectedIndex = 3;   // Default
+		TopPicker.SelectedIndex = 3;    // Default
+		RightPicker.SelectedIndex = 3;  // Default
+		BottomPicker.SelectedIndex = 3; // Default
+		UpdateSafeAreaSettings();
+	}
+
+	private void OnResetNoneClicked(object sender, EventArgs e)
+	{
+		LeftPicker.SelectedIndex = 0;   // None
+		TopPicker.SelectedIndex = 0;    // None
+		RightPicker.SelectedIndex = 0;  // None
+		BottomPicker.SelectedIndex = 0; // None
+		UpdateSafeAreaSettings();
+	}
+
+	private void OnResetAllClicked(object sender, EventArgs e)
+	{
+		LeftPicker.SelectedIndex = 4;   // All
+		TopPicker.SelectedIndex = 4;    // All
+		RightPicker.SelectedIndex = 4;  // All
+		BottomPicker.SelectedIndex = 4; // All
+		UpdateSafeAreaSettings();
+	}
+
+	private SafeAreaRegions GetSafeAreaRegionsFromPickerIndex(int index)
+	{
+		return index switch
+		{
+			0 => SafeAreaRegions.None,
+			1 => SafeAreaRegions.SoftInput,
+			2 => SafeAreaRegions.Container,
+			3 => SafeAreaRegions.Default,
+			4 => SafeAreaRegions.All,
+			_ => SafeAreaRegions.None
+		};
+	}
+
+	private void UpdateSafeAreaSettings()
+	{
+		// Create SafeAreaEdges for ContentView settings
+		var safeAreaSettings = new SafeAreaEdges(
+			GetSafeAreaRegionsFromPickerIndex(LeftPicker.SelectedIndex),   // Left
+			GetSafeAreaRegionsFromPickerIndex(TopPicker.SelectedIndex),    // Top  
+			GetSafeAreaRegionsFromPickerIndex(RightPicker.SelectedIndex),  // Right
+			GetSafeAreaRegionsFromPickerIndex(BottomPicker.SelectedIndex)  // Bottom
+		);
+
+		// Apply SafeAreaEdges to the ContentView
+		TestContentView.SafeAreaEdges = safeAreaSettings;
+
+		// Update the display label
+		var settingsText = $"Left: {GetSafeAreaRegionsFromPickerIndex(LeftPicker.SelectedIndex)}, " +
+		                  $"Top: {GetSafeAreaRegionsFromPickerIndex(TopPicker.SelectedIndex)}, " +
+		                  $"Right: {GetSafeAreaRegionsFromPickerIndex(RightPicker.SelectedIndex)}, " +
+		                  $"Bottom: {GetSafeAreaRegionsFromPickerIndex(BottomPicker.SelectedIndex)}";
+		
+		CurrentSettingsLabel.Text = $"Current ContentView SafeAreaEdges: {settingsText}";
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ScrollView.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ScrollView.xaml
new file mode 100644
index 000000000000..35debe8f9beb
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ScrollView.xaml
@@ -0,0 +1,165 @@
+<?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.Issues.Issue28986_ScrollView"
+             Title="SafeArea ScrollView Test" SafeAreaEdges="None"
+             Background="Red">
+
+    <Grid BackgroundColor="Red" SafeAreaEdges="None">
+        <!-- ScrollView with SafeAreaEdges property -->
+        <ScrollView x:Name="TestScrollView" SafeAreaEdges="All" BackgroundColor="LightBlue">
+            <StackLayout Spacing="20" Padding="20">
+                <Label Text="SafeArea ScrollView Test" 
+                       FontSize="24" 
+                       FontAttributes="Bold"
+                       HorizontalOptions="Center" />
+                
+                <Label Text="This ScrollView has SafeAreaEdges='All' and should extend behind system UI areas. The red background shows areas outside safe area."
+                       FontSize="14"
+                       HorizontalOptions="Center" />
+                
+                <Label x:Name="CurrentSettingsLabel"
+                       Text="Current ScrollView SafeAreaEdges: All"
+                       FontSize="16"
+                       FontAttributes="Bold"
+                       HorizontalOptions="Center"
+                       AutomationId="CurrentSettings" />
+                
+                <!-- Control panel for ScrollView SafeAreaEdges -->
+                <Border BackgroundColor="White" Stroke="Gray" StrokeThickness="2" Padding="15">
+                    <VerticalStackLayout Spacing="15">
+                        <Label Text="ScrollView SafeAreaEdges Control:" 
+                               FontSize="18" 
+                               FontAttributes="Bold"
+                               HorizontalOptions="Center" />
+                        
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="Auto" />
+                            </Grid.RowDefinitions>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            
+                            <!-- Top -->
+                            <StackLayout Grid.Row="0" Grid.Column="1" Orientation="Horizontal" HorizontalOptions="Center">
+                                <Label Text="Top:" VerticalOptions="Center" />
+                                <Picker x:Name="TopPicker" 
+                                        SelectedIndex="0" 
+                                        SelectedIndexChanged="OnEdgePickerChanged"
+                                        AutomationId="TopPicker">
+                                    <Picker.Items>
+                                        <x:String>None</x:String>
+                                        <x:String>SoftInput</x:String>
+                                        <x:String>Container</x:String>
+                                        <x:String>Default</x:String>
+                                        <x:String>All</x:String>
+                                    </Picker.Items>
+                                </Picker>
+                            </StackLayout>
+                            
+                            <!-- Left and Right -->
+                            <StackLayout Grid.Row="1" Grid.Column="0" Orientation="Horizontal" HorizontalOptions="Center">
+                                <Label Text="Left:" VerticalOptions="Center" />
+                                <Picker x:Name="LeftPicker" 
+                                        SelectedIndex="0" 
+                                        SelectedIndexChanged="OnEdgePickerChanged"
+                                        AutomationId="LeftPicker">
+                                    <Picker.Items>
+                                        <x:String>None</x:String>
+                                        <x:String>SoftInput</x:String>
+                                        <x:String>Container</x:String>
+                                        <x:String>Default</x:String>
+                                        <x:String>All</x:String>
+                                    </Picker.Items>
+                                </Picker>
+                            </StackLayout>
+                            
+                            <StackLayout Grid.Row="1" Grid.Column="2" Orientation="Horizontal" HorizontalOptions="Center">
+                                <Label Text="Right:" VerticalOptions="Center" />
+                                <Picker x:Name="RightPicker" 
+                                        SelectedIndex="0" 
+                                        SelectedIndexChanged="OnEdgePickerChanged"
+                                        AutomationId="RightPicker">
+                                    <Picker.Items>
+                                        <x:String>None</x:String>
+                                        <x:String>SoftInput</x:String>
+                                        <x:String>Container</x:String>
+                                        <x:String>Default</x:String>
+                                        <x:String>All</x:String>
+                                    </Picker.Items>
+                                </Picker>
+                            </StackLayout>
+                            
+                            <!-- Bottom -->
+                            <StackLayout Grid.Row="2" Grid.Column="1" Orientation="Horizontal" HorizontalOptions="Center">
+                                <Label Text="Bottom:" VerticalOptions="Center" />
+                                <Picker x:Name="BottomPicker" 
+                                        SelectedIndex="0" 
+                                        SelectedIndexChanged="OnEdgePickerChanged"
+                                        AutomationId="BottomPicker">
+                                    <Picker.Items>
+                                        <x:String>None</x:String>
+                                        <x:String>SoftInput</x:String>
+                                        <x:String>Container</x:String>
+                                        <x:String>Default</x:String>
+                                        <x:String>All</x:String>
+                                    </Picker.Items>
+                                </Picker>
+                            </StackLayout>
+                            
+                            <!-- SoftInput test area -->
+                            <StackLayout Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="3" Orientation="Horizontal" HorizontalOptions="Center">
+                                <Label Text="SoftInput Test:" VerticalOptions="Center" />
+                                <Entry x:Name="SoftInputTestEntry" 
+                                       Placeholder="Tap to show keyboard" 
+                                       WidthRequest="200"
+                                       AutomationId="SoftInputTestEntry" />
+                            </StackLayout>
+                        </Grid>
+                        
+                        <Button Text="Reset All to Default" 
+                                Clicked="OnResetDefaultClicked"
+                                AutomationId="ResetDefaultButton" />
+                        <Button Text="Reset All to None" 
+                                Clicked="OnResetNoneClicked"
+                                AutomationId="ResetNoneButton" />
+                        <Button Text="Reset All to All" 
+                                Clicked="OnResetAllClicked"
+                                AutomationId="ResetAllButton" />
+                    </VerticalStackLayout>
+                </Border>
+                
+                <!-- Sample content to make scrolling meaningful -->
+                <Label Text="Sample Content" FontSize="18" FontAttributes="Bold" />
+                <Label Text="This is sample content to demonstrate ScrollView behavior with SafeAreaEdges." />
+                <Label Text="Line 1" />
+                <Label Text="Line 2" />
+                <Label Text="Line 3" />
+                <Label Text="Line 4" />
+                <Label Text="Line 5" />
+                <Label Text="Line 6" />
+                <Label Text="Line 7" />
+                <Label Text="Line 8" />
+                <Label Text="Line 9" />
+                <Label Text="Line 10" />
+                <Label Text="Line 11" />
+                <Label Text="Line 12" />
+                <Label Text="Line 13" />
+                <Label Text="Line 14" />
+                <Label Text="Line 15" />
+                <Label Text="Line 16" />
+                <Label Text="Line 17" />
+                <Label Text="Line 18" />
+                <Label Text="Line 19" />
+                <Label Text="Line 20" />
+                <Label Text="End of Content" FontSize="18" FontAttributes="Bold" />
+            </StackLayout>
+        </ScrollView>
+    </Grid>
+</ContentPage>
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ScrollView.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ScrollView.xaml.cs
new file mode 100644
index 000000000000..eb148432d683
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ScrollView.xaml.cs
@@ -0,0 +1,84 @@
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 28986, "Test SafeArea ScrollView for per-edge safe area control", PlatformAffected.All)]
+public partial class Issue28986_ScrollView : ContentPage
+{
+	public Issue28986_ScrollView()
+	{
+		InitializeComponent();
+		// Initialize controls (start with all All)
+		LeftPicker.SelectedIndex = 3;   // All
+		TopPicker.SelectedIndex = 3;    // All
+		RightPicker.SelectedIndex = 3;  // All
+		BottomPicker.SelectedIndex = 3; // All
+		
+		UpdateSafeAreaSettings();
+	}
+
+	private void OnEdgePickerChanged(object sender, EventArgs e)
+	{
+		UpdateSafeAreaSettings();
+	}
+
+	private void OnResetDefaultClicked(object sender, EventArgs e)
+	{
+		LeftPicker.SelectedIndex = 3;   // Default
+		TopPicker.SelectedIndex = 3;    // Default
+		RightPicker.SelectedIndex = 3;  // Default
+		BottomPicker.SelectedIndex = 3; // Default
+		UpdateSafeAreaSettings();
+	}
+
+	private void OnResetNoneClicked(object sender, EventArgs e)
+	{
+		LeftPicker.SelectedIndex = 0;   // None
+		TopPicker.SelectedIndex = 0;    // None
+		RightPicker.SelectedIndex = 0;  // None
+		BottomPicker.SelectedIndex = 0; // None
+		UpdateSafeAreaSettings();
+	}
+
+	private void OnResetAllClicked(object sender, EventArgs e)
+	{
+		LeftPicker.SelectedIndex = 4;   // All
+		TopPicker.SelectedIndex = 4;    // All
+		RightPicker.SelectedIndex = 4;  // All
+		BottomPicker.SelectedIndex = 4; // All
+		UpdateSafeAreaSettings();
+	}
+
+	private SafeAreaRegions GetSafeAreaRegionsFromPickerIndex(int index)
+	{
+		return index switch
+		{
+			0 => SafeAreaRegions.None,
+			1 => SafeAreaRegions.SoftInput,
+			2 => SafeAreaRegions.Container,
+			3 => SafeAreaRegions.Default,
+			4 => SafeAreaRegions.All,
+			_ => SafeAreaRegions.None
+		};
+	}
+
+	private void UpdateSafeAreaSettings()
+	{
+		// Create SafeAreaEdges for ScrollView settings
+		var safeAreaSettings = new SafeAreaEdges(
+			GetSafeAreaRegionsFromPickerIndex(LeftPicker.SelectedIndex),   // Left
+			GetSafeAreaRegionsFromPickerIndex(TopPicker.SelectedIndex),    // Top  
+			GetSafeAreaRegionsFromPickerIndex(RightPicker.SelectedIndex),  // Right
+			GetSafeAreaRegionsFromPickerIndex(BottomPicker.SelectedIndex)  // Bottom
+		);
+
+		// Apply SafeAreaEdges to the ScrollView
+		TestScrollView.SafeAreaEdges = safeAreaSettings;
+
+		// Update the display label
+		var settingsText = $"Left: {GetSafeAreaRegionsFromPickerIndex(LeftPicker.SelectedIndex)}, " +
+		                  $"Top: {GetSafeAreaRegionsFromPickerIndex(TopPicker.SelectedIndex)}, " +
+		                  $"Right: {GetSafeAreaRegionsFromPickerIndex(RightPicker.SelectedIndex)}, " +
+		                  $"Bottom: {GetSafeAreaRegionsFromPickerIndex(BottomPicker.SelectedIndex)}";
+		
+		CurrentSettingsLabel.Text = $"Current ScrollView SafeAreaEdges: {settingsText}";
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22417.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22417.cs
index c613ea3f759d..d47e0ee8447b 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22417.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22417.cs
@@ -1,4 +1,4 @@
-#if TEST_FAILS_ON_WINDOWS && TEST_FAILS_ON_CATALYST //This test is failing, likely due to product issue, for more information: https://github.com/dotnet/maui/issues/27059
+#if TEST_FAILS_ON_WINDOWS //This test is failing, likely due to product issue, for more information: https://github.com/dotnet/maui/issues/27059
 using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28986.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28986.cs
new file mode 100644
index 000000000000..25e42f3b3130
--- /dev/null
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28986.cs
@@ -0,0 +1,160 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.TestCases.Tests.Issues
+{
+	public class Issue28986 : _IssuesUITest
+	{
+		public override string Issue => "Test SafeArea attached property for per-edge safe area control";
+
+		public Issue28986(TestDevice device) : base(device)
+		{
+		}
+
+		[Test]
+		[Category(UITestCategories.Layout)]
+		public void SafeAreaInitialStateIsCorrect()
+		{
+			// Verify initial state - all checkboxes should be unchecked
+			App.WaitForElement("TopCheckBox");
+			App.WaitForElement("LeftCheckBox");
+			App.WaitForElement("RightCheckBox");
+			App.WaitForElement("BottomCheckBox");
+
+			// Verify all checkboxes start unchecked (default behavior)
+			Assert.That(App.FindElement("TopCheckBox").GetAttribute<string>("checked"), Is.EqualTo("false"));
+			Assert.That(App.FindElement("LeftCheckBox").GetAttribute<string>("checked"), Is.EqualTo("false"));
+			Assert.That(App.FindElement("RightCheckBox").GetAttribute<string>("checked"), Is.EqualTo("false"));
+			Assert.That(App.FindElement("BottomCheckBox").GetAttribute<string>("checked"), Is.EqualTo("false"));
+
+			// Verify initial settings label contains all "Respect"
+			App.WaitForElement("CurrentSettings");
+			var initialSettings = App.FindElement("CurrentSettings").GetText();
+			Assert.That(initialSettings, Does.Contain("Left: Respect"));
+			Assert.That(initialSettings, Does.Contain("Top: Respect"));
+			Assert.That(initialSettings, Does.Contain("Right: Respect"));
+			Assert.That(initialSettings, Does.Contain("Bottom: Respect"));
+		}
+
+		[Test]
+		[Category(UITestCategories.Layout)]
+		public void SafeAreaIndividualCheckboxFunctionality()
+		{
+			App.WaitForElement("TopCheckBox");
+			App.WaitForElement("CurrentSettings");
+
+			// Test Top checkbox
+			App.Tap("TopCheckBox");
+			var settingsAfterTop = App.FindElement("CurrentSettings").GetText();
+			Assert.That(settingsAfterTop, Does.Contain("Top: Ignore"));
+			Assert.That(settingsAfterTop, Does.Contain("Left: Respect"));
+			Assert.That(settingsAfterTop, Does.Contain("Right: Respect"));
+			Assert.That(settingsAfterTop, Does.Contain("Bottom: Respect"));
+
+			// Test Left checkbox
+			App.Tap("LeftCheckBox");
+			var settingsAfterLeft = App.FindElement("CurrentSettings").GetText();
+			Assert.That(settingsAfterLeft, Does.Contain("Top: Ignore"));
+			Assert.That(settingsAfterLeft, Does.Contain("Left: Ignore"));
+			Assert.That(settingsAfterLeft, Does.Contain("Right: Respect"));
+			Assert.That(settingsAfterLeft, Does.Contain("Bottom: Respect"));
+
+			// Test Right checkbox
+			App.Tap("RightCheckBox");
+			var settingsAfterRight = App.FindElement("CurrentSettings").GetText();
+			Assert.That(settingsAfterRight, Does.Contain("Top: Ignore"));
+			Assert.That(settingsAfterRight, Does.Contain("Left: Ignore"));
+			Assert.That(settingsAfterRight, Does.Contain("Right: Ignore"));
+			Assert.That(settingsAfterRight, Does.Contain("Bottom: Respect"));
+
+			// Test Bottom checkbox
+			App.Tap("BottomCheckBox");
+			var settingsAfterBottom = App.FindElement("CurrentSettings").GetText();
+			Assert.That(settingsAfterBottom, Does.Contain("Top: Ignore"));
+			Assert.That(settingsAfterBottom, Does.Contain("Left: Ignore"));
+			Assert.That(settingsAfterBottom, Does.Contain("Right: Ignore"));
+			Assert.That(settingsAfterBottom, Does.Contain("Bottom: Ignore"));
+		}
+
+		[Test]
+		[Category(UITestCategories.Layout)]
+		public void SafeAreaResetAllButtonFunctionality()
+		{
+			App.WaitForElement("ResetAllButton");
+			App.WaitForElement("CurrentSettings");
+
+			// Tap Reset All button
+			App.Tap("ResetAllButton");
+
+			// Verify all checkboxes are checked
+			Assert.That(App.FindElement("TopCheckBox").GetAttribute<string>("checked"), Is.EqualTo("true"));
+			Assert.That(App.FindElement("LeftCheckBox").GetAttribute<string>("checked"), Is.EqualTo("true"));
+			Assert.That(App.FindElement("RightCheckBox").GetAttribute<string>("checked"), Is.EqualTo("true"));
+			Assert.That(App.FindElement("BottomCheckBox").GetAttribute<string>("checked"), Is.EqualTo("true"));
+
+			// Verify settings label shows all "Ignore"
+			var settingsAfterReset = App.FindElement("CurrentSettings").GetText();
+			Assert.That(settingsAfterReset, Does.Contain("Left: Ignore"));
+			Assert.That(settingsAfterReset, Does.Contain("Top: Ignore"));
+			Assert.That(settingsAfterReset, Does.Contain("Right: Ignore"));
+			Assert.That(settingsAfterReset, Does.Contain("Bottom: Ignore"));
+		}
+
+		[Test]
+		[Category(UITestCategories.Layout)]
+		public void SafeAreaResetNoneButtonFunctionality()
+		{
+			App.WaitForElement("ResetNoneButton");
+			App.WaitForElement("CurrentSettings");
+
+			// First set some checkboxes to checked state
+			App.Tap("TopCheckBox");
+			App.Tap("LeftCheckBox");
+
+			// Tap Reset None button
+			App.Tap("ResetNoneButton");
+
+			// Verify all checkboxes are unchecked
+			Assert.That(App.FindElement("TopCheckBox").GetAttribute<string>("checked"), Is.EqualTo("false"));
+			Assert.That(App.FindElement("LeftCheckBox").GetAttribute<string>("checked"), Is.EqualTo("false"));
+			Assert.That(App.FindElement("RightCheckBox").GetAttribute<string>("checked"), Is.EqualTo("false"));
+			Assert.That(App.FindElement("BottomCheckBox").GetAttribute<string>("checked"), Is.EqualTo("false"));
+
+			// Verify settings label shows all "Respect"
+			var settingsAfterReset = App.FindElement("CurrentSettings").GetText();
+			Assert.That(settingsAfterReset, Does.Contain("Left: Respect"));
+			Assert.That(settingsAfterReset, Does.Contain("Top: Respect"));
+			Assert.That(settingsAfterReset, Does.Contain("Right: Respect"));
+			Assert.That(settingsAfterReset, Does.Contain("Bottom: Respect"));
+		}
+
+		[Test]
+		[Category(UITestCategories.Layout)]
+		public void SafeAreaSyntaxOptimizationTest()
+		{
+			App.WaitForElement("CurrentSettings");
+
+			// Test 1-value syntax (all edges same) - all ignore
+			App.Tap("ResetAllButton");
+			var allIgnoreSettings = App.FindElement("CurrentSettings").GetText();
+			Assert.That(allIgnoreSettings, Does.Contain("1-value syntax"));
+
+			// Test 1-value syntax (all edges same) - all respect
+			App.Tap("ResetNoneButton");
+			var allRespectSettings = App.FindElement("CurrentSettings").GetText();
+			Assert.That(allRespectSettings, Does.Contain("1-value syntax"));
+
+			// Test 2-value syntax (left/right same, top/bottom same)
+			App.Tap("LeftCheckBox");
+			App.Tap("RightCheckBox");
+			var twoValueSettings = App.FindElement("CurrentSettings").GetText();
+			Assert.That(twoValueSettings, Does.Contain("2-value syntax"));
+
+			// Test 4-value syntax (all different)
+			App.Tap("TopCheckBox");
+			var fourValueSettings = App.FindElement("CurrentSettings").GetText();
+			Assert.That(fourValueSettings, Does.Contain("4-value syntax"));
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/tests/Xaml.UnitTests/SafeAreaEdgesTests.xaml b/src/Controls/tests/Xaml.UnitTests/SafeAreaEdgesTests.xaml
new file mode 100644
index 000000000000..c744776395b9
--- /dev/null
+++ b/src/Controls/tests/Xaml.UnitTests/SafeAreaEdgesTests.xaml
@@ -0,0 +1,33 @@
+<?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="Microsoft.Maui.Controls.Xaml.UnitTests.SafeAreaEdgesTests">
+	<Grid>
+		<!-- Test single value -->
+		<Grid x:Name="singleValueNone" SafeAreaEdges="None" />
+		<Grid x:Name="singleValueAll" SafeAreaEdges="All" />
+		<Grid x:Name="singleValueSoftInput" SafeAreaEdges="SoftInput" />
+		<Grid x:Name="singleValueContainer" SafeAreaEdges="Container" />
+		<Grid x:Name="singleValueDefault" SafeAreaEdges="Default" />
+		
+		<!-- Test two values -->
+		<Grid x:Name="twoValueHorVert" SafeAreaEdges="SoftInput,Container" />
+		<Grid x:Name="twoValueMixed" SafeAreaEdges="None,All" />
+		
+		<!-- Test four values -->
+		<Grid x:Name="fourValueMixed" SafeAreaEdges="None,SoftInput,Container,All" />
+		<Grid x:Name="fourValueDefault" SafeAreaEdges="Default,None,Default,All" />
+		
+		<!-- Test ContentView -->
+		<ContentView x:Name="contentViewTest" SafeAreaEdges="Container,SoftInput" />
+		
+		<!-- Test ContentPage -->
+		<ContentPage x:Name="contentPageTest" SafeAreaEdges="All,None" />
+		
+		<!-- Test Border -->
+		<Border x:Name="borderTest" SafeAreaEdges="SoftInput" />
+		
+		<!-- Test ScrollView -->
+		<ScrollView x:Name="scrollViewTest" SafeAreaEdges="Container,Default,All,None" />
+	</Grid>
+</ContentPage>
\ No newline at end of file
diff --git a/src/Controls/tests/Xaml.UnitTests/SafeAreaEdgesTests.xaml.cs b/src/Controls/tests/Xaml.UnitTests/SafeAreaEdgesTests.xaml.cs
new file mode 100644
index 000000000000..3d000fbe2599
--- /dev/null
+++ b/src/Controls/tests/Xaml.UnitTests/SafeAreaEdgesTests.xaml.cs
@@ -0,0 +1,88 @@
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Controls.Core.UnitTests;
+using NUnit.Framework;
+
+namespace Microsoft.Maui.Controls.Xaml.UnitTests
+{
+	public partial class SafeAreaEdgesTests : ContentPage
+	{
+		public SafeAreaEdgesTests()
+		{
+			InitializeComponent();
+		}
+
+		public SafeAreaEdgesTests(bool useCompiledXaml)
+		{
+			//this stub will be replaced at compile time
+		}
+
+		[TestFixture]
+		public class Tests
+		{
+			[TestCase(false)]
+			[TestCase(true)]
+			public void SingleValueConversions(bool useCompiledXaml)
+			{
+				var layout = new SafeAreaEdgesTests(useCompiledXaml);
+				
+				Assert.AreEqual(SafeAreaEdges.None, layout.singleValueNone.SafeAreaEdges);
+				Assert.AreEqual(SafeAreaEdges.All, layout.singleValueAll.SafeAreaEdges);
+				Assert.AreEqual(new SafeAreaEdges(SafeAreaRegions.SoftInput), layout.singleValueSoftInput.SafeAreaEdges);
+				Assert.AreEqual(new SafeAreaEdges(SafeAreaRegions.Container), layout.singleValueContainer.SafeAreaEdges);
+				Assert.AreEqual(new SafeAreaEdges(SafeAreaRegions.Default), layout.singleValueDefault.SafeAreaEdges);
+			}
+
+			[TestCase(false)]
+			[TestCase(true)]
+			public void TwoValueConversions(bool useCompiledXaml)
+			{
+				var layout = new SafeAreaEdgesTests(useCompiledXaml);
+				
+				Assert.AreEqual(new SafeAreaEdges(SafeAreaRegions.SoftInput, SafeAreaRegions.Container), layout.twoValueHorVert.SafeAreaEdges);
+				Assert.AreEqual(new SafeAreaEdges(SafeAreaRegions.None, SafeAreaRegions.All), layout.twoValueMixed.SafeAreaEdges);
+			}
+
+			[TestCase(false)]
+			[TestCase(true)]
+			public void FourValueConversions(bool useCompiledXaml)
+			{
+				var layout = new SafeAreaEdgesTests(useCompiledXaml);
+				
+				Assert.AreEqual(new SafeAreaEdges(SafeAreaRegions.None, SafeAreaRegions.SoftInput, SafeAreaRegions.Container, SafeAreaRegions.All), layout.fourValueMixed.SafeAreaEdges);
+				Assert.AreEqual(new SafeAreaEdges(SafeAreaRegions.Default, SafeAreaRegions.None, SafeAreaRegions.Default, SafeAreaRegions.All), layout.fourValueDefault.SafeAreaEdges);
+			}
+
+			[TestCase(false)]
+			[TestCase(true)]
+			public void ControlSpecificProperties(bool useCompiledXaml)
+			{
+				var layout = new SafeAreaEdgesTests(useCompiledXaml);
+				
+				Assert.AreEqual(new SafeAreaEdges(SafeAreaRegions.Container, SafeAreaRegions.SoftInput), layout.contentViewTest.SafeAreaEdges);
+				Assert.AreEqual(new SafeAreaEdges(SafeAreaRegions.All, SafeAreaRegions.None), layout.contentPageTest.SafeAreaEdges);
+				Assert.AreEqual(new SafeAreaEdges(SafeAreaRegions.SoftInput), layout.borderTest.SafeAreaEdges);
+				Assert.AreEqual(new SafeAreaEdges(SafeAreaRegions.Container, SafeAreaRegions.Default, SafeAreaRegions.All, SafeAreaRegions.None), layout.scrollViewTest.SafeAreaEdges);
+			}
+
+			[TestCase(false)]
+			[TestCase(true)]
+			public void PropertyInflation_WorksWithAllEnumValues(bool useCompiledXaml)
+			{
+				var layout = new SafeAreaEdgesTests(useCompiledXaml);
+				
+				// Verify all enum values are properly inflated from XAML strings
+				var noneGrid = layout.singleValueNone;
+				var allGrid = layout.singleValueAll;
+				var softInputGrid = layout.singleValueSoftInput;
+				var containerGrid = layout.singleValueContainer;
+				var defaultGrid = layout.singleValueDefault;
+
+				Assert.AreEqual(SafeAreaRegions.None, noneGrid.SafeAreaEdges.Left);
+				Assert.AreEqual(SafeAreaRegions.All, allGrid.SafeAreaEdges.Left);
+				Assert.AreEqual(SafeAreaRegions.SoftInput, softInputGrid.SafeAreaEdges.Left);
+				Assert.AreEqual(SafeAreaRegions.Container, containerGrid.SafeAreaEdges.Left);
+				Assert.AreEqual(SafeAreaRegions.Default, defaultGrid.SafeAreaEdges.Left);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Converters/SafeAreaEdgesTypeConverter.cs b/src/Core/src/Converters/SafeAreaEdgesTypeConverter.cs
new file mode 100644
index 000000000000..264cd3961b19
--- /dev/null
+++ b/src/Core/src/Converters/SafeAreaEdgesTypeConverter.cs
@@ -0,0 +1,85 @@
+using System;
+using System.ComponentModel;
+using System.Globalization;
+
+namespace Microsoft.Maui.Converters
+{
+	/// <summary>
+	/// Type converter for SafeAreaEdges struct, supporting XAML parsing of 
+	/// SafeArea.Ignore attached property values.
+	/// </summary>
+	public class SafeAreaEdgesTypeConverter : TypeConverter
+	{
+		public override bool CanConvertFrom(ITypeDescriptorContext? context, Type sourceType)
+			=> sourceType == typeof(string);
+
+		public override bool CanConvertTo(ITypeDescriptorContext? context, Type? destinationType)
+			=> destinationType == typeof(string);
+
+		public override object ConvertFrom(ITypeDescriptorContext? context, CultureInfo? culture, object? value)
+		{
+			// IMPORTANT! Update SafeAreaEdgesTypeDesignConverter.IsValid if making changes here
+			var strValue = value?.ToString();
+
+			if (strValue != null)
+			{
+				strValue = strValue.Trim();
+				
+				// Split by comma - if no comma, we get array with single element
+				var parts = strValue.Split(',');
+				var regions = new SafeAreaRegions[parts.Length];
+
+				for (int i = 0; i < parts.Length; i++)
+				{
+					var part = parts[i].Trim();
+					
+					// Performance optimization: use string comparison instead of Enum.TryParse
+					// since SafeAreaRegions has specific values
+					if (string.Equals(part, "All", StringComparison.OrdinalIgnoreCase))
+					{
+						regions[i] = SafeAreaRegions.All;
+					}
+					else if (string.Equals(part, "None", StringComparison.OrdinalIgnoreCase))
+					{
+						regions[i] = SafeAreaRegions.None;
+					}
+					else if (string.Equals(part, "Container", StringComparison.OrdinalIgnoreCase))
+					{
+						regions[i] = SafeAreaRegions.Container;
+					}
+					else if (string.Equals(part, "SoftInput", StringComparison.OrdinalIgnoreCase))
+					{
+						regions[i] = SafeAreaRegions.SoftInput;
+					}
+					else if (string.Equals(part, "Default", StringComparison.OrdinalIgnoreCase))
+					{
+						regions[i] = SafeAreaRegions.Default;
+					}
+					else
+					{
+						throw new FormatException($"Cannot convert \"{part}\" into {typeof(SafeAreaRegions)}");
+					}
+				}
+
+				// Convert array to SafeAreaEdges using the same logic as before
+				return regions.Length switch
+				{
+					1 => new SafeAreaEdges(regions[0]),
+					2 => new SafeAreaEdges(regions[0], regions[1]), // horizontal, vertical
+					4 => new SafeAreaEdges(regions[0], regions[1], regions[2], regions[3]), // left, top, right, bottom
+					_ => throw new FormatException($"SafeAreaEdges must have 1, 2, or 4 values, but got {regions.Length}")
+				};
+			}
+
+			throw new FormatException($"Cannot convert \"{strValue}\" into {typeof(SafeAreaEdges)}");
+		}
+
+		public override object ConvertTo(ITypeDescriptorContext? context, CultureInfo? culture, object? value, Type destinationType)
+		{
+			if (value is not SafeAreaEdges edges)
+				throw new NotSupportedException();
+
+			return edges.ToString();
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Core/ISafeAreaView2.cs b/src/Core/src/Core/ISafeAreaView2.cs
index e0f0fb9ec757..08920a731981 100644
--- a/src/Core/src/Core/ISafeAreaView2.cs
+++ b/src/Core/src/Core/ISafeAreaView2.cs
@@ -12,5 +12,19 @@ internal interface ISafeAreaView2
 		/// Internal property for the Page's SafeAreaInsets Thickness that may be changed in the future.
 		/// </summary>
 		internal Thickness SafeAreaInsets { set; }
+
+		/// <summary>
+		/// Gets the safe area behavior for the specified edge (0=Left, 1=Top, 2=Right, 3=Bottom).
+		/// </summary>
+		/// <param name="edge">The edge to get the behavior for (0=Left, 1=Top, 2=Right, 3=Bottom).</param>
+		/// <returns>True if safe area should be ignored for this edge, false otherwise.</returns>
+		bool IgnoreSafeAreaForEdge(int edge);
+
+		/// <summary>
+		/// Gets the safe area regions for the specified edge (0=Left, 1=Top, 2=Right, 3=Bottom).
+		/// </summary>
+		/// <param name="edge">The edge to get the behavior for (0=Left, 1=Top, 2=Right, 3=Bottom).</param>
+		/// <returns>The SafeAreaRegions behavior for this edge.</returns>
+		SafeAreaRegions GetSafeAreaRegionsForEdge(int edge);
 	}
 }
diff --git a/src/Core/src/Handlers/ScrollView/ScrollViewHandler.iOS.cs b/src/Core/src/Handlers/ScrollView/ScrollViewHandler.iOS.cs
index 0183dcecad50..9561c9f423ca 100644
--- a/src/Core/src/Handlers/ScrollView/ScrollViewHandler.iOS.cs
+++ b/src/Core/src/Handlers/ScrollView/ScrollViewHandler.iOS.cs
@@ -18,6 +18,15 @@ protected override UIScrollView CreatePlatformView()
 			return new MauiScrollView();
 		}
 
+		public override void SetVirtualView(IView view)
+		{
+			base.SetVirtualView(view);
+			
+			if (PlatformView is MauiScrollView mauiScrollView)
+				mauiScrollView.View = view;
+				
+		}
+
 		protected override void ConnectHandler(UIScrollView platformView)
 		{
 			base.ConnectHandler(platformView);
diff --git a/src/Core/src/Platform/iOS/MauiScrollView.cs b/src/Core/src/Platform/iOS/MauiScrollView.cs
index 61489965edfa..ff8a70c945c5 100644
--- a/src/Core/src/Platform/iOS/MauiScrollView.cs
+++ b/src/Core/src/Platform/iOS/MauiScrollView.cs
@@ -2,6 +2,7 @@
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using CoreGraphics;
+using Foundation;
 using Microsoft.Maui.Graphics;
 using UIKit;
 
@@ -79,11 +80,14 @@ public class MauiScrollView : UIScrollView, IUIViewLifeCycleEvents, ICrossPlatfo
 		/// </summary>
 		UIUserInterfaceLayoutDirection? _previousEffectiveUserInterfaceLayoutDirection;
 
+		WeakReference<ICrossPlatformLayout>? _crossPlatformLayoutReference;
+
+
 		/// <summary>
 		/// Weak reference to the cross-platform layout that manages the content of this scroll view.
 		/// Weak reference prevents circular references and allows proper garbage collection.
 		/// </summary>
-		WeakReference<ICrossPlatformLayout>? _crossPlatformLayoutReference;
+		WeakReference<IView>? _reference;
 
 		/// <summary>
 		/// Gets or sets the cross-platform layout that manages the content of this scroll view.
@@ -153,6 +157,94 @@ public override void SafeAreaInsetsDidChange()
 		/// This method handles safe area validation, measures and arranges content, and manages RTL layout adjustments.
 		/// It's called by iOS whenever the view needs to be laid out, including during scrolling operations.
 		/// </summary>
+		internal IView? View
+		{
+			get => _reference != null && _reference.TryGetTarget(out var v) ? v : null;
+			set => _reference = value == null ? null : new(value);
+		}
+
+		SafeAreaRegions GetSafeAreaRegionForEdge(int edge)
+		{
+			if (View is ISafeAreaView2 safeAreaPage)
+			{
+				return safeAreaPage.GetSafeAreaRegionsForEdge(edge);
+			}
+			
+			return SafeAreaRegions.None; // Default: edge-to-edge content
+		}
+
+		SafeAreaEdges? _previousEdges;
+
+		UIEdgeInsets GetInset()
+		{
+			var leftRegion = GetSafeAreaRegionForEdge(0);
+			var topRegion = GetSafeAreaRegionForEdge(1);
+			var rightRegion = GetSafeAreaRegionForEdge(2);
+			var bottomRegion = GetSafeAreaRegionForEdge(3);
+
+			var safeAreaInsets = SafeAreaInsets;
+
+			var manualInset = new UIEdgeInsets(
+					top: GetManualInsetForEdge(topRegion, safeAreaInsets.Top),
+					left: GetManualInsetForEdge(leftRegion, safeAreaInsets.Left),
+					bottom: GetManualInsetForEdge(bottomRegion, safeAreaInsets.Bottom),
+					right: GetManualInsetForEdge(rightRegion, safeAreaInsets.Right)
+				);
+
+			return manualInset;
+		}
+
+		bool UpdateContentInsetAdjustmentBehavior()
+		{
+			// Get SafeAreaRegions for all edges
+			var leftRegion = GetSafeAreaRegionForEdge(0);
+			var topRegion = GetSafeAreaRegionForEdge(1);
+			var rightRegion = GetSafeAreaRegionForEdge(2);
+			var bottomRegion = GetSafeAreaRegionForEdge(3);
+
+			SafeAreaEdges safeAreaEdges = new SafeAreaEdges(leftRegion, topRegion, rightRegion, bottomRegion);
+
+			if (_previousEdges is not null && _previousEdges.Equals(safeAreaEdges))
+				return false;
+
+			_previousEdges = safeAreaEdges;
+
+			// Check if all edges have the same SafeAreaRegions value
+			if (leftRegion == topRegion && topRegion == rightRegion && rightRegion == bottomRegion)
+			{
+				// All edges have the same value, use built-in iOS behavior
+				ContentInsetAdjustmentBehavior = leftRegion switch
+				{
+					SafeAreaRegions.None => UIScrollViewContentInsetAdjustmentBehavior.Never, // Edge-to-edge content
+					SafeAreaRegions.All => UIScrollViewContentInsetAdjustmentBehavior.Never, // We calculate insets ourselves and include keyboard
+					SafeAreaRegions.Container => UIScrollViewContentInsetAdjustmentBehavior.Always, // Content flows under keyboard but stays out of bars/notch
+					SafeAreaRegions.SoftInput => UIScrollViewContentInsetAdjustmentBehavior.Never, // We calculate insets ourselves and include keyboard
+					SafeAreaRegions.Default => UIScrollViewContentInsetAdjustmentBehavior.Automatic, // Default behavior
+					_ => UIScrollViewContentInsetAdjustmentBehavior.Never // Default: edge-to-edge
+				};
+			}
+			else
+			{
+				// Mixed edges - use manual calculation
+				ContentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentBehavior.Never;
+			}
+
+			return true;
+		}
+
+		static nfloat GetManualInsetForEdge(SafeAreaRegions safeAreaRegion, nfloat safeAreaInset)
+		{
+			return safeAreaRegion switch
+			{
+				SafeAreaRegions.None => 0, // Edge-to-edge content - no inset
+				SafeAreaRegions.All => (nfloat)safeAreaInset, // Obey all safe area insets
+				SafeAreaRegions.Container => safeAreaInset, // Content flows under keyboard but stays out of bars/notch
+				//SafeAreaRegions.SoftInput => (nfloat)safeAreaInset, // Always pad for keyboard - currently not implemented pending design discussions
+				SafeAreaRegions.Default => safeAreaInset, // Default behavior - obey safe area
+				_ => 0 // Default: edge-to-edge
+			};
+		}
+
 		public override void LayoutSubviews()
 		{
 			// If there's no cross-platform layout, fall back to default UIScrollView behavior
@@ -174,6 +266,7 @@ public override void LayoutSubviews()
 			var bounds = Bounds;
 			var widthConstraint = (double)bounds.Width;
 			var heightConstraint = (double)bounds.Height;
+			ValidateSafeArea();
 			var frameChanged = _lastArrangeWidth != widthConstraint || _lastArrangeHeight != heightConstraint;
 
 			// If the frame changed, we need to arrange (and potentially measure) the content again
@@ -189,30 +282,7 @@ public override void LayoutSubviews()
 					CacheMeasureConstraints(widthConstraint, heightConstraint);
 				}
 
-				Size crossPlatformBounds;
-				// Account for safe area adjustments automatically added by iOS
-				var contentSize = CrossPlatformArrange(Bounds, out crossPlatformBounds).ToCGSize();
-
-				// For Right-To-Left (RTL) layouts, we need to adjust the content arrangement and offset
-				// to ensure the content is correctly aligned and scrolled. This involves a second layout
-				// arrangement with an adjusted starting point and recalculating the content offset.
-				if (_previousEffectiveUserInterfaceLayoutDirection is not null && _previousEffectiveUserInterfaceLayoutDirection != EffectiveUserInterfaceLayoutDirection)
-				{
-					if (EffectiveUserInterfaceLayoutDirection == UIUserInterfaceLayoutDirection.RightToLeft)
-					{
-						var horizontalOffset = contentSize.Width - crossPlatformBounds.Width;
-						CrossPlatformArrange(new Rect(new Point(-horizontalOffset, 0), crossPlatformBounds), out _);
-						ContentOffset = new CGPoint(horizontalOffset, 0);
-					}
-					else
-					{
-						ContentOffset = new CGPoint(0, ContentOffset.Y);
-					}
-				}
-
-				// When switching between LTR and RTL, we need to re-arrange and offset content exactly once
-				// to avoid cumulative shifts or incorrect offsets on subsequent layouts.
-				_previousEffectiveUserInterfaceLayoutDirection = EffectiveUserInterfaceLayoutDirection;
+				var contentSize = CrossPlatformArrange(Bounds).ToCGSize();
 
 				// When the content size changes, we need to adjust the scrollable area size so that the content can fit in it.
 				if (ContentSize != contentSize)
@@ -229,6 +299,7 @@ public override void LayoutSubviews()
 			base.LayoutSubviews();
 		}
 
+
 		/// <summary>
 		/// Validates and updates the safe area configuration. This method checks if the safe area
 		/// has changed and updates the internal state accordingly.
@@ -236,14 +307,22 @@ public override void LayoutSubviews()
 		/// <returns>True if the safe area configuration hasn't changed in a way that affects layout, false otherwise.</returns>
 		bool ValidateSafeArea()
 		{
+			//UpdateKeyboardSubscription();
 			// If nothing changed, we don't need to do anything
+
+			if (!UpdateContentInsetAdjustmentBehavior())
+			{
+				InvalidateConstraintsCache();
+				_safeAreaInvalidated = true;
+			}
+
 			if (!_safeAreaInvalidated)
 			{
 				return true;
 			}
 
 			// Mark the safe area as validated given that we're about to check it
-			_safeAreaInvalidated = false;
+			_safeAreaInvalidated = true;
 
 			var oldSafeArea = _safeArea;
 
@@ -253,8 +332,8 @@ bool ValidateSafeArea()
 			// it can push ContentSize over the Bounds, causing AdjustedContentInset to become non-zero and SafeAreaInsets on the child to reset to zero.
 			// This can result in a loop of invalidations as the layout toggles between these states.
 			// To prevent this, we ignore safe area calculations on child views when they are inside a scroll view.
-			if (SystemAdjustedContentInset == UIEdgeInsets.Zero)
-				_safeArea = SafeAreaInsets.ToSafeAreaInsets();
+			if (SystemAdjustedContentInset == UIEdgeInsets.Zero || ContentInsetAdjustmentBehavior == UIScrollViewContentInsetAdjustmentBehavior.Never)
+				_safeArea = GetInset().ToSafeAreaInsets();
 			else
 				_safeArea = SystemAdjustedContentInset.ToSafeAreaInsets();
 
@@ -263,13 +342,19 @@ bool ValidateSafeArea()
 
 			if (_systemAdjustedContentInset != SystemAdjustedContentInset)
 			{
+				InvalidateConstraintsCache();
 				_systemAdjustedContentInset = SystemAdjustedContentInset;
 				return false;
 			}
 
+			if (!oldSafeArea.Equals(_safeArea))
+			{
+				InvalidateConstraintsCache();
+			}
+
 			// Return whether the way safe area interacts with our view has changed
 			return oldApplyingSafeAreaAdjustments == _appliesSafeAreaAdjustments &&
-			       (oldSafeArea == _safeArea || !_appliesSafeAreaAdjustments);
+				   (oldSafeArea == _safeArea || !_appliesSafeAreaAdjustments);
 		}
 
 		UIEdgeInsets SystemAdjustedContentInset
@@ -293,9 +378,8 @@ UIEdgeInsets SystemAdjustedContentInset
 		/// This method applies safe area insets to the bounds before arranging the content.
 		/// </summary>
 		/// <param name="bounds">The bounds within which to arrange the content.</param>
-		/// <param name="adjustedBounds">The bounds after safe area adjustments have been applied.</param>
 		/// <returns>The size of the arranged content.</returns>
-		Size CrossPlatformArrange(CGRect bounds, out Size adjustedBounds)
+		Size CrossPlatformArrange(CGRect bounds)
 		{
 			bounds = new Rect(new Point(), bounds.Size.ToSize());
 			// Apply safe area adjustments to the bounds if this scroll view responds to safe area
@@ -304,20 +388,48 @@ Size CrossPlatformArrange(CGRect bounds, out Size adjustedBounds)
 				bounds = _safeArea.InsetRect(bounds);
 			}
 
-			adjustedBounds = bounds.Size.ToSize();
+			Size contentSize;
 
-			Size size;
 
-			if (SystemAdjustedContentInset == UIEdgeInsets.Zero)
+			if (SystemAdjustedContentInset == UIEdgeInsets.Zero || ContentInsetAdjustmentBehavior == UIScrollViewContentInsetAdjustmentBehavior.Never)
 			{
-				size = CrossPlatformLayout?.CrossPlatformArrange(bounds.ToRectangle()) ?? Size.Zero;
+				contentSize = CrossPlatformLayout?.CrossPlatformArrange(bounds.ToRectangle()) ?? Size.Zero;
 			}
 			else
 			{
-				size = CrossPlatformLayout?.CrossPlatformArrange(new Rect(new Point(), bounds.Size.ToSize())) ?? Size.Zero;
+				contentSize = CrossPlatformLayout?.CrossPlatformArrange(new Rect(new Point(), bounds.Size.ToSize())) ?? Size.Zero;
+			}
+
+			// For Right-To-Left (RTL) layouts, we need to adjust the content arrangement and offset
+			// to ensure the content is correctly aligned and scrolled. This involves a second layout
+			// arrangement with an adjusted starting point and recalculating the content offset.
+			if (_previousEffectiveUserInterfaceLayoutDirection is not null && _previousEffectiveUserInterfaceLayoutDirection != EffectiveUserInterfaceLayoutDirection)
+			{
+				if (EffectiveUserInterfaceLayoutDirection == UIUserInterfaceLayoutDirection.RightToLeft)
+				{
+					var horizontalOffset = contentSize.Width - contentSize.Width;
+					if (ContentInsetAdjustmentBehavior == UIScrollViewContentInsetAdjustmentBehavior.Never)
+					{
+						CrossPlatformArrange(new Rect(new Point(-horizontalOffset, bounds.Y), contentSize));
+					}
+					else
+					{
+						CrossPlatformArrange(new Rect(new Point(-horizontalOffset, 0), contentSize));
+					}
+
+					ContentOffset = new CGPoint(horizontalOffset, 0);
+				}
+				else
+				{
+					ContentOffset = new CGPoint(0, ContentOffset.Y);
+				}
 			}
 
-			return size;
+			// When switching between LTR and RTL, we need to re-arrange and offset content exactly once
+			// to avoid cumulative shifts or incorrect offsets on subsequent layouts.
+			_previousEffectiveUserInterfaceLayoutDirection = EffectiveUserInterfaceLayoutDirection;
+
+			return contentSize;
 		}
 
 		/// <summary>
@@ -354,6 +466,7 @@ Size CrossPlatformMeasure(double widthConstraint, double heightConstraint)
 		/// </summary>
 		/// <param name="size">The available size constraints.</param>
 		/// <returns>The size that fits within the constraints.</returns>
+		
 		public override CGSize SizeThatFits(CGSize size)
 		{
 			if (CrossPlatformLayout is null)
@@ -388,6 +501,7 @@ void IPlatformMeasureInvalidationController.InvalidateAncestorsMeasuresWhenMoved
 		/// <returns>True if the invalidation should stop propagating, false otherwise.</returns>
 		bool IPlatformMeasureInvalidationController.InvalidateMeasure(bool isPropagating)
 		{
+			ValidateSafeArea();
 			SetNeedsLayout();
 			InvalidateConstraintsCache();
 
diff --git a/src/Core/src/Platform/iOS/MauiView.cs b/src/Core/src/Platform/iOS/MauiView.cs
index d81e64640033..9aa8d7f531a2 100644
--- a/src/Core/src/Platform/iOS/MauiView.cs
+++ b/src/Core/src/Platform/iOS/MauiView.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using CoreGraphics;
+using Foundation;
 using Microsoft.Maui.Graphics;
 using ObjCRuntime;
 using UIKit;
@@ -59,7 +60,12 @@ public abstract class MauiView : UIView, ICrossPlatformLayoutBacking, IVisualTre
 		// True if the view is an ISafeAreaView, does not ignore safe area, and is not inside a UIScrollView;
 		// otherwise, false. Null means not yet determined.
 		bool? _scrollViewDescendant;
-
+		
+		// Keyboard tracking
+		CGRect _keyboardFrame = CGRect.Empty;
+		bool _isKeyboardShowing;
+		WeakReference<NSObject>? _keyboardWillShowObserver;
+		WeakReference<NSObject>? _keyboardWillHideObserver;
 
 		/// <summary>
 		/// Weak reference to the cross-platform IView that this native view represents.
@@ -103,7 +109,7 @@ bool RespondsToSafeArea()
 			}
 
 			if (_scrollViewDescendant.HasValue)
-				return _scrollViewDescendant.Value;				
+				return _scrollViewDescendant.Value;
 
 			// iOS sets AdjustedContentInset on UIScrollView only when the ContentSize exceeds the ScrollView's Bounds.
 			// If ContentSize is smaller, AdjustedContentInset is zero, and SafeAreaInsets are applied to child views instead.
@@ -120,6 +126,35 @@ bool RespondsToSafeArea()
 			return _scrollViewDescendant.Value;
 		}
 
+		SafeAreaRegions GetSafeAreaRegionForEdge(int edge)
+		{
+			if (View is ISafeAreaView2 safeAreaPage)
+			{
+				return safeAreaPage.GetSafeAreaRegionsForEdge(edge);
+			}
+			
+			// Fallback to legacy ISafeAreaView behavior
+			if (View is ISafeAreaView sav)
+			{
+				return sav.IgnoreSafeArea ? SafeAreaRegions.All : SafeAreaRegions.Default;
+			}
+			
+			return SafeAreaRegions.Default; // Default: respect safe area
+		}
+
+		static double GetSafeAreaForEdge(SafeAreaRegions safeAreaRegion, double originalSafeArea)
+		{
+			return safeAreaRegion switch
+			{
+				SafeAreaRegions.None => 0, // Edge-to-edge content (no safe area padding)
+				SafeAreaRegions.SoftInput => originalSafeArea, // Always pad for keyboard/soft input
+				SafeAreaRegions.Container => originalSafeArea, // Content flows under keyboard but stays out of bars/notch
+				SafeAreaRegions.Default => originalSafeArea, // Platform default behavior
+				SafeAreaRegions.All => originalSafeArea, // Obey all safe area insets
+				_ => originalSafeArea // Default case - respect safe area
+			};
+		}
+
 
 		/// <summary>
 		/// Adjusts the given bounds rectangle to account for safe area insets.
@@ -135,10 +170,175 @@ protected CGRect AdjustForSafeArea(CGRect bounds)
 			{
 				KeyboardAutoManagerScroll.ShouldScrollAgain = true;
 			}
-
+			
+			ValidateSafeArea();
 			return _safeArea.InsetRect(bounds);
 		}
 
+		bool ShouldSubscribeToKeyboardNotifications()
+		{
+			// Only subscribe if any edge has All or SoftInput regions
+			if (View is ISafeAreaView2 safeAreaPage)
+			{
+				for (int edge = 0; edge < 4; edge++)
+				{
+					var region = safeAreaPage.GetSafeAreaRegionsForEdge(edge);
+					if (region == SafeAreaRegions.All || region == SafeAreaRegions.SoftInput)
+					{
+						return true;
+					}
+				}
+			}
+			return false;
+		}
+
+		void SubscribeToKeyboardNotifications()
+		{
+			if (_keyboardWillShowObserver != null || _keyboardWillHideObserver != null)
+			{
+				// Already subscribed, no need to re-subscribe
+				return;
+			}
+
+			var showObserver = NSNotificationCenter.DefaultCenter.AddObserver(
+				UIKeyboard.WillShowNotification,
+				OnKeyboardWillShow);
+			_keyboardWillShowObserver = new WeakReference<NSObject>(showObserver);
+
+			var hideObserver = NSNotificationCenter.DefaultCenter.AddObserver(
+				UIKeyboard.WillHideNotification,
+				OnKeyboardWillHide);
+			_keyboardWillHideObserver = new WeakReference<NSObject>(hideObserver);
+		}
+
+		void UnsubscribeFromKeyboardNotifications()
+		{
+			if (_keyboardWillShowObserver?.TryGetTarget(out var showObserver) == true)
+			{
+				NSNotificationCenter.DefaultCenter.RemoveObserver(showObserver);
+				_keyboardWillShowObserver = null;
+			}
+			
+			if (_keyboardWillHideObserver?.TryGetTarget(out var hideObserver) == true)
+			{
+				NSNotificationCenter.DefaultCenter.RemoveObserver(hideObserver);
+				_keyboardWillHideObserver = null;
+			}
+		}
+
+		void UpdateKeyboardSubscription()
+		{
+			// Update keyboard subscription based on current SafeAreaEdges settings
+			if (Window != null)
+			{
+				if (ShouldSubscribeToKeyboardNotifications())
+				{
+					SubscribeToKeyboardNotifications();
+				}
+				else
+				{
+					UnsubscribeFromKeyboardNotifications();
+				}
+			}
+		}
+
+		void OnKeyboardWillShow(NSNotification notification)
+		{
+			var keyboardFrame = GetKeyboardFrame(notification);
+			if (keyboardFrame.HasValue)
+			{
+				_keyboardFrame = keyboardFrame.Value;
+				_isKeyboardShowing = true;
+				SetNeedsLayout();
+			}
+		}
+
+		void OnKeyboardWillHide(NSNotification notification)
+		{
+			_keyboardFrame = CGRect.Empty;
+			_isKeyboardShowing = false;
+			SetNeedsLayout();
+		}
+
+		static CGRect? GetKeyboardFrame(NSNotification notification)
+		{
+			if (notification.UserInfo?[UIKeyboard.FrameEndUserInfoKey] is NSValue frameValue)
+			{
+				return frameValue.CGRectValue;
+			}
+			return null;
+		}
+		
+		SafeAreaPadding GetAdjustedSafeAreaInsets()
+		{
+			var baseSafeArea = SafeAreaInsets.ToSafeAreaInsets();
+
+			// Check if keyboard-aware safe area adjustments are needed
+			if (View is ISafeAreaView2 safeAreaPage && _isKeyboardShowing)
+			{
+				// Check if any edge has SafeAreaRegions.SoftInput set
+				var needsKeyboardAdjustment = false;
+				for (int edge = 0; edge < 4; edge++)
+				{
+					var safeAreaRegion = safeAreaPage.GetSafeAreaRegionsForEdge(edge);
+					if (safeAreaRegion == SafeAreaRegions.SoftInput)
+					{
+						needsKeyboardAdjustment = true;
+						break;
+					}
+				}
+
+				if (needsKeyboardAdjustment)
+				{
+					// Get the keyboard frame and calculate its intersection with the current window
+					var window = this.Window;
+					
+					if (window != null && !_keyboardFrame.IsEmpty)
+					{
+						var windowFrame = window.Frame;
+						var keyboardIntersection = CGRect.Intersect(_keyboardFrame, windowFrame);
+						
+						// If keyboard is visible and intersects with window
+						if (!keyboardIntersection.IsEmpty)
+						{
+							// Calculate keyboard height in the window's coordinate system
+							var keyboardHeight = keyboardIntersection.Height;
+							
+							// For SafeAreaRegions.SoftInput: Always pad so content doesn't go under the keyboard
+							
+							// Bottom edge is most commonly affected by keyboard
+							var bottomEdgeRegion = safeAreaPage.GetSafeAreaRegionsForEdge(3); // 3 = bottom edge
+							if (bottomEdgeRegion == SafeAreaRegions.SoftInput)
+							{
+								// Use the larger of the current bottom safe area or the keyboard height
+								var adjustedBottom = Math.Max(baseSafeArea.Bottom, keyboardHeight);
+								baseSafeArea = new SafeAreaPadding(baseSafeArea.Left, baseSafeArea.Right, baseSafeArea.Top, adjustedBottom);
+							}
+						}
+					}
+				}
+			}
+
+			if (View is ISafeAreaView2)
+			{
+				// Apply safe area selectively per edge based on SafeAreaRegions
+				var left = GetSafeAreaForEdge(GetSafeAreaRegionForEdge(0), baseSafeArea.Left);
+				var top = GetSafeAreaForEdge(GetSafeAreaRegionForEdge(1), baseSafeArea.Top);
+				var right = GetSafeAreaForEdge(GetSafeAreaRegionForEdge(2), baseSafeArea.Right);
+				var bottom = GetSafeAreaForEdge(GetSafeAreaRegionForEdge(3), baseSafeArea.Bottom);
+
+				return new SafeAreaPadding(left, right, top, bottom);
+			}
+
+			// Fallback to legacy behavior
+			if (View is ISafeAreaView sav && sav.IgnoreSafeArea)
+			{
+				return SafeAreaPadding.Empty;
+			}
+
+			return baseSafeArea;
+		}
+
 		/// <summary>
 		/// Checks if the current measure information is still valid for the given constraints.
 		/// This optimization avoids redundant measure operations when constraints haven't changed.
@@ -148,9 +348,15 @@ protected CGRect AdjustForSafeArea(CGRect bounds)
 		/// <returns>True if the cached measure is still valid, false otherwise</returns>
 		protected bool IsMeasureValid(double widthConstraint, double heightConstraint)
 		{
-			// Check the last constraints this View was measured with; if they're the same,
-			// then the current measure info is already correct and we don't need to repeat it
-			return heightConstraint == _lastMeasureHeight && widthConstraint == _lastMeasureWidth;
+			return !HasFixedConstraints
+				&& widthConstraint == _lastMeasureWidth
+				&& heightConstraint == _lastMeasureHeight;
+		}
+
+		protected void CacheMeasureConstraints(double widthConstraint, double heightConstraint)
+		{
+			_lastMeasureWidth = widthConstraint;
+			_lastMeasureHeight = heightConstraint;
 		}
 
 		/// <summary>
@@ -174,38 +380,6 @@ protected void InvalidateConstraintsCache()
 			_lastMeasureHeight = double.NaN;
 		}
 
-		/// <summary>
-		/// Caches the measure constraints for future comparison.
-		/// This optimization prevents redundant measure operations when
-		/// the same constraints are applied repeatedly.
-		/// </summary>
-		/// <param name="widthConstraint">The width constraint to cache</param>
-		/// <param name="heightConstraint">The height constraint to cache</param>
-		protected void CacheMeasureConstraints(double widthConstraint, double heightConstraint)
-		{
-			_lastMeasureWidth = widthConstraint;
-			_lastMeasureHeight = heightConstraint;
-		}
-
-		/// <summary>
-		/// Called by iOS when the safe area insets change (e.g., device rotation, status bar changes).
-		/// We can't perform full safe area processing here because this method is called multiple times
-		/// during the layout process with different values, so we just mark the safe area as invalidated.
-		/// </summary>
-		public override void SafeAreaInsetsDidChange()
-		{
-			base.SafeAreaInsetsDidChange();
-
-			// We can't do anything more than this here because `SafeAreaInsetsDidChange()` is triggered twice with
-			// different values when setting the frame via `Center` and `Bounds` in `PlatformArrangeHandler`.
-			_safeAreaInvalidated = true;
-		}
-
-		/// <summary>
-		/// Gets or sets the cross-platform layout manager for this view.
-		/// This delegates measure and arrange operations to the MAUI layout system
-		/// rather than handling them natively.
-		/// </summary>
 		public ICrossPlatformLayout? CrossPlatformLayout
 		{
 			get => _crossPlatformLayoutReference != null && _crossPlatformLayoutReference.TryGetTarget(out var v) ? v : null;
@@ -342,6 +516,8 @@ public override void LayoutSubviews()
 		/// <returns>True if the safe area interaction hasn't changed, false if it has changed and requires layout updates</returns>
 		bool ValidateSafeArea()
 		{
+			UpdateKeyboardSubscription();
+
 			// If nothing changed, we don't need to do anything
 			if (!_safeAreaInvalidated)
 			{
@@ -349,7 +525,7 @@ bool ValidateSafeArea()
 			}
 
 			// Mark the safe area as validated given that we're about to check it
-			_safeAreaInvalidated = false;
+			_safeAreaInvalidated = true;
 
 			// Store the information about the safe area for developers to use
 			if (View is ISafeAreaView2 safeAreaPage)
@@ -358,7 +534,7 @@ bool ValidateSafeArea()
 			}
 
 			var oldSafeArea = _safeArea;
-			_safeArea = SafeAreaInsets.ToSafeAreaInsets();
+			_safeArea = GetAdjustedSafeAreaInsets();
 
 			var oldApplyingSafeAreaAdjustments = _appliesSafeAreaAdjustments;
 			_appliesSafeAreaAdjustments = RespondsToSafeArea() && !_safeArea.IsEmpty;
@@ -470,6 +646,8 @@ public override void MovedToWindow()
 				_invalidateParentWhenMovedToWindow = false;
 				this.InvalidateAncestorsMeasures();
 			}
+
+			UpdateKeyboardSubscription();
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Platform/iOS/SafeAreaPadding.cs b/src/Core/src/Platform/iOS/SafeAreaPadding.cs
index 9c2c8aae338b..da23e4c1d6be 100644
--- a/src/Core/src/Platform/iOS/SafeAreaPadding.cs
+++ b/src/Core/src/Platform/iOS/SafeAreaPadding.cs
@@ -25,6 +25,9 @@ public CGRect InsetRect(CGRect bounds)
 			bounds.Width - HorizontalThickness,
 			bounds.Height - VerticalThickness);
 	}
+
+	public CGRect ToCGRect() =>
+		new((nfloat)Top, (nfloat)Left, (nfloat)Bottom, (nfloat)Right);
 }
 
 internal static class SafeAreaInsetsExtensions
diff --git a/src/Core/src/Primitives/SafeAreaEdges.cs b/src/Core/src/Primitives/SafeAreaEdges.cs
new file mode 100644
index 000000000000..d1db417d1648
--- /dev/null
+++ b/src/Core/src/Primitives/SafeAreaEdges.cs
@@ -0,0 +1,175 @@
+using System;
+using System.ComponentModel;
+
+namespace Microsoft.Maui
+{
+	/// <summary>
+	/// Represents safe area settings for each edge of a layout or visual element.
+	/// </summary>
+	[TypeConverter(typeof(Converters.SafeAreaEdgesTypeConverter))]
+	public struct SafeAreaEdges : IEquatable<SafeAreaEdges>
+	{
+		/// <summary>
+		/// Gets or sets the safe area behavior for the left edge.
+		/// </summary>
+		public SafeAreaRegions Left { get; set; }
+
+		/// <summary>
+		/// Gets or sets the safe area behavior for the top edge.
+		/// </summary>
+		public SafeAreaRegions Top { get; set; }
+
+		/// <summary>
+		/// Gets or sets the safe area behavior for the right edge.
+		/// </summary>
+		public SafeAreaRegions Right { get; set; }
+
+		/// <summary>
+		/// Gets or sets the safe area behavior for the bottom edge.
+		/// </summary>
+		public SafeAreaRegions Bottom { get; set; }
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="SafeAreaEdges"/> struct with the same value for all edges.
+		/// </summary>
+		/// <param name="uniformValue">The value to apply to all edges.</param>
+		public SafeAreaEdges(SafeAreaRegions uniformValue)
+		{
+			Left = uniformValue;
+			Top = uniformValue;
+			Right = uniformValue;
+			Bottom = uniformValue;
+		}
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="SafeAreaEdges"/> struct with horizontal and vertical values.
+		/// </summary>
+		/// <param name="horizontal">The value to apply to left and right edges.</param>
+		/// <param name="vertical">The value to apply to top and bottom edges.</param>
+		public SafeAreaEdges(SafeAreaRegions horizontal, SafeAreaRegions vertical)
+		{
+			Left = horizontal;
+			Right = horizontal;
+			Top = vertical;
+			Bottom = vertical;
+		}
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="SafeAreaEdges"/> struct with individual values for each edge.
+		/// </summary>
+		/// <param name="left">The value for the left edge.</param>
+		/// <param name="top">The value for the top edge.</param>
+		/// <param name="right">The value for the right edge.</param>
+		/// <param name="bottom">The value for the bottom edge.</param>
+		public SafeAreaEdges(SafeAreaRegions left, SafeAreaRegions top, SafeAreaRegions right, SafeAreaRegions bottom)
+		{
+			Left = left;
+			Top = top;
+			Right = right;
+			Bottom = bottom;
+		}
+
+		/// <summary>
+		/// Gets the safe area behavior for the specified edge.
+		/// </summary>
+		/// <param name="edge">The edge index (0=Left, 1=Top, 2=Right, 3=Bottom).</param>
+		/// <returns>The <see cref="SafeAreaRegions"/> for the specified edge.</returns>
+		public SafeAreaRegions GetEdge(int edge)
+		{
+			return edge switch
+			{
+				0 => Left,
+				1 => Top,
+				2 => Right,
+				3 => Bottom,
+				_ => SafeAreaRegions.None
+			};
+		}
+
+		/// <summary>
+		/// Sets the safe area behavior for the specified edge.
+		/// </summary>
+		/// <param name="edge">The edge index (0=Left, 1=Top, 2=Right, 3=Bottom).</param>
+		/// <param name="value">The value to set.</param>
+		public void SetEdge(int edge, SafeAreaRegions value)
+		{
+			switch (edge)
+			{
+				case 0:
+					Left = value;
+					break;
+				case 1:
+					Top = value;
+					break;
+				case 2:
+					Right = value;
+					break;
+				case 3:
+					Bottom = value;
+					break;
+			}
+		}
+
+		/// <summary>
+		/// A <see cref="SafeAreaEdges"/> with all edges set to <see cref="SafeAreaRegions.None"/>.
+		/// </summary>
+		public static SafeAreaEdges Default => new(SafeAreaRegions.None);
+
+		/// <summary>
+		/// A <see cref="SafeAreaEdges"/> with all edges set to <see cref="SafeAreaRegions.None"/>.
+		/// </summary>
+		public static SafeAreaEdges None => new(SafeAreaRegions.None);
+
+		/// <summary>
+		/// A <see cref="SafeAreaEdges"/> with all edges set to <see cref="SafeAreaRegions.All"/>.
+		/// </summary>
+		public static SafeAreaEdges All => new(SafeAreaRegions.All);
+
+		public static bool operator ==(SafeAreaEdges left, SafeAreaEdges right)
+		{
+			return left.Equals(right);
+		}
+
+		public static bool operator !=(SafeAreaEdges left, SafeAreaEdges right)
+		{
+			return !left.Equals(right);
+		}
+
+		public bool Equals(SafeAreaEdges other)
+		{
+			return Left == other.Left && Top == other.Top && Right == other.Right && Bottom == other.Bottom;
+		}
+
+		public override bool Equals(object? obj)
+		{
+			return obj is SafeAreaEdges other && Equals(other);
+		}
+
+		public override int GetHashCode()
+		{
+#if NET
+			return HashCode.Combine(Left, Top, Right, Bottom);
+#else
+			unchecked
+			{
+				int hashCode = Left.GetHashCode();
+				hashCode = (hashCode * 397) ^ Top.GetHashCode();
+				hashCode = (hashCode * 397) ^ Right.GetHashCode();
+				hashCode = (hashCode * 397) ^ Bottom.GetHashCode();
+				return hashCode;
+			}
+#endif
+		}
+
+		public override string ToString()
+		{
+			if (Left == Top && Top == Right && Right == Bottom)
+				return Left.ToString();
+
+			if (Left == Right && Top == Bottom)
+				return $"{Left}, {Top}";
+
+			return $"{Left}, {Top}, {Right}, {Bottom}";
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Primitives/SafeAreaRegions.cs b/src/Core/src/Primitives/SafeAreaRegions.cs
new file mode 100644
index 000000000000..80833953f24a
--- /dev/null
+++ b/src/Core/src/Primitives/SafeAreaRegions.cs
@@ -0,0 +1,37 @@
+using System;
+
+namespace Microsoft.Maui
+{
+	/// <summary>
+	/// Specifies which platform safe area edges to obey for a layout or visual element.
+	/// </summary>
+	[Flags]
+	public enum SafeAreaRegions
+	{
+		/// <summary>
+		/// Content goes edge to edge with no safe area padding.
+		/// </summary>
+		None = 0,
+
+		/// <summary>
+		/// Always pad so content doesn't go under the soft input/keyboard.
+		/// </summary>
+		SoftInput = 1 << 0,
+
+		/// <summary>
+		/// Content flows under keyboard but stays out of top and bottom bars and notch.
+		/// </summary>
+		Container = 1 << 1,
+
+		/// <summary>
+		/// Default behavior - apply platform safe area insets.
+		/// </summary>
+		Default = 1 << 2,
+
+		/// <summary>
+		/// Obey all safe area insets - content will be positioned only in the safe area.
+		/// This includes top and bottom bars, notch, and keyboard.
+		/// </summary>
+		All = int.MaxValue
+	}
+}
\ 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 d9ce2d6fd17f..4adfb5a0c80a 100644
--- a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -1,4 +1,6 @@
 #nullable enable
+Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter
+Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.SafeAreaEdgesTypeConverter() -> void
 Microsoft.Maui.Graphics.MauiDrawable.SetEmptyBorderBrush() -> void
 Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.ContextFlyoutItemHandlerUpdate(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate! original) -> void
 Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
@@ -50,6 +52,28 @@ Microsoft.Maui.IWebRequestInterceptingWebView.WebResourceRequested(Microsoft.Mau
 Microsoft.Maui.Platform.MauiSwipeRefreshLayout.CrossPlatformLayout.get -> Microsoft.Maui.ICrossPlatformLayout?
 Microsoft.Maui.Platform.MauiSwipeRefreshLayout.CrossPlatformLayout.set -> void
 *REMOVED*Microsoft.Maui.PlatformWrapperView.SetHasShadow(bool hasShadow) -> void
+Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.SafeAreaEdges.Bottom.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Bottom.set -> void
+Microsoft.Maui.SafeAreaEdges.Equals(Microsoft.Maui.SafeAreaEdges other) -> bool
+Microsoft.Maui.SafeAreaEdges.GetEdge(int edge) -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Left.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Left.set -> void
+Microsoft.Maui.SafeAreaEdges.Right.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Right.set -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges() -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions horizontal, Microsoft.Maui.SafeAreaRegions vertical) -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions left, Microsoft.Maui.SafeAreaRegions top, Microsoft.Maui.SafeAreaRegions right, Microsoft.Maui.SafeAreaRegions bottom) -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions uniformValue) -> void
+Microsoft.Maui.SafeAreaEdges.SetEdge(int edge, Microsoft.Maui.SafeAreaRegions value) -> void
+Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Top.set -> void
+Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.All = 2147483647 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Default = 4 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.None = 0 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.SoftInput = 1 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.ScrollToRequest.Deconstruct(out double HorizontalOffset, out double VerticalOffset, out bool Instant) -> void
 Microsoft.Maui.ScrollToRequest.ScrollToRequest(Microsoft.Maui.ScrollToRequest! original) -> void
 Microsoft.Maui.SwipeViewCloseRequest.Deconstruct(out bool Animated) -> void
@@ -102,6 +126,10 @@ override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertFrom(System.C
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value) -> object!
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object!
 override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
 override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
 override Microsoft.Maui.Converters.ThicknessTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
@@ -148,6 +176,9 @@ override Microsoft.Maui.Platform.MauiSwipeRefreshLayout.OnMeasure(int widthMeasu
 override Microsoft.Maui.Platform.MauiTimePicker.DefaultMovementMethod.get -> Android.Text.Method.IMovementMethod?
 override Microsoft.Maui.Platform.MauiWebChromeClient.OnHideCustomView() -> void
 ~override Microsoft.Maui.Platform.MauiWebChromeClient.OnShowCustomView(Android.Views.View view, Android.Webkit.WebChromeClient.ICustomViewCallback callback) -> void
+override Microsoft.Maui.SafeAreaEdges.Equals(object? obj) -> bool
+override Microsoft.Maui.SafeAreaEdges.GetHashCode() -> int
+override Microsoft.Maui.SafeAreaEdges.ToString() -> string!
 override Microsoft.Maui.ScrollToRequest.Equals(object? obj) -> bool
 override Microsoft.Maui.ScrollToRequest.GetHashCode() -> int
 override Microsoft.Maui.ScrollToRequest.ToString() -> string!
@@ -193,6 +224,11 @@ static Microsoft.Maui.Platform.ImageButtonExtensions.UpdateButtonBackground(this
 static Microsoft.Maui.Platform.ImageButtonExtensions.UpdateButtonStroke(this Google.Android.Material.ImageView.ShapeableImageView! platformView, Microsoft.Maui.IButtonStroke! button) -> void
 static Microsoft.Maui.Platform.ImageButtonExtensions.UpdateRippleColor(this Google.Android.Material.ImageView.ShapeableImageView! platformView, Microsoft.Maui.Graphics.Color! rippleColor) -> void
 static Microsoft.Maui.Platform.SearchViewExtensions.UpdateReturnType(this AndroidX.AppCompat.Widget.SearchView! searchView, Microsoft.Maui.ISearchBar! searchBar) -> void
+static Microsoft.Maui.SafeAreaEdges.All.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.Default.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.None.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.operator !=(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
+static Microsoft.Maui.SafeAreaEdges.operator ==(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
 static Microsoft.Maui.ScrollToRequest.operator !=(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
 static Microsoft.Maui.ScrollToRequest.operator ==(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
 static Microsoft.Maui.SwipeViewCloseRequest.operator !=(Microsoft.Maui.SwipeViewCloseRequest? left, Microsoft.Maui.SwipeViewCloseRequest? right) -> bool
diff --git a/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
index 7b2d84daaaa1..e7572c1b3e2b 100644
--- a/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
@@ -1,4 +1,6 @@
 #nullable enable
+Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter
+Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.SafeAreaEdgesTypeConverter() -> void
 Microsoft.Maui.FontManager.GetFontFamily(string? fontFamily) -> string!
 *REMOVED*Microsoft.Maui.FontManager.GetFontFamily(string? fontFamliy) -> string!
 Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.ContextFlyoutItemHandlerUpdate(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate! original) -> void
@@ -85,6 +87,10 @@ override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertFrom(System.C
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value) -> object!
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object!
 override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
 override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
 override Microsoft.Maui.Converters.ThicknessTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
diff --git a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
index ef8f9c1591ac..ed907af19a87 100644
--- a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -1,4 +1,6 @@
 #nullable enable
+Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter
+Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.SafeAreaEdgesTypeConverter() -> void
 Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.ContextFlyoutItemHandlerUpdate(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate! original) -> void
 Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
 Microsoft.Maui.Handlers.DataFlowDirection
@@ -44,6 +46,28 @@ Microsoft.Maui.ITimePicker.IsOpen.set -> void
 Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan?
 Microsoft.Maui.IWebRequestInterceptingWebView
 Microsoft.Maui.IWebRequestInterceptingWebView.WebResourceRequested(Microsoft.Maui.WebResourceRequestedEventArgs! args) -> bool
+Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.SafeAreaEdges.Bottom.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Bottom.set -> void
+Microsoft.Maui.SafeAreaEdges.Equals(Microsoft.Maui.SafeAreaEdges other) -> bool
+Microsoft.Maui.SafeAreaEdges.GetEdge(int edge) -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Left.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Left.set -> void
+Microsoft.Maui.SafeAreaEdges.Right.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Right.set -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges() -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions horizontal, Microsoft.Maui.SafeAreaRegions vertical) -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions left, Microsoft.Maui.SafeAreaRegions top, Microsoft.Maui.SafeAreaRegions right, Microsoft.Maui.SafeAreaRegions bottom) -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions uniformValue) -> void
+Microsoft.Maui.SafeAreaEdges.SetEdge(int edge, Microsoft.Maui.SafeAreaRegions value) -> void
+Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Top.set -> void
+Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.All = 2147483647 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Default = 4 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.None = 0 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.SoftInput = 1 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.ScrollToRequest.Deconstruct(out double HorizontalOffset, out double VerticalOffset, out bool Instant) -> void
 Microsoft.Maui.ScrollToRequest.ScrollToRequest(Microsoft.Maui.ScrollToRequest! original) -> void
 Microsoft.Maui.SwipeViewCloseRequest.Deconstruct(out bool Animated) -> void
@@ -92,6 +116,10 @@ override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertFrom(System.C
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value) -> object!
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object!
 override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
 override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
 override Microsoft.Maui.Converters.ThicknessTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
@@ -114,6 +142,9 @@ override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.ToString() -> st
 override Microsoft.Maui.Handlers.OpenWindowRequest.Equals(object? obj) -> bool
 override Microsoft.Maui.Handlers.OpenWindowRequest.GetHashCode() -> int
 override Microsoft.Maui.Handlers.OpenWindowRequest.ToString() -> string!
+override Microsoft.Maui.SafeAreaEdges.Equals(object? obj) -> bool
+override Microsoft.Maui.SafeAreaEdges.GetHashCode() -> int
+override Microsoft.Maui.SafeAreaEdges.ToString() -> string!
 override Microsoft.Maui.ScrollToRequest.Equals(object? obj) -> bool
 override Microsoft.Maui.ScrollToRequest.GetHashCode() -> int
 override Microsoft.Maui.ScrollToRequest.ToString() -> string!
@@ -147,6 +178,11 @@ static Microsoft.Maui.Handlers.OpenWindowRequest.operator !=(Microsoft.Maui.Hand
 static Microsoft.Maui.Handlers.OpenWindowRequest.operator ==(Microsoft.Maui.Handlers.OpenWindowRequest? left, Microsoft.Maui.Handlers.OpenWindowRequest? right) -> bool
 static Microsoft.Maui.Handlers.SearchBarHandler.MapReturnType(Microsoft.Maui.IViewHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
 static Microsoft.Maui.Hosting.AppHostBuilderExtensions.ConfigureEnvironmentVariables(this Microsoft.Maui.Hosting.MauiAppBuilder! builder) -> Microsoft.Maui.Hosting.MauiAppBuilder!
+static Microsoft.Maui.SafeAreaEdges.All.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.Default.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.None.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.operator !=(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
+static Microsoft.Maui.SafeAreaEdges.operator ==(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
 static Microsoft.Maui.ScrollToRequest.operator !=(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
 static Microsoft.Maui.ScrollToRequest.operator ==(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
 static Microsoft.Maui.SwipeViewCloseRequest.operator !=(Microsoft.Maui.SwipeViewCloseRequest? left, Microsoft.Maui.SwipeViewCloseRequest? right) -> bool
diff --git a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
index ef8f9c1591ac..ed907af19a87 100644
--- a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -1,4 +1,6 @@
 #nullable enable
+Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter
+Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.SafeAreaEdgesTypeConverter() -> void
 Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.ContextFlyoutItemHandlerUpdate(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate! original) -> void
 Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
 Microsoft.Maui.Handlers.DataFlowDirection
@@ -44,6 +46,28 @@ Microsoft.Maui.ITimePicker.IsOpen.set -> void
 Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan?
 Microsoft.Maui.IWebRequestInterceptingWebView
 Microsoft.Maui.IWebRequestInterceptingWebView.WebResourceRequested(Microsoft.Maui.WebResourceRequestedEventArgs! args) -> bool
+Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.SafeAreaEdges.Bottom.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Bottom.set -> void
+Microsoft.Maui.SafeAreaEdges.Equals(Microsoft.Maui.SafeAreaEdges other) -> bool
+Microsoft.Maui.SafeAreaEdges.GetEdge(int edge) -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Left.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Left.set -> void
+Microsoft.Maui.SafeAreaEdges.Right.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Right.set -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges() -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions horizontal, Microsoft.Maui.SafeAreaRegions vertical) -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions left, Microsoft.Maui.SafeAreaRegions top, Microsoft.Maui.SafeAreaRegions right, Microsoft.Maui.SafeAreaRegions bottom) -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions uniformValue) -> void
+Microsoft.Maui.SafeAreaEdges.SetEdge(int edge, Microsoft.Maui.SafeAreaRegions value) -> void
+Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Top.set -> void
+Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.All = 2147483647 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Default = 4 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.None = 0 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.SoftInput = 1 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.ScrollToRequest.Deconstruct(out double HorizontalOffset, out double VerticalOffset, out bool Instant) -> void
 Microsoft.Maui.ScrollToRequest.ScrollToRequest(Microsoft.Maui.ScrollToRequest! original) -> void
 Microsoft.Maui.SwipeViewCloseRequest.Deconstruct(out bool Animated) -> void
@@ -92,6 +116,10 @@ override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertFrom(System.C
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value) -> object!
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object!
 override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
 override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
 override Microsoft.Maui.Converters.ThicknessTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
@@ -114,6 +142,9 @@ override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.ToString() -> st
 override Microsoft.Maui.Handlers.OpenWindowRequest.Equals(object? obj) -> bool
 override Microsoft.Maui.Handlers.OpenWindowRequest.GetHashCode() -> int
 override Microsoft.Maui.Handlers.OpenWindowRequest.ToString() -> string!
+override Microsoft.Maui.SafeAreaEdges.Equals(object? obj) -> bool
+override Microsoft.Maui.SafeAreaEdges.GetHashCode() -> int
+override Microsoft.Maui.SafeAreaEdges.ToString() -> string!
 override Microsoft.Maui.ScrollToRequest.Equals(object? obj) -> bool
 override Microsoft.Maui.ScrollToRequest.GetHashCode() -> int
 override Microsoft.Maui.ScrollToRequest.ToString() -> string!
@@ -147,6 +178,11 @@ static Microsoft.Maui.Handlers.OpenWindowRequest.operator !=(Microsoft.Maui.Hand
 static Microsoft.Maui.Handlers.OpenWindowRequest.operator ==(Microsoft.Maui.Handlers.OpenWindowRequest? left, Microsoft.Maui.Handlers.OpenWindowRequest? right) -> bool
 static Microsoft.Maui.Handlers.SearchBarHandler.MapReturnType(Microsoft.Maui.IViewHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
 static Microsoft.Maui.Hosting.AppHostBuilderExtensions.ConfigureEnvironmentVariables(this Microsoft.Maui.Hosting.MauiAppBuilder! builder) -> Microsoft.Maui.Hosting.MauiAppBuilder!
+static Microsoft.Maui.SafeAreaEdges.All.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.Default.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.None.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.operator !=(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
+static Microsoft.Maui.SafeAreaEdges.operator ==(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
 static Microsoft.Maui.ScrollToRequest.operator !=(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
 static Microsoft.Maui.ScrollToRequest.operator ==(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
 static Microsoft.Maui.SwipeViewCloseRequest.operator !=(Microsoft.Maui.SwipeViewCloseRequest? left, Microsoft.Maui.SwipeViewCloseRequest? right) -> bool
diff --git a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
index ef8f9c1591ac..ed907af19a87 100644
--- a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
@@ -1,4 +1,6 @@
 #nullable enable
+Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter
+Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.SafeAreaEdgesTypeConverter() -> void
 Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.ContextFlyoutItemHandlerUpdate(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate! original) -> void
 Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
 Microsoft.Maui.Handlers.DataFlowDirection
@@ -44,6 +46,28 @@ Microsoft.Maui.ITimePicker.IsOpen.set -> void
 Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan?
 Microsoft.Maui.IWebRequestInterceptingWebView
 Microsoft.Maui.IWebRequestInterceptingWebView.WebResourceRequested(Microsoft.Maui.WebResourceRequestedEventArgs! args) -> bool
+Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.SafeAreaEdges.Bottom.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Bottom.set -> void
+Microsoft.Maui.SafeAreaEdges.Equals(Microsoft.Maui.SafeAreaEdges other) -> bool
+Microsoft.Maui.SafeAreaEdges.GetEdge(int edge) -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Left.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Left.set -> void
+Microsoft.Maui.SafeAreaEdges.Right.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Right.set -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges() -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions horizontal, Microsoft.Maui.SafeAreaRegions vertical) -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions left, Microsoft.Maui.SafeAreaRegions top, Microsoft.Maui.SafeAreaRegions right, Microsoft.Maui.SafeAreaRegions bottom) -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions uniformValue) -> void
+Microsoft.Maui.SafeAreaEdges.SetEdge(int edge, Microsoft.Maui.SafeAreaRegions value) -> void
+Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Top.set -> void
+Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.All = 2147483647 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Default = 4 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.None = 0 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.SoftInput = 1 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.ScrollToRequest.Deconstruct(out double HorizontalOffset, out double VerticalOffset, out bool Instant) -> void
 Microsoft.Maui.ScrollToRequest.ScrollToRequest(Microsoft.Maui.ScrollToRequest! original) -> void
 Microsoft.Maui.SwipeViewCloseRequest.Deconstruct(out bool Animated) -> void
@@ -92,6 +116,10 @@ override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertFrom(System.C
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value) -> object!
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object!
 override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
 override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
 override Microsoft.Maui.Converters.ThicknessTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
@@ -114,6 +142,9 @@ override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.ToString() -> st
 override Microsoft.Maui.Handlers.OpenWindowRequest.Equals(object? obj) -> bool
 override Microsoft.Maui.Handlers.OpenWindowRequest.GetHashCode() -> int
 override Microsoft.Maui.Handlers.OpenWindowRequest.ToString() -> string!
+override Microsoft.Maui.SafeAreaEdges.Equals(object? obj) -> bool
+override Microsoft.Maui.SafeAreaEdges.GetHashCode() -> int
+override Microsoft.Maui.SafeAreaEdges.ToString() -> string!
 override Microsoft.Maui.ScrollToRequest.Equals(object? obj) -> bool
 override Microsoft.Maui.ScrollToRequest.GetHashCode() -> int
 override Microsoft.Maui.ScrollToRequest.ToString() -> string!
@@ -147,6 +178,11 @@ static Microsoft.Maui.Handlers.OpenWindowRequest.operator !=(Microsoft.Maui.Hand
 static Microsoft.Maui.Handlers.OpenWindowRequest.operator ==(Microsoft.Maui.Handlers.OpenWindowRequest? left, Microsoft.Maui.Handlers.OpenWindowRequest? right) -> bool
 static Microsoft.Maui.Handlers.SearchBarHandler.MapReturnType(Microsoft.Maui.IViewHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
 static Microsoft.Maui.Hosting.AppHostBuilderExtensions.ConfigureEnvironmentVariables(this Microsoft.Maui.Hosting.MauiAppBuilder! builder) -> Microsoft.Maui.Hosting.MauiAppBuilder!
+static Microsoft.Maui.SafeAreaEdges.All.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.Default.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.None.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.operator !=(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
+static Microsoft.Maui.SafeAreaEdges.operator ==(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
 static Microsoft.Maui.ScrollToRequest.operator !=(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
 static Microsoft.Maui.ScrollToRequest.operator ==(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
 static Microsoft.Maui.SwipeViewCloseRequest.operator !=(Microsoft.Maui.SwipeViewCloseRequest? left, Microsoft.Maui.SwipeViewCloseRequest? right) -> bool
diff --git a/src/Core/tests/DeviceTests/Stubs/LayoutStub.cs b/src/Core/tests/DeviceTests/Stubs/LayoutStub.cs
index a65f0a5204a8..b6aeebde3616 100644
--- a/src/Core/tests/DeviceTests/Stubs/LayoutStub.cs
+++ b/src/Core/tests/DeviceTests/Stubs/LayoutStub.cs
@@ -6,7 +6,7 @@
 
 namespace Microsoft.Maui.DeviceTests.Stubs
 {
-	public class LayoutStub : StubBase, ILayout
+	public class LayoutStub : StubBase, ILayout, ISafeAreaView2
 	{
 		ILayoutManager _layoutManager;
 
@@ -84,6 +84,13 @@ public Size CrossPlatformArrange(Rect bounds)
 
 		public bool ClipsToBounds { get; set; }
 
+		// ISafeAreaView2 implementation
+		Thickness ISafeAreaView2.SafeAreaInsets { set { } }
+
+		public bool IgnoreSafeAreaForEdge(int edge) => false;
+
+		public SafeAreaRegions GetSafeAreaRegionsForEdge(int edge) => SafeAreaRegions.None;
+
 		public IView this[int index] { get => Children[index]; set => Children[index] = value; }
 	}
 }
\ No newline at end of file

From 9d3e9476845dda74a466afcb40d38e385322b485 Mon Sep 17 00:00:00 2001
From: "Shane Neuville (HE/HIM)" <shneuvil@microsoft.com>
Date: Thu, 24 Jul 2025 14:26:15 -0500
Subject: [PATCH 03/34] - fix public APIS

---
 .../PublicAPI/net-ios/PublicAPI.Unshipped.txt | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index 27d4fc40886f..2240a63e0309 100644
--- a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -1,4 +1,6 @@
 #nullable enable
+Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter
+Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.SafeAreaEdgesTypeConverter() -> void
 Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.ContextFlyoutItemHandlerUpdate(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate! original) -> void
 Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
 Microsoft.Maui.Handlers.DataFlowDirection
@@ -54,6 +56,28 @@ Microsoft.Maui.Platform.MauiTimePicker.UpdateTime(System.TimeSpan? time) -> void
 *REMOVED*Microsoft.Maui.Platform.MauiWebViewNavigationDelegate.DidFinishNavigation(WebKit.WKWebView! webView, WebKit.WKNavigation! navigation) -> void
 Microsoft.Maui.Platform.TextInputExtensions
 Microsoft.Maui.Platform.UIApplicationExtensions
+Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.SafeAreaEdges.Bottom.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Bottom.set -> void
+Microsoft.Maui.SafeAreaEdges.Equals(Microsoft.Maui.SafeAreaEdges other) -> bool
+Microsoft.Maui.SafeAreaEdges.GetEdge(int edge) -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Left.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Left.set -> void
+Microsoft.Maui.SafeAreaEdges.Right.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Right.set -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges() -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions horizontal, Microsoft.Maui.SafeAreaRegions vertical) -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions left, Microsoft.Maui.SafeAreaRegions top, Microsoft.Maui.SafeAreaRegions right, Microsoft.Maui.SafeAreaRegions bottom) -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions uniformValue) -> void
+Microsoft.Maui.SafeAreaEdges.SetEdge(int edge, Microsoft.Maui.SafeAreaRegions value) -> void
+Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Top.set -> void
+Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.All = 2147483647 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Default = 4 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.None = 0 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.SoftInput = 1 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.ScrollToRequest.Deconstruct(out double HorizontalOffset, out double VerticalOffset, out bool Instant) -> void
 Microsoft.Maui.ScrollToRequest.ScrollToRequest(Microsoft.Maui.ScrollToRequest! original) -> void
 Microsoft.Maui.SwipeViewCloseRequest.Deconstruct(out bool Animated) -> void
@@ -104,6 +128,10 @@ override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertFrom(System.C
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value) -> object!
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object!
 override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
 override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
 override Microsoft.Maui.Converters.ThicknessTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
@@ -126,8 +154,13 @@ override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.ToString() -> st
 override Microsoft.Maui.Handlers.OpenWindowRequest.Equals(object? obj) -> bool
 override Microsoft.Maui.Handlers.OpenWindowRequest.GetHashCode() -> int
 override Microsoft.Maui.Handlers.OpenWindowRequest.ToString() -> string!
+override Microsoft.Maui.Handlers.ScrollViewHandler.SetVirtualView(Microsoft.Maui.IView! view) -> void
 override Microsoft.Maui.Platform.MauiScrollView.AdjustedContentInsetDidChange() -> void
 override Microsoft.Maui.Platform.MauiScrollView.SafeAreaInsetsDidChange() -> void
+*REMOVED*override Microsoft.Maui.Platform.MauiView.SafeAreaInsetsDidChange() -> void
+override Microsoft.Maui.SafeAreaEdges.Equals(object? obj) -> bool
+override Microsoft.Maui.SafeAreaEdges.GetHashCode() -> int
+override Microsoft.Maui.SafeAreaEdges.ToString() -> string!
 override Microsoft.Maui.ScrollToRequest.Equals(object? obj) -> bool
 override Microsoft.Maui.ScrollToRequest.GetHashCode() -> int
 override Microsoft.Maui.ScrollToRequest.ToString() -> string!
@@ -170,6 +203,11 @@ static Microsoft.Maui.Platform.TextInputExtensions.GetSelectedTextLength(this UI
 static Microsoft.Maui.Platform.TextInputExtensions.SetTextRange(this UIKit.IUITextInput! platformView, int start, int selectedTextLength) -> void
 static Microsoft.Maui.Platform.UIApplicationExtensions.GetKeyWindow(this UIKit.UIApplication! application) -> UIKit.UIWindow?
 static Microsoft.Maui.Platform.UIApplicationExtensions.GetWindow(this UIKit.UIApplication! application) -> Microsoft.Maui.IWindow?
+static Microsoft.Maui.SafeAreaEdges.All.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.Default.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.None.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.operator !=(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
+static Microsoft.Maui.SafeAreaEdges.operator ==(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
 static Microsoft.Maui.ScrollToRequest.operator !=(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
 static Microsoft.Maui.ScrollToRequest.operator ==(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
 static Microsoft.Maui.SwipeViewCloseRequest.operator !=(Microsoft.Maui.SwipeViewCloseRequest? left, Microsoft.Maui.SwipeViewCloseRequest? right) -> bool

From ea1d70138d372136b33db5b2f42a686187906043 Mon Sep 17 00:00:00 2001
From: "Shane Neuville (HE/HIM)" <shneuvil@microsoft.com>
Date: Thu, 24 Jul 2025 14:39:09 -0500
Subject: [PATCH 04/34] - fix publicapi

---
 .../net-android/PublicAPI.Unshipped.txt          | 15 +++++++++++++++
 .../PublicAPI/net-ios/PublicAPI.Unshipped.txt    | 16 ++++++++++++++++
 .../net-maccatalyst/PublicAPI.Unshipped.txt      | 16 ++++++++++++++++
 .../net-windows/PublicAPI.Unshipped.txt          | 15 +++++++++++++++
 .../Core/PublicAPI/net/PublicAPI.Unshipped.txt   | 15 +++++++++++++++
 .../netstandard/PublicAPI.Unshipped.txt          | 15 +++++++++++++++
 6 files changed, 92 insertions(+)

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 6af1276e70fd..82eb8ac184fc 100644
--- a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -6,6 +6,8 @@
 *REMOVED*~Microsoft.Maui.Controls.Accelerator.Modifiers.set -> void
 *REMOVED*Microsoft.Maui.Controls.AcceleratorTypeConverter
 *REMOVED*Microsoft.Maui.Controls.AcceleratorTypeConverter.AcceleratorTypeConverter() -> void
+Microsoft.Maui.Controls.Border.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.Border.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.BrushTypeConverter.GradientBrushParser.GradientBrushParser(Microsoft.Maui.Graphics.Converters.ColorTypeConverter? colorConverter = null) -> void
 Microsoft.Maui.Controls.BrushTypeConverter.GradientBrushParser.Parse(string? css) -> Microsoft.Maui.Controls.GradientBrush?
 *REMOVED*Microsoft.Maui.Controls.ClickGestureRecognizer
@@ -24,6 +26,8 @@ Microsoft.Maui.Controls.BrushTypeConverter.GradientBrushParser.Parse(string? css
 *REMOVED*Microsoft.Maui.Controls.ClickedEventArgs.Buttons.get -> Microsoft.Maui.Controls.ButtonsMask
 *REMOVED*~Microsoft.Maui.Controls.ClickedEventArgs.ClickedEventArgs(Microsoft.Maui.Controls.ButtonsMask buttons, object commandParameter) -> void
 *REMOVED*~Microsoft.Maui.Controls.ClickedEventArgs.Parameter.get -> object
+Microsoft.Maui.Controls.ContentPage.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.ContentPage.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.ContentPresenter.CascadeInputTransparent.get -> bool
 Microsoft.Maui.Controls.ContentPresenter.CascadeInputTransparent.set -> void
 ~Microsoft.Maui.Controls.ContentPresenter.Children.get -> System.Collections.Generic.IReadOnlyList<Microsoft.Maui.Controls.Element>
@@ -32,6 +36,8 @@ Microsoft.Maui.Controls.ContentPresenter.Padding.get -> Microsoft.Maui.Thickness
 Microsoft.Maui.Controls.ContentPresenter.Padding.set -> void
 ~Microsoft.Maui.Controls.ContentPresenter.RaiseChild(Microsoft.Maui.Controls.View view) -> void
 Microsoft.Maui.Controls.ContentPresenter.UpdateChildrenLayout() -> void
+Microsoft.Maui.Controls.ContentView.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.ContentView.SafeAreaEdges.set -> void
 *REMOVED*Microsoft.Maui.Controls.DateChangedEventArgs.DateChangedEventArgs(System.DateTime oldDate, System.DateTime newDate) -> void
 Microsoft.Maui.Controls.DateChangedEventArgs.DateChangedEventArgs(System.DateTime? oldDate, System.DateTime? newDate) -> void
 *REMOVED*Microsoft.Maui.Controls.DateChangedEventArgs.NewDate.get -> System.DateTime
@@ -83,6 +89,8 @@ Microsoft.Maui.Controls.ITextElement.TextTransform.get -> Microsoft.Maui.TextTra
 Microsoft.Maui.Controls.ITextElement.TextTransform.set -> void
 ~Microsoft.Maui.Controls.ITextElement.UpdateFormsText(string original, Microsoft.Maui.TextTransform transform) -> string
 Microsoft.Maui.Controls.Internals.TextTransformUtilities
+Microsoft.Maui.Controls.Layout.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.Layout.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.LayoutConstraint
 Microsoft.Maui.Controls.LayoutConstraint.Fixed = Microsoft.Maui.Controls.LayoutConstraint.HorizontallyFixed | Microsoft.Maui.Controls.LayoutConstraint.VerticallyFixed -> Microsoft.Maui.Controls.LayoutConstraint
 Microsoft.Maui.Controls.LayoutConstraint.HorizontallyFixed = 1 -> Microsoft.Maui.Controls.LayoutConstraint
@@ -117,6 +125,8 @@ Microsoft.Maui.Controls.ScrollView.CascadeInputTransparent.set -> void
 Microsoft.Maui.Controls.ScrollView.Padding.get -> Microsoft.Maui.Thickness
 Microsoft.Maui.Controls.ScrollView.Padding.set -> void
 ~Microsoft.Maui.Controls.ScrollView.RaiseChild(Microsoft.Maui.Controls.View view) -> void
+Microsoft.Maui.Controls.ScrollView.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.ScrollView.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.ScrollView.UpdateChildrenLayout() -> void
 Microsoft.Maui.Controls.SearchBar.ReturnType.get -> Microsoft.Maui.ReturnType
 Microsoft.Maui.Controls.SearchBar.ReturnType.set -> void
@@ -380,13 +390,17 @@ static Microsoft.Maui.Controls.ViewExtensions.ScaleXToAsync(this Microsoft.Maui.
 static Microsoft.Maui.Controls.ViewExtensions.ScaleYToAsync(this Microsoft.Maui.Controls.VisualElement! view, double scale, uint length = 250, Microsoft.Maui.Easing? easing = null) -> System.Threading.Tasks.Task<bool>!
 static Microsoft.Maui.Controls.ViewExtensions.TranslateToAsync(this Microsoft.Maui.Controls.VisualElement! view, double x, double y, uint length = 250, Microsoft.Maui.Easing? easing = null) -> System.Threading.Tasks.Task<bool>!
 ~static Microsoft.Maui.Controls.WebView.MapJavaScriptEnabled(Microsoft.Maui.Handlers.IWebViewHandler handler, Microsoft.Maui.Controls.WebView webView) -> void
+static readonly Microsoft.Maui.Controls.Border.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty!
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.ButtonsProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.CommandParameterProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.CommandProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.NumberOfClicksRequiredProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.ContentPage.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ContentPresenter.CascadeInputTransparentProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ContentPresenter.PaddingProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.ContentView.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.DatePicker.IsOpenProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.Layout.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.MenuItem.AcceleratorProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.Picker.IsOpenProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.PlatformConfiguration.AndroidSpecific.Button.RippleColorProperty -> Microsoft.Maui.Controls.BindableProperty
@@ -396,6 +410,7 @@ static Microsoft.Maui.Controls.ViewExtensions.TranslateToAsync(this Microsoft.Ma
 ~static readonly Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific.Page.ModalPopoverSourceViewProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ScrollView.CascadeInputTransparentProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ScrollView.PaddingProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.ScrollView.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.SearchBar.ReturnTypeProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.SearchBar.SearchIconColorProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.Shell.NavBarVisibilityAnimationEnabledProperty -> Microsoft.Maui.Controls.BindableProperty
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 9d4c2571775a..fed5f5451149 100644
--- a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -6,6 +6,8 @@
 *REMOVED*~Microsoft.Maui.Controls.Accelerator.Modifiers.set -> void
 *REMOVED*Microsoft.Maui.Controls.AcceleratorTypeConverter
 *REMOVED*Microsoft.Maui.Controls.AcceleratorTypeConverter.AcceleratorTypeConverter() -> void
+Microsoft.Maui.Controls.Border.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.Border.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.BrushTypeConverter.GradientBrushParser.GradientBrushParser(Microsoft.Maui.Graphics.Converters.ColorTypeConverter? colorConverter = null) -> void
 Microsoft.Maui.Controls.BrushTypeConverter.GradientBrushParser.Parse(string? css) -> Microsoft.Maui.Controls.GradientBrush?
 *REMOVED*Microsoft.Maui.Controls.ClickGestureRecognizer
@@ -24,6 +26,8 @@ Microsoft.Maui.Controls.BrushTypeConverter.GradientBrushParser.Parse(string? css
 *REMOVED*Microsoft.Maui.Controls.ClickedEventArgs.Buttons.get -> Microsoft.Maui.Controls.ButtonsMask
 *REMOVED*~Microsoft.Maui.Controls.ClickedEventArgs.ClickedEventArgs(Microsoft.Maui.Controls.ButtonsMask buttons, object commandParameter) -> void
 *REMOVED*~Microsoft.Maui.Controls.ClickedEventArgs.Parameter.get -> object
+Microsoft.Maui.Controls.ContentPage.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.ContentPage.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.ContentPresenter.CascadeInputTransparent.get -> bool
 Microsoft.Maui.Controls.ContentPresenter.CascadeInputTransparent.set -> void
 ~Microsoft.Maui.Controls.ContentPresenter.Children.get -> System.Collections.Generic.IReadOnlyList<Microsoft.Maui.Controls.Element>
@@ -32,6 +36,8 @@ Microsoft.Maui.Controls.ContentPresenter.Padding.get -> Microsoft.Maui.Thickness
 Microsoft.Maui.Controls.ContentPresenter.Padding.set -> void
 ~Microsoft.Maui.Controls.ContentPresenter.RaiseChild(Microsoft.Maui.Controls.View view) -> void
 Microsoft.Maui.Controls.ContentPresenter.UpdateChildrenLayout() -> void
+Microsoft.Maui.Controls.ContentView.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.ContentView.SafeAreaEdges.set -> void
 *REMOVED*Microsoft.Maui.Controls.DateChangedEventArgs.DateChangedEventArgs(System.DateTime oldDate, System.DateTime newDate) -> void
 Microsoft.Maui.Controls.DateChangedEventArgs.DateChangedEventArgs(System.DateTime? oldDate, System.DateTime? newDate) -> void
 *REMOVED*Microsoft.Maui.Controls.DateChangedEventArgs.NewDate.get -> System.DateTime
@@ -85,6 +91,8 @@ Microsoft.Maui.Controls.ITextElement.TextTransform.get -> Microsoft.Maui.TextTra
 Microsoft.Maui.Controls.ITextElement.TextTransform.set -> void
 ~Microsoft.Maui.Controls.ITextElement.UpdateFormsText(string original, Microsoft.Maui.TextTransform transform) -> string
 Microsoft.Maui.Controls.Internals.TextTransformUtilities
+Microsoft.Maui.Controls.Layout.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.Layout.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.LayoutConstraint
 Microsoft.Maui.Controls.LayoutConstraint.Fixed = Microsoft.Maui.Controls.LayoutConstraint.HorizontallyFixed | Microsoft.Maui.Controls.LayoutConstraint.VerticallyFixed -> Microsoft.Maui.Controls.LayoutConstraint
 Microsoft.Maui.Controls.LayoutConstraint.HorizontallyFixed = 1 -> Microsoft.Maui.Controls.LayoutConstraint
@@ -118,6 +126,8 @@ Microsoft.Maui.Controls.ScrollView.CascadeInputTransparent.set -> void
 Microsoft.Maui.Controls.ScrollView.Padding.get -> Microsoft.Maui.Thickness
 Microsoft.Maui.Controls.ScrollView.Padding.set -> void
 ~Microsoft.Maui.Controls.ScrollView.RaiseChild(Microsoft.Maui.Controls.View view) -> void
+Microsoft.Maui.Controls.ScrollView.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.ScrollView.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.ScrollView.UpdateChildrenLayout() -> void
 Microsoft.Maui.Controls.SearchBar.ReturnType.get -> Microsoft.Maui.ReturnType
 Microsoft.Maui.Controls.SearchBar.ReturnType.set -> void
@@ -243,6 +253,7 @@ override Microsoft.Maui.Controls.GridLengthTypeConverter.CanConvertFrom(System.C
 override Microsoft.Maui.Controls.GridLengthTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
 override Microsoft.Maui.Controls.GridLengthTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
 override Microsoft.Maui.Controls.GridLengthTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Controls.Handlers.Items.CarouselViewHandler.PlatformArrange(Microsoft.Maui.Graphics.Rect rect) -> void
 override Microsoft.Maui.Controls.Handlers.Items.MauiCollectionView.MovedToWindow() -> void
 override Microsoft.Maui.Controls.Handlers.Items.MauiCollectionView.ScrollRectToVisible(CoreGraphics.CGRect rect, bool animated) -> void
 ~override Microsoft.Maui.Controls.HorizontalStackLayout.ComputeConstraintForView(Microsoft.Maui.Controls.View view) -> void
@@ -382,13 +393,17 @@ static Microsoft.Maui.Controls.ViewExtensions.ScaleToAsync(this Microsoft.Maui.C
 static Microsoft.Maui.Controls.ViewExtensions.ScaleXToAsync(this Microsoft.Maui.Controls.VisualElement! view, double scale, uint length = 250, Microsoft.Maui.Easing? easing = null) -> System.Threading.Tasks.Task<bool>!
 static Microsoft.Maui.Controls.ViewExtensions.ScaleYToAsync(this Microsoft.Maui.Controls.VisualElement! view, double scale, uint length = 250, Microsoft.Maui.Easing? easing = null) -> System.Threading.Tasks.Task<bool>!
 static Microsoft.Maui.Controls.ViewExtensions.TranslateToAsync(this Microsoft.Maui.Controls.VisualElement! view, double x, double y, uint length = 250, Microsoft.Maui.Easing? easing = null) -> System.Threading.Tasks.Task<bool>!
+static readonly Microsoft.Maui.Controls.Border.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty!
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.ButtonsProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.CommandParameterProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.CommandProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.NumberOfClicksRequiredProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.ContentPage.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ContentPresenter.CascadeInputTransparentProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ContentPresenter.PaddingProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.ContentView.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.DatePicker.IsOpenProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.Layout.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.MenuItem.AcceleratorProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.Picker.IsOpenProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.PlatformConfiguration.AndroidSpecific.Button.RippleColorProperty -> Microsoft.Maui.Controls.BindableProperty
@@ -398,6 +413,7 @@ static Microsoft.Maui.Controls.ViewExtensions.TranslateToAsync(this Microsoft.Ma
 ~static readonly Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific.Page.ModalPopoverSourceViewProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ScrollView.CascadeInputTransparentProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ScrollView.PaddingProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.ScrollView.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.SearchBar.ReturnTypeProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.SearchBar.SearchIconColorProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.Shell.NavBarVisibilityAnimationEnabledProperty -> Microsoft.Maui.Controls.BindableProperty
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 9d4c2571775a..fed5f5451149 100644
--- a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -6,6 +6,8 @@
 *REMOVED*~Microsoft.Maui.Controls.Accelerator.Modifiers.set -> void
 *REMOVED*Microsoft.Maui.Controls.AcceleratorTypeConverter
 *REMOVED*Microsoft.Maui.Controls.AcceleratorTypeConverter.AcceleratorTypeConverter() -> void
+Microsoft.Maui.Controls.Border.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.Border.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.BrushTypeConverter.GradientBrushParser.GradientBrushParser(Microsoft.Maui.Graphics.Converters.ColorTypeConverter? colorConverter = null) -> void
 Microsoft.Maui.Controls.BrushTypeConverter.GradientBrushParser.Parse(string? css) -> Microsoft.Maui.Controls.GradientBrush?
 *REMOVED*Microsoft.Maui.Controls.ClickGestureRecognizer
@@ -24,6 +26,8 @@ Microsoft.Maui.Controls.BrushTypeConverter.GradientBrushParser.Parse(string? css
 *REMOVED*Microsoft.Maui.Controls.ClickedEventArgs.Buttons.get -> Microsoft.Maui.Controls.ButtonsMask
 *REMOVED*~Microsoft.Maui.Controls.ClickedEventArgs.ClickedEventArgs(Microsoft.Maui.Controls.ButtonsMask buttons, object commandParameter) -> void
 *REMOVED*~Microsoft.Maui.Controls.ClickedEventArgs.Parameter.get -> object
+Microsoft.Maui.Controls.ContentPage.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.ContentPage.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.ContentPresenter.CascadeInputTransparent.get -> bool
 Microsoft.Maui.Controls.ContentPresenter.CascadeInputTransparent.set -> void
 ~Microsoft.Maui.Controls.ContentPresenter.Children.get -> System.Collections.Generic.IReadOnlyList<Microsoft.Maui.Controls.Element>
@@ -32,6 +36,8 @@ Microsoft.Maui.Controls.ContentPresenter.Padding.get -> Microsoft.Maui.Thickness
 Microsoft.Maui.Controls.ContentPresenter.Padding.set -> void
 ~Microsoft.Maui.Controls.ContentPresenter.RaiseChild(Microsoft.Maui.Controls.View view) -> void
 Microsoft.Maui.Controls.ContentPresenter.UpdateChildrenLayout() -> void
+Microsoft.Maui.Controls.ContentView.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.ContentView.SafeAreaEdges.set -> void
 *REMOVED*Microsoft.Maui.Controls.DateChangedEventArgs.DateChangedEventArgs(System.DateTime oldDate, System.DateTime newDate) -> void
 Microsoft.Maui.Controls.DateChangedEventArgs.DateChangedEventArgs(System.DateTime? oldDate, System.DateTime? newDate) -> void
 *REMOVED*Microsoft.Maui.Controls.DateChangedEventArgs.NewDate.get -> System.DateTime
@@ -85,6 +91,8 @@ Microsoft.Maui.Controls.ITextElement.TextTransform.get -> Microsoft.Maui.TextTra
 Microsoft.Maui.Controls.ITextElement.TextTransform.set -> void
 ~Microsoft.Maui.Controls.ITextElement.UpdateFormsText(string original, Microsoft.Maui.TextTransform transform) -> string
 Microsoft.Maui.Controls.Internals.TextTransformUtilities
+Microsoft.Maui.Controls.Layout.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.Layout.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.LayoutConstraint
 Microsoft.Maui.Controls.LayoutConstraint.Fixed = Microsoft.Maui.Controls.LayoutConstraint.HorizontallyFixed | Microsoft.Maui.Controls.LayoutConstraint.VerticallyFixed -> Microsoft.Maui.Controls.LayoutConstraint
 Microsoft.Maui.Controls.LayoutConstraint.HorizontallyFixed = 1 -> Microsoft.Maui.Controls.LayoutConstraint
@@ -118,6 +126,8 @@ Microsoft.Maui.Controls.ScrollView.CascadeInputTransparent.set -> void
 Microsoft.Maui.Controls.ScrollView.Padding.get -> Microsoft.Maui.Thickness
 Microsoft.Maui.Controls.ScrollView.Padding.set -> void
 ~Microsoft.Maui.Controls.ScrollView.RaiseChild(Microsoft.Maui.Controls.View view) -> void
+Microsoft.Maui.Controls.ScrollView.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.ScrollView.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.ScrollView.UpdateChildrenLayout() -> void
 Microsoft.Maui.Controls.SearchBar.ReturnType.get -> Microsoft.Maui.ReturnType
 Microsoft.Maui.Controls.SearchBar.ReturnType.set -> void
@@ -243,6 +253,7 @@ override Microsoft.Maui.Controls.GridLengthTypeConverter.CanConvertFrom(System.C
 override Microsoft.Maui.Controls.GridLengthTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
 override Microsoft.Maui.Controls.GridLengthTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
 override Microsoft.Maui.Controls.GridLengthTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Controls.Handlers.Items.CarouselViewHandler.PlatformArrange(Microsoft.Maui.Graphics.Rect rect) -> void
 override Microsoft.Maui.Controls.Handlers.Items.MauiCollectionView.MovedToWindow() -> void
 override Microsoft.Maui.Controls.Handlers.Items.MauiCollectionView.ScrollRectToVisible(CoreGraphics.CGRect rect, bool animated) -> void
 ~override Microsoft.Maui.Controls.HorizontalStackLayout.ComputeConstraintForView(Microsoft.Maui.Controls.View view) -> void
@@ -382,13 +393,17 @@ static Microsoft.Maui.Controls.ViewExtensions.ScaleToAsync(this Microsoft.Maui.C
 static Microsoft.Maui.Controls.ViewExtensions.ScaleXToAsync(this Microsoft.Maui.Controls.VisualElement! view, double scale, uint length = 250, Microsoft.Maui.Easing? easing = null) -> System.Threading.Tasks.Task<bool>!
 static Microsoft.Maui.Controls.ViewExtensions.ScaleYToAsync(this Microsoft.Maui.Controls.VisualElement! view, double scale, uint length = 250, Microsoft.Maui.Easing? easing = null) -> System.Threading.Tasks.Task<bool>!
 static Microsoft.Maui.Controls.ViewExtensions.TranslateToAsync(this Microsoft.Maui.Controls.VisualElement! view, double x, double y, uint length = 250, Microsoft.Maui.Easing? easing = null) -> System.Threading.Tasks.Task<bool>!
+static readonly Microsoft.Maui.Controls.Border.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty!
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.ButtonsProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.CommandParameterProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.CommandProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.NumberOfClicksRequiredProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.ContentPage.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ContentPresenter.CascadeInputTransparentProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ContentPresenter.PaddingProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.ContentView.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.DatePicker.IsOpenProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.Layout.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.MenuItem.AcceleratorProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.Picker.IsOpenProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.PlatformConfiguration.AndroidSpecific.Button.RippleColorProperty -> Microsoft.Maui.Controls.BindableProperty
@@ -398,6 +413,7 @@ static Microsoft.Maui.Controls.ViewExtensions.TranslateToAsync(this Microsoft.Ma
 ~static readonly Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific.Page.ModalPopoverSourceViewProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ScrollView.CascadeInputTransparentProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ScrollView.PaddingProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.ScrollView.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.SearchBar.ReturnTypeProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.SearchBar.SearchIconColorProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.Shell.NavBarVisibilityAnimationEnabledProperty -> 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 8680432ab60f..f2071345c830 100644
--- a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -6,6 +6,8 @@
 *REMOVED*~Microsoft.Maui.Controls.Accelerator.Modifiers.set -> void
 *REMOVED*Microsoft.Maui.Controls.AcceleratorTypeConverter
 *REMOVED*Microsoft.Maui.Controls.AcceleratorTypeConverter.AcceleratorTypeConverter() -> void
+Microsoft.Maui.Controls.Border.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.Border.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.BrushTypeConverter.GradientBrushParser.GradientBrushParser(Microsoft.Maui.Graphics.Converters.ColorTypeConverter? colorConverter = null) -> void
 Microsoft.Maui.Controls.BrushTypeConverter.GradientBrushParser.Parse(string? css) -> Microsoft.Maui.Controls.GradientBrush?
 *REMOVED*Microsoft.Maui.Controls.ClickGestureRecognizer
@@ -24,6 +26,8 @@ Microsoft.Maui.Controls.BrushTypeConverter.GradientBrushParser.Parse(string? css
 *REMOVED*Microsoft.Maui.Controls.ClickedEventArgs.Buttons.get -> Microsoft.Maui.Controls.ButtonsMask
 *REMOVED*~Microsoft.Maui.Controls.ClickedEventArgs.ClickedEventArgs(Microsoft.Maui.Controls.ButtonsMask buttons, object commandParameter) -> void
 *REMOVED*~Microsoft.Maui.Controls.ClickedEventArgs.Parameter.get -> object
+Microsoft.Maui.Controls.ContentPage.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.ContentPage.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.ContentPresenter.CascadeInputTransparent.get -> bool
 Microsoft.Maui.Controls.ContentPresenter.CascadeInputTransparent.set -> void
 ~Microsoft.Maui.Controls.ContentPresenter.Children.get -> System.Collections.Generic.IReadOnlyList<Microsoft.Maui.Controls.Element>
@@ -32,6 +36,8 @@ Microsoft.Maui.Controls.ContentPresenter.Padding.get -> Microsoft.Maui.Thickness
 Microsoft.Maui.Controls.ContentPresenter.Padding.set -> void
 ~Microsoft.Maui.Controls.ContentPresenter.RaiseChild(Microsoft.Maui.Controls.View view) -> void
 Microsoft.Maui.Controls.ContentPresenter.UpdateChildrenLayout() -> void
+Microsoft.Maui.Controls.ContentView.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.ContentView.SafeAreaEdges.set -> void
 *REMOVED*Microsoft.Maui.Controls.DateChangedEventArgs.DateChangedEventArgs(System.DateTime oldDate, System.DateTime newDate) -> void
 Microsoft.Maui.Controls.DateChangedEventArgs.DateChangedEventArgs(System.DateTime? oldDate, System.DateTime? newDate) -> void
 *REMOVED*Microsoft.Maui.Controls.DateChangedEventArgs.NewDate.get -> System.DateTime
@@ -83,6 +89,8 @@ Microsoft.Maui.Controls.ITextElement.TextTransform.get -> Microsoft.Maui.TextTra
 Microsoft.Maui.Controls.ITextElement.TextTransform.set -> void
 ~Microsoft.Maui.Controls.ITextElement.UpdateFormsText(string original, Microsoft.Maui.TextTransform transform) -> string
 Microsoft.Maui.Controls.Internals.TextTransformUtilities
+Microsoft.Maui.Controls.Layout.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.Layout.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.LayoutConstraint
 Microsoft.Maui.Controls.LayoutConstraint.Fixed = Microsoft.Maui.Controls.LayoutConstraint.HorizontallyFixed | Microsoft.Maui.Controls.LayoutConstraint.VerticallyFixed -> Microsoft.Maui.Controls.LayoutConstraint
 Microsoft.Maui.Controls.LayoutConstraint.HorizontallyFixed = 1 -> Microsoft.Maui.Controls.LayoutConstraint
@@ -116,6 +124,8 @@ Microsoft.Maui.Controls.ScrollView.CascadeInputTransparent.set -> void
 Microsoft.Maui.Controls.ScrollView.Padding.get -> Microsoft.Maui.Thickness
 Microsoft.Maui.Controls.ScrollView.Padding.set -> void
 ~Microsoft.Maui.Controls.ScrollView.RaiseChild(Microsoft.Maui.Controls.View view) -> void
+Microsoft.Maui.Controls.ScrollView.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.ScrollView.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.ScrollView.UpdateChildrenLayout() -> void
 Microsoft.Maui.Controls.SearchBar.ReturnType.get -> Microsoft.Maui.ReturnType
 Microsoft.Maui.Controls.SearchBar.ReturnType.set -> void
@@ -377,13 +387,17 @@ static Microsoft.Maui.Controls.ViewExtensions.ScaleToAsync(this Microsoft.Maui.C
 static Microsoft.Maui.Controls.ViewExtensions.ScaleXToAsync(this Microsoft.Maui.Controls.VisualElement! view, double scale, uint length = 250, Microsoft.Maui.Easing? easing = null) -> System.Threading.Tasks.Task<bool>!
 static Microsoft.Maui.Controls.ViewExtensions.ScaleYToAsync(this Microsoft.Maui.Controls.VisualElement! view, double scale, uint length = 250, Microsoft.Maui.Easing? easing = null) -> System.Threading.Tasks.Task<bool>!
 static Microsoft.Maui.Controls.ViewExtensions.TranslateToAsync(this Microsoft.Maui.Controls.VisualElement! view, double x, double y, uint length = 250, Microsoft.Maui.Easing? easing = null) -> System.Threading.Tasks.Task<bool>!
+static readonly Microsoft.Maui.Controls.Border.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty!
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.ButtonsProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.CommandParameterProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.CommandProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.NumberOfClicksRequiredProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.ContentPage.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ContentPresenter.CascadeInputTransparentProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ContentPresenter.PaddingProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.ContentView.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.DatePicker.IsOpenProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.Layout.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.MenuItem.AcceleratorProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.Picker.IsOpenProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.PlatformConfiguration.AndroidSpecific.Button.RippleColorProperty -> Microsoft.Maui.Controls.BindableProperty
@@ -393,6 +407,7 @@ static Microsoft.Maui.Controls.ViewExtensions.TranslateToAsync(this Microsoft.Ma
 ~static readonly Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific.Page.ModalPopoverSourceViewProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ScrollView.CascadeInputTransparentProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ScrollView.PaddingProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.ScrollView.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.SearchBar.ReturnTypeProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.SearchBar.SearchIconColorProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.Shell.NavBarVisibilityAnimationEnabledProperty -> Microsoft.Maui.Controls.BindableProperty
diff --git a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
index 72ec40e113b7..e79bc61cc361 100644
--- a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -6,6 +6,8 @@
 *REMOVED*~Microsoft.Maui.Controls.Accelerator.Modifiers.set -> void
 *REMOVED*Microsoft.Maui.Controls.AcceleratorTypeConverter
 *REMOVED*Microsoft.Maui.Controls.AcceleratorTypeConverter.AcceleratorTypeConverter() -> void
+Microsoft.Maui.Controls.Border.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.Border.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.BrushTypeConverter.GradientBrushParser.GradientBrushParser(Microsoft.Maui.Graphics.Converters.ColorTypeConverter? colorConverter = null) -> void
 Microsoft.Maui.Controls.BrushTypeConverter.GradientBrushParser.Parse(string? css) -> Microsoft.Maui.Controls.GradientBrush?
 *REMOVED*Microsoft.Maui.Controls.ClickGestureRecognizer
@@ -24,6 +26,8 @@ Microsoft.Maui.Controls.BrushTypeConverter.GradientBrushParser.Parse(string? css
 *REMOVED*Microsoft.Maui.Controls.ClickedEventArgs.Buttons.get -> Microsoft.Maui.Controls.ButtonsMask
 *REMOVED*~Microsoft.Maui.Controls.ClickedEventArgs.ClickedEventArgs(Microsoft.Maui.Controls.ButtonsMask buttons, object commandParameter) -> void
 *REMOVED*~Microsoft.Maui.Controls.ClickedEventArgs.Parameter.get -> object
+Microsoft.Maui.Controls.ContentPage.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.ContentPage.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.ContentPresenter.CascadeInputTransparent.get -> bool
 Microsoft.Maui.Controls.ContentPresenter.CascadeInputTransparent.set -> void
 ~Microsoft.Maui.Controls.ContentPresenter.Children.get -> System.Collections.Generic.IReadOnlyList<Microsoft.Maui.Controls.Element>
@@ -32,6 +36,8 @@ Microsoft.Maui.Controls.ContentPresenter.Padding.get -> Microsoft.Maui.Thickness
 Microsoft.Maui.Controls.ContentPresenter.Padding.set -> void
 ~Microsoft.Maui.Controls.ContentPresenter.RaiseChild(Microsoft.Maui.Controls.View view) -> void
 Microsoft.Maui.Controls.ContentPresenter.UpdateChildrenLayout() -> void
+Microsoft.Maui.Controls.ContentView.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.ContentView.SafeAreaEdges.set -> void
 *REMOVED*Microsoft.Maui.Controls.DateChangedEventArgs.DateChangedEventArgs(System.DateTime oldDate, System.DateTime newDate) -> void
 Microsoft.Maui.Controls.DateChangedEventArgs.DateChangedEventArgs(System.DateTime? oldDate, System.DateTime? newDate) -> void
 *REMOVED*Microsoft.Maui.Controls.DateChangedEventArgs.NewDate.get -> System.DateTime
@@ -83,6 +89,8 @@ Microsoft.Maui.Controls.ITextElement.TextTransform.get -> Microsoft.Maui.TextTra
 Microsoft.Maui.Controls.ITextElement.TextTransform.set -> void
 ~Microsoft.Maui.Controls.ITextElement.UpdateFormsText(string original, Microsoft.Maui.TextTransform transform) -> string
 Microsoft.Maui.Controls.Internals.TextTransformUtilities
+Microsoft.Maui.Controls.Layout.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.Layout.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.LayoutConstraint
 Microsoft.Maui.Controls.LayoutConstraint.Fixed = Microsoft.Maui.Controls.LayoutConstraint.HorizontallyFixed | Microsoft.Maui.Controls.LayoutConstraint.VerticallyFixed -> Microsoft.Maui.Controls.LayoutConstraint
 Microsoft.Maui.Controls.LayoutConstraint.HorizontallyFixed = 1 -> Microsoft.Maui.Controls.LayoutConstraint
@@ -113,6 +121,8 @@ Microsoft.Maui.Controls.ScrollView.CascadeInputTransparent.set -> void
 Microsoft.Maui.Controls.ScrollView.Padding.get -> Microsoft.Maui.Thickness
 Microsoft.Maui.Controls.ScrollView.Padding.set -> void
 ~Microsoft.Maui.Controls.ScrollView.RaiseChild(Microsoft.Maui.Controls.View view) -> void
+Microsoft.Maui.Controls.ScrollView.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.ScrollView.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.ScrollView.UpdateChildrenLayout() -> void
 Microsoft.Maui.Controls.SearchBar.ReturnType.get -> Microsoft.Maui.ReturnType
 Microsoft.Maui.Controls.SearchBar.ReturnType.set -> void
@@ -370,13 +380,17 @@ static Microsoft.Maui.Controls.ViewExtensions.ScaleToAsync(this Microsoft.Maui.C
 static Microsoft.Maui.Controls.ViewExtensions.ScaleXToAsync(this Microsoft.Maui.Controls.VisualElement! view, double scale, uint length = 250, Microsoft.Maui.Easing? easing = null) -> System.Threading.Tasks.Task<bool>!
 static Microsoft.Maui.Controls.ViewExtensions.ScaleYToAsync(this Microsoft.Maui.Controls.VisualElement! view, double scale, uint length = 250, Microsoft.Maui.Easing? easing = null) -> System.Threading.Tasks.Task<bool>!
 static Microsoft.Maui.Controls.ViewExtensions.TranslateToAsync(this Microsoft.Maui.Controls.VisualElement! view, double x, double y, uint length = 250, Microsoft.Maui.Easing? easing = null) -> System.Threading.Tasks.Task<bool>!
+static readonly Microsoft.Maui.Controls.Border.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty!
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.ButtonsProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.CommandParameterProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.CommandProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.NumberOfClicksRequiredProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.ContentPage.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ContentPresenter.CascadeInputTransparentProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ContentPresenter.PaddingProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.ContentView.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.DatePicker.IsOpenProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.Layout.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.MenuItem.AcceleratorProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.Picker.IsOpenProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.PlatformConfiguration.AndroidSpecific.Button.RippleColorProperty -> Microsoft.Maui.Controls.BindableProperty
@@ -386,6 +400,7 @@ static Microsoft.Maui.Controls.ViewExtensions.TranslateToAsync(this Microsoft.Ma
 ~static readonly Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific.Page.ModalPopoverSourceViewProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ScrollView.CascadeInputTransparentProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ScrollView.PaddingProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.ScrollView.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.SearchBar.ReturnTypeProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.SearchBar.SearchIconColorProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.Shell.NavBarVisibilityAnimationEnabledProperty -> Microsoft.Maui.Controls.BindableProperty
diff --git a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
index 72ec40e113b7..e79bc61cc361 100644
--- a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -6,6 +6,8 @@
 *REMOVED*~Microsoft.Maui.Controls.Accelerator.Modifiers.set -> void
 *REMOVED*Microsoft.Maui.Controls.AcceleratorTypeConverter
 *REMOVED*Microsoft.Maui.Controls.AcceleratorTypeConverter.AcceleratorTypeConverter() -> void
+Microsoft.Maui.Controls.Border.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.Border.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.BrushTypeConverter.GradientBrushParser.GradientBrushParser(Microsoft.Maui.Graphics.Converters.ColorTypeConverter? colorConverter = null) -> void
 Microsoft.Maui.Controls.BrushTypeConverter.GradientBrushParser.Parse(string? css) -> Microsoft.Maui.Controls.GradientBrush?
 *REMOVED*Microsoft.Maui.Controls.ClickGestureRecognizer
@@ -24,6 +26,8 @@ Microsoft.Maui.Controls.BrushTypeConverter.GradientBrushParser.Parse(string? css
 *REMOVED*Microsoft.Maui.Controls.ClickedEventArgs.Buttons.get -> Microsoft.Maui.Controls.ButtonsMask
 *REMOVED*~Microsoft.Maui.Controls.ClickedEventArgs.ClickedEventArgs(Microsoft.Maui.Controls.ButtonsMask buttons, object commandParameter) -> void
 *REMOVED*~Microsoft.Maui.Controls.ClickedEventArgs.Parameter.get -> object
+Microsoft.Maui.Controls.ContentPage.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.ContentPage.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.ContentPresenter.CascadeInputTransparent.get -> bool
 Microsoft.Maui.Controls.ContentPresenter.CascadeInputTransparent.set -> void
 ~Microsoft.Maui.Controls.ContentPresenter.Children.get -> System.Collections.Generic.IReadOnlyList<Microsoft.Maui.Controls.Element>
@@ -32,6 +36,8 @@ Microsoft.Maui.Controls.ContentPresenter.Padding.get -> Microsoft.Maui.Thickness
 Microsoft.Maui.Controls.ContentPresenter.Padding.set -> void
 ~Microsoft.Maui.Controls.ContentPresenter.RaiseChild(Microsoft.Maui.Controls.View view) -> void
 Microsoft.Maui.Controls.ContentPresenter.UpdateChildrenLayout() -> void
+Microsoft.Maui.Controls.ContentView.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.ContentView.SafeAreaEdges.set -> void
 *REMOVED*Microsoft.Maui.Controls.DateChangedEventArgs.DateChangedEventArgs(System.DateTime oldDate, System.DateTime newDate) -> void
 Microsoft.Maui.Controls.DateChangedEventArgs.DateChangedEventArgs(System.DateTime? oldDate, System.DateTime? newDate) -> void
 *REMOVED*Microsoft.Maui.Controls.DateChangedEventArgs.NewDate.get -> System.DateTime
@@ -83,6 +89,8 @@ Microsoft.Maui.Controls.ITextElement.TextTransform.get -> Microsoft.Maui.TextTra
 Microsoft.Maui.Controls.ITextElement.TextTransform.set -> void
 ~Microsoft.Maui.Controls.ITextElement.UpdateFormsText(string original, Microsoft.Maui.TextTransform transform) -> string
 Microsoft.Maui.Controls.Internals.TextTransformUtilities
+Microsoft.Maui.Controls.Layout.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.Layout.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.LayoutConstraint
 Microsoft.Maui.Controls.LayoutConstraint.Fixed = Microsoft.Maui.Controls.LayoutConstraint.HorizontallyFixed | Microsoft.Maui.Controls.LayoutConstraint.VerticallyFixed -> Microsoft.Maui.Controls.LayoutConstraint
 Microsoft.Maui.Controls.LayoutConstraint.HorizontallyFixed = 1 -> Microsoft.Maui.Controls.LayoutConstraint
@@ -113,6 +121,8 @@ Microsoft.Maui.Controls.ScrollView.CascadeInputTransparent.set -> void
 Microsoft.Maui.Controls.ScrollView.Padding.get -> Microsoft.Maui.Thickness
 Microsoft.Maui.Controls.ScrollView.Padding.set -> void
 ~Microsoft.Maui.Controls.ScrollView.RaiseChild(Microsoft.Maui.Controls.View view) -> void
+Microsoft.Maui.Controls.ScrollView.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.ScrollView.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.ScrollView.UpdateChildrenLayout() -> void
 Microsoft.Maui.Controls.SearchBar.ReturnType.get -> Microsoft.Maui.ReturnType
 Microsoft.Maui.Controls.SearchBar.ReturnType.set -> void
@@ -370,13 +380,17 @@ static Microsoft.Maui.Controls.ViewExtensions.ScaleToAsync(this Microsoft.Maui.C
 static Microsoft.Maui.Controls.ViewExtensions.ScaleXToAsync(this Microsoft.Maui.Controls.VisualElement! view, double scale, uint length = 250, Microsoft.Maui.Easing? easing = null) -> System.Threading.Tasks.Task<bool>!
 static Microsoft.Maui.Controls.ViewExtensions.ScaleYToAsync(this Microsoft.Maui.Controls.VisualElement! view, double scale, uint length = 250, Microsoft.Maui.Easing? easing = null) -> System.Threading.Tasks.Task<bool>!
 static Microsoft.Maui.Controls.ViewExtensions.TranslateToAsync(this Microsoft.Maui.Controls.VisualElement! view, double x, double y, uint length = 250, Microsoft.Maui.Easing? easing = null) -> System.Threading.Tasks.Task<bool>!
+static readonly Microsoft.Maui.Controls.Border.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty!
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.ButtonsProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.CommandParameterProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.CommandProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.NumberOfClicksRequiredProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.ContentPage.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ContentPresenter.CascadeInputTransparentProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ContentPresenter.PaddingProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.ContentView.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.DatePicker.IsOpenProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.Layout.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.MenuItem.AcceleratorProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.Picker.IsOpenProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.PlatformConfiguration.AndroidSpecific.Button.RippleColorProperty -> Microsoft.Maui.Controls.BindableProperty
@@ -386,6 +400,7 @@ static Microsoft.Maui.Controls.ViewExtensions.TranslateToAsync(this Microsoft.Ma
 ~static readonly Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific.Page.ModalPopoverSourceViewProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ScrollView.CascadeInputTransparentProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ScrollView.PaddingProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.ScrollView.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.SearchBar.ReturnTypeProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.SearchBar.SearchIconColorProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.Shell.NavBarVisibilityAnimationEnabledProperty -> Microsoft.Maui.Controls.BindableProperty

From 7568cba7538c517171afc254b582554003413b6d Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Thu, 24 Jul 2025 14:54:30 -0500
Subject: [PATCH 05/34] - fix default safearea

---
 src/Core/src/Platform/iOS/MauiScrollView.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Core/src/Platform/iOS/MauiScrollView.cs b/src/Core/src/Platform/iOS/MauiScrollView.cs
index ff8a70c945c5..f479c6bcda64 100644
--- a/src/Core/src/Platform/iOS/MauiScrollView.cs
+++ b/src/Core/src/Platform/iOS/MauiScrollView.cs
@@ -394,6 +394,7 @@ Size CrossPlatformArrange(CGRect bounds)
 			if (SystemAdjustedContentInset == UIEdgeInsets.Zero || ContentInsetAdjustmentBehavior == UIScrollViewContentInsetAdjustmentBehavior.Never)
 			{
 				contentSize = CrossPlatformLayout?.CrossPlatformArrange(bounds.ToRectangle()) ?? Size.Zero;
+				contentSize = new Size(contentSize.Width + _safeArea.HorizontalThickness, contentSize.Height + _safeArea.VerticalThickness);
 			}
 			else
 			{

From dfbf4621222fcc6094a1a2391f94218a89980b4d Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Thu, 24 Jul 2025 15:41:11 -0500
Subject: [PATCH 06/34] - fix tests

---
 .../DeviceTests/Elements/CollectionView/CollectionViewTests.cs  | 2 +-
 src/Controls/tests/DeviceTests/Elements/Page/PageTests.iOS.cs   | 2 +-
 src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml.cs  | 2 +-
 .../tests/TestCases.HostApp/Issues/Issue28986_Border.xaml.cs    | 2 +-
 .../TestCases.HostApp/Issues/Issue28986_ContentPage.xaml.cs     | 2 +-
 .../TestCases.HostApp/Issues/Issue28986_ContentView.xaml.cs     | 2 +-
 .../TestCases.HostApp/Issues/Issue28986_ScrollView.xaml.cs      | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.cs b/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.cs
index 6daeb96dd99b..a0ca83c64568 100644
--- a/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.cs
@@ -730,7 +730,7 @@ public async Task SafeAreaBehaviorConsistency(bool useNewApi)
 
 			if (useNewApi)
 			{
-				SafeArea.SetIgnore(layout, SafeAreaEdges.All);
+				layout.SafeAreaEdges = SafeAreaEdges.None;
 			}
 			else
 			{
diff --git a/src/Controls/tests/DeviceTests/Elements/Page/PageTests.iOS.cs b/src/Controls/tests/DeviceTests/Elements/Page/PageTests.iOS.cs
index 2c6fe0ac58d6..013bffe31e62 100644
--- a/src/Controls/tests/DeviceTests/Elements/Page/PageTests.iOS.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Page/PageTests.iOS.cs
@@ -56,7 +56,7 @@ public async Task SafeAreaBehaviorConsistency(bool useNewApi)
 
 			if (useNewApi)
 			{
-				SafeArea.SetIgnore(page, SafeAreaEdges.None);
+				page.SafeAreaEdges = SafeAreaEdges.All;
 			}
 			else
 			{
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml.cs
index b2d2ab429002..f2988a4ede9f 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml.cs
@@ -1,6 +1,6 @@
 namespace Maui.Controls.Sample.Issues;
 
-[Issue(IssueTracker.Github, 28986, "Test SafeArea attached property for per-edge safe area control", PlatformAffected.All)]
+[Issue(IssueTracker.Github, 28986, "Test SafeArea attached property for per-edge safe area control", PlatformAffected.All, issueTestNumber: 0)]
 public partial class Issue28986 : ContentPage
 {
 	public Issue28986()
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_Border.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_Border.xaml.cs
index 55a86f97e0cd..89158d60c576 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_Border.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_Border.xaml.cs
@@ -1,6 +1,6 @@
 namespace Maui.Controls.Sample.Issues;
 
-[Issue(IssueTracker.Github, 28986, "Test SafeArea Border for per-edge safe area control", PlatformAffected.All)]
+[Issue(IssueTracker.Github, 28986, "Test SafeArea Border for per-edge safe area control", PlatformAffected.All, issueTestNumber: 1)]
 public partial class Issue28986_Border : ContentPage
 {
 	public Issue28986_Border()
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ContentPage.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ContentPage.xaml.cs
index f26483ae72ea..9b472ac84a0c 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ContentPage.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ContentPage.xaml.cs
@@ -1,6 +1,6 @@
 namespace Maui.Controls.Sample.Issues;
 
-[Issue(IssueTracker.Github, 28986, "Test SafeArea ContentPage for per-edge safe area control", PlatformAffected.All)]
+[Issue(IssueTracker.Github, 28986, "Test SafeArea ContentPage for per-edge safe area control", PlatformAffected.All, issueTestNumber: 2)]
 public partial class Issue28986_ContentPage : ContentPage
 {
 	public Issue28986_ContentPage()
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ContentView.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ContentView.xaml.cs
index f46ee1d3f430..dcb4ae416942 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ContentView.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ContentView.xaml.cs
@@ -1,6 +1,6 @@
 namespace Maui.Controls.Sample.Issues;
 
-[Issue(IssueTracker.Github, 28986, "Test SafeArea ContentView for per-edge safe area control", PlatformAffected.All)]
+[Issue(IssueTracker.Github, 28986, "Test SafeArea ContentView for per-edge safe area control", PlatformAffected.All, issueTestNumber: 3)]
 public partial class Issue28986_ContentView : ContentPage
 {
 	public Issue28986_ContentView()
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ScrollView.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ScrollView.xaml.cs
index eb148432d683..51cdec127f28 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ScrollView.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ScrollView.xaml.cs
@@ -1,6 +1,6 @@
 namespace Maui.Controls.Sample.Issues;
 
-[Issue(IssueTracker.Github, 28986, "Test SafeArea ScrollView for per-edge safe area control", PlatformAffected.All)]
+[Issue(IssueTracker.Github, 28986, "Test SafeArea ScrollView for per-edge safe area control", PlatformAffected.All, issueTestNumber: 4)]
 public partial class Issue28986_ScrollView : ContentPage
 {
 	public Issue28986_ScrollView()

From 221807ad31b77dd493a061280259fc88e4ad8c60 Mon Sep 17 00:00:00 2001
From: "Shane Neuville (HE/HIM)" <shneuvil@microsoft.com>
Date: Thu, 24 Jul 2025 21:54:25 -0500
Subject: [PATCH 07/34] - publicapi fix

---
 .../net-maccatalyst/PublicAPI.Unshipped.txt   | 38 +++++++++++++++++++
 .../net-windows/PublicAPI.Unshipped.txt       | 36 ++++++++++++++++++
 2 files changed, 74 insertions(+)

diff --git a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index 63642795bccc..928c8fd87f21 100644
--- a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -1,4 +1,6 @@
 #nullable enable
+Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter
+Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.SafeAreaEdgesTypeConverter() -> void
 Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.ContextFlyoutItemHandlerUpdate(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate! original) -> void
 Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
 Microsoft.Maui.Handlers.DataFlowDirection
@@ -56,6 +58,28 @@ Microsoft.Maui.Platform.MauiTimePicker.UpdateTime(System.TimeSpan? time) -> void
 *REMOVED*Microsoft.Maui.Platform.MauiWebViewNavigationDelegate.DidFinishNavigation(WebKit.WKWebView! webView, WebKit.WKNavigation! navigation) -> void
 Microsoft.Maui.Platform.TextInputExtensions
 Microsoft.Maui.Platform.UIApplicationExtensions
+Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.SafeAreaEdges.Bottom.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Bottom.set -> void
+Microsoft.Maui.SafeAreaEdges.Equals(Microsoft.Maui.SafeAreaEdges other) -> bool
+Microsoft.Maui.SafeAreaEdges.GetEdge(int edge) -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Left.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Left.set -> void
+Microsoft.Maui.SafeAreaEdges.Right.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Right.set -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges() -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions horizontal, Microsoft.Maui.SafeAreaRegions vertical) -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions left, Microsoft.Maui.SafeAreaRegions top, Microsoft.Maui.SafeAreaRegions right, Microsoft.Maui.SafeAreaRegions bottom) -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions uniformValue) -> void
+Microsoft.Maui.SafeAreaEdges.SetEdge(int edge, Microsoft.Maui.SafeAreaRegions value) -> void
+Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Top.set -> void
+Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.All = 2147483647 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Default = 4 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.None = 0 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.SoftInput = 1 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.ScrollToRequest.Deconstruct(out double HorizontalOffset, out double VerticalOffset, out bool Instant) -> void
 Microsoft.Maui.ScrollToRequest.ScrollToRequest(Microsoft.Maui.ScrollToRequest! original) -> void
 Microsoft.Maui.SwipeViewCloseRequest.Deconstruct(out bool Animated) -> void
@@ -106,6 +130,10 @@ override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertFrom(System.C
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value) -> object!
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object!
 override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
 override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
 override Microsoft.Maui.Converters.ThicknessTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
@@ -128,8 +156,13 @@ override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.ToString() -> st
 override Microsoft.Maui.Handlers.OpenWindowRequest.Equals(object? obj) -> bool
 override Microsoft.Maui.Handlers.OpenWindowRequest.GetHashCode() -> int
 override Microsoft.Maui.Handlers.OpenWindowRequest.ToString() -> string!
+override Microsoft.Maui.Handlers.ScrollViewHandler.SetVirtualView(Microsoft.Maui.IView! view) -> void
 override Microsoft.Maui.Platform.MauiScrollView.AdjustedContentInsetDidChange() -> void
 override Microsoft.Maui.Platform.MauiScrollView.SafeAreaInsetsDidChange() -> void
+*REMOVED*override Microsoft.Maui.Platform.MauiView.SafeAreaInsetsDidChange() -> void
+override Microsoft.Maui.SafeAreaEdges.Equals(object? obj) -> bool
+override Microsoft.Maui.SafeAreaEdges.GetHashCode() -> int
+override Microsoft.Maui.SafeAreaEdges.ToString() -> string!
 override Microsoft.Maui.ScrollToRequest.Equals(object? obj) -> bool
 override Microsoft.Maui.ScrollToRequest.GetHashCode() -> int
 override Microsoft.Maui.ScrollToRequest.ToString() -> string!
@@ -173,6 +206,11 @@ static Microsoft.Maui.Platform.TextInputExtensions.GetSelectedTextLength(this UI
 static Microsoft.Maui.Platform.TextInputExtensions.SetTextRange(this UIKit.IUITextInput! platformView, int start, int selectedTextLength) -> void
 static Microsoft.Maui.Platform.UIApplicationExtensions.GetKeyWindow(this UIKit.UIApplication! application) -> UIKit.UIWindow?
 static Microsoft.Maui.Platform.UIApplicationExtensions.GetWindow(this UIKit.UIApplication! application) -> Microsoft.Maui.IWindow?
+static Microsoft.Maui.SafeAreaEdges.All.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.Default.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.None.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.operator !=(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
+static Microsoft.Maui.SafeAreaEdges.operator ==(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
 static Microsoft.Maui.ScrollToRequest.operator !=(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
 static Microsoft.Maui.ScrollToRequest.operator ==(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
 static Microsoft.Maui.SwipeViewCloseRequest.operator !=(Microsoft.Maui.SwipeViewCloseRequest? left, Microsoft.Maui.SwipeViewCloseRequest? right) -> bool
diff --git a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index 911613fbe02a..f73005f0a8b1 100644
--- a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -1,4 +1,6 @@
 #nullable enable
+Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter
+Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.SafeAreaEdgesTypeConverter() -> void
 Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.ContextFlyoutItemHandlerUpdate(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate! original) -> void
 Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
 Microsoft.Maui.Handlers.DataFlowDirection
@@ -47,6 +49,28 @@ Microsoft.Maui.IWebRequestInterceptingWebView.WebResourceRequested(Microsoft.Mau
 Microsoft.Maui.IWindow.IsMaximizable.get -> bool
 Microsoft.Maui.IWindow.IsMinimizable.get -> bool
 Microsoft.Maui.Platform.CalendarDatePickerExtensions
+Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.SafeAreaEdges.Bottom.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Bottom.set -> void
+Microsoft.Maui.SafeAreaEdges.Equals(Microsoft.Maui.SafeAreaEdges other) -> bool
+Microsoft.Maui.SafeAreaEdges.GetEdge(int edge) -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Left.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Left.set -> void
+Microsoft.Maui.SafeAreaEdges.Right.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Right.set -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges() -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions horizontal, Microsoft.Maui.SafeAreaRegions vertical) -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions left, Microsoft.Maui.SafeAreaRegions top, Microsoft.Maui.SafeAreaRegions right, Microsoft.Maui.SafeAreaRegions bottom) -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions uniformValue) -> void
+Microsoft.Maui.SafeAreaEdges.SetEdge(int edge, Microsoft.Maui.SafeAreaRegions value) -> void
+Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Top.set -> void
+Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.All = 2147483647 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Default = 4 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.None = 0 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.SoftInput = 1 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.ScrollToRequest.Deconstruct(out double HorizontalOffset, out double VerticalOffset, out bool Instant) -> void
 Microsoft.Maui.ScrollToRequest.ScrollToRequest(Microsoft.Maui.ScrollToRequest! original) -> void
 Microsoft.Maui.SwipeViewCloseRequest.Deconstruct(out bool Animated) -> void
@@ -97,6 +121,10 @@ override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertFrom(System.C
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value) -> object!
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object!
 override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
 override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
 override Microsoft.Maui.Converters.ThicknessTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
@@ -119,6 +147,9 @@ override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.ToString() -> st
 override Microsoft.Maui.Handlers.OpenWindowRequest.Equals(object? obj) -> bool
 override Microsoft.Maui.Handlers.OpenWindowRequest.GetHashCode() -> int
 override Microsoft.Maui.Handlers.OpenWindowRequest.ToString() -> string!
+override Microsoft.Maui.SafeAreaEdges.Equals(object? obj) -> bool
+override Microsoft.Maui.SafeAreaEdges.GetHashCode() -> int
+override Microsoft.Maui.SafeAreaEdges.ToString() -> string!
 override Microsoft.Maui.ScrollToRequest.Equals(object? obj) -> bool
 override Microsoft.Maui.ScrollToRequest.GetHashCode() -> int
 override Microsoft.Maui.ScrollToRequest.ToString() -> string!
@@ -163,6 +194,11 @@ static Microsoft.Maui.Platform.ScrollViewerExtensions.UpdateScrollBarVisibility(
 static Microsoft.Maui.Platform.SearchBarExtensions.UpdateReturnType(this Microsoft.UI.Xaml.Controls.AutoSuggestBox! platformControl, Microsoft.Maui.ISearchBar! searchBar) -> void
 static Microsoft.Maui.Platform.TextBoxExtensions.GetCursorPosition(this Microsoft.UI.Xaml.Controls.TextBox! textBox, int cursorOffset = 0) -> int
 static Microsoft.Maui.Platform.TimePickerExtensions.UpdateBackground(this Microsoft.UI.Xaml.Controls.TimePicker! platformTimePicker, Microsoft.Maui.ITimePicker! timePicker) -> void
+static Microsoft.Maui.SafeAreaEdges.All.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.Default.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.None.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.operator !=(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
+static Microsoft.Maui.SafeAreaEdges.operator ==(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
 static Microsoft.Maui.ScrollToRequest.operator !=(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
 static Microsoft.Maui.ScrollToRequest.operator ==(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
 static Microsoft.Maui.SwipeViewCloseRequest.operator !=(Microsoft.Maui.SwipeViewCloseRequest? left, Microsoft.Maui.SwipeViewCloseRequest? right) -> bool

From 7d0cc5bc64591ff13dcf91609abb644c3a9c612b Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 25 Jul 2025 03:22:58 +0000
Subject: [PATCH 08/34] Fix Controls.Sample compilation errors - update
 SafeAreaElement API usage

Co-authored-by: PureWeen <5375137+PureWeen@users.noreply.github.com>
---
 .../samples/Controls.Sample/Pages/Others/LargeTitlesPageiOS.cs  | 2 +-
 .../Pages/PlatformSpecifics/iOS/iOSSafeAreaPage.xaml.cs         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Controls/samples/Controls.Sample/Pages/Others/LargeTitlesPageiOS.cs b/src/Controls/samples/Controls.Sample/Pages/Others/LargeTitlesPageiOS.cs
index 09152fbb5fa8..f4066c6fc93c 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Others/LargeTitlesPageiOS.cs
+++ b/src/Controls/samples/Controls.Sample/Pages/Others/LargeTitlesPageiOS.cs
@@ -57,7 +57,7 @@ public LargeTitlesPageiOS()
 							var navPage = (Parent as NavigationPage)!;
 							navPage.On<iOS>().SetPrefersLargeTitles(true);
 							var page = new ContentPage { Title = "New Title", BackgroundColor = Colors.Red };
-							SafeAreaElement.SetIgnore(page, SafeAreaEdges.None);
+							page.SafeAreaEdges = Microsoft.Maui.SafeAreaEdges.All;
 							var listView = new ListView(ListViewCachingStrategy.RecycleElementAndDataTemplate)
 							{
 								HasUnevenRows = true,
diff --git a/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/iOS/iOSSafeAreaPage.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/iOS/iOSSafeAreaPage.xaml.cs
index 369a874fe940..7eb309d2078d 100644
--- a/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/iOS/iOSSafeAreaPage.xaml.cs
+++ b/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/iOS/iOSSafeAreaPage.xaml.cs
@@ -12,7 +12,7 @@ public iOSSafeAreaPage()
 
 		void OnButtonClicked(object sender, EventArgs e)
 		{
-			SafeAreaElement.SetIgnore(this, SafeAreaEdges.All);
+			this.SafeAreaEdges = Microsoft.Maui.SafeAreaEdges.None;
 			(sender as Button)!.IsEnabled = false;
 		}
 	}

From c408853cedaed495fc0b1982d207d16a935c0061 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 25 Jul 2025 03:55:05 +0000
Subject: [PATCH 09/34] Remove IgnoreSafeAreaForEdge from ISafeAreaView2
 interface and convert all usages to GetSafeAreaRegionsForEdge

Co-authored-by: PureWeen <5375137+PureWeen@users.noreply.github.com>
---
 src/Controls/src/Core/Border/Border.cs        |  22 ---
 .../src/Core/ContentView/ContentView.cs       |  22 ---
 src/Controls/src/Core/Layout/Layout.cs        |  22 ---
 src/Controls/src/Core/Page/Page.cs            |   7 -
 src/Controls/src/Core/SafeAreaElement.cs      |  13 --
 .../src/Core/ScrollView/ScrollView.cs         |   7 -
 .../tests/Core.UnitTests/SafeAreaTests.cs     | 151 +++++++++---------
 src/Core/src/Core/ISafeAreaView2.cs           |   7 -
 .../tests/DeviceTests/Stubs/LayoutStub.cs     |   2 -
 9 files changed, 76 insertions(+), 177 deletions(-)

diff --git a/src/Controls/src/Core/Border/Border.cs b/src/Controls/src/Core/Border/Border.cs
index 7bb012fd1109..912427fa4f54 100644
--- a/src/Controls/src/Core/Border/Border.cs
+++ b/src/Controls/src/Core/Border/Border.cs
@@ -364,28 +364,6 @@ SafeAreaRegions ISafeAreaView2.GetSafeAreaRegionsForEdge(int edge)
 		/// <inheritdoc cref="ISafeAreaView2.SafeAreaInsets"/>
 		Thickness ISafeAreaView2.SafeAreaInsets { set { } } // Default no-op implementation for borders
 
-		/// <inheritdoc cref="ISafeAreaView2.IgnoreSafeAreaForEdge"/>
-		bool ISafeAreaView2.IgnoreSafeAreaForEdge(int edge)
-		{
-			// Use new SafeAreaEdges property with inverted logic (obey -> ignore conversion)
-			var regionForEdge = SafeAreaEdges.GetEdge(edge);
-			
-			// Convert from "obey" logic to "ignore" logic for backwards compatibility
-			switch (regionForEdge)
-			{
-				case SafeAreaRegions.None:
-					return true; // None means edge-to-edge, so ignore safe area
-				case SafeAreaRegions.All:
-				case SafeAreaRegions.Container:
-				case SafeAreaRegions.SoftInput:
-				case SafeAreaRegions.Default:
-					return false; // These obey safe area, so don't ignore
-				default:
-					// For Border, default to None behavior (edge-to-edge)
-					return true;
-			}
-		}
-
 		SafeAreaEdges ISafeAreaElement.SafeAreaEdgesDefaultValueCreator()
 		{
 			return SafeAreaEdges.Default;
diff --git a/src/Controls/src/Core/ContentView/ContentView.cs b/src/Controls/src/Core/ContentView/ContentView.cs
index 39fe35d3c14e..c65016423658 100644
--- a/src/Controls/src/Core/ContentView/ContentView.cs
+++ b/src/Controls/src/Core/ContentView/ContentView.cs
@@ -82,28 +82,6 @@ private protected override string GetDebuggerDisplay()
 		/// <inheritdoc cref="ISafeAreaView2.SafeAreaInsets"/>
 		Thickness ISafeAreaView2.SafeAreaInsets { set { } } // Default no-op implementation for content views
 
-		/// <inheritdoc cref="ISafeAreaView2.IgnoreSafeAreaForEdge"/>
-		bool ISafeAreaView2.IgnoreSafeAreaForEdge(int edge)
-		{
-			// Use new SafeAreaEdges property with inverted logic (obey -> ignore conversion)
-			var regionForEdge = SafeAreaEdges.GetEdge(edge);
-			
-			// Convert from "obey" logic to "ignore" logic for backwards compatibility
-			switch (regionForEdge)
-			{
-				case SafeAreaRegions.None:
-					return true; // None means edge-to-edge, so ignore safe area
-				case SafeAreaRegions.All:
-				case SafeAreaRegions.Container:
-				case SafeAreaRegions.SoftInput:
-				case SafeAreaRegions.Default:
-					return false; // These obey safe area, so don't ignore
-				default:
-					// For ContentView, default to None behavior (edge-to-edge)
-					return true;
-			}
-		}
-
 		/// <inheritdoc cref="ISafeAreaView2.GetSafeAreaRegionsForEdge"/>
 		SafeAreaRegions ISafeAreaView2.GetSafeAreaRegionsForEdge(int edge)
 		{
diff --git a/src/Controls/src/Core/Layout/Layout.cs b/src/Controls/src/Core/Layout/Layout.cs
index 285b72049fc3..5ac47240f4b3 100644
--- a/src/Controls/src/Core/Layout/Layout.cs
+++ b/src/Controls/src/Core/Layout/Layout.cs
@@ -411,28 +411,6 @@ private protected override string GetDebuggerDisplay()
 		/// <inheritdoc cref="ISafeAreaView2.SafeAreaInsets"/>
 		Thickness ISafeAreaView2.SafeAreaInsets { set { } } // Default no-op implementation for layouts
 
-		/// <inheritdoc cref="ISafeAreaView2.IgnoreSafeAreaForEdge"/>
-		bool ISafeAreaView2.IgnoreSafeAreaForEdge(int edge)
-		{
-			// Use new SafeAreaEdges property with inverted logic (obey -> ignore conversion)
-			var regionForEdge = SafeAreaEdges.GetEdge(edge);
-			
-			// Convert from "obey" logic to "ignore" logic for backwards compatibility
-			switch (regionForEdge)
-			{
-				case SafeAreaRegions.None:
-					return true; // None means edge-to-edge, so ignore safe area
-				case SafeAreaRegions.All:
-				case SafeAreaRegions.Container:
-				case SafeAreaRegions.SoftInput:
-				case SafeAreaRegions.Default:
-					return false; // These obey safe area, so don't ignore
-				default:
-					// For Layout views, default to None behavior (edge-to-edge)
-					return true;
-			}
-		}
-
 		/// <inheritdoc cref="ISafeAreaView2.GetSafeAreaRegionsForEdge"/>
 		SafeAreaRegions ISafeAreaView2.GetSafeAreaRegionsForEdge(int edge)
 		{
diff --git a/src/Controls/src/Core/Page/Page.cs b/src/Controls/src/Core/Page/Page.cs
index 045993ba0da3..1ce7e5f709ec 100644
--- a/src/Controls/src/Core/Page/Page.cs
+++ b/src/Controls/src/Core/Page/Page.cs
@@ -262,13 +262,6 @@ Thickness ISafeAreaView2.SafeAreaInsets
 			}
 		}
 
-		/// <inheritdoc cref="ISafeAreaView2.IgnoreSafeAreaForEdge"/>
-		bool ISafeAreaView2.IgnoreSafeAreaForEdge(int edge)
-		{
-			// Use new SafeAreaElement logic with inverted behavior
-			return !SafeAreaElement.ShouldObeySafeAreaForEdge(this, edge);
-		}
-
 		/// <inheritdoc cref="ISafeAreaView2.GetSafeAreaRegionsForEdge"/>
 		SafeAreaRegions ISafeAreaView2.GetSafeAreaRegionsForEdge(int edge)
 		{
diff --git a/src/Controls/src/Core/SafeAreaElement.cs b/src/Controls/src/Core/SafeAreaElement.cs
index 756ab880663b..17f2d393d0d7 100644
--- a/src/Controls/src/Core/SafeAreaElement.cs
+++ b/src/Controls/src/Core/SafeAreaElement.cs
@@ -90,18 +90,5 @@ internal static bool ShouldObeySafeAreaForEdge(BindableObject bindable, int edge
 			// Default to false (don't obey safe area) since the new default is SafeAreaRegions.None (edge to edge)
 			return false;
 		}
-
-		/// <summary>
-		/// Gets whether safe area should be ignored for a specific edge (opposite of ShouldObeySafeAreaForEdge).
-		/// This is used by ISafeAreaView2.IgnoreSafeAreaForEdge implementations.
-		/// </summary>
-		/// <param name="bindable">The bindable object that implements ISafeAreaView.</param>
-		/// <param name="edge">The edge to get the behavior for (0=Left, 1=Top, 2=Right, 3=Bottom).</param>
-		/// <returns>True if safe area should be ignored for this edge, false otherwise.</returns>
-		internal static bool ShouldIgnoreSafeAreaForEdge(BindableObject bindable, int edge)
-		{
-			// This is simply the inverse of ShouldObeySafeAreaForEdge
-			return !ShouldObeySafeAreaForEdge(bindable, edge);
-		}
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/src/Core/ScrollView/ScrollView.cs b/src/Controls/src/Core/ScrollView/ScrollView.cs
index 8c773d136051..9653bb24d966 100644
--- a/src/Controls/src/Core/ScrollView/ScrollView.cs
+++ b/src/Controls/src/Core/ScrollView/ScrollView.cs
@@ -527,13 +527,6 @@ Thickness ISafeAreaView2.SafeAreaInsets
 			}
 		}
 
-		/// <inheritdoc cref="ISafeAreaView2.IgnoreSafeAreaForEdge"/>
-		bool ISafeAreaView2.IgnoreSafeAreaForEdge(int edge)
-		{
-			// Use direct property first, then fall back to attached property and legacy behavior
-			return SafeAreaElement.ShouldIgnoreSafeAreaForEdge(this, edge);
-		}
-
 		/// <inheritdoc cref="ISafeAreaView2.GetSafeAreaRegionsForEdge"/>
 		SafeAreaRegions ISafeAreaView2.GetSafeAreaRegionsForEdge(int edge)
 		{
diff --git a/src/Controls/tests/Core.UnitTests/SafeAreaTests.cs b/src/Controls/tests/Core.UnitTests/SafeAreaTests.cs
index d8bdbd2ebf4c..40dd2a4747f3 100644
--- a/src/Controls/tests/Core.UnitTests/SafeAreaTests.cs
+++ b/src/Controls/tests/Core.UnitTests/SafeAreaTests.cs
@@ -209,33 +209,34 @@ public void Layout_ImplementsISafeAreaView()
 		}
 
 		[Fact]
-		public void Layout_IgnoreSafeAreaForEdge_UsesDirectProperty()
+		public void Layout_GetSafeAreaRegionsForEdge_UsesDirectProperty()
 		{
 			var layout = new Grid();
 			layout.SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.None, SafeAreaRegions.All, SafeAreaRegions.None, SafeAreaRegions.All);
 
-			// Test via ISafeAreaView2 interface - inverted logic: None means edge-to-edge (ignore), All means obey
+			// Test via ISafeAreaView2 interface - direct region values
 			var safeAreaView2 = (ISafeAreaView2)layout;
 			
-			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(0));  // Left = None (edge-to-edge, so ignore)
-			Assert.False(safeAreaView2.IgnoreSafeAreaForEdge(1)); // Top = All (obey safe area, so don't ignore)  
-			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(2));  // Right = None (edge-to-edge, so ignore)
-			Assert.False(safeAreaView2.IgnoreSafeAreaForEdge(3)); // Bottom = All (obey safe area, so don't ignore)
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(0)); // Left = None
+			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(1));  // Top = All
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(2)); // Right = None
+			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(3));  // Bottom = All
 		}
 
 		[Fact]
-		public void Layout_IgnoreSafeAreaForEdge_FallsBackToLegacyProperty()
+		public void Layout_GetSafeAreaRegionsForEdge_FallsBackToLegacyProperty()
 		{
 			var layout = new Grid();
 			layout.IgnoreSafeArea = true; // Legacy property
 
 			// Should fall back to legacy property when no direct property is set
+			// IgnoreSafeArea = true should result in SafeAreaRegions.None (edge-to-edge)
 			var safeAreaView2 = (ISafeAreaView2)layout;
 			
-			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(0));
-			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(1));
-			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(2));
-			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(3));
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(0));
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(1));
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(2));
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(3));
 		}
 
 		[Fact]
@@ -256,46 +257,46 @@ public void ContentView_ImplementsISafeAreaView()
 		}
 
 		[Fact]
-		public void Page_IgnoreSafeAreaForEdge_UsesDirectProperty()
+		public void Page_GetSafeAreaRegionsForEdge_UsesDirectProperty()
 		{
 			var page = new ContentPage();
 			page.SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.None, SafeAreaRegions.All, SafeAreaRegions.None, SafeAreaRegions.All);
 
-			// Test via ISafeAreaView2 interface - inverted logic: None means edge-to-edge (ignore), All means obey
+			// Test via ISafeAreaView2 interface - direct region values
 			var safeAreaView2 = (ISafeAreaView2)page;
 			
-			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(0));  // Left = None (edge-to-edge, so ignore)
-			Assert.False(safeAreaView2.IgnoreSafeAreaForEdge(1)); // Top = All (obey safe area, so don't ignore)  
-			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(2));  // Right = None (edge-to-edge, so ignore)
-			Assert.False(safeAreaView2.IgnoreSafeAreaForEdge(3)); // Bottom = All (obey safe area, so don't ignore)
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(0)); // Left = None
+			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(1));  // Top = All
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(2)); // Right = None
+			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(3));  // Bottom = All
 		}
 
 		[Fact]
-		public void ContentView_IgnoreSafeAreaForEdge_DefaultsToNoneWhenNoPropertySet()
+		public void ContentView_GetSafeAreaRegionsForEdge_DefaultsToNoneWhenNoPropertySet()
 		{
 			var contentView = new ContentView(); // ContentView implements ISafeAreaView2
 
-			// Should default to true (ignore) when no property is set since default is SafeAreaRegions.None (edge-to-edge)
+			// Should default to SafeAreaRegions.None when no property is set (edge-to-edge behavior)
 			var safeAreaView2 = (ISafeAreaView2)contentView;
 			
-			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(0));
-			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(1));
-			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(2));
-			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(3));
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(0));
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(1));
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(2));
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(3));
 		}
 
 		[Fact]
-		public void Page_IgnoreSafeAreaForEdge_DefaultsToNoneForContentPage()
+		public void Page_GetSafeAreaRegionsForEdge_DefaultsToNoneForContentPage()
 		{
-			var page = new ContentPage(); // ContentPage returns All when SafeAreaRegions.None is specified for better UX
+			var page = new ContentPage(); // ContentPage defaults to SafeAreaRegions.None on iOS (IgnoreSafeArea = true)
 
-			// ContentPage has special logic - when SafeAreaRegions.None is specified, it returns All for better UX
+			// ContentPage has special logic - defaults to SafeAreaRegions.None (edge-to-edge) on iOS
 			var safeAreaView2 = (ISafeAreaView2)page;
 			
-			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(0));
-			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(1));
-			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(2));
-			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(3));
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(0));
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(1));
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(2));
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(3));
 		}
 
 		// Tests based on existing iOS safe area usage patterns
@@ -314,11 +315,11 @@ public void SafeArea_CanReplaceUseSafeAreaScenario()
 
 			var safeAreaView2 = (ISafeAreaView2)contentView;
 			
-			// All edges should obey safe area (false = don't ignore)
-			Assert.False(safeAreaView2.IgnoreSafeAreaForEdge(0));
-			Assert.False(safeAreaView2.IgnoreSafeAreaForEdge(1));
-			Assert.False(safeAreaView2.IgnoreSafeAreaForEdge(2));
-			Assert.False(safeAreaView2.IgnoreSafeAreaForEdge(3));
+			// All edges should obey safe area (return All region)
+			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(0));
+			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(1));
+			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(2));
+			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(3));
 		}
 
 		[Fact]
@@ -332,10 +333,10 @@ public void SafeArea_SupportsPerEdgeControl_IgnoreTopAndBottom()
 
 			var safeAreaView2 = (ISafeAreaView2)stackLayout;
 			
-			Assert.False(safeAreaView2.IgnoreSafeAreaForEdge(0)); // Left = All (obey safe area, so don't ignore)
-			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(1));  // Top = None (edge-to-edge, so ignore)
-			Assert.False(safeAreaView2.IgnoreSafeAreaForEdge(2)); // Right = All (obey safe area, so don't ignore)
-			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(3));  // Bottom = None (edge-to-edge, so ignore)
+			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(0));  // Left = All
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(1)); // Top = None
+			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(2));  // Right = All
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(3)); // Bottom = None
 		}
 
 		[Fact]
@@ -348,10 +349,10 @@ public void SafeArea_TwoValueShorthand_LeftRightTopBottom()
 
 			var safeAreaView2 = (ISafeAreaView2)grid;
 			
-			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(0));  // Left = None (edge-to-edge, so ignore)
-			Assert.False(safeAreaView2.IgnoreSafeAreaForEdge(1)); // Top = All (obey safe area, so don't ignore)
-			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(2));  // Right = None (edge-to-edge, so ignore)
-			Assert.False(safeAreaView2.IgnoreSafeAreaForEdge(3)); // Bottom = All (obey safe area, so don't ignore)
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(0)); // Left = None
+			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(1));  // Top = All
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(2)); // Right = None
+			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(3));  // Bottom = All
 		}
 
 		[Fact]
@@ -535,10 +536,10 @@ public void HorizontalStackLayout_BehavesLikeRegularLayout()
 			// Should behave like regular layout with default SafeAreaEdges.None (edge-to-edge)
 			var safeAreaView2 = (ISafeAreaView2)stackLayout;
 			
-			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(0)); // Left
-			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(1)); // Top  
-			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(2)); // Right
-			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(3)); // Bottom
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(0)); // Left
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(1)); // Top
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(2)); // Right
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(3)); // Bottom
 		}
 
 		[Fact]
@@ -551,10 +552,10 @@ public void HorizontalStackLayout_RespectsDirectProperty_RTL()
 			// Should respect SafeAreaEdges direct property
 			var safeAreaView2 = (ISafeAreaView2)stackLayout;
 			
-			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(0));   // Left (set to None - edge-to-edge)
-			Assert.False(safeAreaView2.IgnoreSafeAreaForEdge(1));  // Top (set to All - obey)
-			Assert.False(safeAreaView2.IgnoreSafeAreaForEdge(2));  // Right (set to All - obey)
-			Assert.False(safeAreaView2.IgnoreSafeAreaForEdge(3));  // Bottom (set to All - obey)
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(0)); // Left (set to None)
+			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(1));  // Top (set to All)
+			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(2));  // Right (set to All)
+			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(3));  // Bottom (set to All)
 		}
 
 		[Fact]
@@ -565,10 +566,10 @@ public void VerticalStackLayout_BehavesLikeRegularLayout()
 			// Should behave like regular layout with default SafeAreaEdges.None (edge-to-edge)
 			var safeAreaView2 = (ISafeAreaView2)stackLayout;
 			
-			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(0)); // Left
-			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(1)); // Top  
-			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(2)); // Right
-			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(3)); // Bottom
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(0)); // Left
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(1)); // Top
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(2)); // Right
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(3)); // Bottom
 		}
 
 		[Fact]
@@ -579,10 +580,10 @@ public void StackLayout_HorizontalOrientation_BehavesLikeRegularLayout_LTR()
 			// Should behave like regular layout with default SafeAreaEdges.None (edge-to-edge)
 			var safeAreaView2 = (ISafeAreaView2)stackLayout;
 			
-			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(0)); // Left
-			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(1)); // Top  
-			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(2)); // Right
-			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(3)); // Bottom
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(0)); // Left
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(1)); // Top
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(2)); // Right
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(3)); // Bottom
 		}
 
 		[Fact]
@@ -595,10 +596,10 @@ public void StackLayout_HorizontalOrientation_RespectsDirectProperty_RTL()
 			// Should respect SafeAreaEdges direct property
 			var safeAreaView2 = (ISafeAreaView2)stackLayout;
 			
-			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(0));   // Left (set to None - edge-to-edge)
-			Assert.False(safeAreaView2.IgnoreSafeAreaForEdge(1));  // Top (set to All - obey)
-			Assert.False(safeAreaView2.IgnoreSafeAreaForEdge(2));  // Right (set to All - obey)
-			Assert.False(safeAreaView2.IgnoreSafeAreaForEdge(3));  // Bottom (set to All - obey)
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(0)); // Left (set to None)
+			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(1));  // Top (set to All)
+			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(2));  // Right (set to All)
+			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(3));  // Bottom (set to All)
 		}
 
 		[Fact]
@@ -609,10 +610,10 @@ public void StackLayout_VerticalOrientation_BehavesLikeRegularLayout()
 			// Should behave like regular layout with default SafeAreaEdges.None (edge-to-edge)
 			var safeAreaView2 = (ISafeAreaView2)stackLayout;
 			
-			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(0)); // Left
-			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(1)); // Top  
-			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(2)); // Right
-			Assert.True(safeAreaView2.IgnoreSafeAreaForEdge(3)); // Bottom
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(0)); // Left
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(1)); // Top
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(2)); // Right
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(3)); // Bottom
 		}
 
 		[Fact]
@@ -629,16 +630,16 @@ public void StackLayouts_RespectUserSettings()
 			var horizontalSafeAreaView2 = (ISafeAreaView2)horizontalStackLayout;
 			
 			// VerticalStackLayout should respect user setting (All = obey safe area)
-			Assert.False(verticalSafeAreaView2.IgnoreSafeAreaForEdge(0)); // Left (obeys safe area)
-			Assert.False(verticalSafeAreaView2.IgnoreSafeAreaForEdge(1)); // Top (obeys safe area)
-			Assert.False(verticalSafeAreaView2.IgnoreSafeAreaForEdge(2)); // Right (obeys safe area)
-			Assert.False(verticalSafeAreaView2.IgnoreSafeAreaForEdge(3)); // Bottom (obeys safe area)
+			Assert.Equal(SafeAreaRegions.All, verticalSafeAreaView2.GetSafeAreaRegionsForEdge(0)); // Left
+			Assert.Equal(SafeAreaRegions.All, verticalSafeAreaView2.GetSafeAreaRegionsForEdge(1)); // Top
+			Assert.Equal(SafeAreaRegions.All, verticalSafeAreaView2.GetSafeAreaRegionsForEdge(2)); // Right
+			Assert.Equal(SafeAreaRegions.All, verticalSafeAreaView2.GetSafeAreaRegionsForEdge(3)); // Bottom
 			
 			// HorizontalStackLayout should respect user setting (None = edge-to-edge)
-			Assert.True(horizontalSafeAreaView2.IgnoreSafeAreaForEdge(0)); // Left (edge-to-edge)
-			Assert.True(horizontalSafeAreaView2.IgnoreSafeAreaForEdge(1)); // Top (edge-to-edge)
-			Assert.True(horizontalSafeAreaView2.IgnoreSafeAreaForEdge(2)); // Right (edge-to-edge)
-			Assert.True(horizontalSafeAreaView2.IgnoreSafeAreaForEdge(3)); // Bottom (edge-to-edge)
+			Assert.Equal(SafeAreaRegions.None, horizontalSafeAreaView2.GetSafeAreaRegionsForEdge(0)); // Left
+			Assert.Equal(SafeAreaRegions.None, horizontalSafeAreaView2.GetSafeAreaRegionsForEdge(1)); // Top
+			Assert.Equal(SafeAreaRegions.None, horizontalSafeAreaView2.GetSafeAreaRegionsForEdge(2)); // Right
+			Assert.Equal(SafeAreaRegions.None, horizontalSafeAreaView2.GetSafeAreaRegionsForEdge(3)); // Bottom
 		}
 
 		#endregion
diff --git a/src/Core/src/Core/ISafeAreaView2.cs b/src/Core/src/Core/ISafeAreaView2.cs
index 08920a731981..6ded20b81480 100644
--- a/src/Core/src/Core/ISafeAreaView2.cs
+++ b/src/Core/src/Core/ISafeAreaView2.cs
@@ -13,13 +13,6 @@ internal interface ISafeAreaView2
 		/// </summary>
 		internal Thickness SafeAreaInsets { set; }
 
-		/// <summary>
-		/// Gets the safe area behavior for the specified edge (0=Left, 1=Top, 2=Right, 3=Bottom).
-		/// </summary>
-		/// <param name="edge">The edge to get the behavior for (0=Left, 1=Top, 2=Right, 3=Bottom).</param>
-		/// <returns>True if safe area should be ignored for this edge, false otherwise.</returns>
-		bool IgnoreSafeAreaForEdge(int edge);
-
 		/// <summary>
 		/// Gets the safe area regions for the specified edge (0=Left, 1=Top, 2=Right, 3=Bottom).
 		/// </summary>
diff --git a/src/Core/tests/DeviceTests/Stubs/LayoutStub.cs b/src/Core/tests/DeviceTests/Stubs/LayoutStub.cs
index b6aeebde3616..d7d7e5972f94 100644
--- a/src/Core/tests/DeviceTests/Stubs/LayoutStub.cs
+++ b/src/Core/tests/DeviceTests/Stubs/LayoutStub.cs
@@ -87,8 +87,6 @@ public Size CrossPlatformArrange(Rect bounds)
 		// ISafeAreaView2 implementation
 		Thickness ISafeAreaView2.SafeAreaInsets { set { } }
 
-		public bool IgnoreSafeAreaForEdge(int edge) => false;
-
 		public SafeAreaRegions GetSafeAreaRegionsForEdge(int edge) => SafeAreaRegions.None;
 
 		public IView this[int index] { get => Children[index]; set => Children[index] = value; }

From 40b81f76b2abe707a8ca29ee0d680e46e37e7133 Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Thu, 24 Jul 2025 23:01:09 -0500
Subject: [PATCH 10/34] - fix

---
 src/Controls/src/Core/Layout/Layout.cs        | 12 +++++++
 src/Core/src/Platform/iOS/MauiView.cs         |  4 +--
 src/Core/src/Primitives/SafeAreaEdges.cs      | 31 +++----------------
 src/Core/src/Primitives/SafeAreaRegions.cs    |  2 +-
 .../net-android/PublicAPI.Unshipped.txt       |  2 +-
 .../PublicAPI/net-ios/PublicAPI.Unshipped.txt |  2 +-
 .../net-maccatalyst/PublicAPI.Unshipped.txt   |  2 +-
 .../net-windows/PublicAPI.Unshipped.txt       |  2 +-
 .../src/PublicAPI/net/PublicAPI.Unshipped.txt |  2 +-
 .../netstandard/PublicAPI.Unshipped.txt       |  2 +-
 .../netstandard2.0/PublicAPI.Unshipped.txt    |  2 +-
 11 files changed, 27 insertions(+), 36 deletions(-)

diff --git a/src/Controls/src/Core/Layout/Layout.cs b/src/Controls/src/Core/Layout/Layout.cs
index 5ac47240f4b3..c61c0840bd4f 100644
--- a/src/Controls/src/Core/Layout/Layout.cs
+++ b/src/Controls/src/Core/Layout/Layout.cs
@@ -416,6 +416,18 @@ SafeAreaRegions ISafeAreaView2.GetSafeAreaRegionsForEdge(int edge)
 		{
 			// Use direct property first
 			var regionForEdge = SafeAreaEdges.GetEdge(edge);
+
+			if (regionForEdge == SafeAreaRegions.Default)
+			{
+#pragma warning disable CS0618 // Type or member is obsolete
+				if (IgnoreSafeArea)
+				{
+					return SafeAreaRegions.None;
+				}
+#pragma warning restore CS0618 // Type or member is obsolete
+
+				return SafeAreaRegions.Container;
+			}
 			
 			// For Layout views, never return the old Default - return None instead
 			// (since Default no longer exists in the new enum)
diff --git a/src/Core/src/Platform/iOS/MauiView.cs b/src/Core/src/Platform/iOS/MauiView.cs
index 9aa8d7f531a2..615c9a608e52 100644
--- a/src/Core/src/Platform/iOS/MauiView.cs
+++ b/src/Core/src/Platform/iOS/MauiView.cs
@@ -136,10 +136,10 @@ SafeAreaRegions GetSafeAreaRegionForEdge(int edge)
 			// Fallback to legacy ISafeAreaView behavior
 			if (View is ISafeAreaView sav)
 			{
-				return sav.IgnoreSafeArea ? SafeAreaRegions.All : SafeAreaRegions.Default;
+				return sav.IgnoreSafeArea ? SafeAreaRegions.None : SafeAreaRegions.Container;
 			}
 			
-			return SafeAreaRegions.Default; // Default: respect safe area
+			return SafeAreaRegions.Container; // Default: respect safe area
 		}
 
 		static double GetSafeAreaForEdge(SafeAreaRegions safeAreaRegion, double originalSafeArea)
diff --git a/src/Core/src/Primitives/SafeAreaEdges.cs b/src/Core/src/Primitives/SafeAreaEdges.cs
index d1db417d1648..aad902e7fb57 100644
--- a/src/Core/src/Primitives/SafeAreaEdges.cs
+++ b/src/Core/src/Primitives/SafeAreaEdges.cs
@@ -113,7 +113,7 @@ public void SetEdge(int edge, SafeAreaRegions value)
 		/// <summary>
 		/// A <see cref="SafeAreaEdges"/> with all edges set to <see cref="SafeAreaRegions.None"/>.
 		/// </summary>
-		public static SafeAreaEdges Default => new(SafeAreaRegions.None);
+		public static SafeAreaEdges Default => new(SafeAreaRegions.Default);
 
 		/// <summary>
 		/// A <see cref="SafeAreaEdges"/> with all edges set to <see cref="SafeAreaRegions.None"/>.
@@ -145,31 +145,10 @@ public override bool Equals(object? obj)
 			return obj is SafeAreaEdges other && Equals(other);
 		}
 
-		public override int GetHashCode()
-		{
-#if NET
-			return HashCode.Combine(Left, Top, Right, Bottom);
-#else
-			unchecked
-			{
-				int hashCode = Left.GetHashCode();
-				hashCode = (hashCode * 397) ^ Top.GetHashCode();
-				hashCode = (hashCode * 397) ^ Right.GetHashCode();
-				hashCode = (hashCode * 397) ^ Bottom.GetHashCode();
-				return hashCode;
-			}
-#endif
-		}
+		public override int GetHashCode() =>
+			HashCode.Combine(Left, Top, Right, Bottom);
 
-		public override string ToString()
-		{
-			if (Left == Top && Top == Right && Right == Bottom)
-				return Left.ToString();
-
-			if (Left == Right && Top == Bottom)
-				return $"{Left}, {Top}";
-
-			return $"{Left}, {Top}, {Right}, {Bottom}";
-		}
+		public override string ToString() =>
+			$"{Left}, {Top}, {Right}, {Bottom}";
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Primitives/SafeAreaRegions.cs b/src/Core/src/Primitives/SafeAreaRegions.cs
index 80833953f24a..5c8222de3ee0 100644
--- a/src/Core/src/Primitives/SafeAreaRegions.cs
+++ b/src/Core/src/Primitives/SafeAreaRegions.cs
@@ -32,6 +32,6 @@ public enum SafeAreaRegions
 		/// Obey all safe area insets - content will be positioned only in the safe area.
 		/// This includes top and bottom bars, notch, and keyboard.
 		/// </summary>
-		All = int.MaxValue
+		All = Container | SoftInput
 	}
 }
\ 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 4adfb5a0c80a..d63fc630af8d 100644
--- a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -69,7 +69,7 @@ Microsoft.Maui.SafeAreaEdges.SetEdge(int edge, Microsoft.Maui.SafeAreaRegions va
 Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaEdges.Top.set -> void
 Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.All = 2147483647 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.All = Microsoft.Maui.SafeAreaRegions.SoftInput | Microsoft.Maui.SafeAreaRegions.Container -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.Default = 4 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.None = 0 -> Microsoft.Maui.SafeAreaRegions
diff --git a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index 2240a63e0309..2170ef116130 100644
--- a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -73,7 +73,7 @@ Microsoft.Maui.SafeAreaEdges.SetEdge(int edge, Microsoft.Maui.SafeAreaRegions va
 Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaEdges.Top.set -> void
 Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.All = 2147483647 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.All = Microsoft.Maui.SafeAreaRegions.SoftInput | Microsoft.Maui.SafeAreaRegions.Container -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.Default = 4 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.None = 0 -> Microsoft.Maui.SafeAreaRegions
diff --git a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index 928c8fd87f21..df1199186606 100644
--- a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -75,7 +75,7 @@ Microsoft.Maui.SafeAreaEdges.SetEdge(int edge, Microsoft.Maui.SafeAreaRegions va
 Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaEdges.Top.set -> void
 Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.All = 2147483647 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.All = Microsoft.Maui.SafeAreaRegions.SoftInput | Microsoft.Maui.SafeAreaRegions.Container -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.Default = 4 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.None = 0 -> Microsoft.Maui.SafeAreaRegions
diff --git a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index f73005f0a8b1..e0d0f8973c9e 100644
--- a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -66,7 +66,7 @@ Microsoft.Maui.SafeAreaEdges.SetEdge(int edge, Microsoft.Maui.SafeAreaRegions va
 Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaEdges.Top.set -> void
 Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.All = 2147483647 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.All = Microsoft.Maui.SafeAreaRegions.SoftInput | Microsoft.Maui.SafeAreaRegions.Container -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.Default = 4 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.None = 0 -> Microsoft.Maui.SafeAreaRegions
diff --git a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
index ed907af19a87..b1e783e9d28c 100644
--- a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -63,7 +63,7 @@ Microsoft.Maui.SafeAreaEdges.SetEdge(int edge, Microsoft.Maui.SafeAreaRegions va
 Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaEdges.Top.set -> void
 Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.All = 2147483647 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.All = Microsoft.Maui.SafeAreaRegions.SoftInput | Microsoft.Maui.SafeAreaRegions.Container -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.Default = 4 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.None = 0 -> Microsoft.Maui.SafeAreaRegions
diff --git a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
index ed907af19a87..b1e783e9d28c 100644
--- a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -63,7 +63,7 @@ Microsoft.Maui.SafeAreaEdges.SetEdge(int edge, Microsoft.Maui.SafeAreaRegions va
 Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaEdges.Top.set -> void
 Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.All = 2147483647 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.All = Microsoft.Maui.SafeAreaRegions.SoftInput | Microsoft.Maui.SafeAreaRegions.Container -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.Default = 4 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.None = 0 -> Microsoft.Maui.SafeAreaRegions
diff --git a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
index ed907af19a87..b1e783e9d28c 100644
--- a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
@@ -63,7 +63,7 @@ Microsoft.Maui.SafeAreaEdges.SetEdge(int edge, Microsoft.Maui.SafeAreaRegions va
 Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaEdges.Top.set -> void
 Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.All = 2147483647 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.All = Microsoft.Maui.SafeAreaRegions.SoftInput | Microsoft.Maui.SafeAreaRegions.Container -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.Default = 4 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.None = 0 -> Microsoft.Maui.SafeAreaRegions

From 12ee04a54fc77c1e5e7630dec56caf26b3872de0 Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Thu, 24 Jul 2025 23:04:36 -0500
Subject: [PATCH 11/34] - fix netstandard

---
 src/Core/src/Primitives/SafeAreaEdges.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Core/src/Primitives/SafeAreaEdges.cs b/src/Core/src/Primitives/SafeAreaEdges.cs
index aad902e7fb57..f6287a5d9bee 100644
--- a/src/Core/src/Primitives/SafeAreaEdges.cs
+++ b/src/Core/src/Primitives/SafeAreaEdges.cs
@@ -145,9 +145,10 @@ public override bool Equals(object? obj)
 			return obj is SafeAreaEdges other && Equals(other);
 		}
 
+#if !NETSTANDARD2_0
 		public override int GetHashCode() =>
 			HashCode.Combine(Left, Top, Right, Bottom);
-
+#endif
 		public override string ToString() =>
 			$"{Left}, {Top}, {Right}, {Bottom}";
 	}

From 9de66b9abf3378b374d463eb4af26ed57c6d77a6 Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Thu, 24 Jul 2025 23:13:12 -0500
Subject: [PATCH 12/34] - fix

---
 src/Core/src/Platform/iOS/MauiView.cs    |  6 ------
 src/Core/src/Primitives/SafeAreaEdges.cs | 18 +++++++++++++++---
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/Core/src/Platform/iOS/MauiView.cs b/src/Core/src/Platform/iOS/MauiView.cs
index 615c9a608e52..5b174a9c5813 100644
--- a/src/Core/src/Platform/iOS/MauiView.cs
+++ b/src/Core/src/Platform/iOS/MauiView.cs
@@ -102,12 +102,6 @@ public IView? View
 		/// </summary>
 		bool RespondsToSafeArea()
 		{
-			if (View is not ISafeAreaView sav || sav.IgnoreSafeArea)
-			{
-				_scrollViewDescendant = false;
-				return false;
-			}
-
 			if (_scrollViewDescendant.HasValue)
 				return _scrollViewDescendant.Value;
 
diff --git a/src/Core/src/Primitives/SafeAreaEdges.cs b/src/Core/src/Primitives/SafeAreaEdges.cs
index f6287a5d9bee..2646b9646655 100644
--- a/src/Core/src/Primitives/SafeAreaEdges.cs
+++ b/src/Core/src/Primitives/SafeAreaEdges.cs
@@ -145,9 +145,21 @@ public override bool Equals(object? obj)
 			return obj is SafeAreaEdges other && Equals(other);
 		}
 
-#if !NETSTANDARD2_0
-		public override int GetHashCode() =>
-			HashCode.Combine(Left, Top, Right, Bottom);
+#if NETSTANDARD2_0
+	public override int GetHashCode()
+	{
+		unchecked
+		{
+			int hashCode = Left.GetHashCode();
+			hashCode = (hashCode * 397) ^ Top.GetHashCode();
+			hashCode = (hashCode * 397) ^ Right.GetHashCode();
+			hashCode = (hashCode * 397) ^ Bottom.GetHashCode();
+			return hashCode;
+		}
+	}
+#else
+	public override int GetHashCode() =>
+		HashCode.Combine(Left, Top, Right, Bottom);
 #endif
 		public override string ToString() =>
 			$"{Left}, {Top}, {Right}, {Bottom}";

From f1ec5ef94bc46c324e1d6a91f459f3465d031988 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 25 Jul 2025 13:48:38 +0000
Subject: [PATCH 13/34] Make SafeAreaEdges immutable and update SafeAreaRegions
 flag values

- Changed SafeAreaRegions enum values from bit shifts to simple integers (None=0, SoftInput=1, Container=2, Default=4)
- Made SafeAreaEdges immutable by removing property setters and SetEdge method
- Updated all PublicAPI.Unshipped.txt files to remove setter and SetEdge method entries
- Updated unit tests to use constructor instead of SetEdge method
- Maintained default constructor behavior for backward compatibility

Co-authored-by: PureWeen <5375137+PureWeen@users.noreply.github.com>

# Conflicts:
#	src/Controls/tests/Xaml.UnitTests/BindingDiagnosticsTests.xaml.cs
#	src/Controls/tests/Xaml.UnitTests/Issues/Maui2418.xaml.cs
#	src/Controls/tests/Xaml.UnitTests/Issues/Maui25608_2.xaml.cs
---
 .../Android/AppCompat/FlyoutPageRenderer.cs   |  14 +-
 .../AppCompat/NavigationPageRenderer.cs       |  28 +-
 .../Core/src/Android/AppCompat/Platform.cs    |   7 +-
 .../Android/AppCompat/TabbedPageRenderer.cs   |   7 +-
 .../CollectionView/CarouselViewRenderer.cs    |   7 +-
 .../CollectionView/ItemsViewRenderer.cs       |   7 +-
 .../Android/FastRenderers/FrameRenderer.cs    |  28 +-
 .../Android/FastRenderers/ImageRenderer.cs    |  14 +-
 .../Android/FastRenderers/LabelRenderer.cs    |  14 +-
 .../Core/src/Android/Renderers/BoxRenderer.cs |   7 +-
 .../src/Android/Renderers/ListViewAdapter.cs  |   7 +-
 .../src/Android/Renderers/ListViewRenderer.cs |  14 +-
 .../Android/Renderers/SwipeViewRenderer.cs    |   7 +-
 .../Android/Renderers/TableViewRenderer.cs    |   7 +-
 .../Core/src/Android/VisualElementPackager.cs |   7 +-
 .../Core/src/Android/VisualElementRenderer.cs |  14 +-
 src/Controls/src/Core/Border/Border.cs        |   2 +-
 .../Handlers/Android/FrameRenderer.cs         |   7 +-
 .../ListView/Android/ListViewAdapter.cs       |   7 +-
 .../ListView/Android/ListViewRenderer.cs      |   7 +-
 .../TableView/Android/TableViewRenderer.cs    |   7 +-
 .../src/Core/ContentPage/ContentPage.cs       |   2 +-
 src/Controls/src/Core/ContentPresenter.cs     |   2 +-
 .../src/Core/ContentView/ContentView.cs       |   2 +-
 .../src/Core/DatePicker/DatePicker.cs         |  16 +-
 src/Controls/src/Core/Element/Element.cs      |   2 +-
 .../Items/Android/MauiCarouselRecyclerView.cs |   7 +-
 .../Items/Android/MauiRecyclerView.cs         |  22 +-
 src/Controls/src/Core/Layout/Layout.cs        |   2 +-
 src/Controls/src/Core/LegacyLayouts/Layout.cs |  22 +-
 src/Controls/src/Core/Page/Page.cs            |   4 +-
 src/Controls/src/Core/Picker/Picker.cs        |  12 +-
 .../Android/TapAndPanGestureDetector.cs       |   7 +-
 src/Controls/src/Core/SafeAreaElement.cs      |   2 +-
 .../src/Core/ScrollView/ScrollView.cs         |   8 +-
 src/Controls/src/Core/Shell/SearchHandler.cs  |   2 +-
 .../src/Core/TemplatedView/TemplatedView.cs   |   2 +-
 .../src/Core/TimePicker/TimePicker.cs         |  14 +-
 .../src/Core/VisualElement/VisualElement.cs   |   2 +-
 .../Core.UnitTests/ContentViewUnitTest.cs     | 105 +++---
 .../tests/Core.UnitTests/SafeAreaTests.cs     | 153 ++++-----
 .../Elements/Button/ButtonTests.Android.cs    |   2 +-
 .../CollectionView/CollectionViewTests.cs     |   2 +-
 .../TestCases.HostApp/Issues/Issue28051.cs    |  18 +-
 .../Issues/Issue28986.xaml.cs                 |  30 +-
 .../Issues/Issue28986_Border.xaml.cs          |  10 +-
 .../Issues/Issue28986_ContentPage.xaml.cs     |  10 +-
 .../Issues/Issue28986_ContentView.xaml.cs     |  10 +-
 .../Issues/Issue28986_ScrollView.xaml.cs      |  10 +-
 .../Issues/Issue8945.xaml.cs                  |   6 +-
 .../Issues/Issue8945DatePicker.xaml.cs        |  12 +-
 .../Issues/Issue8945Picker.xaml.cs            |  12 +-
 .../Issues/Issue8945TimePicker.xaml.cs        |  12 +-
 .../Tests/Issues/Issue27715.cs                |   2 +-
 .../Tests/Issues/Issue8945.cs                 |   2 +-
 .../Tests/Issues/Issue8945DatePicker.cs       |   2 +-
 .../Tests/Issues/Issue8945Picker.cs           |   2 +-
 .../Tests/Issues/Issue8945TimePicker.cs       |   2 +-
 .../Xaml.UnitTests/Issues/Maui17222.xaml.cs   |   4 +-
 .../Xaml.UnitTests/SafeAreaEdgesTests.xaml.cs |  10 +-
 .../Converters/SafeAreaEdgesTypeConverter.cs  |   4 +-
 src/Core/src/Core/IDatePicker.cs              |   4 +-
 src/Core/src/Core/IPicker.cs                  |   4 +-
 src/Core/src/Core/ITimePicker.cs              |   4 +-
 src/Core/src/Graphics/MauiDrawable.Android.cs |  28 +-
 .../DatePicker/DatePickerHandler.Android.cs   |  18 +-
 .../Handlers/Picker/PickerHandler.Android.cs  |   6 +-
 .../TimePicker/TimePickerHandler.Android.cs   |   8 +-
 .../src/Platform/Android/BorderDrawable.cs    |  14 +-
 .../Android/MauiSwipeRefreshLayout.cs         |   2 +-
 .../src/Platform/Android/PickerExtensions.cs  |   2 +-
 src/Core/src/Primitives/SafeAreaEdges.cs      |  44 +--
 src/Core/src/Primitives/SafeAreaRegions.cs    |   6 +-
 .../net-android/PublicAPI.Unshipped.txt       |   5 -
 .../net-android/PublicAPI.Unshipped.txt.bak   | 315 ++++++++++++++++++
 .../PublicAPI/net-ios/PublicAPI.Unshipped.txt |   5 -
 .../net-ios/PublicAPI.Unshipped.txt.bak       | 306 +++++++++++++++++
 .../net-maccatalyst/PublicAPI.Unshipped.txt   |   5 -
 .../PublicAPI.Unshipped.txt.bak               | 309 +++++++++++++++++
 .../net-tizen/PublicAPI.Unshipped.txt.bak     | 222 ++++++++++++
 .../net-windows/PublicAPI.Unshipped.txt       |   5 -
 .../net-windows/PublicAPI.Unshipped.txt.bak   | 273 +++++++++++++++
 .../src/PublicAPI/net/PublicAPI.Unshipped.txt |   5 -
 .../netstandard/PublicAPI.Unshipped.txt       |   5 -
 .../netstandard/PublicAPI.Unshipped.txt.bak   | 248 ++++++++++++++
 .../netstandard2.0/PublicAPI.Unshipped.txt    |   5 -
 .../PublicAPI.Unshipped.txt.bak               | 248 ++++++++++++++
 src/Core/src/RuntimeFeature.cs                |   2 +-
 .../ImageAnalysis/RawBitmap.cs                |   2 +-
 src/Graphics/src/Graphics.Skia/SkiaCanvas.cs  |  14 +-
 .../src/Graphics.Skia/SkiaCanvasState.cs      |   7 +-
 src/Graphics/src/Graphics/AbstractCanvas.cs   |  28 +-
 .../Android/PlatformBitmapExportContext.cs    |   7 +-
 .../Platforms/Android/PlatformCanvas.cs       |  14 +-
 .../Platforms/Android/PlatformCanvasState.cs  |  28 +-
 95 files changed, 2333 insertions(+), 634 deletions(-)
 create mode 100644 src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt.bak
 create mode 100644 src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt.bak
 create mode 100644 src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt.bak
 create mode 100644 src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt.bak
 create mode 100644 src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt.bak
 create mode 100644 src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt.bak
 create mode 100644 src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt.bak

diff --git a/src/Compatibility/Core/src/Android/AppCompat/FlyoutPageRenderer.cs b/src/Compatibility/Core/src/Android/AppCompat/FlyoutPageRenderer.cs
index d614406940c5..1ddbe9c3467e 100644
--- a/src/Compatibility/Core/src/Android/AppCompat/FlyoutPageRenderer.cs
+++ b/src/Compatibility/Core/src/Android/AppCompat/FlyoutPageRenderer.cs
@@ -260,11 +260,8 @@ protected override void Dispose(bool disposing)
 				if (!this.IsDisposed())
 					RemoveDrawerListener(this);
 
-				if (_tracker != null)
-				{
-					_tracker.Dispose();
-					_tracker = null;
-				}
+				_tracker?.Dispose();
+				_tracker = null;
 
 				if (_detailLayout != null)
 				{
@@ -280,11 +277,8 @@ protected override void Dispose(bool disposing)
 					_flyoutLayout = null;
 				}
 
-				if (Element != null)
-				{
-					Element.ClearValue(Microsoft.Maui.Controls.Compatibility.Platform.Android.Platform.RendererProperty);
-					Element = null;
-				}
+				Element?.ClearValue(Microsoft.Maui.Controls.Compatibility.Platform.Android.Platform.RendererProperty);
+				Element = null;
 			}
 
 			base.Dispose(disposing);
diff --git a/src/Compatibility/Core/src/Android/AppCompat/NavigationPageRenderer.cs b/src/Compatibility/Core/src/Android/AppCompat/NavigationPageRenderer.cs
index 4fcff0c857dd..c3b93bfc4c3c 100644
--- a/src/Compatibility/Core/src/Android/AppCompat/NavigationPageRenderer.cs
+++ b/src/Compatibility/Core/src/Android/AppCompat/NavigationPageRenderer.cs
@@ -222,17 +222,11 @@ protected override void Dispose(bool disposing)
 					_toolbarTracker = null;
 				}
 
-				if (_currentMenuItems != null)
-				{
-					_currentMenuItems.Clear();
-					_currentMenuItems = null;
-				}
+				_currentMenuItems?.Clear();
+				_currentMenuItems = null;
 
-				if (_currentToolbarItems != null)
-				{
-					_currentToolbarItems.Clear();
-					_currentToolbarItems = null;
-				}
+				_currentToolbarItems?.Clear();
+				_currentToolbarItems = null;
 
 				if (_toolbar != null)
 				{
@@ -252,11 +246,8 @@ protected override void Dispose(bool disposing)
 					RemoveView(_drawerLayout);
 				}
 
-				if (_drawerListener != null)
-				{
-					_drawerListener.Dispose();
-					_drawerListener = null;
-				}
+				_drawerListener?.Dispose();
+				_drawerListener = null;
 
 				if (_drawerToggle != null)
 				{
@@ -265,11 +256,8 @@ protected override void Dispose(bool disposing)
 					_drawerToggle = null;
 				}
 
-				if (_backgroundDrawable != null)
-				{
-					_backgroundDrawable.Dispose();
-					_backgroundDrawable = null;
-				}
+				_backgroundDrawable?.Dispose();
+				_backgroundDrawable = null;
 
 				Current = null;
 
diff --git a/src/Compatibility/Core/src/Android/AppCompat/Platform.cs b/src/Compatibility/Core/src/Android/AppCompat/Platform.cs
index d738a737eee4..211281164e3f 100644
--- a/src/Compatibility/Core/src/Android/AppCompat/Platform.cs
+++ b/src/Compatibility/Core/src/Android/AppCompat/Platform.cs
@@ -673,11 +673,8 @@ protected override void Dispose(bool disposing)
 						_modal = null;
 					}
 
-					if (_backgroundView != null)
-					{
-						_backgroundView.Dispose();
-						_backgroundView = null;
-					}
+					_backgroundView?.Dispose();
+					_backgroundView = null;
 				}
 
 				_disposed = true;
diff --git a/src/Compatibility/Core/src/Android/AppCompat/TabbedPageRenderer.cs b/src/Compatibility/Core/src/Android/AppCompat/TabbedPageRenderer.cs
index a1f3373d8a95..a60122046aa1 100644
--- a/src/Compatibility/Core/src/Android/AppCompat/TabbedPageRenderer.cs
+++ b/src/Compatibility/Core/src/Android/AppCompat/TabbedPageRenderer.cs
@@ -198,11 +198,8 @@ protected override void Dispose(bool disposing)
 					_bottomNavigationView = null;
 				}
 
-				if (_relativeLayout != null)
-				{
-					_relativeLayout.Dispose();
-					_relativeLayout = null;
-				}
+				_relativeLayout?.Dispose();
+				_relativeLayout = null;
 
 				if (Element != null)
 				{
diff --git a/src/Compatibility/Core/src/Android/CollectionView/CarouselViewRenderer.cs b/src/Compatibility/Core/src/Android/CollectionView/CarouselViewRenderer.cs
index a5d31f643c5e..05e51a915870 100644
--- a/src/Compatibility/Core/src/Android/CollectionView/CarouselViewRenderer.cs
+++ b/src/Compatibility/Core/src/Android/CollectionView/CarouselViewRenderer.cs
@@ -78,11 +78,8 @@ protected override void Dispose(bool disposing)
 				_carouselViewLoopManager?.SetItemsSource(null);
 				_carouselViewLoopManager = null;
 
-				if (_itemDecoration != null)
-				{
-					_itemDecoration.Dispose();
-					_itemDecoration = null;
-				}
+				_itemDecoration?.Dispose();
+				_itemDecoration = null;
 
 				ClearLayoutListener();
 			}
diff --git a/src/Compatibility/Core/src/Android/CollectionView/ItemsViewRenderer.cs b/src/Compatibility/Core/src/Android/CollectionView/ItemsViewRenderer.cs
index 4ea715d4d434..cb0165490698 100644
--- a/src/Compatibility/Core/src/Android/CollectionView/ItemsViewRenderer.cs
+++ b/src/Compatibility/Core/src/Android/CollectionView/ItemsViewRenderer.cs
@@ -410,11 +410,8 @@ protected virtual void TearDownOldElement(ItemsView oldElement)
 				ItemsViewAdapter?.Dispose();
 			}
 
-			if (_snapManager != null)
-			{
-				_snapManager.Dispose();
-				_snapManager = null;
-			}
+			_snapManager?.Dispose();
+			_snapManager = null;
 
 			if (_itemDecoration != null)
 			{
diff --git a/src/Compatibility/Core/src/Android/FastRenderers/FrameRenderer.cs b/src/Compatibility/Core/src/Android/FastRenderers/FrameRenderer.cs
index 5d913aa5267d..81f015040d9e 100644
--- a/src/Compatibility/Core/src/Android/FastRenderers/FrameRenderer.cs
+++ b/src/Compatibility/Core/src/Android/FastRenderers/FrameRenderer.cs
@@ -119,29 +119,17 @@ protected override void Dispose(bool disposing)
 					Element.PropertyChanged -= OnElementPropertyChanged;
 				}
 
-				if (_visualElementTracker != null)
-				{
-					_visualElementTracker.Dispose();
-					_visualElementTracker = null;
-				}
+				_visualElementTracker?.Dispose();
+				_visualElementTracker = null;
 
-				if (_visualElementPackager != null)
-				{
-					_visualElementPackager.Dispose();
-					_visualElementPackager = null;
-				}
+				_visualElementPackager?.Dispose();
+				_visualElementPackager = null;
 
-				if (_backgroundDrawable != null)
-				{
-					_backgroundDrawable.Dispose();
-					_backgroundDrawable = null;
-				}
+				_backgroundDrawable?.Dispose();
+				_backgroundDrawable = null;
 
-				if (_visualElementRenderer != null)
-				{
-					_visualElementRenderer.Dispose();
-					_visualElementRenderer = null;
-				}
+				_visualElementRenderer?.Dispose();
+				_visualElementRenderer = null;
 
 				while (ChildCount > 0)
 				{
diff --git a/src/Compatibility/Core/src/Android/FastRenderers/ImageRenderer.cs b/src/Compatibility/Core/src/Android/FastRenderers/ImageRenderer.cs
index 2e2df5f66ac5..9a7ea6c4181f 100644
--- a/src/Compatibility/Core/src/Android/FastRenderers/ImageRenderer.cs
+++ b/src/Compatibility/Core/src/Android/FastRenderers/ImageRenderer.cs
@@ -44,17 +44,11 @@ protected override void Dispose(bool disposing)
 				ImageElementManager.Dispose(this);
 				BackgroundManager.Dispose(this);
 
-				if (_visualElementTracker != null)
-				{
-					_visualElementTracker.Dispose();
-					_visualElementTracker = null;
-				}
+				_visualElementTracker?.Dispose();
+				_visualElementTracker = null;
 
-				if (_visualElementRenderer != null)
-				{
-					_visualElementRenderer.Dispose();
-					_visualElementRenderer = null;
-				}
+				_visualElementRenderer?.Dispose();
+				_visualElementRenderer = null;
 
 				if (_element != null)
 				{
diff --git a/src/Compatibility/Core/src/Android/FastRenderers/LabelRenderer.cs b/src/Compatibility/Core/src/Android/FastRenderers/LabelRenderer.cs
index cf1b7523e61f..a311fee08d19 100644
--- a/src/Compatibility/Core/src/Android/FastRenderers/LabelRenderer.cs
+++ b/src/Compatibility/Core/src/Android/FastRenderers/LabelRenderer.cs
@@ -192,17 +192,11 @@ protected override void Dispose(bool disposing)
 				}
 
 				BackgroundManager.Dispose(this);
-				if (_visualElementTracker != null)
-				{
-					_visualElementTracker.Dispose();
-					_visualElementTracker = null;
-				}
+				_visualElementTracker?.Dispose();
+				_visualElementTracker = null;
 
-				if (_visualElementRenderer != null)
-				{
-					_visualElementRenderer.Dispose();
-					_visualElementRenderer = null;
-				}
+				_visualElementRenderer?.Dispose();
+				_visualElementRenderer = null;
 
 				_spannableString?.Dispose();
 
diff --git a/src/Compatibility/Core/src/Android/Renderers/BoxRenderer.cs b/src/Compatibility/Core/src/Android/Renderers/BoxRenderer.cs
index 7ada3c01d3ec..2ed2e06e8344 100644
--- a/src/Compatibility/Core/src/Android/Renderers/BoxRenderer.cs
+++ b/src/Compatibility/Core/src/Android/Renderers/BoxRenderer.cs
@@ -118,11 +118,8 @@ protected override void Dispose(bool disposing)
 
 			if (disposing)
 			{
-				if (_backgroundDrawable != null)
-				{
-					_backgroundDrawable.Dispose();
-					_backgroundDrawable = null;
-				}
+				_backgroundDrawable?.Dispose();
+				_backgroundDrawable = null;
 
 				if (Element != null)
 				{
diff --git a/src/Compatibility/Core/src/Android/Renderers/ListViewAdapter.cs b/src/Compatibility/Core/src/Android/Renderers/ListViewAdapter.cs
index 8336909f2134..42cb99aa1f86 100644
--- a/src/Compatibility/Core/src/Android/Renderers/ListViewAdapter.cs
+++ b/src/Compatibility/Core/src/Android/Renderers/ListViewAdapter.cs
@@ -447,11 +447,8 @@ protected override void Dispose(bool disposing)
 				templatedItems.GroupedCollectionChanged -= OnGroupedCollectionChanged;
 				_listView.ItemSelected -= OnItemSelected;
 
-				if (_lastSelected != null)
-				{
-					_lastSelected.Dispose();
-					_lastSelected = null;
-				}
+				_lastSelected?.Dispose();
+				_lastSelected = null;
 
 				DisposeCells();
 			}
diff --git a/src/Compatibility/Core/src/Android/Renderers/ListViewRenderer.cs b/src/Compatibility/Core/src/Android/Renderers/ListViewRenderer.cs
index e5aaf91bf77a..cb6835069176 100644
--- a/src/Compatibility/Core/src/Android/Renderers/ListViewRenderer.cs
+++ b/src/Compatibility/Core/src/Android/Renderers/ListViewRenderer.cs
@@ -86,11 +86,8 @@ protected override void Dispose(bool disposing)
 					Control.SetOnScrollListener(null);
 				}
 
-				if (_adapter != null)
-				{
-					_adapter.Dispose();
-					_adapter = null;
-				}
+				_adapter?.Dispose();
+				_adapter = null;
 			}
 
 			base.Dispose(disposing);
@@ -145,11 +142,8 @@ protected override void OnElementChanged(ElementChangedEventArgs<ListView> e)
 					Control.SetOnScrollListener(null);
 				}
 
-				if (_adapter != null)
-				{
-					_adapter.Dispose();
-					_adapter = null;
-				}
+				_adapter?.Dispose();
+				_adapter = null;
 			}
 
 			if (e.NewElement != null)
diff --git a/src/Compatibility/Core/src/Android/Renderers/SwipeViewRenderer.cs b/src/Compatibility/Core/src/Android/Renderers/SwipeViewRenderer.cs
index 21f94ae06dfa..83ed4820b032 100644
--- a/src/Compatibility/Core/src/Android/Renderers/SwipeViewRenderer.cs
+++ b/src/Compatibility/Core/src/Android/Renderers/SwipeViewRenderer.cs
@@ -204,11 +204,8 @@ protected override void Dispose(bool disposing)
 					_actionView = null;
 				}
 
-				if (_initialPoint != null)
-				{
-					_initialPoint.Dispose();
-					_initialPoint = null;
-				}
+				_initialPoint?.Dispose();
+				_initialPoint = null;
 			}
 
 			_isDisposed = true;
diff --git a/src/Compatibility/Core/src/Android/Renderers/TableViewRenderer.cs b/src/Compatibility/Core/src/Android/Renderers/TableViewRenderer.cs
index 065fb01ee941..2e8ea6616750 100644
--- a/src/Compatibility/Core/src/Android/Renderers/TableViewRenderer.cs
+++ b/src/Compatibility/Core/src/Android/Renderers/TableViewRenderer.cs
@@ -78,11 +78,8 @@ protected override void Dispose(bool disposing)
 					Control.Adapter = null;
 				}
 
-				if (_adapter != null)
-				{
-					_adapter.Dispose();
-					_adapter = null;
-				}
+				_adapter?.Dispose();
+				_adapter = null;
 			}
 
 
diff --git a/src/Compatibility/Core/src/Android/VisualElementPackager.cs b/src/Compatibility/Core/src/Android/VisualElementPackager.cs
index 4abc452e0391..264501ef5e8d 100644
--- a/src/Compatibility/Core/src/Android/VisualElementPackager.cs
+++ b/src/Compatibility/Core/src/Android/VisualElementPackager.cs
@@ -89,11 +89,8 @@ protected virtual void Dispose(bool disposing)
 
 					SetElement(_element, null);
 
-					if (_childViews != null)
-					{
-						_childViews.Clear();
-						_childViews = null;
-					}
+					_childViews?.Clear();
+					_childViews = null;
 
 					if (_childPackagers != null)
 					{
diff --git a/src/Compatibility/Core/src/Android/VisualElementRenderer.cs b/src/Compatibility/Core/src/Android/VisualElementRenderer.cs
index 335af78c9828..6ece5b1e3238 100644
--- a/src/Compatibility/Core/src/Android/VisualElementRenderer.cs
+++ b/src/Compatibility/Core/src/Android/VisualElementRenderer.cs
@@ -217,17 +217,11 @@ protected override void Dispose(bool disposing)
 					Element.PropertyChanged -= _propertyChangeHandler;
 				}
 
-				if (Tracker != null)
-				{
-					Tracker.Dispose();
-					Tracker = null;
-				}
+				Tracker?.Dispose();
+				Tracker = null;
 
-				if (_packager != null)
-				{
-					_packager.Dispose();
-					_packager = null;
-				}
+				_packager?.Dispose();
+				_packager = null;
 
 				if (ManageNativeControlLifetime)
 				{
diff --git a/src/Controls/src/Core/Border/Border.cs b/src/Controls/src/Core/Border/Border.cs
index 912427fa4f54..6263b2fbb342 100644
--- a/src/Controls/src/Core/Border/Border.cs
+++ b/src/Controls/src/Core/Border/Border.cs
@@ -356,7 +356,7 @@ SafeAreaRegions ISafeAreaView2.GetSafeAreaRegionsForEdge(int edge)
 		{
 			// Use direct property
 			var regionForEdge = SafeAreaEdges.GetEdge(edge);
-			
+
 			// For Border, return as-is
 			return regionForEdge;
 		}
diff --git a/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs
index 2fbfd43da6e0..f7c26d91ca22 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs
@@ -122,11 +122,8 @@ protected override void Dispose(bool disposing)
 					Element.PropertyChanged -= OnElementPropertyChanged;
 				}
 
-				if (_backgroundDrawable != null)
-				{
-					_backgroundDrawable.Dispose();
-					_backgroundDrawable = null;
-				}
+				_backgroundDrawable?.Dispose();
+				_backgroundDrawable = null;
 
 				while (ChildCount > 0)
 				{
diff --git a/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/ListViewAdapter.cs b/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/ListViewAdapter.cs
index dcef962703a1..64b9ed2c6e11 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/ListViewAdapter.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/ListViewAdapter.cs
@@ -533,11 +533,8 @@ protected override void Dispose(bool disposing)
 				templatedItems.GroupedCollectionChanged -= OnGroupedCollectionChanged;
 				_listView.ItemSelected -= OnItemSelected;
 
-				if (_lastSelected != null)
-				{
-					_lastSelected.Dispose();
-					_lastSelected = null;
-				}
+				_lastSelected?.Dispose();
+				_lastSelected = null;
 
 				DisposeCells();
 			}
diff --git a/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/ListViewRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/ListViewRenderer.cs
index 4ada4d0080ea..c1cbcb792cf8 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/ListViewRenderer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/ListViewRenderer.cs
@@ -145,11 +145,8 @@ protected override void OnElementChanged(ElementChangedEventArgs<ListView> e)
 					Control.SetOnScrollListener(null);
 				}
 
-				if (_adapter != null)
-				{
-					_adapter.Dispose();
-					_adapter = null;
-				}
+				_adapter?.Dispose();
+				_adapter = null;
 			}
 
 			if (e.NewElement != null)
diff --git a/src/Controls/src/Core/Compatibility/Handlers/TableView/Android/TableViewRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/TableView/Android/TableViewRenderer.cs
index d778aa4f61a1..345452b7343a 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/TableView/Android/TableViewRenderer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/TableView/Android/TableViewRenderer.cs
@@ -200,11 +200,8 @@ protected override void Dispose(bool disposing)
 					Control.Adapter = null;
 				}
 
-				if (_adapter != null)
-				{
-					_adapter.Dispose();
-					_adapter = null;
-				}
+				_adapter?.Dispose();
+				_adapter = null;
 			}
 
 
diff --git a/src/Controls/src/Core/ContentPage/ContentPage.cs b/src/Controls/src/Core/ContentPage/ContentPage.cs
index e5958448cbec..73e5e59fcdcb 100644
--- a/src/Controls/src/Core/ContentPage/ContentPage.cs
+++ b/src/Controls/src/Core/ContentPage/ContentPage.cs
@@ -178,7 +178,7 @@ SafeAreaRegions ISafeAreaView2.GetSafeAreaRegionsForEdge(int edge)
 				// Developer has explicitly set SafeAreaEdges, use it directly
 				return SafeAreaEdges.GetEdge(edge);
 			}
-			
+
 			// Developer hasn't set SafeAreaEdges, fall back to legacy IgnoreSafeArea behavior
 			var ignoreSafeArea = ((ISafeAreaView)this).IgnoreSafeArea;
 			if (ignoreSafeArea)
diff --git a/src/Controls/src/Core/ContentPresenter.cs b/src/Controls/src/Core/ContentPresenter.cs
index f1bf5708bbb9..256f90c9ffc4 100644
--- a/src/Controls/src/Core/ContentPresenter.cs
+++ b/src/Controls/src/Core/ContentPresenter.cs
@@ -247,7 +247,7 @@ protected override SizeRequest OnMeasure(double widthConstraint, double heightCo
 		{
 			return base.OnMeasure(widthConstraint, heightConstraint);
 		}
-		
+
 		[EditorBrowsable(EditorBrowsableState.Never)]
 		[Obsolete("Use IVisualTreeElement.GetVisualChildren() instead.")]
 		public new IReadOnlyList<Element> Children => base.Children;
diff --git a/src/Controls/src/Core/ContentView/ContentView.cs b/src/Controls/src/Core/ContentView/ContentView.cs
index c65016423658..7728e3f10413 100644
--- a/src/Controls/src/Core/ContentView/ContentView.cs
+++ b/src/Controls/src/Core/ContentView/ContentView.cs
@@ -87,7 +87,7 @@ SafeAreaRegions ISafeAreaView2.GetSafeAreaRegionsForEdge(int edge)
 		{
 			// Use direct property
 			var regionForEdge = SafeAreaEdges.GetEdge(edge);
-			
+
 			// For ContentView, return the region directly
 			return regionForEdge;
 		}
diff --git a/src/Controls/src/Core/DatePicker/DatePicker.cs b/src/Controls/src/Core/DatePicker/DatePicker.cs
index 53a660e93108..4aac290a97f1 100644
--- a/src/Controls/src/Core/DatePicker/DatePicker.cs
+++ b/src/Controls/src/Core/DatePicker/DatePicker.cs
@@ -47,7 +47,7 @@ public partial class DatePicker : View, IFontElement, ITextElement, IElementConf
 		public static readonly BindableProperty FontAutoScalingEnabledProperty = FontElement.FontAutoScalingEnabledProperty;
 
 		/// <summary>Bindable property for <see cref="IsOpen"/>.</summary>
-		public static readonly BindableProperty IsOpenProperty =	
+		public static readonly BindableProperty IsOpenProperty =
 			BindableProperty.Create(nameof(IDatePicker.IsOpen), typeof(bool), typeof(DatePicker), default, BindingMode.TwoWay,
 				propertyChanged: OnIsOpenPropertyChanged);
 
@@ -138,18 +138,18 @@ public bool FontAutoScalingEnabled
 			get => (bool)GetValue(FontAutoScalingEnabledProperty);
 			set => SetValue(FontAutoScalingEnabledProperty, value);
 		}
-		
+
 		public bool IsOpen
 		{
 			get => (bool)GetValue(IsOpenProperty);
 			set => SetValue(IsOpenProperty, value);
 		}
-		
+
 		static void OnIsOpenPropertyChanged(BindableObject bindable, object oldValue, object newValue)
 		{
 			((DatePicker)bindable).OnIsOpenPropertyChanged((bool)oldValue, (bool)newValue);
 		}
-		
+
 		void IFontElement.OnFontFamilyChanged(string oldValue, string newValue) =>
 			HandleFontChanged();
 
@@ -176,7 +176,7 @@ void ITextElement.OnTextTransformChanged(TextTransform oldValue, TextTransform n
 		}
 
 		readonly Queue<Action> _pendingIsOpenActions = new Queue<Action>();
-		
+
 		void OnIsOpenPropertyChanged(bool oldValue, bool newValue)
 		{
 			if (Handler?.VirtualView is DatePicker)
@@ -188,11 +188,11 @@ void OnIsOpenPropertyChanged(bool oldValue, bool newValue)
 				_pendingIsOpenActions.Enqueue(HandleIsOpenChanged);
 			}
 		}
-		
+
 		protected override void OnHandlerChanged()
 		{
 			base.OnHandlerChanged();
-            
+
 			// Process any pending actions when handler becomes available
 			while (_pendingIsOpenActions.Count > 0 && Handler != null)
 			{
@@ -200,7 +200,7 @@ protected override void OnHandlerChanged()
 				action.Invoke();
 			}
 		}
-		
+
 		void HandleIsOpenChanged()
 		{
 			if (Handler?.VirtualView is not DatePicker datePicker)
diff --git a/src/Controls/src/Core/Element/Element.cs b/src/Controls/src/Core/Element/Element.cs
index 5364b40ff98f..82cee996f655 100644
--- a/src/Controls/src/Core/Element/Element.cs
+++ b/src/Controls/src/Core/Element/Element.cs
@@ -515,7 +515,7 @@ public object FindByName(string name)
 		{
 			if (!RuntimeFeature.AreNamescopesSupported)
 				throw new NotSupportedException("Namescopes are not supported. Please enable the feature switch 'Microsoft.Maui.RuntimeFeature.AreNamescopesSupported' to keep using namescopes.");
-			
+
 			var namescope = GetNameScope() ?? transientNamescope;
 			if (namescope == null)
 				throw new InvalidOperationException("this element is not in a namescope");
diff --git a/src/Controls/src/Core/Handlers/Items/Android/MauiCarouselRecyclerView.cs b/src/Controls/src/Core/Handlers/Items/Android/MauiCarouselRecyclerView.cs
index 8e0a4f63272d..279b965728dc 100644
--- a/src/Controls/src/Core/Handlers/Items/Android/MauiCarouselRecyclerView.cs
+++ b/src/Controls/src/Core/Handlers/Items/Android/MauiCarouselRecyclerView.cs
@@ -75,11 +75,8 @@ protected override void Dispose(bool disposing)
 				_carouselViewLoopManager?.SetItemsSource(null);
 				_carouselViewLoopManager = null;
 
-				if (_itemDecoration != null)
-				{
-					_itemDecoration.Dispose();
-					_itemDecoration = null;
-				}
+				_itemDecoration?.Dispose();
+				_itemDecoration = null;
 
 				ClearLayoutListener();
 			}
diff --git a/src/Controls/src/Core/Handlers/Items/Android/MauiRecyclerView.cs b/src/Controls/src/Core/Handlers/Items/Android/MauiRecyclerView.cs
index 363e82a56ecc..0c4f47629f24 100644
--- a/src/Controls/src/Core/Handlers/Items/Android/MauiRecyclerView.cs
+++ b/src/Controls/src/Core/Handlers/Items/Android/MauiRecyclerView.cs
@@ -84,11 +84,8 @@ public virtual void TearDownOldElement(TItemsView oldElement)
 				ItemsViewAdapter?.Dispose();
 			}
 
-			if (_snapManager != null)
-			{
-				_snapManager.Dispose();
-				_snapManager = null;
-			}
+			_snapManager?.Dispose();
+			_snapManager = null;
 
 			if (_itemDecoration != null)
 			{
@@ -102,11 +99,8 @@ public virtual void TearDownOldElement(TItemsView oldElement)
 				_itemTouchHelper = null;
 			}
 
-			if (_itemTouchHelperCallback != null)
-			{
-				_itemTouchHelperCallback.Dispose();
-				_itemTouchHelperCallback = null;
-			}
+			_itemTouchHelperCallback?.Dispose();
+			_itemTouchHelperCallback = null;
 		}
 
 		public virtual void SetUpNewElement(TItemsView newElement)
@@ -276,11 +270,9 @@ public virtual void UpdateCanReorderItems()
 					_itemTouchHelper.Dispose();
 					_itemTouchHelper = null;
 				}
-				if (_itemTouchHelperCallback != null)
-				{
-					_itemTouchHelperCallback.Dispose();
-					_itemTouchHelperCallback = null;
-				}
+
+				_itemTouchHelperCallback?.Dispose();
+				_itemTouchHelperCallback = null;
 			}
 		}
 
diff --git a/src/Controls/src/Core/Layout/Layout.cs b/src/Controls/src/Core/Layout/Layout.cs
index c61c0840bd4f..56eebb580111 100644
--- a/src/Controls/src/Core/Layout/Layout.cs
+++ b/src/Controls/src/Core/Layout/Layout.cs
@@ -428,7 +428,7 @@ SafeAreaRegions ISafeAreaView2.GetSafeAreaRegionsForEdge(int edge)
 
 				return SafeAreaRegions.Container;
 			}
-			
+
 			// For Layout views, never return the old Default - return None instead
 			// (since Default no longer exists in the new enum)
 			return regionForEdge;
diff --git a/src/Controls/src/Core/LegacyLayouts/Layout.cs b/src/Controls/src/Core/LegacyLayouts/Layout.cs
index 4acbda6e7b77..6f17715efe8a 100644
--- a/src/Controls/src/Core/LegacyLayouts/Layout.cs
+++ b/src/Controls/src/Core/LegacyLayouts/Layout.cs
@@ -105,7 +105,7 @@ public abstract class Layout : View, ILayout, ILayoutController, IPaddingElement
 		bool _hasDoneLayout;
 		Size _lastLayoutSize = new Size(-1, -1);
 
-		private protected bool UseCompatibilityMode {get; }
+		private protected bool UseCompatibilityMode { get; }
 
 		protected Layout()
 		{
@@ -223,7 +223,7 @@ public override SizeRequest Measure(double widthConstraint, double heightConstra
 		[Obsolete("Use the Arrange method on child instead.")]
 		public static void LayoutChildIntoBoundingRegion(VisualElement child, Rect region)
 		{
-			if(child?.Parent is Layout layout && !layout.UseCompatibilityMode)
+			if (child?.Parent is Layout layout && !layout.UseCompatibilityMode)
 			{
 				return;
 			}
@@ -298,7 +298,7 @@ public void LowerChild(View view)
 		{
 			if (!UseCompatibilityMode)
 				return;
-				
+
 			if (!InternalChildren.Contains(view) || InternalChildren.First() == view)
 			{
 				return;
@@ -474,7 +474,7 @@ protected void UpdateChildrenLayout()
 			{
 				return;
 			}
-			
+
 			_hasDoneLayout = true;
 
 			if (!ShouldLayoutChildren())
@@ -536,7 +536,7 @@ protected void UpdateChildrenLayout()
 		internal static void LayoutChildIntoBoundingRegion(View child, Rect region, SizeRequest childSizeRequest)
 #pragma warning restore CS0618 // Type or member is obsolete
 		{
-			if(child?.Parent is Layout layout && !layout.UseCompatibilityMode)
+			if (child?.Parent is Layout layout && !layout.UseCompatibilityMode)
 			{
 				return;
 			}
@@ -600,7 +600,7 @@ internal override void OnIsVisibleChanged(bool oldValue, bool newValue)
 		{
 			base.OnIsVisibleChanged(oldValue, newValue);
 
-			if(!UseCompatibilityMode)
+			if (!UseCompatibilityMode)
 			{
 				return;
 			}
@@ -616,7 +616,7 @@ internal override void OnIsVisibleChanged(bool oldValue, bool newValue)
 
 		void InternalChildrenOnCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
 		{
-			if(!UseCompatibilityMode)
+			if (!UseCompatibilityMode)
 			{
 				return;
 			}
@@ -672,14 +672,14 @@ protected override void OnChildAdded(Element child)
 		protected override void OnChildRemoved(Element child, int oldLogicalIndex)
 		{
 			base.OnChildRemoved(child, oldLogicalIndex);
-			
+
 			if (!UseCompatibilityMode)
 				InternalChildren.Remove(child);
 		}
 
 		void OnInternalAdded(View view)
 		{
-			if(!UseCompatibilityMode)
+			if (!UseCompatibilityMode)
 			{
 				return;
 			}
@@ -696,7 +696,7 @@ void OnInternalAdded(View view)
 
 		void OnInternalRemoved(View view, int oldIndex)
 		{
-			if(!UseCompatibilityMode)
+			if (!UseCompatibilityMode)
 			{
 				return;
 			}
@@ -710,7 +710,7 @@ void OnInternalRemoved(View view, int oldIndex)
 
 		bool ShouldLayoutChildren()
 		{
-			if(!UseCompatibilityMode)
+			if (!UseCompatibilityMode)
 			{
 				return false;
 			}
diff --git a/src/Controls/src/Core/Page/Page.cs b/src/Controls/src/Core/Page/Page.cs
index 1ce7e5f709ec..be8b94dccbd8 100644
--- a/src/Controls/src/Core/Page/Page.cs
+++ b/src/Controls/src/Core/Page/Page.cs
@@ -267,7 +267,7 @@ SafeAreaRegions ISafeAreaView2.GetSafeAreaRegionsForEdge(int edge)
 		{
 			// Use new SafeAreaElement method
 			var regionForEdge = SafeAreaElement.GetEdgeValue(this, edge);
-			
+
 			// For Page (but not ContentPage), return as-is
 			return regionForEdge;
 		}
@@ -570,7 +570,7 @@ protected override void OnSizeAllocated(double width, double height)
 		[Obsolete("Use ArrangeOverride instead")]
 		protected void UpdateChildrenLayout()
 		{
-			
+
 		}
 
 		internal void OnAppearing(Action action)
diff --git a/src/Controls/src/Core/Picker/Picker.cs b/src/Controls/src/Core/Picker/Picker.cs
index 6b82fc0ea2d4..706af8b6f94e 100644
--- a/src/Controls/src/Core/Picker/Picker.cs
+++ b/src/Controls/src/Core/Picker/Picker.cs
@@ -66,7 +66,7 @@ public partial class Picker : View, IFontElement, ITextElement, ITextAlignmentEl
 		public static readonly BindableProperty VerticalTextAlignmentProperty = TextAlignmentElement.VerticalTextAlignmentProperty;
 
 		/// <summary>Bindable property for <see cref="IsOpen"/>.</summary>
-		public static readonly BindableProperty IsOpenProperty =	
+		public static readonly BindableProperty IsOpenProperty =
 			BindableProperty.Create(nameof(IPicker.IsOpen), typeof(bool), typeof(Picker), default, BindingMode.TwoWay,
 				propertyChanged: OnIsOpenPropertyChanged);
 
@@ -235,7 +235,7 @@ static void OnIsOpenPropertyChanged(BindableObject bindable, object oldValue, ob
 		{
 			((Picker)bindable).OnIsOpenPropertyChanged((bool)oldValue, (bool)newValue);
 		}
-		
+
 		public event EventHandler SelectedIndexChanged;
 		public event EventHandler<PickerOpenedEventArgs> Opened;
 		public event EventHandler<PickerClosedEventArgs> Closed;
@@ -306,7 +306,7 @@ void OnItemsSourceChanged(IList oldValue, IList newValue)
 		}
 
 		readonly Queue<Action> _pendingIsOpenActions = new Queue<Action>();
-		
+
 		void OnIsOpenPropertyChanged(bool oldValue, bool newValue)
 		{
 			if (Handler?.VirtualView is Picker)
@@ -318,11 +318,11 @@ void OnIsOpenPropertyChanged(bool oldValue, bool newValue)
 				_pendingIsOpenActions.Enqueue(HandleIsOpenChanged);
 			}
 		}
-		
+
 		protected override void OnHandlerChanged()
 		{
 			base.OnHandlerChanged();
-            
+
 			// Process any pending actions when handler becomes available
 			while (_pendingIsOpenActions.Count > 0 && Handler != null)
 			{
@@ -330,7 +330,7 @@ protected override void OnHandlerChanged()
 				action.Invoke();
 			}
 		}
-		
+
 		void HandleIsOpenChanged()
 		{
 			if (Handler?.VirtualView is not Picker picker)
diff --git a/src/Controls/src/Core/Platform/Android/TapAndPanGestureDetector.cs b/src/Controls/src/Core/Platform/Android/TapAndPanGestureDetector.cs
index 3db432e57215..1f4de55efe34 100644
--- a/src/Controls/src/Core/Platform/Android/TapAndPanGestureDetector.cs
+++ b/src/Controls/src/Core/Platform/Android/TapAndPanGestureDetector.cs
@@ -48,11 +48,8 @@ protected override void Dispose(bool disposing)
 
 			if (disposing)
 			{
-				if (_listener != null)
-				{
-					_listener.Dispose();
-					_listener = null;
-				}
+				_listener?.Dispose();
+				_listener = null;
 			}
 		}
 	}
diff --git a/src/Controls/src/Core/SafeAreaElement.cs b/src/Controls/src/Core/SafeAreaElement.cs
index 17f2d393d0d7..16f0d3cc1b17 100644
--- a/src/Controls/src/Core/SafeAreaElement.cs
+++ b/src/Controls/src/Core/SafeAreaElement.cs
@@ -48,7 +48,7 @@ internal static bool ShouldObeySafeAreaForEdge(BindableObject bindable, int edge
 		{
 			// Check the SafeAreaEdges property
 			var regionForEdge = GetEdgeValue(bindable, edge);
-			
+
 			// Handle the new SafeAreaRegions behavior (now obey-based instead of ignore-based)
 			if (regionForEdge == SafeAreaRegions.All)
 			{
diff --git a/src/Controls/src/Core/ScrollView/ScrollView.cs b/src/Controls/src/Core/ScrollView/ScrollView.cs
index 9653bb24d966..cadd85438560 100644
--- a/src/Controls/src/Core/ScrollView/ScrollView.cs
+++ b/src/Controls/src/Core/ScrollView/ScrollView.cs
@@ -511,7 +511,7 @@ Size ICrossPlatformLayout.CrossPlatformArrange(Rect bounds)
 
 		Size IContentView.CrossPlatformArrange(Rect bounds) =>
 			((ICrossPlatformLayout)this).CrossPlatformArrange(bounds);
-			
+
 		SafeAreaEdges ISafeAreaElement.SafeAreaEdgesDefaultValueCreator()
 		{
 			return SafeAreaEdges.Default;
@@ -532,7 +532,7 @@ SafeAreaRegions ISafeAreaView2.GetSafeAreaRegionsForEdge(int edge)
 		{
 			// Use direct property 
 			var regionForEdge = SafeAreaEdges.GetEdge(edge);
-			
+
 			// For ScrollView, return Default behavior as-is (it's special)
 			return regionForEdge;
 		}
@@ -554,7 +554,7 @@ public override SizeRequest Measure(double widthConstraint, double heightConstra
 			return base.Measure(widthConstraint, heightConstraint);
 		}
 
-		
+
 		/// <summary>
 		/// Sends a child to the back of the visual stack.
 		/// </summary>
@@ -621,7 +621,7 @@ protected override void OnChildMeasureInvalidated()
 		protected new void UpdateChildrenLayout()
 		{
 		}
-		
+
 		[Obsolete("Use MeasureOverride instead")]
 		protected override SizeRequest OnMeasure(double widthConstraint, double heightConstraint)
 		{
diff --git a/src/Controls/src/Core/Shell/SearchHandler.cs b/src/Controls/src/Core/Shell/SearchHandler.cs
index a05a8cb08a82..0788e13052db 100644
--- a/src/Controls/src/Core/Shell/SearchHandler.cs
+++ b/src/Controls/src/Core/Shell/SearchHandler.cs
@@ -20,7 +20,7 @@ public class SearchHandler : BindableObject, ISearchHandlerController, IPlacehol
 
 		public event EventHandler<EventArgs> Focused;
 		public event EventHandler<EventArgs> Unfocused;
-		
+
 		internal event EventHandler<EventArgs> ShowSoftInputRequested;
 		internal event EventHandler<EventArgs> HideSoftInputRequested;
 
diff --git a/src/Controls/src/Core/TemplatedView/TemplatedView.cs b/src/Controls/src/Core/TemplatedView/TemplatedView.cs
index b019a0ebdf19..1cc6b25dd2db 100644
--- a/src/Controls/src/Core/TemplatedView/TemplatedView.cs
+++ b/src/Controls/src/Core/TemplatedView/TemplatedView.cs
@@ -14,7 +14,7 @@ namespace Microsoft.Maui.Controls
 #pragma warning disable CS0618 // Type or member is obsolete
 	public partial class TemplatedView : Compatibility.Layout, ILayout, ILayoutController, IPaddingElement, IView, IVisualTreeElement, IInputTransparentContainerElement, IControlTemplated, IContentView, IClippedToBoundsElement
 	{
-#pragma warning restore CS0618 
+#pragma warning restore CS0618
 		/// <summary>Bindable property for <see cref="ControlTemplate"/>.</summary>
 		public static readonly BindableProperty ControlTemplateProperty = BindableProperty.Create(nameof(ControlTemplate), typeof(ControlTemplate), typeof(TemplatedView), null,
 			propertyChanged: TemplateUtilities.OnControlTemplateChanged);
diff --git a/src/Controls/src/Core/TimePicker/TimePicker.cs b/src/Controls/src/Core/TimePicker/TimePicker.cs
index 37e99fc49fd0..68a628596cd0 100644
--- a/src/Controls/src/Core/TimePicker/TimePicker.cs
+++ b/src/Controls/src/Core/TimePicker/TimePicker.cs
@@ -42,7 +42,7 @@ public partial class TimePicker : View, IFontElement, ITextElement, IElementConf
 		public static readonly BindableProperty FontAutoScalingEnabledProperty = FontElement.FontAutoScalingEnabledProperty;
 
 		/// <summary>Bindable property for <see cref="IsOpen"/>.</summary>
-		public static readonly BindableProperty IsOpenProperty =	
+		public static readonly BindableProperty IsOpenProperty =
 			BindableProperty.Create(nameof(ITimePicker.IsOpen), typeof(bool), typeof(TimePicker), default, BindingMode.TwoWay,
 				propertyChanged: OnIsOpenPropertyChanged);
 
@@ -115,12 +115,12 @@ public bool IsOpen
 			get => (bool)GetValue(IsOpenProperty);
 			set => SetValue(IsOpenProperty, value);
 		}
-		
+
 		static void OnIsOpenPropertyChanged(BindableObject bindable, object oldValue, object newValue)
 		{
 			((TimePicker)bindable).OnIsOpenPropertyChanged((bool)oldValue, (bool)newValue);
 		}
-		
+
 		TextTransform ITextElement.TextTransform
 		{
 			get => TextTransform.Default;
@@ -157,7 +157,7 @@ void HandleFontChanged()
 		}
 
 		readonly Queue<Action> _pendingIsOpenActions = new Queue<Action>();
-		
+
 		void OnIsOpenPropertyChanged(bool oldValue, bool newValue)
 		{
 			if (Handler?.VirtualView is TimePicker)
@@ -169,11 +169,11 @@ void OnIsOpenPropertyChanged(bool oldValue, bool newValue)
 				_pendingIsOpenActions.Enqueue(HandleIsOpenChanged);
 			}
 		}
-		
+
 		protected override void OnHandlerChanged()
 		{
 			base.OnHandlerChanged();
-            
+
 			// Process any pending actions when handler becomes available
 			while (_pendingIsOpenActions.Count > 0 && Handler != null)
 			{
@@ -181,7 +181,7 @@ protected override void OnHandlerChanged()
 				action.Invoke();
 			}
 		}
-		
+
 		void HandleIsOpenChanged()
 		{
 			if (Handler?.VirtualView is not TimePicker timePicker)
diff --git a/src/Controls/src/Core/VisualElement/VisualElement.cs b/src/Controls/src/Core/VisualElement/VisualElement.cs
index d58f9954de98..772d4ba27689 100644
--- a/src/Controls/src/Core/VisualElement/VisualElement.cs
+++ b/src/Controls/src/Core/VisualElement/VisualElement.cs
@@ -1922,7 +1922,7 @@ public void Layout(Rect bounds)
 				Bounds = bounds;
 				return;
 			}
-			
+
 			// This forces any call to Layout to use the newer Arrange passes
 			// This should make it so legacy code that calls Layout will still work, but will use the new Measure and Arrange passes.
 			Arrange(bounds);
diff --git a/src/Controls/tests/Core.UnitTests/ContentViewUnitTest.cs b/src/Controls/tests/Core.UnitTests/ContentViewUnitTest.cs
index a054ce8c6c12..48746fad97e6 100644
--- a/src/Controls/tests/Core.UnitTests/ContentViewUnitTest.cs
+++ b/src/Controls/tests/Core.UnitTests/ContentViewUnitTest.cs
@@ -77,11 +77,12 @@ public void TestFrameLayout()
 			var mockViewHandler = Substitute.For<IViewHandler>();
 
 			// Set up the mock handler to properly participate in the layout system
-			mockViewHandler.GetDesiredSize(Arg.Any<double>(), Arg.Any<double>()).Returns(callInfo => {
+			mockViewHandler.GetDesiredSize(Arg.Any<double>(), Arg.Any<double>()).Returns(callInfo =>
+			{
 				// Extract the constraints passed to GetDesiredSize
 				var width = (double)callInfo[0];
 				var height = (double)callInfo[1];
-				
+
 				// Return the child's requested size (100x200)
 				return new Size(100, 200);
 			});
@@ -111,10 +112,10 @@ public void TestFrameLayout()
 			Assert.Equal(new Rect(100, 50, 100, 200), child.Bounds);
 
 			// Verify the PlatformArrange method was called on the handler with the correct frame
-			mockViewHandler.Received().PlatformArrange(Arg.Is<Rect>(r => 
-				Math.Abs(r.X - 100) < 0.001 && 
-				Math.Abs(r.Y - 50) < 0.001 && 
-				Math.Abs(r.Width - 100) < 0.001 && 
+			mockViewHandler.Received().PlatformArrange(Arg.Is<Rect>(r =>
+				Math.Abs(r.X - 100) < 0.001 &&
+				Math.Abs(r.Y - 50) < 0.001 &&
+				Math.Abs(r.Width - 100) < 0.001 &&
 				Math.Abs(r.Height - 200) < 0.001));
 		}
 
@@ -125,11 +126,12 @@ public void WidthRequest()
 			var mockViewHandler = Substitute.For<IViewHandler>();
 
 			// Set up the mock handler to properly participate in the layout system
-			mockViewHandler.GetDesiredSize(Arg.Any<double>(), Arg.Any<double>()).Returns(callInfo => {
+			mockViewHandler.GetDesiredSize(Arg.Any<double>(), Arg.Any<double>()).Returns(callInfo =>
+			{
 				// Extract the constraints passed to GetDesiredSize
 				var width = (double)callInfo[0];
 				var height = (double)callInfo[1];
-				
+
 				// Return the child's requested size
 				return new Size(100, 200);
 			});
@@ -150,7 +152,7 @@ public void WidthRequest()
 
 			// Get the ICrossPlatformLayout implementation
 			ICrossPlatformLayout crossPlatformLayout = contentView;
-			
+
 			// Test that the measure includes padding and respects the contentView's WidthRequest
 			var result = crossPlatformLayout.CrossPlatformMeasure(double.PositiveInfinity, double.PositiveInfinity);
 			Assert.Equal(new Size(120, 220), result);
@@ -163,11 +165,12 @@ public void HeightRequest()
 			var mockViewHandler = Substitute.For<IViewHandler>();
 
 			// Set up the mock handler to properly participate in the layout system
-			mockViewHandler.GetDesiredSize(Arg.Any<double>(), Arg.Any<double>()).Returns(callInfo => {
+			mockViewHandler.GetDesiredSize(Arg.Any<double>(), Arg.Any<double>()).Returns(callInfo =>
+			{
 				// Extract the constraints passed to GetDesiredSize
 				var width = (double)callInfo[0];
 				var height = (double)callInfo[1];
-				
+
 				// Return the child's requested size
 				return new Size(100, 200);
 			});
@@ -188,7 +191,7 @@ public void HeightRequest()
 
 			// Get the ICrossPlatformLayout implementation
 			ICrossPlatformLayout crossPlatformLayout = contentView;
-			
+
 			// Test that the measure includes padding and respects the contentView's HeightRequest
 			var result = crossPlatformLayout.CrossPlatformMeasure(double.PositiveInfinity, double.PositiveInfinity);
 			Assert.Equal(new Size(120, 220), result);
@@ -201,11 +204,12 @@ public void LayoutVerticallyCenter()
 			var mockViewHandler = Substitute.For<IViewHandler>();
 
 			// Set up the mock handler to properly participate in the layout system
-			mockViewHandler.GetDesiredSize(Arg.Any<double>(), Arg.Any<double>()).Returns(callInfo => {
+			mockViewHandler.GetDesiredSize(Arg.Any<double>(), Arg.Any<double>()).Returns(callInfo =>
+			{
 				// Extract the constraints passed to GetDesiredSize
 				var width = (double)callInfo[0];
 				var height = (double)callInfo[1];
-				
+
 				// Return the child's requested size
 				return new Size(100, 100);
 			});
@@ -230,10 +234,10 @@ public void LayoutVerticallyCenter()
 			Assert.Equal(new Rect(100, 100, 0, 0), child.Bounds);
 
 			// Verify the PlatformArrange method was called on the handler with the correct frame
-			mockViewHandler.Received().PlatformArrange(Arg.Is<Rect>(r => 
-				Math.Abs(r.X - 100) < 0.001 && 
-				Math.Abs(r.Y - 100) < 0.001 && 
-				Math.Abs(r.Width - 0) < 0.001 && 
+			mockViewHandler.Received().PlatformArrange(Arg.Is<Rect>(r =>
+				Math.Abs(r.X - 100) < 0.001 &&
+				Math.Abs(r.Y - 100) < 0.001 &&
+				Math.Abs(r.Width - 0) < 0.001 &&
 				Math.Abs(r.Height - 0) < 0.001));
 		}
 
@@ -244,11 +248,12 @@ public void LayoutVerticallyBegin()
 			var mockViewHandler = Substitute.For<IViewHandler>();
 
 			// Set up the mock handler to properly participate in the layout system
-			mockViewHandler.GetDesiredSize(Arg.Any<double>(), Arg.Any<double>()).Returns(callInfo => {
+			mockViewHandler.GetDesiredSize(Arg.Any<double>(), Arg.Any<double>()).Returns(callInfo =>
+			{
 				// Extract the constraints passed to GetDesiredSize
 				var width = (double)callInfo[0];
 				var height = (double)callInfo[1];
-				
+
 				// Return the child's requested size
 				return new Size(100, 100);
 			});
@@ -273,10 +278,10 @@ public void LayoutVerticallyBegin()
 			Assert.Equal(new Rect(100, 0, 0, 0), child.Bounds);
 
 			// Verify the PlatformArrange method was called on the handler with the correct frame
-			mockViewHandler.Received().PlatformArrange(Arg.Is<Rect>(r => 
-				Math.Abs(r.X - 100) < 0.001 && 
-				Math.Abs(r.Y - 0) < 0.001 && 
-				Math.Abs(r.Width - 0) < 0.001 && 
+			mockViewHandler.Received().PlatformArrange(Arg.Is<Rect>(r =>
+				Math.Abs(r.X - 100) < 0.001 &&
+				Math.Abs(r.Y - 0) < 0.001 &&
+				Math.Abs(r.Width - 0) < 0.001 &&
 				Math.Abs(r.Height - 0) < 0.001));
 		}
 
@@ -287,11 +292,12 @@ public void LayoutVerticallyEnd()
 			var mockViewHandler = Substitute.For<IViewHandler>();
 
 			// Set up the mock handler to properly participate in the layout system
-			mockViewHandler.GetDesiredSize(Arg.Any<double>(), Arg.Any<double>()).Returns(callInfo => {
+			mockViewHandler.GetDesiredSize(Arg.Any<double>(), Arg.Any<double>()).Returns(callInfo =>
+			{
 				// Extract the constraints passed to GetDesiredSize
 				var width = (double)callInfo[0];
 				var height = (double)callInfo[1];
-				
+
 				// Return the child's requested size
 				return new Size(100, 100);
 			});
@@ -316,10 +322,10 @@ public void LayoutVerticallyEnd()
 			Assert.Equal(new Rect(100, 200, 0, 0), child.Bounds);
 
 			// Verify the PlatformArrange method was called on the handler with the correct frame
-			mockViewHandler.Received().PlatformArrange(Arg.Is<Rect>(r => 
-				Math.Abs(r.X - 100) < 0.001 && 
-				Math.Abs(r.Y - 200) < 0.001 && 
-				Math.Abs(r.Width - 0) < 0.001 && 
+			mockViewHandler.Received().PlatformArrange(Arg.Is<Rect>(r =>
+				Math.Abs(r.X - 100) < 0.001 &&
+				Math.Abs(r.Y - 200) < 0.001 &&
+				Math.Abs(r.Width - 0) < 0.001 &&
 				Math.Abs(r.Height - 0) < 0.001));
 		}
 
@@ -330,11 +336,12 @@ public void LayoutHorizontallyCenter()
 			var mockViewHandler = Substitute.For<IViewHandler>();
 
 			// Set up the mock handler to properly participate in the layout system
-			mockViewHandler.GetDesiredSize(Arg.Any<double>(), Arg.Any<double>()).Returns(callInfo => {
+			mockViewHandler.GetDesiredSize(Arg.Any<double>(), Arg.Any<double>()).Returns(callInfo =>
+			{
 				// Extract the constraints passed to GetDesiredSize
 				var width = (double)callInfo[0];
 				var height = (double)callInfo[1];
-				
+
 				// Return the child's requested size
 				return new Size(100, 100);
 			});
@@ -359,10 +366,10 @@ public void LayoutHorizontallyCenter()
 			Assert.Equal(new Rect(100, 100, 0, 0), child.Bounds);
 
 			// Verify the PlatformArrange method was called on the handler with the correct frame
-			mockViewHandler.Received().PlatformArrange(Arg.Is<Rect>(r => 
-				Math.Abs(r.X - 100) < 0.001 && 
-				Math.Abs(r.Y - 100) < 0.001 && 
-				Math.Abs(r.Width - 0) < 0.001 && 
+			mockViewHandler.Received().PlatformArrange(Arg.Is<Rect>(r =>
+				Math.Abs(r.X - 100) < 0.001 &&
+				Math.Abs(r.Y - 100) < 0.001 &&
+				Math.Abs(r.Width - 0) < 0.001 &&
 				Math.Abs(r.Height - 0) < 0.001));
 		}
 
@@ -373,11 +380,12 @@ public void LayoutHorizontallyBegin()
 			var mockViewHandler = Substitute.For<IViewHandler>();
 
 			// Set up the mock handler to properly participate in the layout system
-			mockViewHandler.GetDesiredSize(Arg.Any<double>(), Arg.Any<double>()).Returns(callInfo => {
+			mockViewHandler.GetDesiredSize(Arg.Any<double>(), Arg.Any<double>()).Returns(callInfo =>
+			{
 				// Extract the constraints passed to GetDesiredSize
 				var width = (double)callInfo[0];
 				var height = (double)callInfo[1];
-				
+
 				// Return the child's requested size
 				return new Size(100, 100);
 			});
@@ -402,10 +410,10 @@ public void LayoutHorizontallyBegin()
 			Assert.Equal(new Rect(0, 100, 0, 0), child.Bounds);
 
 			// Verify the PlatformArrange method was called on the handler with the correct frame
-			mockViewHandler.Received().PlatformArrange(Arg.Is<Rect>(r => 
-				Math.Abs(r.X - 0) < 0.001 && 
-				Math.Abs(r.Y - 100) < 0.001 && 
-				Math.Abs(r.Width - 0) < 0.001 && 
+			mockViewHandler.Received().PlatformArrange(Arg.Is<Rect>(r =>
+				Math.Abs(r.X - 0) < 0.001 &&
+				Math.Abs(r.Y - 100) < 0.001 &&
+				Math.Abs(r.Width - 0) < 0.001 &&
 				Math.Abs(r.Height - 0) < 0.001));
 		}
 
@@ -416,11 +424,12 @@ public void LayoutHorizontallyEnd()
 			var mockViewHandler = Substitute.For<IViewHandler>();
 
 			// Set up the mock handler to properly participate in the layout system
-			mockViewHandler.GetDesiredSize(Arg.Any<double>(), Arg.Any<double>()).Returns(callInfo => {
+			mockViewHandler.GetDesiredSize(Arg.Any<double>(), Arg.Any<double>()).Returns(callInfo =>
+			{
 				// Extract the constraints passed to GetDesiredSize
 				var width = (double)callInfo[0];
 				var height = (double)callInfo[1];
-				
+
 				// Return the child's requested size
 				return new Size(100, 100);
 			});
@@ -445,10 +454,10 @@ public void LayoutHorizontallyEnd()
 			Assert.Equal(new Rect(200, 100, 0, 0), child.Bounds);
 
 			// Verify the PlatformArrange method was called on the handler with the correct frame
-			mockViewHandler.Received().PlatformArrange(Arg.Is<Rect>(r => 
-				Math.Abs(r.X - 200) < 0.001 && 
-				Math.Abs(r.Y - 100) < 0.001 && 
-				Math.Abs(r.Width - 0) < 0.001 && 
+			mockViewHandler.Received().PlatformArrange(Arg.Is<Rect>(r =>
+				Math.Abs(r.X - 200) < 0.001 &&
+				Math.Abs(r.Y - 100) < 0.001 &&
+				Math.Abs(r.Width - 0) < 0.001 &&
 				Math.Abs(r.Height - 0) < 0.001));
 		}
 
diff --git a/src/Controls/tests/Core.UnitTests/SafeAreaTests.cs b/src/Controls/tests/Core.UnitTests/SafeAreaTests.cs
index 40dd2a4747f3..b385b5d6371b 100644
--- a/src/Controls/tests/Core.UnitTests/SafeAreaTests.cs
+++ b/src/Controls/tests/Core.UnitTests/SafeAreaTests.cs
@@ -12,9 +12,9 @@ public class SafeAreaTests : BaseTestFixture
 		public void GetEdges_DefaultValue_ReturnsDefault()
 		{
 			var layout = new Grid();
-			
+
 			var result = layout.SafeAreaEdges;
-			
+
 			Assert.Equal(SafeAreaEdges.Default, result);
 		}
 
@@ -23,10 +23,10 @@ public void SetEdges_SingleValue_AppliedCorrectly()
 		{
 			var layout = new Grid();
 			var value = SafeAreaEdges.All;
-			
+
 			layout.SafeAreaEdges = value;
 			var result = layout.SafeAreaEdges;
-			
+
 			Assert.Equal(value, result);
 		}
 
@@ -35,7 +35,7 @@ public void GetEdgeValue_UniformValue_AppliesAllEdges()
 		{
 			var layout = new Grid();
 			layout.SafeAreaEdges = SafeAreaEdges.All;
-			
+
 			Assert.Equal(SafeAreaRegions.All, SafeAreaElement.GetEdgeValue(layout, 0)); // Left
 			Assert.Equal(SafeAreaRegions.All, SafeAreaElement.GetEdgeValue(layout, 1)); // Top
 			Assert.Equal(SafeAreaRegions.All, SafeAreaElement.GetEdgeValue(layout, 2)); // Right
@@ -47,7 +47,7 @@ public void GetEdgeValue_TwoValues_AppliesCorrectly()
 		{
 			var layout = new Grid();
 			layout.SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.All, SafeAreaRegions.None);
-			
+
 			Assert.Equal(SafeAreaRegions.All, SafeAreaElement.GetEdgeValue(layout, 0)); // Left
 			Assert.Equal(SafeAreaRegions.None, SafeAreaElement.GetEdgeValue(layout, 1)); // Top
 			Assert.Equal(SafeAreaRegions.All, SafeAreaElement.GetEdgeValue(layout, 2)); // Right
@@ -64,7 +64,7 @@ public void GetEdgeValue_FourValues_AppliesCorrectly()
 				SafeAreaRegions.All,   // Right
 				SafeAreaRegions.None   // Bottom
 			);
-			
+
 			Assert.Equal(SafeAreaRegions.All, SafeAreaElement.GetEdgeValue(layout, 0)); // Left
 			Assert.Equal(SafeAreaRegions.None, SafeAreaElement.GetEdgeValue(layout, 1)); // Top
 			Assert.Equal(SafeAreaRegions.All, SafeAreaElement.GetEdgeValue(layout, 2)); // Right
@@ -76,7 +76,7 @@ public void GetEdgeValue_InvalidEdgeIndex_ReturnsNone()
 		{
 			var layout = new Grid();
 			layout.SafeAreaEdges = SafeAreaEdges.All;
-			
+
 			Assert.Equal(SafeAreaRegions.None, SafeAreaElement.GetEdgeValue(layout, -1));
 			Assert.Equal(SafeAreaRegions.None, SafeAreaElement.GetEdgeValue(layout, 4));
 		}
@@ -85,7 +85,7 @@ public void GetEdgeValue_InvalidEdgeIndex_ReturnsNone()
 		public void SafeAreaEdges_DefaultConstructor_ReturnsNone()
 		{
 			var edges = new SafeAreaEdges();
-			
+
 			Assert.Equal(SafeAreaRegions.None, edges.Left);
 			Assert.Equal(SafeAreaRegions.None, edges.Top);
 			Assert.Equal(SafeAreaRegions.None, edges.Right);
@@ -96,7 +96,7 @@ public void SafeAreaEdges_DefaultConstructor_ReturnsNone()
 		public void SafeAreaEdges_UniformConstructor_AppliesAllEdges()
 		{
 			var edges = new SafeAreaEdges(SafeAreaRegions.All);
-			
+
 			Assert.Equal(SafeAreaRegions.All, edges.Left);
 			Assert.Equal(SafeAreaRegions.All, edges.Top);
 			Assert.Equal(SafeAreaRegions.All, edges.Right);
@@ -107,7 +107,7 @@ public void SafeAreaEdges_UniformConstructor_AppliesAllEdges()
 		public void SafeAreaEdges_HorizontalVerticalConstructor_AppliesCorrectly()
 		{
 			var edges = new SafeAreaEdges(SafeAreaRegions.All, SafeAreaRegions.None);
-			
+
 			Assert.Equal(SafeAreaRegions.All, edges.Left);   // horizontal
 			Assert.Equal(SafeAreaRegions.None, edges.Top);   // vertical
 			Assert.Equal(SafeAreaRegions.All, edges.Right);  // horizontal
@@ -123,7 +123,7 @@ public void SafeAreaEdges_IndividualConstructor_AppliesCorrectly()
 				SafeAreaRegions.All,   // Right
 				SafeAreaRegions.None   // Bottom
 			);
-			
+
 			Assert.Equal(SafeAreaRegions.All, edges.Left);
 			Assert.Equal(SafeAreaRegions.None, edges.Top);
 			Assert.Equal(SafeAreaRegions.All, edges.Right);
@@ -139,7 +139,7 @@ public void SafeAreaEdges_GetEdge_ReturnsCorrectValues()
 				SafeAreaRegions.All,   // Right
 				SafeAreaRegions.None   // Bottom
 			);
-			
+
 			Assert.Equal(SafeAreaRegions.All, edges.GetEdge(0));   // Left
 			Assert.Equal(SafeAreaRegions.None, edges.GetEdge(1));  // Top
 			Assert.Equal(SafeAreaRegions.All, edges.GetEdge(2));   // Right
@@ -149,19 +149,14 @@ public void SafeAreaEdges_GetEdge_ReturnsCorrectValues()
 		}
 
 		[Fact]
-		public void SafeAreaEdges_SetEdge_UpdatesCorrectValues()
+		public void SafeAreaEdges_GetEdge_ReturnsCorrectValues()
 		{
-			var edges = new SafeAreaEdges();
-			
-			edges.SetEdge(0, SafeAreaRegions.All); // Left
-			edges.SetEdge(1, SafeAreaRegions.None); // Top
-			edges.SetEdge(2, SafeAreaRegions.All); // Right
-			edges.SetEdge(3, SafeAreaRegions.None); // Bottom
-			
-			Assert.Equal(SafeAreaRegions.All, edges.Left);
-			Assert.Equal(SafeAreaRegions.None, edges.Top);
-			Assert.Equal(SafeAreaRegions.All, edges.Right);
-			Assert.Equal(SafeAreaRegions.None, edges.Bottom);
+			var edges = new SafeAreaEdges(SafeAreaRegions.All, SafeAreaRegions.None, SafeAreaRegions.All, SafeAreaRegions.None);
+
+			Assert.Equal(SafeAreaRegions.All, edges.GetEdge(0)); // Left
+			Assert.Equal(SafeAreaRegions.None, edges.GetEdge(1)); // Top
+			Assert.Equal(SafeAreaRegions.All, edges.GetEdge(2)); // Right
+			Assert.Equal(SafeAreaRegions.None, edges.GetEdge(3)); // Bottom
 		}
 
 		[Fact]
@@ -177,7 +172,7 @@ public void SafeAreaEdges_Equality_WorksCorrectly()
 			var edges1 = new SafeAreaEdges(SafeAreaRegions.All, SafeAreaRegions.None, SafeAreaRegions.All, SafeAreaRegions.None);
 			var edges2 = new SafeAreaEdges(SafeAreaRegions.All, SafeAreaRegions.None, SafeAreaRegions.All, SafeAreaRegions.None);
 			var edges3 = new SafeAreaEdges(SafeAreaRegions.None);
-			
+
 			Assert.True(edges1 == edges2);
 			Assert.False(edges1 == edges3);
 			Assert.True(edges1 != edges3);
@@ -192,7 +187,7 @@ public void SafeAreaEdges_ToString_FormatsCorrectly()
 			var twoValue = new SafeAreaEdges(SafeAreaRegions.All, SafeAreaRegions.None);
 			var fourValue = new SafeAreaEdges(SafeAreaRegions.All, SafeAreaRegions.None, SafeAreaRegions.All, SafeAreaRegions.None);
 			var asymmetric = new SafeAreaEdges(SafeAreaRegions.All, SafeAreaRegions.None, SafeAreaRegions.None, SafeAreaRegions.All);
-			
+
 			Assert.Equal("All", uniform.ToString());
 			Assert.Equal("All, None", twoValue.ToString());
 			Assert.Equal("All, None", fourValue.ToString()); // Optimized: Left==Right, Top==Bottom
@@ -203,7 +198,7 @@ public void SafeAreaEdges_ToString_FormatsCorrectly()
 		public void Layout_ImplementsISafeAreaView()
 		{
 			var layout = new Grid();
-			
+
 			Assert.IsAssignableFrom<ISafeAreaView>(layout);
 			Assert.IsAssignableFrom<ISafeAreaView2>(layout);
 		}
@@ -216,7 +211,7 @@ public void Layout_GetSafeAreaRegionsForEdge_UsesDirectProperty()
 
 			// Test via ISafeAreaView2 interface - direct region values
 			var safeAreaView2 = (ISafeAreaView2)layout;
-			
+
 			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(0)); // Left = None
 			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(1));  // Top = All
 			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(2)); // Right = None
@@ -232,7 +227,7 @@ public void Layout_GetSafeAreaRegionsForEdge_FallsBackToLegacyProperty()
 			// Should fall back to legacy property when no direct property is set
 			// IgnoreSafeArea = true should result in SafeAreaRegions.None (edge-to-edge)
 			var safeAreaView2 = (ISafeAreaView2)layout;
-			
+
 			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(0));
 			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(1));
 			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(2));
@@ -243,7 +238,7 @@ public void Layout_GetSafeAreaRegionsForEdge_FallsBackToLegacyProperty()
 		public void Page_ImplementsISafeAreaView()
 		{
 			var page = new ContentPage();
-			
+
 			Assert.IsAssignableFrom<ISafeAreaView>(page);
 			Assert.IsAssignableFrom<ISafeAreaView2>(page);
 		}
@@ -252,7 +247,7 @@ public void Page_ImplementsISafeAreaView()
 		public void ContentView_ImplementsISafeAreaView()
 		{
 			var contentView = new ContentView();
-			
+
 			Assert.IsAssignableFrom<ISafeAreaView2>(contentView);
 		}
 
@@ -264,7 +259,7 @@ public void Page_GetSafeAreaRegionsForEdge_UsesDirectProperty()
 
 			// Test via ISafeAreaView2 interface - direct region values
 			var safeAreaView2 = (ISafeAreaView2)page;
-			
+
 			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(0)); // Left = None
 			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(1));  // Top = All
 			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(2)); // Right = None
@@ -278,7 +273,7 @@ public void ContentView_GetSafeAreaRegionsForEdge_DefaultsToNoneWhenNoPropertySe
 
 			// Should default to SafeAreaRegions.None when no property is set (edge-to-edge behavior)
 			var safeAreaView2 = (ISafeAreaView2)contentView;
-			
+
 			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(0));
 			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(1));
 			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(2));
@@ -292,7 +287,7 @@ public void Page_GetSafeAreaRegionsForEdge_DefaultsToNoneForContentPage()
 
 			// ContentPage has special logic - defaults to SafeAreaRegions.None (edge-to-edge) on iOS
 			var safeAreaView2 = (ISafeAreaView2)page;
-			
+
 			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(0));
 			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(1));
 			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(2));
@@ -304,8 +299,8 @@ public void Page_GetSafeAreaRegionsForEdge_DefaultsToNoneForContentPage()
 		public void SafeArea_CanReplaceUseSafeAreaScenario()
 		{
 			// This test mimics the usage pattern from Issue3809 and ShellTests.iOS
-			var contentView = new ContentView() 
-			{ 
+			var contentView = new ContentView()
+			{
 				Content = new Label() { Text = "Test Page" }
 			};
 
@@ -314,7 +309,7 @@ public void SafeArea_CanReplaceUseSafeAreaScenario()
 			contentView.SafeAreaEdges = SafeAreaEdges.All; // Obey all safe areas
 
 			var safeAreaView2 = (ISafeAreaView2)contentView;
-			
+
 			// All edges should obey safe area (return All region)
 			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(0));
 			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(1));
@@ -327,12 +322,12 @@ public void SafeArea_SupportsPerEdgeControl_IgnoreTopAndBottom()
 		{
 			// Common use case: ignore safe area for top and bottom edges only (e.g., for full-width background)
 			var stackLayout = new VerticalStackLayout();
-			
+
 			// Edge-to-edge for top and bottom (None), obey for left and right (All)
 			stackLayout.SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.All, SafeAreaRegions.None, SafeAreaRegions.All, SafeAreaRegions.None);
 
 			var safeAreaView2 = (ISafeAreaView2)stackLayout;
-			
+
 			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(0));  // Left = All
 			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(1)); // Top = None
 			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(2));  // Right = All
@@ -344,11 +339,11 @@ public void SafeArea_TwoValueShorthand_LeftRightTopBottom()
 		{
 			// Test two-value shorthand: first value for left/right, second for top/bottom
 			var grid = new Grid();
-			
+
 			grid.SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.None, SafeAreaRegions.All);
 
 			var safeAreaView2 = (ISafeAreaView2)grid;
-			
+
 			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(0)); // Left = None
 			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(1));  // Top = All
 			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(2)); // Right = None
@@ -359,7 +354,7 @@ public void SafeArea_TwoValueShorthand_LeftRightTopBottom()
 		public void SafeAreaEdgesTypeConverter_CanConvertFromString()
 		{
 			var converter = new SafeAreaEdgesTypeConverter();
-			
+
 			Assert.True(converter.CanConvertFrom(null, typeof(string)));
 			Assert.False(converter.CanConvertFrom(null, typeof(int)));
 		}
@@ -368,9 +363,9 @@ public void SafeAreaEdgesTypeConverter_CanConvertFromString()
 		public void SafeAreaEdgesTypeConverter_ConvertFromSingleValue()
 		{
 			var converter = new SafeAreaEdgesTypeConverter();
-			
+
 			var result = (SafeAreaEdges)converter.ConvertFrom(null, null, "All");
-			
+
 			Assert.Equal(SafeAreaEdges.All, result);
 		}
 
@@ -378,9 +373,9 @@ public void SafeAreaEdgesTypeConverter_ConvertFromSingleValue()
 		public void SafeAreaEdgesTypeConverter_ConvertFromTwoValues()
 		{
 			var converter = new SafeAreaEdgesTypeConverter();
-			
+
 			var result = (SafeAreaEdges)converter.ConvertFrom(null, null, "None,Container");
-			
+
 			Assert.Equal(new SafeAreaEdges(SafeAreaRegions.None, SafeAreaRegions.Container), result);
 		}
 
@@ -388,9 +383,9 @@ public void SafeAreaEdgesTypeConverter_ConvertFromTwoValues()
 		public void SafeAreaEdgesTypeConverter_ConvertFromFourValues()
 		{
 			var converter = new SafeAreaEdgesTypeConverter();
-			
+
 			var result = (SafeAreaEdges)converter.ConvertFrom(null, null, "None,All,Container,SoftInput");
-			
+
 			Assert.Equal(new SafeAreaEdges(SafeAreaRegions.None, SafeAreaRegions.All, SafeAreaRegions.Container, SafeAreaRegions.SoftInput), result);
 		}
 
@@ -398,8 +393,8 @@ public void SafeAreaEdgesTypeConverter_ConvertFromFourValues()
 		public void SafeAreaEdgesTypeConverter_ConvertFromInvalidValue_ThrowsException()
 		{
 			var converter = new SafeAreaEdgesTypeConverter();
-			
-			Assert.Throws<FormatException>(() => 
+
+			Assert.Throws<FormatException>(() =>
 				converter.ConvertFrom(null, null, "InvalidValue"));
 		}
 
@@ -407,8 +402,8 @@ public void SafeAreaEdgesTypeConverter_ConvertFromInvalidValue_ThrowsException()
 		public void SafeAreaEdgesTypeConverter_ConvertFromInvalidLength_ThrowsException()
 		{
 			var converter = new SafeAreaEdgesTypeConverter();
-			
-			Assert.Throws<FormatException>(() => 
+
+			Assert.Throws<FormatException>(() =>
 				converter.ConvertFrom(null, null, "None,Container,All")); // 3 values not supported
 		}
 
@@ -417,9 +412,9 @@ public void SafeAreaEdgesTypeConverter_ConvertToString()
 		{
 			var converter = new SafeAreaEdgesTypeConverter();
 			var edges = new SafeAreaEdges(SafeAreaRegions.None, SafeAreaRegions.Container);
-			
+
 			var result = converter.ConvertTo(null, null, edges, typeof(string));
-			
+
 			Assert.Equal("None, Container", result);
 		}
 
@@ -488,22 +483,22 @@ public void SafeAreaEdges_TypeConverterWithBinding_SimulatedConversion()
 		{
 			// Test that the type converter works as it would in a binding scenario
 			var converter = new SafeAreaEdgesTypeConverter();
-			
+
 			// Simulate what happens when binding encounters a string value
 			// and needs to convert it to SafeAreaEdges
-			
+
 			// Test single value conversion (what binding would do)
 			var allResult = converter.ConvertFrom(null, null, "All");
 			Assert.Equal(SafeAreaEdges.All, allResult);
-			
+
 			// Test two values conversion
 			var twoValueResult = converter.ConvertFrom(null, null, "SoftInput,Container");
 			Assert.Equal(new SafeAreaEdges(SafeAreaRegions.SoftInput, SafeAreaRegions.Container), twoValueResult);
-			
+
 			// Test four values conversion
 			var fourValueResult = converter.ConvertFrom(null, null, "None,SoftInput,Container,All");
 			Assert.Equal(new SafeAreaEdges(SafeAreaRegions.None, SafeAreaRegions.SoftInput, SafeAreaRegions.Container, SafeAreaRegions.All), fourValueResult);
-			
+
 			// Test that conversion back to string works (for two-way binding)
 			var backToString = converter.ConvertTo(null, null, SafeAreaEdges.All, typeof(string));
 			Assert.Equal("All", backToString);
@@ -514,14 +509,14 @@ public void SafeAreaEdges_PropertyAssignment_WorksDirectly()
 		{
 			// Test direct property assignment (what would happen after successful binding conversion)
 			var layout = new Grid();
-			
+
 			// Test setting from converted values (simulating what binding would do after conversion)
 			layout.SafeAreaEdges = SafeAreaEdges.All;
 			Assert.Equal(SafeAreaEdges.All, layout.SafeAreaEdges);
-			
+
 			layout.SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.SoftInput, SafeAreaRegions.Container);
 			Assert.Equal(new SafeAreaEdges(SafeAreaRegions.SoftInput, SafeAreaRegions.Container), layout.SafeAreaEdges);
-			
+
 			layout.SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.None, SafeAreaRegions.SoftInput, SafeAreaRegions.Container, SafeAreaRegions.All);
 			Assert.Equal(new SafeAreaEdges(SafeAreaRegions.None, SafeAreaRegions.SoftInput, SafeAreaRegions.Container, SafeAreaRegions.All), layout.SafeAreaEdges);
 		}
@@ -532,10 +527,10 @@ public void SafeAreaEdges_PropertyAssignment_WorksDirectly()
 		public void HorizontalStackLayout_BehavesLikeRegularLayout()
 		{
 			var stackLayout = new HorizontalStackLayout();
-			
+
 			// Should behave like regular layout with default SafeAreaEdges.None (edge-to-edge)
 			var safeAreaView2 = (ISafeAreaView2)stackLayout;
-			
+
 			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(0)); // Left
 			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(1)); // Top
 			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(2)); // Right
@@ -548,10 +543,10 @@ public void HorizontalStackLayout_RespectsDirectProperty_RTL()
 			var stackLayout = new HorizontalStackLayout();
 			stackLayout.FlowDirection = FlowDirection.RightToLeft;
 			stackLayout.SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.None, SafeAreaRegions.All, SafeAreaRegions.All, SafeAreaRegions.All);
-			
+
 			// Should respect SafeAreaEdges direct property
 			var safeAreaView2 = (ISafeAreaView2)stackLayout;
-			
+
 			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(0)); // Left (set to None)
 			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(1));  // Top (set to All)
 			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(2));  // Right (set to All)
@@ -562,10 +557,10 @@ public void HorizontalStackLayout_RespectsDirectProperty_RTL()
 		public void VerticalStackLayout_BehavesLikeRegularLayout()
 		{
 			var stackLayout = new VerticalStackLayout();
-			
+
 			// Should behave like regular layout with default SafeAreaEdges.None (edge-to-edge)
 			var safeAreaView2 = (ISafeAreaView2)stackLayout;
-			
+
 			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(0)); // Left
 			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(1)); // Top
 			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(2)); // Right
@@ -576,10 +571,10 @@ public void VerticalStackLayout_BehavesLikeRegularLayout()
 		public void StackLayout_HorizontalOrientation_BehavesLikeRegularLayout_LTR()
 		{
 			var stackLayout = new StackLayout { Orientation = StackOrientation.Horizontal };
-			
+
 			// Should behave like regular layout with default SafeAreaEdges.None (edge-to-edge)
 			var safeAreaView2 = (ISafeAreaView2)stackLayout;
-			
+
 			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(0)); // Left
 			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(1)); // Top
 			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(2)); // Right
@@ -592,10 +587,10 @@ public void StackLayout_HorizontalOrientation_RespectsDirectProperty_RTL()
 			var stackLayout = new StackLayout { Orientation = StackOrientation.Horizontal };
 			stackLayout.FlowDirection = FlowDirection.RightToLeft;
 			stackLayout.SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.None, SafeAreaRegions.All, SafeAreaRegions.All, SafeAreaRegions.All);
-			
+
 			// Should respect SafeAreaEdges direct property
 			var safeAreaView2 = (ISafeAreaView2)stackLayout;
-			
+
 			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(0)); // Left (set to None)
 			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(1));  // Top (set to All)
 			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(2));  // Right (set to All)
@@ -606,10 +601,10 @@ public void StackLayout_HorizontalOrientation_RespectsDirectProperty_RTL()
 		public void StackLayout_VerticalOrientation_BehavesLikeRegularLayout()
 		{
 			var stackLayout = new StackLayout { Orientation = StackOrientation.Vertical };
-			
+
 			// Should behave like regular layout with default SafeAreaEdges.None (edge-to-edge)
 			var safeAreaView2 = (ISafeAreaView2)stackLayout;
-			
+
 			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(0)); // Left
 			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(1)); // Top
 			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(2)); // Right
@@ -621,20 +616,20 @@ public void StackLayouts_RespectUserSettings()
 		{
 			var verticalStackLayout = new VerticalStackLayout();
 			var horizontalStackLayout = new HorizontalStackLayout();
-			
+
 			// Set explicit SafeAreaEdges property - this should be respected
 			verticalStackLayout.SafeAreaEdges = SafeAreaEdges.All; // Obey all edges
 			horizontalStackLayout.SafeAreaEdges = SafeAreaEdges.None; // Edge-to-edge all edges
-			
+
 			var verticalSafeAreaView2 = (ISafeAreaView2)verticalStackLayout;
 			var horizontalSafeAreaView2 = (ISafeAreaView2)horizontalStackLayout;
-			
+
 			// VerticalStackLayout should respect user setting (All = obey safe area)
 			Assert.Equal(SafeAreaRegions.All, verticalSafeAreaView2.GetSafeAreaRegionsForEdge(0)); // Left
 			Assert.Equal(SafeAreaRegions.All, verticalSafeAreaView2.GetSafeAreaRegionsForEdge(1)); // Top
 			Assert.Equal(SafeAreaRegions.All, verticalSafeAreaView2.GetSafeAreaRegionsForEdge(2)); // Right
 			Assert.Equal(SafeAreaRegions.All, verticalSafeAreaView2.GetSafeAreaRegionsForEdge(3)); // Bottom
-			
+
 			// HorizontalStackLayout should respect user setting (None = edge-to-edge)
 			Assert.Equal(SafeAreaRegions.None, horizontalSafeAreaView2.GetSafeAreaRegionsForEdge(0)); // Left
 			Assert.Equal(SafeAreaRegions.None, horizontalSafeAreaView2.GetSafeAreaRegionsForEdge(1)); // Top
diff --git a/src/Controls/tests/DeviceTests/Elements/Button/ButtonTests.Android.cs b/src/Controls/tests/DeviceTests/Elements/Button/ButtonTests.Android.cs
index 5c4a192c13de..dcc04373852e 100644
--- a/src/Controls/tests/DeviceTests/Elements/Button/ButtonTests.Android.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Button/ButtonTests.Android.cs
@@ -218,7 +218,7 @@ public async Task ButtonRippleColorPlatformSpecific()
 				}
 			}
 		}
-		
+
 		//src/Compatibility/Core/tests/Android/TranslationTests.cs
 		[Fact]
 		[Description("The Translation property of a Button should match with native Translation")]
diff --git a/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.cs b/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.cs
index a0ca83c64568..822b6c4d8351 100644
--- a/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.cs
@@ -751,7 +751,7 @@ public async Task SafeAreaBehaviorConsistency(bool useNewApi)
 			await CreateHandlerAndAddToWindow<LayoutHandler>(layout, async handler =>
 			{
 				await Task.Delay(100);
-				
+
 				// Both APIs should result in the same layout behavior
 				// The layout should fill the container and ignore safe area
 				var layoutBounds = layout.GetPlatformViewBounds();
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28051.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue28051.cs
index e2f7f9127442..de4101d98ced 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue28051.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28051.cs
@@ -139,14 +139,14 @@ protected override void OnDetachedFrom(Element bindable, Microsoft.UI.Xaml.Frame
 #else
 public class LongPressBehavior : PlatformBehavior<Element, object>
 {
-    protected override void OnAttachedTo(Element bindable, object platformView)
-    {
-        BindingContext = bindable.BindingContext;
-    }
- 
-    protected override void OnDetachedFrom(Element bindable, object platformView)
-    {
-        BindingContext = null;
-    }
+	protected override void OnAttachedTo(Element bindable, object platformView)
+	{
+		BindingContext = bindable.BindingContext;
+	}
+
+	protected override void OnDetachedFrom(Element bindable, object platformView)
+	{
+		BindingContext = null;
+	}
 }
 #endif
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml.cs
index f2988a4ede9f..ad5fc3e2b123 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml.cs
@@ -11,13 +11,13 @@ public Issue28986()
 		PageTopPicker.SelectedIndex = 0;    // None
 		PageRightPicker.SelectedIndex = 0;  // None
 		PageBottomPicker.SelectedIndex = 0; // None
-		
+
 		// Initialize grid-level controls (start with all None)
 		GridLeftPicker.SelectedIndex = 0;   // None
 		GridTopPicker.SelectedIndex = 0;    // None
 		GridRightPicker.SelectedIndex = 0;  // None
 		GridBottomPicker.SelectedIndex = 0; // None
-		
+
 		UpdateSafeAreaSettings();
 	}
 
@@ -126,15 +126,15 @@ private void UpdateSafeAreaSettings()
 
 		// Update the display label
 		var pageSettingsText = $"Page - Left: {GetSafeAreaRegionsFromPickerIndex(PageLeftPicker.SelectedIndex)}, " +
-		                      $"Top: {GetSafeAreaRegionsFromPickerIndex(PageTopPicker.SelectedIndex)}, " +
-		                      $"Right: {GetSafeAreaRegionsFromPickerIndex(PageRightPicker.SelectedIndex)}, " +
-		                      $"Bottom: {GetSafeAreaRegionsFromPickerIndex(PageBottomPicker.SelectedIndex)}";
+							  $"Top: {GetSafeAreaRegionsFromPickerIndex(PageTopPicker.SelectedIndex)}, " +
+							  $"Right: {GetSafeAreaRegionsFromPickerIndex(PageRightPicker.SelectedIndex)}, " +
+							  $"Bottom: {GetSafeAreaRegionsFromPickerIndex(PageBottomPicker.SelectedIndex)}";
 
 		var gridSettingsText = $"Grid - Left: {GetSafeAreaRegionsFromPickerIndex(GridLeftPicker.SelectedIndex)}, " +
-		                      $"Top: {GetSafeAreaRegionsFromPickerIndex(GridTopPicker.SelectedIndex)}, " +
-		                      $"Right: {GetSafeAreaRegionsFromPickerIndex(GridRightPicker.SelectedIndex)}, " +
-		                      $"Bottom: {GetSafeAreaRegionsFromPickerIndex(GridBottomPicker.SelectedIndex)}";
-		
+							  $"Top: {GetSafeAreaRegionsFromPickerIndex(GridTopPicker.SelectedIndex)}, " +
+							  $"Right: {GetSafeAreaRegionsFromPickerIndex(GridRightPicker.SelectedIndex)}, " +
+							  $"Bottom: {GetSafeAreaRegionsFromPickerIndex(GridBottomPicker.SelectedIndex)}";
+
 		CurrentSettingsLabel.Text = $"Current:\n{pageSettingsText}\n{gridSettingsText}";
 
 		// Test different syntax formats based on the current selections
@@ -145,7 +145,7 @@ private void ApplyOptimizedSyntax(SafeAreaEdges pageSettings, SafeAreaEdges grid
 	{
 		// Optimize page-level syntax when possible to test different input formats
 		var pageLeft = pageSettings.Left;
-		var pageTop = pageSettings.Top; 
+		var pageTop = pageSettings.Top;
 		var pageRight = pageSettings.Right;
 		var pageBottom = pageSettings.Bottom;
 
@@ -169,7 +169,7 @@ private void ApplyOptimizedSyntax(SafeAreaEdges pageSettings, SafeAreaEdges grid
 
 		// Optimize grid-level syntax when possible
 		var gridLeft = gridSettings.Left;
-		var gridTop = gridSettings.Top; 
+		var gridTop = gridSettings.Top;
 		var gridRight = gridSettings.Right;
 		var gridBottom = gridSettings.Bottom;
 
@@ -197,12 +197,12 @@ private void ApplyOptimizedSyntax(SafeAreaEdges pageSettings, SafeAreaEdges grid
 
 		// Update the label to show which syntax is being used
 		var pageSyntaxInfo = (pageLeft == pageTop && pageTop == pageRight && pageRight == pageBottom) ? " (1-value)" :
-		                    (pageLeft == pageRight && pageTop == pageBottom) ? " (2-value)" : 
-		                    " (4-value)";
+							(pageLeft == pageRight && pageTop == pageBottom) ? " (2-value)" :
+							" (4-value)";
 
 		var gridSyntaxInfo = (gridLeft == gridTop && gridTop == gridRight && gridRight == gridBottom) ? " (1-value)" :
-		                    (gridLeft == gridRight && gridTop == gridBottom) ? " (2-value)" : 
-		                    " (4-value)";
+							(gridLeft == gridRight && gridTop == gridBottom) ? " (2-value)" :
+							" (4-value)";
 
 		CurrentSettingsLabel.Text += $"\nPage{pageSyntaxInfo}, Grid{gridSyntaxInfo}";
 	}
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_Border.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_Border.xaml.cs
index 89158d60c576..ff66829c5007 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_Border.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_Border.xaml.cs
@@ -11,7 +11,7 @@ public Issue28986_Border()
 		TopPicker.SelectedIndex = 3;    // All
 		RightPicker.SelectedIndex = 3;  // All
 		BottomPicker.SelectedIndex = 3; // All
-		
+
 		UpdateSafeAreaSettings();
 	}
 
@@ -75,10 +75,10 @@ private void UpdateSafeAreaSettings()
 
 		// Update the display label
 		var settingsText = $"Left: {GetSafeAreaRegionsFromPickerIndex(LeftPicker.SelectedIndex)}, " +
-		                  $"Top: {GetSafeAreaRegionsFromPickerIndex(TopPicker.SelectedIndex)}, " +
-		                  $"Right: {GetSafeAreaRegionsFromPickerIndex(RightPicker.SelectedIndex)}, " +
-		                  $"Bottom: {GetSafeAreaRegionsFromPickerIndex(BottomPicker.SelectedIndex)}";
-		
+						  $"Top: {GetSafeAreaRegionsFromPickerIndex(TopPicker.SelectedIndex)}, " +
+						  $"Right: {GetSafeAreaRegionsFromPickerIndex(RightPicker.SelectedIndex)}, " +
+						  $"Bottom: {GetSafeAreaRegionsFromPickerIndex(BottomPicker.SelectedIndex)}";
+
 		CurrentSettingsLabel.Text = $"Current Border SafeAreaEdges: {settingsText}";
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ContentPage.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ContentPage.xaml.cs
index 9b472ac84a0c..2b11eb4fd037 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ContentPage.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ContentPage.xaml.cs
@@ -11,7 +11,7 @@ public Issue28986_ContentPage()
 		TopPicker.SelectedIndex = 3;    // All
 		RightPicker.SelectedIndex = 3;  // All
 		BottomPicker.SelectedIndex = 3; // All
-		
+
 		UpdateSafeAreaSettings();
 	}
 
@@ -75,10 +75,10 @@ private void UpdateSafeAreaSettings()
 
 		// Update the display label
 		var settingsText = $"Left: {GetSafeAreaRegionsFromPickerIndex(LeftPicker.SelectedIndex)}, " +
-		                  $"Top: {GetSafeAreaRegionsFromPickerIndex(TopPicker.SelectedIndex)}, " +
-		                  $"Right: {GetSafeAreaRegionsFromPickerIndex(RightPicker.SelectedIndex)}, " +
-		                  $"Bottom: {GetSafeAreaRegionsFromPickerIndex(BottomPicker.SelectedIndex)}";
-		
+						  $"Top: {GetSafeAreaRegionsFromPickerIndex(TopPicker.SelectedIndex)}, " +
+						  $"Right: {GetSafeAreaRegionsFromPickerIndex(RightPicker.SelectedIndex)}, " +
+						  $"Bottom: {GetSafeAreaRegionsFromPickerIndex(BottomPicker.SelectedIndex)}";
+
 		CurrentSettingsLabel.Text = $"Current ContentPage SafeAreaEdges: {settingsText}";
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ContentView.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ContentView.xaml.cs
index dcb4ae416942..89a4066ad923 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ContentView.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ContentView.xaml.cs
@@ -11,7 +11,7 @@ public Issue28986_ContentView()
 		TopPicker.SelectedIndex = 3;    // All
 		RightPicker.SelectedIndex = 3;  // All
 		BottomPicker.SelectedIndex = 3; // All
-		
+
 		UpdateSafeAreaSettings();
 	}
 
@@ -75,10 +75,10 @@ private void UpdateSafeAreaSettings()
 
 		// Update the display label
 		var settingsText = $"Left: {GetSafeAreaRegionsFromPickerIndex(LeftPicker.SelectedIndex)}, " +
-		                  $"Top: {GetSafeAreaRegionsFromPickerIndex(TopPicker.SelectedIndex)}, " +
-		                  $"Right: {GetSafeAreaRegionsFromPickerIndex(RightPicker.SelectedIndex)}, " +
-		                  $"Bottom: {GetSafeAreaRegionsFromPickerIndex(BottomPicker.SelectedIndex)}";
-		
+						  $"Top: {GetSafeAreaRegionsFromPickerIndex(TopPicker.SelectedIndex)}, " +
+						  $"Right: {GetSafeAreaRegionsFromPickerIndex(RightPicker.SelectedIndex)}, " +
+						  $"Bottom: {GetSafeAreaRegionsFromPickerIndex(BottomPicker.SelectedIndex)}";
+
 		CurrentSettingsLabel.Text = $"Current ContentView SafeAreaEdges: {settingsText}";
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ScrollView.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ScrollView.xaml.cs
index 51cdec127f28..1d3b29ef9891 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ScrollView.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ScrollView.xaml.cs
@@ -11,7 +11,7 @@ public Issue28986_ScrollView()
 		TopPicker.SelectedIndex = 3;    // All
 		RightPicker.SelectedIndex = 3;  // All
 		BottomPicker.SelectedIndex = 3; // All
-		
+
 		UpdateSafeAreaSettings();
 	}
 
@@ -75,10 +75,10 @@ private void UpdateSafeAreaSettings()
 
 		// Update the display label
 		var settingsText = $"Left: {GetSafeAreaRegionsFromPickerIndex(LeftPicker.SelectedIndex)}, " +
-		                  $"Top: {GetSafeAreaRegionsFromPickerIndex(TopPicker.SelectedIndex)}, " +
-		                  $"Right: {GetSafeAreaRegionsFromPickerIndex(RightPicker.SelectedIndex)}, " +
-		                  $"Bottom: {GetSafeAreaRegionsFromPickerIndex(BottomPicker.SelectedIndex)}";
-		
+						  $"Top: {GetSafeAreaRegionsFromPickerIndex(TopPicker.SelectedIndex)}, " +
+						  $"Right: {GetSafeAreaRegionsFromPickerIndex(RightPicker.SelectedIndex)}, " +
+						  $"Bottom: {GetSafeAreaRegionsFromPickerIndex(BottomPicker.SelectedIndex)}";
+
 		CurrentSettingsLabel.Text = $"Current ScrollView SafeAreaEdges: {settingsText}";
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue8945.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue8945.xaml.cs
index 6b37238ef76a..a13321d479bb 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue8945.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue8945.xaml.cs
@@ -10,7 +10,7 @@ public partial class Issue8945 : TestContentPage
 		bool _timePickerClosed;
 		bool _pickerOpened;
 		bool _pickerClosed;
-		
+
 		public Issue8945()
 		{
 			InitializeComponent();
@@ -113,8 +113,8 @@ void IsOpenPickerClosed(object sender, PickerClosedEventArgs e)
 		{
 			_pickerClosed = true;
 			UpdatePickerStatus();
-		}  
-		
+		}
+
 		void UpdateDatePickerStatus()
 		{
 			if (_datePickerOpened && _datePickerClosed)
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue8945DatePicker.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue8945DatePicker.xaml.cs
index 3a7cb28cbe05..44553a565e92 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue8945DatePicker.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue8945DatePicker.xaml.cs
@@ -2,9 +2,9 @@
 {
 	[Issue(IssueTracker.Github, "8945DatePicker", "Add Open/Close API to picker controls (DatePicker)", PlatformAffected.All)]
 	public partial class Issue8945DatePicker : TestContentPage
-	{	
+	{
 		bool _datePickerOpened;
-		
+
 		public Issue8945DatePicker()
 		{
 			InitializeComponent();
@@ -16,20 +16,20 @@ protected override void Init()
 		{
 
 		}
-		
+
 		protected override void OnDisappearing()
 		{
 			base.OnDisappearing();
 
 			IsOpenDatePicker.Opened -= IsOpenPickerOpened;
-		}	
-		
+		}
+
 		void IsOpenPickerOpened(object sender, DatePickerOpenedEventArgs e)
 		{
 			_datePickerOpened = true;
 			UpdateDatePickerStatus();
 		}
-		
+
 		void UpdateDatePickerStatus()
 		{
 			if (_datePickerOpened)
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue8945Picker.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue8945Picker.xaml.cs
index db6b7b8df1b6..2622704afc5b 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue8945Picker.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue8945Picker.xaml.cs
@@ -2,9 +2,9 @@
 {
 	[Issue(IssueTracker.Github, "8945Picker", "Add Open/Close API to picker controls (Picker)", PlatformAffected.All)]
 	public partial class Issue8945Picker : TestContentPage
-	{	
+	{
 		bool _pickerOpened;
-		
+
 		public Issue8945Picker()
 		{
 			InitializeComponent();
@@ -16,20 +16,20 @@ protected override void Init()
 		{
 
 		}
-		
+
 		protected override void OnDisappearing()
 		{
 			base.OnDisappearing();
 
 			IsOpenPicker.Opened -= IsOpenPickerOpened;
-		}	
-		
+		}
+
 		void IsOpenPickerOpened(object sender, PickerOpenedEventArgs e)
 		{
 			_pickerOpened = true;
 			UpdatePickerStatus();
 		}
-		
+
 		void UpdatePickerStatus()
 		{
 			if (_pickerOpened)
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue8945TimePicker.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue8945TimePicker.xaml.cs
index 58d410a37819..e20fc857ce44 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue8945TimePicker.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue8945TimePicker.xaml.cs
@@ -2,9 +2,9 @@
 {
 	[Issue(IssueTracker.Github, "8945TimePicker", "Add Open/Close API to picker controls (TimePicker)", PlatformAffected.All)]
 	public partial class Issue8945TimePicker : TestContentPage
-	{	
+	{
 		bool _timePickerOpened;
-		
+
 		public Issue8945TimePicker()
 		{
 			InitializeComponent();
@@ -16,20 +16,20 @@ protected override void Init()
 		{
 
 		}
-		
+
 		protected override void OnDisappearing()
 		{
 			base.OnDisappearing();
 
 			IsOpenTimePicker.Opened -= IsOpenPickerOpened;
-		}	
-		
+		}
+
 		void IsOpenPickerOpened(object sender, TimePickerOpenedEventArgs e)
 		{
 			_timePickerOpened = true;
 			UpdateDatePickerStatus();
 		}
-		
+
 		void UpdateDatePickerStatus()
 		{
 			if (_timePickerOpened)
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue27715.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue27715.cs
index 2f5bb06d238f..015457fe5de2 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue27715.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue27715.cs
@@ -19,7 +19,7 @@ public Issue27715(TestDevice testDevice) : base(testDevice)
 		public void ScrollViewShouldRenderWithinBounds()
 		{
 			App.WaitForElement("WaitForStubControl");
-			VerifyScreenshot();	
+			VerifyScreenshot();
 		}
 	}
 }
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue8945.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue8945.cs
index a9f30ab4a12b..5bebef53246a 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue8945.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue8945.cs
@@ -19,7 +19,7 @@ public Issue8945(TestDevice testDevice) : base(testDevice)
 		[Test, Order(1)]
 		[Category(UITestCategories.DatePicker)]
 		public void OpenCloseDatePicker()
-		{ 
+		{
 			App.WaitForElement("OpenDatePickerButton");
 			App.Tap("OpenDatePickerButton");
 #if ANDROID
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue8945DatePicker.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue8945DatePicker.cs
index e5cd9a0e3190..a9cfe4704784 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue8945DatePicker.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue8945DatePicker.cs
@@ -10,7 +10,7 @@ public class Issue8945DatePicker : _IssuesUITest
 #if ANDROID
 	const string CancelBtn = "Cancel";
 #endif
-	
+
 	public Issue8945DatePicker(TestDevice testDevice) : base(testDevice)
 	{
 	}
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue8945Picker.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue8945Picker.cs
index ee404729ab2e..ac59b1a92b15 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue8945Picker.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue8945Picker.cs
@@ -10,7 +10,7 @@ public class Issue8945Picker : _IssuesUITest
 #if ANDROID
 	const string CancelBtn = "Cancel";
 #endif
-	
+
 	public Issue8945Picker(TestDevice testDevice) : base(testDevice)
 	{
 	}
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue8945TimePicker.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue8945TimePicker.cs
index 97b88934c912..611eecdeaeb7 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue8945TimePicker.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue8945TimePicker.cs
@@ -10,7 +10,7 @@ public class Issue8945TimePicker : _IssuesUITest
 #if ANDROID
 	const string CancelBtn = "Cancel";
 #endif
-	
+
 	public Issue8945TimePicker(TestDevice testDevice) : base(testDevice)
 	{
 	}
diff --git a/src/Controls/tests/Xaml.UnitTests/Issues/Maui17222.xaml.cs b/src/Controls/tests/Xaml.UnitTests/Issues/Maui17222.xaml.cs
index c105b82ddee0..f04c0320232f 100644
--- a/src/Controls/tests/Xaml.UnitTests/Issues/Maui17222.xaml.cs
+++ b/src/Controls/tests/Xaml.UnitTests/Issues/Maui17222.xaml.cs
@@ -23,7 +23,7 @@ class Test
 	{
 #if DEBUG
 		bool enableDiagnosticsInitialState;
-		
+
 		[SetUp]
 		public void Setup()
 		{
@@ -35,7 +35,7 @@ public void Setup()
 		[TearDown]
 		public void TearDown()
 		{
-			RuntimeFeature.EnableMauiDiagnostics = enableDiagnosticsInitialState;			
+			RuntimeFeature.EnableMauiDiagnostics = enableDiagnosticsInitialState;
 			AppInfo.SetCurrent(null);
 		}
 
diff --git a/src/Controls/tests/Xaml.UnitTests/SafeAreaEdgesTests.xaml.cs b/src/Controls/tests/Xaml.UnitTests/SafeAreaEdgesTests.xaml.cs
index 3d000fbe2599..3453df101340 100644
--- a/src/Controls/tests/Xaml.UnitTests/SafeAreaEdgesTests.xaml.cs
+++ b/src/Controls/tests/Xaml.UnitTests/SafeAreaEdgesTests.xaml.cs
@@ -24,7 +24,7 @@ public class Tests
 			public void SingleValueConversions(bool useCompiledXaml)
 			{
 				var layout = new SafeAreaEdgesTests(useCompiledXaml);
-				
+
 				Assert.AreEqual(SafeAreaEdges.None, layout.singleValueNone.SafeAreaEdges);
 				Assert.AreEqual(SafeAreaEdges.All, layout.singleValueAll.SafeAreaEdges);
 				Assert.AreEqual(new SafeAreaEdges(SafeAreaRegions.SoftInput), layout.singleValueSoftInput.SafeAreaEdges);
@@ -37,7 +37,7 @@ public void SingleValueConversions(bool useCompiledXaml)
 			public void TwoValueConversions(bool useCompiledXaml)
 			{
 				var layout = new SafeAreaEdgesTests(useCompiledXaml);
-				
+
 				Assert.AreEqual(new SafeAreaEdges(SafeAreaRegions.SoftInput, SafeAreaRegions.Container), layout.twoValueHorVert.SafeAreaEdges);
 				Assert.AreEqual(new SafeAreaEdges(SafeAreaRegions.None, SafeAreaRegions.All), layout.twoValueMixed.SafeAreaEdges);
 			}
@@ -47,7 +47,7 @@ public void TwoValueConversions(bool useCompiledXaml)
 			public void FourValueConversions(bool useCompiledXaml)
 			{
 				var layout = new SafeAreaEdgesTests(useCompiledXaml);
-				
+
 				Assert.AreEqual(new SafeAreaEdges(SafeAreaRegions.None, SafeAreaRegions.SoftInput, SafeAreaRegions.Container, SafeAreaRegions.All), layout.fourValueMixed.SafeAreaEdges);
 				Assert.AreEqual(new SafeAreaEdges(SafeAreaRegions.Default, SafeAreaRegions.None, SafeAreaRegions.Default, SafeAreaRegions.All), layout.fourValueDefault.SafeAreaEdges);
 			}
@@ -57,7 +57,7 @@ public void FourValueConversions(bool useCompiledXaml)
 			public void ControlSpecificProperties(bool useCompiledXaml)
 			{
 				var layout = new SafeAreaEdgesTests(useCompiledXaml);
-				
+
 				Assert.AreEqual(new SafeAreaEdges(SafeAreaRegions.Container, SafeAreaRegions.SoftInput), layout.contentViewTest.SafeAreaEdges);
 				Assert.AreEqual(new SafeAreaEdges(SafeAreaRegions.All, SafeAreaRegions.None), layout.contentPageTest.SafeAreaEdges);
 				Assert.AreEqual(new SafeAreaEdges(SafeAreaRegions.SoftInput), layout.borderTest.SafeAreaEdges);
@@ -69,7 +69,7 @@ public void ControlSpecificProperties(bool useCompiledXaml)
 			public void PropertyInflation_WorksWithAllEnumValues(bool useCompiledXaml)
 			{
 				var layout = new SafeAreaEdgesTests(useCompiledXaml);
-				
+
 				// Verify all enum values are properly inflated from XAML strings
 				var noneGrid = layout.singleValueNone;
 				var allGrid = layout.singleValueAll;
diff --git a/src/Core/src/Converters/SafeAreaEdgesTypeConverter.cs b/src/Core/src/Converters/SafeAreaEdgesTypeConverter.cs
index 264cd3961b19..e376510636ff 100644
--- a/src/Core/src/Converters/SafeAreaEdgesTypeConverter.cs
+++ b/src/Core/src/Converters/SafeAreaEdgesTypeConverter.cs
@@ -24,7 +24,7 @@ public override object ConvertFrom(ITypeDescriptorContext? context, CultureInfo?
 			if (strValue != null)
 			{
 				strValue = strValue.Trim();
-				
+
 				// Split by comma - if no comma, we get array with single element
 				var parts = strValue.Split(',');
 				var regions = new SafeAreaRegions[parts.Length];
@@ -32,7 +32,7 @@ public override object ConvertFrom(ITypeDescriptorContext? context, CultureInfo?
 				for (int i = 0; i < parts.Length; i++)
 				{
 					var part = parts[i].Trim();
-					
+
 					// Performance optimization: use string comparison instead of Enum.TryParse
 					// since SafeAreaRegions has specific values
 					if (string.Equals(part, "All", StringComparison.OrdinalIgnoreCase))
diff --git a/src/Core/src/Core/IDatePicker.cs b/src/Core/src/Core/IDatePicker.cs
index 000849385ab4..4f8a785abbb6 100644
--- a/src/Core/src/Core/IDatePicker.cs
+++ b/src/Core/src/Core/IDatePicker.cs
@@ -20,9 +20,9 @@ public interface IDatePicker : IView, ITextStyle
 #if NETSTANDARD2_0
 	bool IsOpen { get; set; }
 #else
-	bool IsOpen { get => false; set {} }
+	bool IsOpen { get => false; set { } }
 #endif
-	
+
 	/// <summary>
 	/// Gets the format of the date to display to the user. 
 	/// </summary>
diff --git a/src/Core/src/Core/IPicker.cs b/src/Core/src/Core/IPicker.cs
index b7a7ca2e2c2d..506c09cff3a9 100644
--- a/src/Core/src/Core/IPicker.cs
+++ b/src/Core/src/Core/IPicker.cs
@@ -22,9 +22,9 @@ public interface IPicker : IView, ITextStyle, ITextAlignment, IItemDelegate<stri
 #if NETSTANDARD2_0
 		bool IsOpen { get; set; }
 #else
-		bool IsOpen { get => false; set {} }
+		bool IsOpen { get => false; set { } }
 #endif
-		
+
 		/// <summary>
 		/// Gets the list of choices.
 		/// </summary>
diff --git a/src/Core/src/Core/ITimePicker.cs b/src/Core/src/Core/ITimePicker.cs
index 04cdf3c10d6b..c6c55141509f 100644
--- a/src/Core/src/Core/ITimePicker.cs
+++ b/src/Core/src/Core/ITimePicker.cs
@@ -20,9 +20,9 @@ public interface ITimePicker : IView, ITextStyle
 #if NETSTANDARD2_0
 	bool IsOpen { get; set; }
 #else
-	bool IsOpen { get => false; set {} }
+	bool IsOpen { get => false; set { } }
 #endif
-	
+
 	/// <summary>
 	/// The format of the time to display to the user.
 	/// </summary>
diff --git a/src/Core/src/Graphics/MauiDrawable.Android.cs b/src/Core/src/Graphics/MauiDrawable.Android.cs
index cd288ac21abd..8243069637fa 100644
--- a/src/Core/src/Graphics/MauiDrawable.Android.cs
+++ b/src/Core/src/Graphics/MauiDrawable.Android.cs
@@ -509,23 +509,14 @@ protected override void Dispose(bool disposing)
 
 			if (disposing)
 			{
-				if (_borderPathEffect != null)
-				{
-					_borderPathEffect.Dispose();
-					_borderPathEffect = null;
-				}
+				_borderPathEffect?.Dispose();
+				_borderPathEffect = null;
 
-				if (_clipPath != null)
-				{
-					_clipPath.Dispose();
-					_clipPath = null;
-				}
+				_clipPath?.Dispose();
+				_clipPath = null;
 
-				if (_fullClipPath != null)
-				{
-					_fullClipPath.Dispose();
-					_fullClipPath = null;
-				}
+				_fullClipPath?.Dispose();
+				_fullClipPath = null;
 			}
 
 			DisposeBorder(disposing);
@@ -537,11 +528,8 @@ protected virtual void DisposeBorder(bool disposing)
 		{
 			if (disposing)
 			{
-				if (_borderPaint != null)
-				{
-					_borderPaint.Dispose();
-					_borderPaint = null;
-				}
+				_borderPaint?.Dispose();
+				_borderPaint = null;
 			}
 		}
 
diff --git a/src/Core/src/Handlers/DatePicker/DatePickerHandler.Android.cs b/src/Core/src/Handlers/DatePicker/DatePickerHandler.Android.cs
index bab79e92ed52..aecaaf169b4e 100644
--- a/src/Core/src/Handlers/DatePicker/DatePickerHandler.Android.cs
+++ b/src/Core/src/Handlers/DatePicker/DatePickerHandler.Android.cs
@@ -7,7 +7,7 @@
 namespace Microsoft.Maui.Handlers
 {
 	public partial class DatePickerHandler : ViewHandler<IDatePicker, MauiDatePicker>
-	{		
+	{
 		DatePickerDialog? _dialog;
 
 		internal DatePickerDialog? DatePickerDialog => _dialog;
@@ -32,7 +32,7 @@ protected override void ConnectHandler(MauiDatePicker platformView)
 
 			platformView.ShowPicker = ShowPickerDialog;
 			platformView.HidePicker = HidePickerDialog;
-				
+
 			platformView.ViewAttachedToWindow += OnViewAttachedToWindow;
 			platformView.ViewDetachedFromWindow += OnViewDetachedFromWindow;
 
@@ -56,7 +56,7 @@ void OnViewAttachedToWindow(object? sender = null, View.ViewAttachedToWindowEven
 		protected override void DisconnectHandler(MauiDatePicker platformView)
 		{
 			if (_dialog != null)
-			{	
+			{
 				_dialog.DismissEvent -= OnDialogDismiss;
 				_dialog.Hide();
 				_dialog.Dispose();
@@ -65,10 +65,10 @@ protected override void DisconnectHandler(MauiDatePicker platformView)
 
 			platformView.ViewAttachedToWindow -= OnViewAttachedToWindow;
 			platformView.ViewDetachedFromWindow -= OnViewDetachedFromWindow;
-			
+
 			platformView.ShowPicker = null;
 			platformView.HidePicker = null;
-			
+
 			OnViewDetachedFromWindow();
 
 			base.DisconnectHandler(platformView);
@@ -83,9 +83,9 @@ protected virtual DatePickerDialog CreateDatePickerDialog(int year, int month, i
 					VirtualView.Date = e.Date;
 				}
 			}, year, month, day);
-		
+
 			dialog.DismissEvent += OnDialogDismiss;
-			
+
 			return dialog;
 		}
 
@@ -150,7 +150,7 @@ void ShowPickerDialog()
 			if (VirtualView is null)
 			{
 				return;
-			} 
+			}
 
 			if (_dialog is not null && _dialog.IsShowing)
 			{
@@ -190,7 +190,7 @@ void HidePickerDialog()
 				_dialog.DismissEvent -= OnDialogDismiss;
 				_dialog.Hide();
 			}
-			
+
 			VirtualView.IsOpen = false;
 		}
 
diff --git a/src/Core/src/Handlers/Picker/PickerHandler.Android.cs b/src/Core/src/Handlers/Picker/PickerHandler.Android.cs
index f2fdbe287968..342d1e439bcf 100644
--- a/src/Core/src/Handlers/Picker/PickerHandler.Android.cs
+++ b/src/Core/src/Handlers/Picker/PickerHandler.Android.cs
@@ -5,9 +5,9 @@
 using Android.Graphics.Drawables;
 using Android.Text;
 using Android.Text.Style;
+using Google.Android.Material.Dialog;
 using AppCompatAlertDialog = AndroidX.AppCompat.App.AlertDialog;
 using AResource = Android.Resource;
-using Google.Android.Material.Dialog;
 
 namespace Microsoft.Maui.Handlers
 {
@@ -121,7 +121,7 @@ void ShowDialog()
 			else
 				OnClick(PlatformView, EventArgs.Empty);
 		}
-		
+
 		void DismissDialog()
 		{
 			_dialog?.Dismiss();
@@ -182,7 +182,7 @@ void OnClick(object? sender, EventArgs e)
 
 				_dialog.Show();
 
-				VirtualView.IsOpen = true;		
+				VirtualView.IsOpen = true;
 			}
 		}
 
diff --git a/src/Core/src/Handlers/TimePicker/TimePickerHandler.Android.cs b/src/Core/src/Handlers/TimePicker/TimePickerHandler.Android.cs
index 8794bdfe5060..83c0d141fa12 100644
--- a/src/Core/src/Handlers/TimePicker/TimePickerHandler.Android.cs
+++ b/src/Core/src/Handlers/TimePicker/TimePickerHandler.Android.cs
@@ -36,7 +36,7 @@ protected override void DisconnectHandler(MauiTimePicker platformView)
 				_dialog.Hide();
 				_dialog = null;
 			}
-			
+
 			platformView.ShowPicker = null;
 			platformView.HidePicker = null;
 		}
@@ -59,7 +59,7 @@ void onTimeSetCallback(object? obj, TimePickerDialog.TimeSetEventArgs args)
 
 			var dialog = new TimePickerDialog(Context!, onTimeSetCallback, hour, minute, Use24HourView);
 			dialog.DismissEvent += OnDialogDismiss;
-			
+
 			return dialog;
 		}
 
@@ -106,7 +106,7 @@ internal static void MapIsOpen(ITimePickerHandler handler, ITimePicker timePicke
 					timePickerHandler.HidePickerDialog();
 			}
 		}
-		
+
 		void ShowPickerDialog()
 		{
 			if (VirtualView is null)
@@ -126,7 +126,7 @@ void ShowPickerDialog(TimeSpan? time)
 			{
 				return;
 			}
-			
+
 			var hour = time?.Hours ?? 0;
 			var minute = time?.Minutes ?? 0;
 
diff --git a/src/Core/src/Platform/Android/BorderDrawable.cs b/src/Core/src/Platform/Android/BorderDrawable.cs
index 3c132a17fe72..302e21cd9fc1 100644
--- a/src/Core/src/Platform/Android/BorderDrawable.cs
+++ b/src/Core/src/Platform/Android/BorderDrawable.cs
@@ -332,11 +332,8 @@ protected override void Dispose(bool disposing)
 
 			if (disposing)
 			{
-				if (_clipPath != null)
-				{
-					_clipPath.Dispose();
-					_clipPath = null;
-				}
+				_clipPath?.Dispose();
+				_clipPath = null;
 			}
 
 			DisposeBorder(disposing);
@@ -348,11 +345,8 @@ protected virtual void DisposeBorder(bool disposing)
 		{
 			if (disposing)
 			{
-				if (_borderPaint != null)
-				{
-					_borderPaint.Dispose();
-					_borderPaint = null;
-				}
+				_borderPaint?.Dispose();
+				_borderPaint = null;
 			}
 		}
 
diff --git a/src/Core/src/Platform/Android/MauiSwipeRefreshLayout.cs b/src/Core/src/Platform/Android/MauiSwipeRefreshLayout.cs
index 13df8aa647bf..ec1999c60138 100644
--- a/src/Core/src/Platform/Android/MauiSwipeRefreshLayout.cs
+++ b/src/Core/src/Platform/Android/MauiSwipeRefreshLayout.cs
@@ -29,7 +29,7 @@ public MauiSwipeRefreshLayout(Context context) : base(context)
 			// It looks like this issue is fixed on the main branch of Android but it hasn't made its way into the packages yet
 			SetProgressViewOffset(true, ProgressViewStartOffset, ProgressViewEndOffset - Math.Abs(ProgressViewStartOffset));
 		}
-		
+
 		public ICrossPlatformLayout? CrossPlatformLayout
 		{
 			get;
diff --git a/src/Core/src/Platform/Android/PickerExtensions.cs b/src/Core/src/Platform/Android/PickerExtensions.cs
index 1c77bdacd99a..e9c5c485d828 100644
--- a/src/Core/src/Platform/Android/PickerExtensions.cs
+++ b/src/Core/src/Platform/Android/PickerExtensions.cs
@@ -39,7 +39,7 @@ public static void UpdateTextColor(this MauiPicker platformPicker, IPicker picke
 
 		public static void UpdateSelectedIndex(this MauiPicker platformPicker, IPicker picker) =>
 			UpdatePicker(platformPicker, picker);
-		
+
 		internal static void UpdatePicker(this MauiPicker platformPicker, IPicker picker)
 		{
 			platformPicker.Hint = picker.Title;
diff --git a/src/Core/src/Primitives/SafeAreaEdges.cs b/src/Core/src/Primitives/SafeAreaEdges.cs
index 2646b9646655..751ac892d077 100644
--- a/src/Core/src/Primitives/SafeAreaEdges.cs
+++ b/src/Core/src/Primitives/SafeAreaEdges.cs
@@ -10,24 +10,24 @@ namespace Microsoft.Maui
 	public struct SafeAreaEdges : IEquatable<SafeAreaEdges>
 	{
 		/// <summary>
-		/// Gets or sets the safe area behavior for the left edge.
+		/// Gets the safe area behavior for the left edge.
 		/// </summary>
-		public SafeAreaRegions Left { get; set; }
+		public SafeAreaRegions Left { get; }
 
 		/// <summary>
-		/// Gets or sets the safe area behavior for the top edge.
+		/// Gets the safe area behavior for the top edge.
 		/// </summary>
-		public SafeAreaRegions Top { get; set; }
+		public SafeAreaRegions Top { get; }
 
 		/// <summary>
-		/// Gets or sets the safe area behavior for the right edge.
+		/// Gets the safe area behavior for the right edge.
 		/// </summary>
-		public SafeAreaRegions Right { get; set; }
+		public SafeAreaRegions Right { get; }
 
 		/// <summary>
-		/// Gets or sets the safe area behavior for the bottom edge.
+		/// Gets the safe area behavior for the bottom edge.
 		/// </summary>
-		public SafeAreaRegions Bottom { get; set; }
+		public SafeAreaRegions Bottom { get; }
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="SafeAreaEdges"/> struct with the same value for all edges.
@@ -86,30 +86,6 @@ public SafeAreaRegions GetEdge(int edge)
 			};
 		}
 
-		/// <summary>
-		/// Sets the safe area behavior for the specified edge.
-		/// </summary>
-		/// <param name="edge">The edge index (0=Left, 1=Top, 2=Right, 3=Bottom).</param>
-		/// <param name="value">The value to set.</param>
-		public void SetEdge(int edge, SafeAreaRegions value)
-		{
-			switch (edge)
-			{
-				case 0:
-					Left = value;
-					break;
-				case 1:
-					Top = value;
-					break;
-				case 2:
-					Right = value;
-					break;
-				case 3:
-					Bottom = value;
-					break;
-			}
-		}
-
 		/// <summary>
 		/// A <see cref="SafeAreaEdges"/> with all edges set to <see cref="SafeAreaRegions.None"/>.
 		/// </summary>
@@ -158,8 +134,8 @@ public override int GetHashCode()
 		}
 	}
 #else
-	public override int GetHashCode() =>
-		HashCode.Combine(Left, Top, Right, Bottom);
+		public override int GetHashCode() =>
+			HashCode.Combine(Left, Top, Right, Bottom);
 #endif
 		public override string ToString() =>
 			$"{Left}, {Top}, {Right}, {Bottom}";
diff --git a/src/Core/src/Primitives/SafeAreaRegions.cs b/src/Core/src/Primitives/SafeAreaRegions.cs
index 5c8222de3ee0..7d1b5942b1b9 100644
--- a/src/Core/src/Primitives/SafeAreaRegions.cs
+++ b/src/Core/src/Primitives/SafeAreaRegions.cs
@@ -16,17 +16,17 @@ public enum SafeAreaRegions
 		/// <summary>
 		/// Always pad so content doesn't go under the soft input/keyboard.
 		/// </summary>
-		SoftInput = 1 << 0,
+		SoftInput = 1,
 
 		/// <summary>
 		/// Content flows under keyboard but stays out of top and bottom bars and notch.
 		/// </summary>
-		Container = 1 << 1,
+		Container = 2,
 
 		/// <summary>
 		/// Default behavior - apply platform safe area insets.
 		/// </summary>
-		Default = 1 << 2,
+		Default = 4,
 
 		/// <summary>
 		/// Obey all safe area insets - content will be positioned only in the safe area.
diff --git a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
index d63fc630af8d..1f1f0fc8d2e7 100644
--- a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -54,20 +54,15 @@ Microsoft.Maui.Platform.MauiSwipeRefreshLayout.CrossPlatformLayout.set -> void
 *REMOVED*Microsoft.Maui.PlatformWrapperView.SetHasShadow(bool hasShadow) -> void
 Microsoft.Maui.SafeAreaEdges
 Microsoft.Maui.SafeAreaEdges.Bottom.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Bottom.set -> void
 Microsoft.Maui.SafeAreaEdges.Equals(Microsoft.Maui.SafeAreaEdges other) -> bool
 Microsoft.Maui.SafeAreaEdges.GetEdge(int edge) -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaEdges.Left.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Left.set -> void
 Microsoft.Maui.SafeAreaEdges.Right.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Right.set -> void
 Microsoft.Maui.SafeAreaEdges.SafeAreaEdges() -> void
 Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions horizontal, Microsoft.Maui.SafeAreaRegions vertical) -> void
 Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions left, Microsoft.Maui.SafeAreaRegions top, Microsoft.Maui.SafeAreaRegions right, Microsoft.Maui.SafeAreaRegions bottom) -> void
 Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions uniformValue) -> void
-Microsoft.Maui.SafeAreaEdges.SetEdge(int edge, Microsoft.Maui.SafeAreaRegions value) -> void
 Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Top.set -> void
 Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.All = Microsoft.Maui.SafeAreaRegions.SoftInput | Microsoft.Maui.SafeAreaRegions.Container -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
diff --git a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt.bak b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt.bak
new file mode 100644
index 000000000000..d63fc630af8d
--- /dev/null
+++ b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt.bak
@@ -0,0 +1,315 @@
+#nullable enable
+Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter
+Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.SafeAreaEdgesTypeConverter() -> void
+Microsoft.Maui.Graphics.MauiDrawable.SetEmptyBorderBrush() -> void
+Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.ContextFlyoutItemHandlerUpdate(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate! original) -> void
+Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
+Microsoft.Maui.Handlers.DataFlowDirection
+Microsoft.Maui.Handlers.DataFlowDirection.FromPlatform = 1 -> Microsoft.Maui.Handlers.DataFlowDirection
+Microsoft.Maui.Handlers.DataFlowDirection.ToPlatform = 0 -> Microsoft.Maui.Handlers.DataFlowDirection
+Microsoft.Maui.Handlers.LayoutHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IView! View) -> void
+Microsoft.Maui.Handlers.LayoutHandlerUpdate.LayoutHandlerUpdate(Microsoft.Maui.Handlers.LayoutHandlerUpdate! original) -> void
+Microsoft.Maui.Handlers.MenuBarHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuBarItem! MenuBarItem) -> void
+Microsoft.Maui.Handlers.MenuBarHandlerUpdate.MenuBarHandlerUpdate(Microsoft.Maui.Handlers.MenuBarHandlerUpdate! original) -> void
+Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
+Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.MenuBarItemHandlerUpdate(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate! original) -> void
+Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
+Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.MenuFlyoutSubItemHandlerUpdate(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate! original) -> void
+Microsoft.Maui.Handlers.OpenWindowRequest.Deconstruct(out Microsoft.Maui.IPersistedState? State) -> void
+Microsoft.Maui.Handlers.OpenWindowRequest.OpenWindowRequest(Microsoft.Maui.Handlers.OpenWindowRequest! original) -> void
+Microsoft.Maui.Hosting.MauiAppBuilder.Environment.get -> Microsoft.Maui.Hosting.MauiHostEnvironment!
+Microsoft.Maui.Hosting.MauiAppBuilder.Properties.get -> System.Collections.Generic.IDictionary<object!, object!>!
+Microsoft.Maui.Hosting.MauiHostEnvironment
+Microsoft.Maui.Hosting.MauiHostEnvironment.ApplicationName.get -> string!
+Microsoft.Maui.Hosting.MauiHostEnvironment.ApplicationName.set -> void
+Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootFileProvider.get -> Microsoft.Extensions.FileProviders.IFileProvider!
+Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootFileProvider.set -> void
+Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootPath.get -> string!
+Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootPath.set -> void
+Microsoft.Maui.Hosting.MauiHostEnvironment.EnvironmentName.get -> string!
+Microsoft.Maui.Hosting.MauiHostEnvironment.EnvironmentName.set -> void
+Microsoft.Maui.Hosting.MauiHostEnvironment.MauiHostEnvironment() -> void
+*REMOVED*Microsoft.Maui.IDatePicker.Date.get -> System.DateTime
+Microsoft.Maui.IDatePicker.Date.get -> System.DateTime?
+Microsoft.Maui.IDatePicker.IsOpen.get -> bool
+Microsoft.Maui.IDatePicker.IsOpen.set -> void
+*REMOVED*Microsoft.Maui.IDatePicker.MaximumDate.get -> System.DateTime
+Microsoft.Maui.IDatePicker.MaximumDate.get -> System.DateTime?
+*REMOVED*Microsoft.Maui.IDatePicker.MinimumDate.get -> System.DateTime
+Microsoft.Maui.IDatePicker.MinimumDate.get -> System.DateTime?
+Microsoft.Maui.IPicker.IsOpen.get -> bool
+Microsoft.Maui.IPicker.IsOpen.set -> void
+Microsoft.Maui.ISearchBar.ReturnType.get -> Microsoft.Maui.ReturnType
+Microsoft.Maui.ISearchBar.SearchIconColor.get -> Microsoft.Maui.Graphics.Color!
+Microsoft.Maui.ITimePicker.IsOpen.get -> bool
+Microsoft.Maui.ITimePicker.IsOpen.set -> void
+*REMOVED*Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan
+Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan?
+Microsoft.Maui.IWebRequestInterceptingWebView
+Microsoft.Maui.IWebRequestInterceptingWebView.WebResourceRequested(Microsoft.Maui.WebResourceRequestedEventArgs! args) -> bool
+*REMOVED*Microsoft.Maui.Platform.MauiPicker.ShowPopupOnFocus.get -> bool
+*REMOVED*Microsoft.Maui.Platform.MauiPicker.ShowPopupOnFocus.set -> void
+Microsoft.Maui.Platform.MauiSwipeRefreshLayout.CrossPlatformLayout.get -> Microsoft.Maui.ICrossPlatformLayout?
+Microsoft.Maui.Platform.MauiSwipeRefreshLayout.CrossPlatformLayout.set -> void
+*REMOVED*Microsoft.Maui.PlatformWrapperView.SetHasShadow(bool hasShadow) -> void
+Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.SafeAreaEdges.Bottom.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Bottom.set -> void
+Microsoft.Maui.SafeAreaEdges.Equals(Microsoft.Maui.SafeAreaEdges other) -> bool
+Microsoft.Maui.SafeAreaEdges.GetEdge(int edge) -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Left.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Left.set -> void
+Microsoft.Maui.SafeAreaEdges.Right.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Right.set -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges() -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions horizontal, Microsoft.Maui.SafeAreaRegions vertical) -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions left, Microsoft.Maui.SafeAreaRegions top, Microsoft.Maui.SafeAreaRegions right, Microsoft.Maui.SafeAreaRegions bottom) -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions uniformValue) -> void
+Microsoft.Maui.SafeAreaEdges.SetEdge(int edge, Microsoft.Maui.SafeAreaRegions value) -> void
+Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Top.set -> void
+Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.All = Microsoft.Maui.SafeAreaRegions.SoftInput | Microsoft.Maui.SafeAreaRegions.Container -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Default = 4 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.None = 0 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.SoftInput = 1 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.ScrollToRequest.Deconstruct(out double HorizontalOffset, out double VerticalOffset, out bool Instant) -> void
+Microsoft.Maui.ScrollToRequest.ScrollToRequest(Microsoft.Maui.ScrollToRequest! original) -> void
+Microsoft.Maui.SwipeViewCloseRequest.Deconstruct(out bool Animated) -> void
+Microsoft.Maui.SwipeViewCloseRequest.SwipeViewCloseRequest(Microsoft.Maui.SwipeViewCloseRequest! original) -> void
+Microsoft.Maui.SwipeViewOpenRequest.Deconstruct(out Microsoft.Maui.OpenSwipeItem OpenSwipeItem, out bool Animated) -> void
+Microsoft.Maui.SwipeViewOpenRequest.SwipeViewOpenRequest(Microsoft.Maui.SwipeViewOpenRequest! original) -> void
+Microsoft.Maui.SwipeViewSwipeChanging.Deconstruct(out Microsoft.Maui.SwipeDirection SwipeDirection, out double Offset) -> void
+Microsoft.Maui.SwipeViewSwipeChanging.SwipeViewSwipeChanging(Microsoft.Maui.SwipeViewSwipeChanging! original) -> void
+Microsoft.Maui.SwipeViewSwipeEnded.Deconstruct(out Microsoft.Maui.SwipeDirection SwipeDirection, out bool IsOpen) -> void
+Microsoft.Maui.SwipeViewSwipeEnded.SwipeViewSwipeEnded(Microsoft.Maui.SwipeViewSwipeEnded! original) -> void
+Microsoft.Maui.SwipeViewSwipeStarted.Deconstruct(out Microsoft.Maui.SwipeDirection SwipeDirection) -> void
+Microsoft.Maui.SwipeViewSwipeStarted.SwipeViewSwipeStarted(Microsoft.Maui.SwipeViewSwipeStarted! original) -> void
+Microsoft.Maui.WebResourceRequestedEventArgs
+Microsoft.Maui.WebResourceRequestedEventArgs.Request.get -> Android.Webkit.IWebResourceRequest!
+Microsoft.Maui.WebResourceRequestedEventArgs.Response.get -> Android.Webkit.WebResourceResponse?
+Microsoft.Maui.WebResourceRequestedEventArgs.Response.set -> void
+Microsoft.Maui.WebResourceRequestedEventArgs.Sender.get -> Android.Webkit.WebView!
+override Microsoft.Maui.Converters.EasingTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.EasingTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.EasingTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.EasingTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.EasingTypeConverter.GetStandardValues(System.ComponentModel.ITypeDescriptorContext? context) -> System.ComponentModel.TypeConverter.StandardValuesCollection?
+override Microsoft.Maui.Converters.EasingTypeConverter.GetStandardValuesExclusive(System.ComponentModel.ITypeDescriptorContext? context) -> bool
+override Microsoft.Maui.Converters.EasingTypeConverter.GetStandardValuesSupported(System.ComponentModel.ITypeDescriptorContext? context) -> bool
+override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.FlexBasisTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexBasisTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexBasisTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexBasisTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.FlexDirectionTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexDirectionTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexDirectionTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexDirectionTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.FlexJustifyTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexJustifyTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexJustifyTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexJustifyTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value) -> object!
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object!
+override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.ThicknessTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.ThicknessTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Equals(object? obj) -> bool
+override Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.GetHashCode() -> int
+override Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.ToString() -> string!
+*REMOVED*override Microsoft.Maui.Handlers.EditorHandler.ConnectHandler(AndroidX.AppCompat.Widget.AppCompatEditText! platformView) -> void
+override Microsoft.Maui.Handlers.EditorHandler.ConnectHandler(Microsoft.Maui.Platform.MauiAppCompatEditText! platformView) -> void
+*REMOVED*override Microsoft.Maui.Handlers.EditorHandler.CreatePlatformView() -> AndroidX.AppCompat.Widget.AppCompatEditText!
+override Microsoft.Maui.Handlers.EditorHandler.CreatePlatformView() -> Microsoft.Maui.Platform.MauiAppCompatEditText!
+*REMOVED*override Microsoft.Maui.Handlers.EditorHandler.DisconnectHandler(AndroidX.AppCompat.Widget.AppCompatEditText! platformView) -> void
+override Microsoft.Maui.Handlers.EditorHandler.DisconnectHandler(Microsoft.Maui.Platform.MauiAppCompatEditText! platformView) -> void
+*REMOVED*override Microsoft.Maui.Handlers.EntryHandler.ConnectHandler(AndroidX.AppCompat.Widget.AppCompatEditText! platformView) -> void
+override Microsoft.Maui.Handlers.EntryHandler.ConnectHandler(Microsoft.Maui.Platform.MauiAppCompatEditText! platformView) -> void
+*REMOVED*override Microsoft.Maui.Handlers.EntryHandler.CreatePlatformView() -> AndroidX.AppCompat.Widget.AppCompatEditText!
+override Microsoft.Maui.Handlers.EntryHandler.CreatePlatformView() -> Microsoft.Maui.Platform.MauiAppCompatEditText!
+*REMOVED*override Microsoft.Maui.Handlers.EntryHandler.DisconnectHandler(AndroidX.AppCompat.Widget.AppCompatEditText! platformView) -> void
+override Microsoft.Maui.Handlers.EntryHandler.DisconnectHandler(Microsoft.Maui.Platform.MauiAppCompatEditText! platformView) -> void
+override Microsoft.Maui.Handlers.LayoutHandlerUpdate.Equals(object? obj) -> bool
+override Microsoft.Maui.Handlers.LayoutHandlerUpdate.GetHashCode() -> int
+override Microsoft.Maui.Handlers.LayoutHandlerUpdate.ToString() -> string!
+override Microsoft.Maui.Handlers.MenuBarHandlerUpdate.Equals(object? obj) -> bool
+override Microsoft.Maui.Handlers.MenuBarHandlerUpdate.GetHashCode() -> int
+override Microsoft.Maui.Handlers.MenuBarHandlerUpdate.ToString() -> string!
+override Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.Equals(object? obj) -> bool
+override Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.GetHashCode() -> int
+override Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.ToString() -> string!
+override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.Equals(object? obj) -> bool
+override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.GetHashCode() -> int
+override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.ToString() -> string!
+override Microsoft.Maui.Handlers.OpenWindowRequest.Equals(object? obj) -> bool
+override Microsoft.Maui.Handlers.OpenWindowRequest.GetHashCode() -> int
+override Microsoft.Maui.Handlers.OpenWindowRequest.ToString() -> string!
+override Microsoft.Maui.Handlers.RefreshViewHandler.SetVirtualView(Microsoft.Maui.IView! view) -> void
+override Microsoft.Maui.Handlers.TimePickerHandler.ConnectHandler(Microsoft.Maui.Platform.MauiTimePicker! platformView) -> void
+override Microsoft.Maui.Platform.MauiDatePicker.DefaultMovementMethod.get -> Android.Text.Method.IMovementMethod?
+*REMOVED*override Microsoft.Maui.Platform.MauiPicker.OnFocusChanged(bool gainFocus, Android.Views.FocusSearchDirection direction, Android.Graphics.Rect? previouslyFocusedRect) -> void
+*REMOVED*override Microsoft.Maui.Platform.MauiPicker.OnTouchEvent(Android.Views.MotionEvent? e) -> bool
+override Microsoft.Maui.Platform.MauiPickerBase.DefaultMovementMethod.get -> Android.Text.Method.IMovementMethod?
+override Microsoft.Maui.Platform.MauiSwipeRefreshLayout.OnLayout(bool changed, int left, int top, int right, int bottom) -> void
+override Microsoft.Maui.Platform.MauiSwipeRefreshLayout.OnMeasure(int widthMeasureSpec, int heightMeasureSpec) -> void
+*REMOVED*override Microsoft.Maui.Platform.MauiTextView.OnMeasure(int widthMeasureSpec, int heightMeasureSpec) -> void
+override Microsoft.Maui.Platform.MauiTimePicker.DefaultMovementMethod.get -> Android.Text.Method.IMovementMethod?
+override Microsoft.Maui.Platform.MauiWebChromeClient.OnHideCustomView() -> void
+~override Microsoft.Maui.Platform.MauiWebChromeClient.OnShowCustomView(Android.Views.View view, Android.Webkit.WebChromeClient.ICustomViewCallback callback) -> void
+override Microsoft.Maui.SafeAreaEdges.Equals(object? obj) -> bool
+override Microsoft.Maui.SafeAreaEdges.GetHashCode() -> int
+override Microsoft.Maui.SafeAreaEdges.ToString() -> string!
+override Microsoft.Maui.ScrollToRequest.Equals(object? obj) -> bool
+override Microsoft.Maui.ScrollToRequest.GetHashCode() -> int
+override Microsoft.Maui.ScrollToRequest.ToString() -> string!
+override Microsoft.Maui.SwipeViewCloseRequest.Equals(object? obj) -> bool
+override Microsoft.Maui.SwipeViewCloseRequest.GetHashCode() -> int
+override Microsoft.Maui.SwipeViewCloseRequest.ToString() -> string!
+override Microsoft.Maui.SwipeViewOpenRequest.Equals(object? obj) -> bool
+override Microsoft.Maui.SwipeViewOpenRequest.GetHashCode() -> int
+override Microsoft.Maui.SwipeViewOpenRequest.ToString() -> string!
+override Microsoft.Maui.SwipeViewSwipeChanging.Equals(object? obj) -> bool
+override Microsoft.Maui.SwipeViewSwipeChanging.GetHashCode() -> int
+override Microsoft.Maui.SwipeViewSwipeChanging.ToString() -> string!
+override Microsoft.Maui.SwipeViewSwipeEnded.Equals(object? obj) -> bool
+override Microsoft.Maui.SwipeViewSwipeEnded.GetHashCode() -> int
+override Microsoft.Maui.SwipeViewSwipeEnded.ToString() -> string!
+override Microsoft.Maui.SwipeViewSwipeStarted.Equals(object? obj) -> bool
+override Microsoft.Maui.SwipeViewSwipeStarted.GetHashCode() -> int
+override Microsoft.Maui.SwipeViewSwipeStarted.ToString() -> string!
+*REMOVED*readonly Microsoft.Maui.PropertyMapper._mapper -> System.Collections.Generic.Dictionary<string!, System.Action<Microsoft.Maui.IElementHandler!, Microsoft.Maui.IElement!>!>!
+static Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.operator !=(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? left, Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.operator ==(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? left, Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.GraphicsViewHandler.MapBackground(Microsoft.Maui.Handlers.IGraphicsViewHandler! handler, Microsoft.Maui.IGraphicsView! graphicsView) -> void
+static Microsoft.Maui.Handlers.LayoutHandlerUpdate.operator !=(Microsoft.Maui.Handlers.LayoutHandlerUpdate? left, Microsoft.Maui.Handlers.LayoutHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.LayoutHandlerUpdate.operator ==(Microsoft.Maui.Handlers.LayoutHandlerUpdate? left, Microsoft.Maui.Handlers.LayoutHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.MenuBarHandlerUpdate.operator !=(Microsoft.Maui.Handlers.MenuBarHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.MenuBarHandlerUpdate.operator ==(Microsoft.Maui.Handlers.MenuBarHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.operator !=(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.operator ==(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.operator !=(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.operator ==(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.OpenWindowRequest.operator !=(Microsoft.Maui.Handlers.OpenWindowRequest? left, Microsoft.Maui.Handlers.OpenWindowRequest? right) -> bool
+static Microsoft.Maui.Handlers.OpenWindowRequest.operator ==(Microsoft.Maui.Handlers.OpenWindowRequest? left, Microsoft.Maui.Handlers.OpenWindowRequest? right) -> bool
+static Microsoft.Maui.Handlers.SearchBarHandler.MapReturnType(Microsoft.Maui.Handlers.ISearchBarHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
+static Microsoft.Maui.Hosting.AppHostBuilderExtensions.ConfigureEnvironmentVariables(this Microsoft.Maui.Hosting.MauiAppBuilder! builder) -> Microsoft.Maui.Hosting.MauiAppBuilder!
+static Microsoft.Maui.Platform.ButtonExtensions.UpdateRippleColor(this Google.Android.Material.Button.MaterialButton! platformView, Microsoft.Maui.Graphics.Color? rippleColor) -> void
+static Microsoft.Maui.Platform.EditTextExtensions.GetCursorPosition(this Android.Widget.EditText! editText, int cursorOffset = 0) -> int
+static Microsoft.Maui.Platform.EditTextExtensions.GetSelectedTextLength(this Android.Widget.EditText! editText) -> int
+static Microsoft.Maui.Platform.EditTextExtensions.UpdateClearButtonVisibility(this Android.Widget.EditText! editText, Microsoft.Maui.IEntry! entry) -> void
+*REMOVED*static Microsoft.Maui.Platform.EditTextExtensions.UpdateClearButtonVisibility(this Android.Widget.EditText! editText, Microsoft.Maui.IEntry! entry, Android.Graphics.Drawables.Drawable? clearButtonDrawable) -> void
+*REMOVED*static Microsoft.Maui.Platform.EditTextExtensions.UpdateClearButtonVisibility(this Android.Widget.EditText! editText, Microsoft.Maui.IEntry! entry, System.Func<Android.Graphics.Drawables.Drawable?>? getClearButtonDrawable) -> void
+static Microsoft.Maui.Platform.ImageButtonExtensions.UpdateBackground(this Google.Android.Material.ImageView.ShapeableImageView! platformButton, Microsoft.Maui.IImageButton! imageButton) -> void
+static Microsoft.Maui.Platform.ImageButtonExtensions.UpdateButtonBackground(this Google.Android.Material.ImageView.ShapeableImageView! platformView, Microsoft.Maui.IImageButton! button) -> void
+static Microsoft.Maui.Platform.ImageButtonExtensions.UpdateButtonStroke(this Google.Android.Material.ImageView.ShapeableImageView! platformView, Microsoft.Maui.IButtonStroke! button) -> void
+static Microsoft.Maui.Platform.ImageButtonExtensions.UpdateRippleColor(this Google.Android.Material.ImageView.ShapeableImageView! platformView, Microsoft.Maui.Graphics.Color! rippleColor) -> void
+static Microsoft.Maui.Platform.SearchViewExtensions.UpdateReturnType(this AndroidX.AppCompat.Widget.SearchView! searchView, Microsoft.Maui.ISearchBar! searchBar) -> void
+static Microsoft.Maui.SafeAreaEdges.All.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.Default.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.None.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.operator !=(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
+static Microsoft.Maui.SafeAreaEdges.operator ==(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
+static Microsoft.Maui.ScrollToRequest.operator !=(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
+static Microsoft.Maui.ScrollToRequest.operator ==(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
+static Microsoft.Maui.SwipeViewCloseRequest.operator !=(Microsoft.Maui.SwipeViewCloseRequest? left, Microsoft.Maui.SwipeViewCloseRequest? right) -> bool
+static Microsoft.Maui.SwipeViewCloseRequest.operator ==(Microsoft.Maui.SwipeViewCloseRequest? left, Microsoft.Maui.SwipeViewCloseRequest? right) -> bool
+static Microsoft.Maui.SwipeViewOpenRequest.operator !=(Microsoft.Maui.SwipeViewOpenRequest? left, Microsoft.Maui.SwipeViewOpenRequest? right) -> bool
+static Microsoft.Maui.SwipeViewOpenRequest.operator ==(Microsoft.Maui.SwipeViewOpenRequest? left, Microsoft.Maui.SwipeViewOpenRequest? right) -> bool
+static Microsoft.Maui.SwipeViewSwipeChanging.operator !=(Microsoft.Maui.SwipeViewSwipeChanging? left, Microsoft.Maui.SwipeViewSwipeChanging? right) -> bool
+static Microsoft.Maui.SwipeViewSwipeChanging.operator ==(Microsoft.Maui.SwipeViewSwipeChanging? left, Microsoft.Maui.SwipeViewSwipeChanging? right) -> bool
+static Microsoft.Maui.SwipeViewSwipeEnded.operator !=(Microsoft.Maui.SwipeViewSwipeEnded? left, Microsoft.Maui.SwipeViewSwipeEnded? right) -> bool
+static Microsoft.Maui.SwipeViewSwipeEnded.operator ==(Microsoft.Maui.SwipeViewSwipeEnded? left, Microsoft.Maui.SwipeViewSwipeEnded? right) -> bool
+static Microsoft.Maui.SwipeViewSwipeStarted.operator !=(Microsoft.Maui.SwipeViewSwipeStarted? left, Microsoft.Maui.SwipeViewSwipeStarted? right) -> bool
+static Microsoft.Maui.SwipeViewSwipeStarted.operator ==(Microsoft.Maui.SwipeViewSwipeStarted? left, Microsoft.Maui.SwipeViewSwipeStarted? right) -> bool
+virtual Microsoft.Maui.Animations.Lerp.LerpDelegate.Invoke(object! start, object! end, double progress) -> object!
+virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate!
+virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Equals(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? other) -> bool
+virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.LayoutHandlerUpdate!
+virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.Equals(Microsoft.Maui.Handlers.LayoutHandlerUpdate? other) -> bool
+virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.MenuBarHandlerUpdate!
+virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.Equals(Microsoft.Maui.Handlers.MenuBarHandlerUpdate? other) -> bool
+virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate!
+virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.Equals(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? other) -> bool
+virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate!
+virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.Equals(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? other) -> bool
+virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.Handlers.OpenWindowRequest.<Clone>$() -> Microsoft.Maui.Handlers.OpenWindowRequest!
+virtual Microsoft.Maui.Handlers.OpenWindowRequest.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.Handlers.OpenWindowRequest.Equals(Microsoft.Maui.Handlers.OpenWindowRequest? other) -> bool
+virtual Microsoft.Maui.Handlers.OpenWindowRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.LifecycleEvents.AndroidLifecycle.OnActivityResult.Invoke(Android.App.Activity! activity, int requestCode, Android.App.Result resultCode, Android.Content.Intent? data) -> void
+virtual Microsoft.Maui.LifecycleEvents.AndroidLifecycle.OnApplicationConfigurationChanged.Invoke(Android.App.Application! application, Android.Content.Res.Configuration! newConfig) -> void
+virtual Microsoft.Maui.LifecycleEvents.AndroidLifecycle.OnApplicationCreate.Invoke(Android.App.Application! application) -> void
+virtual Microsoft.Maui.LifecycleEvents.AndroidLifecycle.OnApplicationCreating.Invoke(Android.App.Application! application) -> void
+virtual Microsoft.Maui.LifecycleEvents.AndroidLifecycle.OnApplicationLowMemory.Invoke(Android.App.Application! application) -> void
+virtual Microsoft.Maui.LifecycleEvents.AndroidLifecycle.OnApplicationTrimMemory.Invoke(Android.App.Application! application, Android.Content.TrimMemory level) -> void
+virtual Microsoft.Maui.LifecycleEvents.AndroidLifecycle.OnBackPressed.Invoke(Android.App.Activity! activity) -> bool
+virtual Microsoft.Maui.LifecycleEvents.AndroidLifecycle.OnConfigurationChanged.Invoke(Android.App.Activity! activity, Android.Content.Res.Configuration! newConfig) -> void
+virtual Microsoft.Maui.LifecycleEvents.AndroidLifecycle.OnCreate.Invoke(Android.App.Activity! activity, Android.OS.Bundle? savedInstanceState) -> void
+virtual Microsoft.Maui.LifecycleEvents.AndroidLifecycle.OnDestroy.Invoke(Android.App.Activity! activity) -> void
+virtual Microsoft.Maui.LifecycleEvents.AndroidLifecycle.OnNewIntent.Invoke(Android.App.Activity! activity, Android.Content.Intent? intent) -> void
+virtual Microsoft.Maui.LifecycleEvents.AndroidLifecycle.OnPause.Invoke(Android.App.Activity! activity) -> void
+virtual Microsoft.Maui.LifecycleEvents.AndroidLifecycle.OnPostCreate.Invoke(Android.App.Activity! activity, Android.OS.Bundle? savedInstanceState) -> void
+virtual Microsoft.Maui.LifecycleEvents.AndroidLifecycle.OnPostResume.Invoke(Android.App.Activity! activity) -> void
+virtual Microsoft.Maui.LifecycleEvents.AndroidLifecycle.OnRequestPermissionsResult.Invoke(Android.App.Activity! activity, int requestCode, string![]! permissions, Android.Content.PM.Permission[]! grantResults) -> void
+virtual Microsoft.Maui.LifecycleEvents.AndroidLifecycle.OnRestart.Invoke(Android.App.Activity! activity) -> void
+virtual Microsoft.Maui.LifecycleEvents.AndroidLifecycle.OnRestoreInstanceState.Invoke(Android.App.Activity! activity, Android.OS.Bundle! savedInstanceState) -> void
+virtual Microsoft.Maui.LifecycleEvents.AndroidLifecycle.OnResume.Invoke(Android.App.Activity! activity) -> void
+virtual Microsoft.Maui.LifecycleEvents.AndroidLifecycle.OnSaveInstanceState.Invoke(Android.App.Activity! activity, Android.OS.Bundle! outState) -> void
+virtual Microsoft.Maui.LifecycleEvents.AndroidLifecycle.OnStart.Invoke(Android.App.Activity! activity) -> void
+virtual Microsoft.Maui.LifecycleEvents.AndroidLifecycle.OnStop.Invoke(Android.App.Activity! activity) -> void
+*REMOVED*virtual Microsoft.Maui.PropertyMapper.ClearKeyCache() -> void
+*REMOVED*virtual Microsoft.Maui.PropertyMapper.UpdateKeys.get -> System.Collections.Generic.IReadOnlyCollection<string!>!
+virtual Microsoft.Maui.ScrollToRequest.<Clone>$() -> Microsoft.Maui.ScrollToRequest!
+virtual Microsoft.Maui.ScrollToRequest.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.ScrollToRequest.Equals(Microsoft.Maui.ScrollToRequest? other) -> bool
+virtual Microsoft.Maui.ScrollToRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.SwipeViewCloseRequest.<Clone>$() -> Microsoft.Maui.SwipeViewCloseRequest!
+virtual Microsoft.Maui.SwipeViewCloseRequest.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.SwipeViewCloseRequest.Equals(Microsoft.Maui.SwipeViewCloseRequest? other) -> bool
+virtual Microsoft.Maui.SwipeViewCloseRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.SwipeViewOpenRequest.<Clone>$() -> Microsoft.Maui.SwipeViewOpenRequest!
+virtual Microsoft.Maui.SwipeViewOpenRequest.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.SwipeViewOpenRequest.Equals(Microsoft.Maui.SwipeViewOpenRequest? other) -> bool
+virtual Microsoft.Maui.SwipeViewOpenRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.SwipeViewSwipeChanging.<Clone>$() -> Microsoft.Maui.SwipeViewSwipeChanging!
+virtual Microsoft.Maui.SwipeViewSwipeChanging.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.SwipeViewSwipeChanging.Equals(Microsoft.Maui.SwipeViewSwipeChanging? other) -> bool
+virtual Microsoft.Maui.SwipeViewSwipeChanging.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.SwipeViewSwipeEnded.<Clone>$() -> Microsoft.Maui.SwipeViewSwipeEnded!
+virtual Microsoft.Maui.SwipeViewSwipeEnded.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.SwipeViewSwipeEnded.Equals(Microsoft.Maui.SwipeViewSwipeEnded? other) -> bool
+virtual Microsoft.Maui.SwipeViewSwipeEnded.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.SwipeViewSwipeStarted.<Clone>$() -> Microsoft.Maui.SwipeViewSwipeStarted!
+virtual Microsoft.Maui.SwipeViewSwipeStarted.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.SwipeViewSwipeStarted.Equals(Microsoft.Maui.SwipeViewSwipeStarted? other) -> bool
+virtual Microsoft.Maui.SwipeViewSwipeStarted.PrintMembers(System.Text.StringBuilder! builder) -> bool
diff --git a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index 2170ef116130..aeb3115edcc9 100644
--- a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -58,20 +58,15 @@ Microsoft.Maui.Platform.TextInputExtensions
 Microsoft.Maui.Platform.UIApplicationExtensions
 Microsoft.Maui.SafeAreaEdges
 Microsoft.Maui.SafeAreaEdges.Bottom.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Bottom.set -> void
 Microsoft.Maui.SafeAreaEdges.Equals(Microsoft.Maui.SafeAreaEdges other) -> bool
 Microsoft.Maui.SafeAreaEdges.GetEdge(int edge) -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaEdges.Left.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Left.set -> void
 Microsoft.Maui.SafeAreaEdges.Right.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Right.set -> void
 Microsoft.Maui.SafeAreaEdges.SafeAreaEdges() -> void
 Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions horizontal, Microsoft.Maui.SafeAreaRegions vertical) -> void
 Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions left, Microsoft.Maui.SafeAreaRegions top, Microsoft.Maui.SafeAreaRegions right, Microsoft.Maui.SafeAreaRegions bottom) -> void
 Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions uniformValue) -> void
-Microsoft.Maui.SafeAreaEdges.SetEdge(int edge, Microsoft.Maui.SafeAreaRegions value) -> void
 Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Top.set -> void
 Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.All = Microsoft.Maui.SafeAreaRegions.SoftInput | Microsoft.Maui.SafeAreaRegions.Container -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
diff --git a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt.bak b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt.bak
new file mode 100644
index 000000000000..2170ef116130
--- /dev/null
+++ b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt.bak
@@ -0,0 +1,306 @@
+#nullable enable
+Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter
+Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.SafeAreaEdgesTypeConverter() -> void
+Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.ContextFlyoutItemHandlerUpdate(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate! original) -> void
+Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
+Microsoft.Maui.Handlers.DataFlowDirection
+Microsoft.Maui.Handlers.DataFlowDirection.FromPlatform = 1 -> Microsoft.Maui.Handlers.DataFlowDirection
+Microsoft.Maui.Handlers.DataFlowDirection.ToPlatform = 0 -> Microsoft.Maui.Handlers.DataFlowDirection
+Microsoft.Maui.Handlers.LayoutHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IView! View) -> void
+Microsoft.Maui.Handlers.LayoutHandlerUpdate.LayoutHandlerUpdate(Microsoft.Maui.Handlers.LayoutHandlerUpdate! original) -> void
+Microsoft.Maui.Handlers.MenuBarHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuBarItem! MenuBarItem) -> void
+Microsoft.Maui.Handlers.MenuBarHandlerUpdate.MenuBarHandlerUpdate(Microsoft.Maui.Handlers.MenuBarHandlerUpdate! original) -> void
+Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
+Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.MenuBarItemHandlerUpdate(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate! original) -> void
+Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
+Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.MenuFlyoutSubItemHandlerUpdate(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate! original) -> void
+Microsoft.Maui.Handlers.OpenWindowRequest.Deconstruct(out Microsoft.Maui.IPersistedState? State) -> void
+Microsoft.Maui.Handlers.OpenWindowRequest.OpenWindowRequest(Microsoft.Maui.Handlers.OpenWindowRequest! original) -> void
+Microsoft.Maui.Hosting.MauiAppBuilder.Environment.get -> Microsoft.Maui.Hosting.MauiHostEnvironment!
+Microsoft.Maui.Hosting.MauiAppBuilder.Properties.get -> System.Collections.Generic.IDictionary<object!, object!>!
+Microsoft.Maui.Hosting.MauiHostEnvironment
+Microsoft.Maui.Hosting.MauiHostEnvironment.ApplicationName.get -> string!
+Microsoft.Maui.Hosting.MauiHostEnvironment.ApplicationName.set -> void
+Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootFileProvider.get -> Microsoft.Extensions.FileProviders.IFileProvider!
+Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootFileProvider.set -> void
+Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootPath.get -> string!
+Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootPath.set -> void
+Microsoft.Maui.Hosting.MauiHostEnvironment.EnvironmentName.get -> string!
+Microsoft.Maui.Hosting.MauiHostEnvironment.EnvironmentName.set -> void
+Microsoft.Maui.Hosting.MauiHostEnvironment.MauiHostEnvironment() -> void
+*REMOVED*Microsoft.Maui.IDatePicker.Date.get -> System.DateTime
+Microsoft.Maui.IDatePicker.Date.get -> System.DateTime?
+Microsoft.Maui.IDatePicker.IsOpen.get -> bool
+Microsoft.Maui.IDatePicker.IsOpen.set -> void
+*REMOVED*Microsoft.Maui.IDatePicker.MaximumDate.get -> System.DateTime
+Microsoft.Maui.IDatePicker.MaximumDate.get -> System.DateTime?
+*REMOVED*Microsoft.Maui.IDatePicker.MinimumDate.get -> System.DateTime
+Microsoft.Maui.IDatePicker.MinimumDate.get -> System.DateTime?
+Microsoft.Maui.IPicker.IsOpen.get -> bool
+Microsoft.Maui.IPicker.IsOpen.set -> void
+Microsoft.Maui.ISearchBar.ReturnType.get -> Microsoft.Maui.ReturnType
+Microsoft.Maui.ISearchBar.SearchIconColor.get -> Microsoft.Maui.Graphics.Color!
+Microsoft.Maui.ITimePicker.IsOpen.get -> bool
+Microsoft.Maui.ITimePicker.IsOpen.set -> void
+*REMOVED*Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan
+Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan?
+Microsoft.Maui.IWebRequestInterceptingWebView
+Microsoft.Maui.IWebRequestInterceptingWebView.WebResourceRequested(Microsoft.Maui.WebResourceRequestedEventArgs! args) -> bool
+Microsoft.Maui.Platform.IAutoSizableCALayer
+Microsoft.Maui.Platform.IAutoSizableCALayer.AutoSizeToSuperLayer() -> void
+*REMOVED*Microsoft.Maui.Platform.MauiTimePicker.UpdateTime(System.TimeSpan time) -> void
+Microsoft.Maui.Platform.MauiTimePicker.UpdateTime(System.TimeSpan? time) -> void
+*REMOVED*Microsoft.Maui.Platform.MauiWebViewNavigationDelegate.DecidePolicy(WebKit.WKWebView! webView, WebKit.WKNavigationAction! navigationAction, System.Action<WebKit.WKNavigationActionPolicy>! decisionHandler) -> void
+*REMOVED*Microsoft.Maui.Platform.MauiWebViewNavigationDelegate.DidFailNavigation(WebKit.WKWebView! webView, WebKit.WKNavigation! navigation, Foundation.NSError! error) -> void
+*REMOVED*Microsoft.Maui.Platform.MauiWebViewNavigationDelegate.DidFailProvisionalNavigation(WebKit.WKWebView! webView, WebKit.WKNavigation! navigation, Foundation.NSError! error) -> void
+*REMOVED*Microsoft.Maui.Platform.MauiWebViewNavigationDelegate.DidFinishNavigation(WebKit.WKWebView! webView, WebKit.WKNavigation! navigation) -> void
+Microsoft.Maui.Platform.TextInputExtensions
+Microsoft.Maui.Platform.UIApplicationExtensions
+Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.SafeAreaEdges.Bottom.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Bottom.set -> void
+Microsoft.Maui.SafeAreaEdges.Equals(Microsoft.Maui.SafeAreaEdges other) -> bool
+Microsoft.Maui.SafeAreaEdges.GetEdge(int edge) -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Left.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Left.set -> void
+Microsoft.Maui.SafeAreaEdges.Right.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Right.set -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges() -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions horizontal, Microsoft.Maui.SafeAreaRegions vertical) -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions left, Microsoft.Maui.SafeAreaRegions top, Microsoft.Maui.SafeAreaRegions right, Microsoft.Maui.SafeAreaRegions bottom) -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions uniformValue) -> void
+Microsoft.Maui.SafeAreaEdges.SetEdge(int edge, Microsoft.Maui.SafeAreaRegions value) -> void
+Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Top.set -> void
+Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.All = Microsoft.Maui.SafeAreaRegions.SoftInput | Microsoft.Maui.SafeAreaRegions.Container -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Default = 4 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.None = 0 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.SoftInput = 1 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.ScrollToRequest.Deconstruct(out double HorizontalOffset, out double VerticalOffset, out bool Instant) -> void
+Microsoft.Maui.ScrollToRequest.ScrollToRequest(Microsoft.Maui.ScrollToRequest! original) -> void
+Microsoft.Maui.SwipeViewCloseRequest.Deconstruct(out bool Animated) -> void
+Microsoft.Maui.SwipeViewCloseRequest.SwipeViewCloseRequest(Microsoft.Maui.SwipeViewCloseRequest! original) -> void
+Microsoft.Maui.SwipeViewOpenRequest.Deconstruct(out Microsoft.Maui.OpenSwipeItem OpenSwipeItem, out bool Animated) -> void
+Microsoft.Maui.SwipeViewOpenRequest.SwipeViewOpenRequest(Microsoft.Maui.SwipeViewOpenRequest! original) -> void
+Microsoft.Maui.SwipeViewSwipeChanging.Deconstruct(out Microsoft.Maui.SwipeDirection SwipeDirection, out double Offset) -> void
+Microsoft.Maui.SwipeViewSwipeChanging.SwipeViewSwipeChanging(Microsoft.Maui.SwipeViewSwipeChanging! original) -> void
+Microsoft.Maui.SwipeViewSwipeEnded.Deconstruct(out Microsoft.Maui.SwipeDirection SwipeDirection, out bool IsOpen) -> void
+Microsoft.Maui.SwipeViewSwipeEnded.SwipeViewSwipeEnded(Microsoft.Maui.SwipeViewSwipeEnded! original) -> void
+Microsoft.Maui.SwipeViewSwipeStarted.Deconstruct(out Microsoft.Maui.SwipeDirection SwipeDirection) -> void
+Microsoft.Maui.SwipeViewSwipeStarted.SwipeViewSwipeStarted(Microsoft.Maui.SwipeViewSwipeStarted! original) -> void
+Microsoft.Maui.WebResourceRequestedEventArgs
+Microsoft.Maui.WebResourceRequestedEventArgs.Sender.get -> WebKit.WKWebView!
+Microsoft.Maui.WebResourceRequestedEventArgs.UrlSchemeTask.get -> WebKit.IWKUrlSchemeTask!
+override Microsoft.Maui.Converters.EasingTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.EasingTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.EasingTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.EasingTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.EasingTypeConverter.GetStandardValues(System.ComponentModel.ITypeDescriptorContext? context) -> System.ComponentModel.TypeConverter.StandardValuesCollection?
+override Microsoft.Maui.Converters.EasingTypeConverter.GetStandardValuesExclusive(System.ComponentModel.ITypeDescriptorContext? context) -> bool
+override Microsoft.Maui.Converters.EasingTypeConverter.GetStandardValuesSupported(System.ComponentModel.ITypeDescriptorContext? context) -> bool
+override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.FlexBasisTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexBasisTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexBasisTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexBasisTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.FlexDirectionTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexDirectionTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexDirectionTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexDirectionTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.FlexJustifyTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexJustifyTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexJustifyTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexJustifyTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value) -> object!
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object!
+override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.ThicknessTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.ThicknessTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Equals(object? obj) -> bool
+override Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.GetHashCode() -> int
+override Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.ToString() -> string!
+override Microsoft.Maui.Handlers.LayoutHandlerUpdate.Equals(object? obj) -> bool
+override Microsoft.Maui.Handlers.LayoutHandlerUpdate.GetHashCode() -> int
+override Microsoft.Maui.Handlers.LayoutHandlerUpdate.ToString() -> string!
+override Microsoft.Maui.Handlers.MenuBarHandlerUpdate.Equals(object? obj) -> bool
+override Microsoft.Maui.Handlers.MenuBarHandlerUpdate.GetHashCode() -> int
+override Microsoft.Maui.Handlers.MenuBarHandlerUpdate.ToString() -> string!
+override Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.Equals(object? obj) -> bool
+override Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.GetHashCode() -> int
+override Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.ToString() -> string!
+override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.Equals(object? obj) -> bool
+override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.GetHashCode() -> int
+override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.ToString() -> string!
+override Microsoft.Maui.Handlers.OpenWindowRequest.Equals(object? obj) -> bool
+override Microsoft.Maui.Handlers.OpenWindowRequest.GetHashCode() -> int
+override Microsoft.Maui.Handlers.OpenWindowRequest.ToString() -> string!
+override Microsoft.Maui.Handlers.ScrollViewHandler.SetVirtualView(Microsoft.Maui.IView! view) -> void
+override Microsoft.Maui.Platform.MauiScrollView.AdjustedContentInsetDidChange() -> void
+override Microsoft.Maui.Platform.MauiScrollView.SafeAreaInsetsDidChange() -> void
+*REMOVED*override Microsoft.Maui.Platform.MauiView.SafeAreaInsetsDidChange() -> void
+override Microsoft.Maui.SafeAreaEdges.Equals(object? obj) -> bool
+override Microsoft.Maui.SafeAreaEdges.GetHashCode() -> int
+override Microsoft.Maui.SafeAreaEdges.ToString() -> string!
+override Microsoft.Maui.ScrollToRequest.Equals(object? obj) -> bool
+override Microsoft.Maui.ScrollToRequest.GetHashCode() -> int
+override Microsoft.Maui.ScrollToRequest.ToString() -> string!
+override Microsoft.Maui.SwipeViewCloseRequest.Equals(object? obj) -> bool
+override Microsoft.Maui.SwipeViewCloseRequest.GetHashCode() -> int
+override Microsoft.Maui.SwipeViewCloseRequest.ToString() -> string!
+override Microsoft.Maui.SwipeViewOpenRequest.Equals(object? obj) -> bool
+override Microsoft.Maui.SwipeViewOpenRequest.GetHashCode() -> int
+override Microsoft.Maui.SwipeViewOpenRequest.ToString() -> string!
+override Microsoft.Maui.SwipeViewSwipeChanging.Equals(object? obj) -> bool
+override Microsoft.Maui.SwipeViewSwipeChanging.GetHashCode() -> int
+override Microsoft.Maui.SwipeViewSwipeChanging.ToString() -> string!
+override Microsoft.Maui.SwipeViewSwipeEnded.Equals(object? obj) -> bool
+override Microsoft.Maui.SwipeViewSwipeEnded.GetHashCode() -> int
+override Microsoft.Maui.SwipeViewSwipeEnded.ToString() -> string!
+override Microsoft.Maui.SwipeViewSwipeStarted.Equals(object? obj) -> bool
+override Microsoft.Maui.SwipeViewSwipeStarted.GetHashCode() -> int
+override Microsoft.Maui.SwipeViewSwipeStarted.ToString() -> string!
+*REMOVED*readonly Microsoft.Maui.PropertyMapper._mapper -> System.Collections.Generic.Dictionary<string!, System.Action<Microsoft.Maui.IElementHandler!, Microsoft.Maui.IElement!>!>!
+static Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.operator !=(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? left, Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.operator ==(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? left, Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.GraphicsViewHandler.MapBackground(Microsoft.Maui.Handlers.IGraphicsViewHandler! handler, Microsoft.Maui.IGraphicsView! graphicsView) -> void
+static Microsoft.Maui.Handlers.LayoutHandlerUpdate.operator !=(Microsoft.Maui.Handlers.LayoutHandlerUpdate? left, Microsoft.Maui.Handlers.LayoutHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.LayoutHandlerUpdate.operator ==(Microsoft.Maui.Handlers.LayoutHandlerUpdate? left, Microsoft.Maui.Handlers.LayoutHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.MenuBarHandlerUpdate.operator !=(Microsoft.Maui.Handlers.MenuBarHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.MenuBarHandlerUpdate.operator ==(Microsoft.Maui.Handlers.MenuBarHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.operator !=(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.operator ==(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.operator !=(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.operator ==(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.OpenWindowRequest.operator !=(Microsoft.Maui.Handlers.OpenWindowRequest? left, Microsoft.Maui.Handlers.OpenWindowRequest? right) -> bool
+static Microsoft.Maui.Handlers.OpenWindowRequest.operator ==(Microsoft.Maui.Handlers.OpenWindowRequest? left, Microsoft.Maui.Handlers.OpenWindowRequest? right) -> bool
+static Microsoft.Maui.Handlers.SearchBarHandler.MapReturnType(Microsoft.Maui.Handlers.ISearchBarHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
+static Microsoft.Maui.Hosting.AppHostBuilderExtensions.ConfigureEnvironmentVariables(this Microsoft.Maui.Hosting.MauiAppBuilder! builder) -> Microsoft.Maui.Hosting.MauiAppBuilder!
+*REMOVED*static Microsoft.Maui.Platform.ApplicationExtensions.CreatePlatformWindow(this UIKit.IUIApplicationDelegate! platformApplication, Microsoft.Maui.IApplication! application, UIKit.UIApplication! uiApplication, Foundation.NSDictionary! launchOptions) -> void
+static Microsoft.Maui.Platform.ApplicationExtensions.CreatePlatformWindow(this UIKit.IUIApplicationDelegate! platformApplication, Microsoft.Maui.IApplication! application, UIKit.UIApplication! uiApplication, Foundation.NSDictionary? launchOptions) -> void
+static Microsoft.Maui.Platform.SearchBarExtensions.UpdateReturnType(this UIKit.UISearchBar! uiSearchBar, Microsoft.Maui.ISearchBar! searchBar) -> void
+static Microsoft.Maui.Platform.TextInputExtensions.GetCursorPosition(this UIKit.IUITextInput! platformView, int cursorOffset = 0) -> int
+static Microsoft.Maui.Platform.TextInputExtensions.GetSelectedTextLength(this UIKit.IUITextInput! platformView) -> int
+static Microsoft.Maui.Platform.TextInputExtensions.SetTextRange(this UIKit.IUITextInput! platformView, int start, int selectedTextLength) -> void
+static Microsoft.Maui.Platform.UIApplicationExtensions.GetKeyWindow(this UIKit.UIApplication! application) -> UIKit.UIWindow?
+static Microsoft.Maui.Platform.UIApplicationExtensions.GetWindow(this UIKit.UIApplication! application) -> Microsoft.Maui.IWindow?
+static Microsoft.Maui.SafeAreaEdges.All.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.Default.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.None.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.operator !=(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
+static Microsoft.Maui.SafeAreaEdges.operator ==(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
+static Microsoft.Maui.ScrollToRequest.operator !=(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
+static Microsoft.Maui.ScrollToRequest.operator ==(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
+static Microsoft.Maui.SwipeViewCloseRequest.operator !=(Microsoft.Maui.SwipeViewCloseRequest? left, Microsoft.Maui.SwipeViewCloseRequest? right) -> bool
+static Microsoft.Maui.SwipeViewCloseRequest.operator ==(Microsoft.Maui.SwipeViewCloseRequest? left, Microsoft.Maui.SwipeViewCloseRequest? right) -> bool
+static Microsoft.Maui.SwipeViewOpenRequest.operator !=(Microsoft.Maui.SwipeViewOpenRequest? left, Microsoft.Maui.SwipeViewOpenRequest? right) -> bool
+static Microsoft.Maui.SwipeViewOpenRequest.operator ==(Microsoft.Maui.SwipeViewOpenRequest? left, Microsoft.Maui.SwipeViewOpenRequest? right) -> bool
+static Microsoft.Maui.SwipeViewSwipeChanging.operator !=(Microsoft.Maui.SwipeViewSwipeChanging? left, Microsoft.Maui.SwipeViewSwipeChanging? right) -> bool
+static Microsoft.Maui.SwipeViewSwipeChanging.operator ==(Microsoft.Maui.SwipeViewSwipeChanging? left, Microsoft.Maui.SwipeViewSwipeChanging? right) -> bool
+static Microsoft.Maui.SwipeViewSwipeEnded.operator !=(Microsoft.Maui.SwipeViewSwipeEnded? left, Microsoft.Maui.SwipeViewSwipeEnded? right) -> bool
+static Microsoft.Maui.SwipeViewSwipeEnded.operator ==(Microsoft.Maui.SwipeViewSwipeEnded? left, Microsoft.Maui.SwipeViewSwipeEnded? right) -> bool
+static Microsoft.Maui.SwipeViewSwipeStarted.operator !=(Microsoft.Maui.SwipeViewSwipeStarted? left, Microsoft.Maui.SwipeViewSwipeStarted? right) -> bool
+static Microsoft.Maui.SwipeViewSwipeStarted.operator ==(Microsoft.Maui.SwipeViewSwipeStarted? left, Microsoft.Maui.SwipeViewSwipeStarted? right) -> bool
+virtual Microsoft.Maui.Animations.Lerp.LerpDelegate.Invoke(object! start, object! end, double progress) -> object!
+virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate!
+virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Equals(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? other) -> bool
+virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.LayoutHandlerUpdate!
+virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.Equals(Microsoft.Maui.Handlers.LayoutHandlerUpdate? other) -> bool
+virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.MenuBarHandlerUpdate!
+virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.Equals(Microsoft.Maui.Handlers.MenuBarHandlerUpdate? other) -> bool
+virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate!
+virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.Equals(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? other) -> bool
+virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate!
+virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.Equals(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? other) -> bool
+virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.Handlers.OpenWindowRequest.<Clone>$() -> Microsoft.Maui.Handlers.OpenWindowRequest!
+virtual Microsoft.Maui.Handlers.OpenWindowRequest.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.Handlers.OpenWindowRequest.Equals(Microsoft.Maui.Handlers.OpenWindowRequest? other) -> bool
+virtual Microsoft.Maui.Handlers.OpenWindowRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.ApplicationSignificantTimeChange.Invoke(UIKit.UIApplication! application) -> void
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.ContinueUserActivity.Invoke(UIKit.UIApplication! application, Foundation.NSUserActivity! userActivity, UIKit.UIApplicationRestorationHandler! completionHandler) -> bool
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.DidEnterBackground.Invoke(UIKit.UIApplication! application) -> void
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.FinishedLaunching.Invoke(UIKit.UIApplication! application, Foundation.NSDictionary! launchOptions) -> bool
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.OnActivated.Invoke(UIKit.UIApplication! application) -> void
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.OnResignActivation.Invoke(UIKit.UIApplication! application) -> void
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.OpenUrl.Invoke(UIKit.UIApplication! app, Foundation.NSUrl! url, Foundation.NSDictionary! options) -> bool
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.PerformActionForShortcutItem.Invoke(UIKit.UIApplication! application, UIKit.UIApplicationShortcutItem! shortcutItem, UIKit.UIOperationHandler! completionHandler) -> void
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.PerformFetch.Invoke(UIKit.UIApplication! application, System.Action<UIKit.UIBackgroundFetchResult>! completionHandler) -> void
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneContinueUserActivity.Invoke(UIKit.UIScene! scene, Foundation.NSUserActivity! userActivity) -> bool
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneDidDisconnect.Invoke(UIKit.UIScene! scene) -> void
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneDidEnterBackground.Invoke(UIKit.UIScene! scene) -> void
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneDidFailToContinueUserActivity.Invoke(UIKit.UIScene! scene, string! userActivityType, Foundation.NSError! error) -> void
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneDidUpdateUserActivity.Invoke(UIKit.UIScene! scene, Foundation.NSUserActivity! userActivity) -> void
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneOnActivated.Invoke(UIKit.UIScene! scene) -> void
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneOnResignActivation.Invoke(UIKit.UIScene! scene) -> void
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneOpenUrl.Invoke(UIKit.UIScene! scene, Foundation.NSSet<UIKit.UIOpenUrlContext!>! urlContexts) -> bool
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneRestoreInteractionState.Invoke(UIKit.UIScene! scene, Foundation.NSUserActivity! stateRestorationActivity) -> void
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneWillConnect.Invoke(UIKit.UIScene! scene, UIKit.UISceneSession! session, UIKit.UISceneConnectionOptions! connectionOptions) -> void
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneWillContinueUserActivity.Invoke(UIKit.UIScene! scene, string! userActivityType) -> void
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneWillEnterForeground.Invoke(UIKit.UIScene! scene) -> void
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.WillEnterForeground.Invoke(UIKit.UIApplication! application) -> void
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.WillFinishLaunching.Invoke(UIKit.UIApplication! application, Foundation.NSDictionary? launchOptions) -> bool
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.WillTerminate.Invoke(UIKit.UIApplication! application) -> void
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.WindowSceneDidUpdateCoordinateSpace.Invoke(UIKit.UIWindowScene! windowScene, UIKit.IUICoordinateSpace! previousCoordinateSpace, UIKit.UIInterfaceOrientation previousInterfaceOrientation, UIKit.UITraitCollection! previousTraitCollection) -> void
+*REMOVED*virtual Microsoft.Maui.MauiUIApplicationDelegate.FinishedLaunching(UIKit.UIApplication! application, Foundation.NSDictionary! launchOptions) -> bool
+virtual Microsoft.Maui.MauiUIApplicationDelegate.FinishedLaunching(UIKit.UIApplication! application, Foundation.NSDictionary? launchOptions) -> bool
+*REMOVED*virtual Microsoft.Maui.MauiUIApplicationDelegate.WillFinishLaunching(UIKit.UIApplication! application, Foundation.NSDictionary! launchOptions) -> bool
+virtual Microsoft.Maui.MauiUIApplicationDelegate.WillFinishLaunching(UIKit.UIApplication! application, Foundation.NSDictionary? launchOptions) -> bool
+virtual Microsoft.Maui.Platform.MauiWebViewNavigationDelegate.DecidePolicy(WebKit.WKWebView! webView, WebKit.WKNavigationAction! navigationAction, System.Action<WebKit.WKNavigationActionPolicy>! decisionHandler) -> void
+virtual Microsoft.Maui.Platform.MauiWebViewNavigationDelegate.DidFailNavigation(WebKit.WKWebView! webView, WebKit.WKNavigation! navigation, Foundation.NSError! error) -> void
+virtual Microsoft.Maui.Platform.MauiWebViewNavigationDelegate.DidFailProvisionalNavigation(WebKit.WKWebView! webView, WebKit.WKNavigation! navigation, Foundation.NSError! error) -> void
+virtual Microsoft.Maui.Platform.MauiWebViewNavigationDelegate.DidFinishNavigation(WebKit.WKWebView! webView, WebKit.WKNavigation! navigation) -> void
+*REMOVED*virtual Microsoft.Maui.PropertyMapper.ClearKeyCache() -> void
+*REMOVED*virtual Microsoft.Maui.PropertyMapper.UpdateKeys.get -> System.Collections.Generic.IReadOnlyCollection<string!>!
+virtual Microsoft.Maui.ScrollToRequest.<Clone>$() -> Microsoft.Maui.ScrollToRequest!
+virtual Microsoft.Maui.ScrollToRequest.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.ScrollToRequest.Equals(Microsoft.Maui.ScrollToRequest? other) -> bool
+virtual Microsoft.Maui.ScrollToRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.SwipeViewCloseRequest.<Clone>$() -> Microsoft.Maui.SwipeViewCloseRequest!
+virtual Microsoft.Maui.SwipeViewCloseRequest.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.SwipeViewCloseRequest.Equals(Microsoft.Maui.SwipeViewCloseRequest? other) -> bool
+virtual Microsoft.Maui.SwipeViewCloseRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.SwipeViewOpenRequest.<Clone>$() -> Microsoft.Maui.SwipeViewOpenRequest!
+virtual Microsoft.Maui.SwipeViewOpenRequest.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.SwipeViewOpenRequest.Equals(Microsoft.Maui.SwipeViewOpenRequest? other) -> bool
+virtual Microsoft.Maui.SwipeViewOpenRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.SwipeViewSwipeChanging.<Clone>$() -> Microsoft.Maui.SwipeViewSwipeChanging!
+virtual Microsoft.Maui.SwipeViewSwipeChanging.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.SwipeViewSwipeChanging.Equals(Microsoft.Maui.SwipeViewSwipeChanging? other) -> bool
+virtual Microsoft.Maui.SwipeViewSwipeChanging.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.SwipeViewSwipeEnded.<Clone>$() -> Microsoft.Maui.SwipeViewSwipeEnded!
+virtual Microsoft.Maui.SwipeViewSwipeEnded.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.SwipeViewSwipeEnded.Equals(Microsoft.Maui.SwipeViewSwipeEnded? other) -> bool
+virtual Microsoft.Maui.SwipeViewSwipeEnded.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.SwipeViewSwipeStarted.<Clone>$() -> Microsoft.Maui.SwipeViewSwipeStarted!
+virtual Microsoft.Maui.SwipeViewSwipeStarted.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.SwipeViewSwipeStarted.Equals(Microsoft.Maui.SwipeViewSwipeStarted? other) -> bool
+virtual Microsoft.Maui.SwipeViewSwipeStarted.PrintMembers(System.Text.StringBuilder! builder) -> bool
diff --git a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index df1199186606..165055fa4309 100644
--- a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -60,20 +60,15 @@ Microsoft.Maui.Platform.TextInputExtensions
 Microsoft.Maui.Platform.UIApplicationExtensions
 Microsoft.Maui.SafeAreaEdges
 Microsoft.Maui.SafeAreaEdges.Bottom.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Bottom.set -> void
 Microsoft.Maui.SafeAreaEdges.Equals(Microsoft.Maui.SafeAreaEdges other) -> bool
 Microsoft.Maui.SafeAreaEdges.GetEdge(int edge) -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaEdges.Left.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Left.set -> void
 Microsoft.Maui.SafeAreaEdges.Right.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Right.set -> void
 Microsoft.Maui.SafeAreaEdges.SafeAreaEdges() -> void
 Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions horizontal, Microsoft.Maui.SafeAreaRegions vertical) -> void
 Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions left, Microsoft.Maui.SafeAreaRegions top, Microsoft.Maui.SafeAreaRegions right, Microsoft.Maui.SafeAreaRegions bottom) -> void
 Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions uniformValue) -> void
-Microsoft.Maui.SafeAreaEdges.SetEdge(int edge, Microsoft.Maui.SafeAreaRegions value) -> void
 Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Top.set -> void
 Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.All = Microsoft.Maui.SafeAreaRegions.SoftInput | Microsoft.Maui.SafeAreaRegions.Container -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
diff --git a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt.bak b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt.bak
new file mode 100644
index 000000000000..df1199186606
--- /dev/null
+++ b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt.bak
@@ -0,0 +1,309 @@
+#nullable enable
+Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter
+Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.SafeAreaEdgesTypeConverter() -> void
+Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.ContextFlyoutItemHandlerUpdate(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate! original) -> void
+Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
+Microsoft.Maui.Handlers.DataFlowDirection
+Microsoft.Maui.Handlers.DataFlowDirection.FromPlatform = 1 -> Microsoft.Maui.Handlers.DataFlowDirection
+Microsoft.Maui.Handlers.DataFlowDirection.ToPlatform = 0 -> Microsoft.Maui.Handlers.DataFlowDirection
+Microsoft.Maui.Handlers.LayoutHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IView! View) -> void
+Microsoft.Maui.Handlers.LayoutHandlerUpdate.LayoutHandlerUpdate(Microsoft.Maui.Handlers.LayoutHandlerUpdate! original) -> void
+Microsoft.Maui.Handlers.MenuBarHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuBarItem! MenuBarItem) -> void
+Microsoft.Maui.Handlers.MenuBarHandlerUpdate.MenuBarHandlerUpdate(Microsoft.Maui.Handlers.MenuBarHandlerUpdate! original) -> void
+Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
+Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.MenuBarItemHandlerUpdate(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate! original) -> void
+Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
+Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.MenuFlyoutSubItemHandlerUpdate(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate! original) -> void
+Microsoft.Maui.Handlers.OpenWindowRequest.Deconstruct(out Microsoft.Maui.IPersistedState? State) -> void
+Microsoft.Maui.Handlers.OpenWindowRequest.OpenWindowRequest(Microsoft.Maui.Handlers.OpenWindowRequest! original) -> void
+Microsoft.Maui.Hosting.MauiAppBuilder.Environment.get -> Microsoft.Maui.Hosting.MauiHostEnvironment!
+Microsoft.Maui.Hosting.MauiAppBuilder.Properties.get -> System.Collections.Generic.IDictionary<object!, object!>!
+Microsoft.Maui.Hosting.MauiHostEnvironment
+Microsoft.Maui.Hosting.MauiHostEnvironment.ApplicationName.get -> string!
+Microsoft.Maui.Hosting.MauiHostEnvironment.ApplicationName.set -> void
+Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootFileProvider.get -> Microsoft.Extensions.FileProviders.IFileProvider!
+Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootFileProvider.set -> void
+Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootPath.get -> string!
+Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootPath.set -> void
+Microsoft.Maui.Hosting.MauiHostEnvironment.EnvironmentName.get -> string!
+Microsoft.Maui.Hosting.MauiHostEnvironment.EnvironmentName.set -> void
+Microsoft.Maui.Hosting.MauiHostEnvironment.MauiHostEnvironment() -> void
+*REMOVED*Microsoft.Maui.IDatePicker.Date.get -> System.DateTime
+Microsoft.Maui.IDatePicker.Date.get -> System.DateTime?
+Microsoft.Maui.IDatePicker.IsOpen.get -> bool
+Microsoft.Maui.IDatePicker.IsOpen.set -> void
+*REMOVED*Microsoft.Maui.IDatePicker.MaximumDate.get -> System.DateTime
+Microsoft.Maui.IDatePicker.MaximumDate.get -> System.DateTime?
+*REMOVED*Microsoft.Maui.IDatePicker.MinimumDate.get -> System.DateTime
+Microsoft.Maui.IDatePicker.MinimumDate.get -> System.DateTime?
+Microsoft.Maui.IPicker.IsOpen.get -> bool
+Microsoft.Maui.IPicker.IsOpen.set -> void
+Microsoft.Maui.ISearchBar.ReturnType.get -> Microsoft.Maui.ReturnType
+Microsoft.Maui.ISearchBar.SearchIconColor.get -> Microsoft.Maui.Graphics.Color!
+Microsoft.Maui.ITimePicker.IsOpen.get -> bool
+Microsoft.Maui.ITimePicker.IsOpen.set -> void
+*REMOVED*Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan
+Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan?
+Microsoft.Maui.IWebRequestInterceptingWebView
+Microsoft.Maui.IWebRequestInterceptingWebView.WebResourceRequested(Microsoft.Maui.WebResourceRequestedEventArgs! args) -> bool
+Microsoft.Maui.IWindow.IsMaximizable.get -> bool
+Microsoft.Maui.IWindow.IsMinimizable.get -> bool
+Microsoft.Maui.Platform.IAutoSizableCALayer
+Microsoft.Maui.Platform.IAutoSizableCALayer.AutoSizeToSuperLayer() -> void
+*REMOVED*Microsoft.Maui.Platform.MauiTimePicker.UpdateTime(System.TimeSpan time) -> void
+Microsoft.Maui.Platform.MauiTimePicker.UpdateTime(System.TimeSpan? time) -> void
+*REMOVED*Microsoft.Maui.Platform.MauiWebViewNavigationDelegate.DecidePolicy(WebKit.WKWebView! webView, WebKit.WKNavigationAction! navigationAction, System.Action<WebKit.WKNavigationActionPolicy>! decisionHandler) -> void
+*REMOVED*Microsoft.Maui.Platform.MauiWebViewNavigationDelegate.DidFailNavigation(WebKit.WKWebView! webView, WebKit.WKNavigation! navigation, Foundation.NSError! error) -> void
+*REMOVED*Microsoft.Maui.Platform.MauiWebViewNavigationDelegate.DidFailProvisionalNavigation(WebKit.WKWebView! webView, WebKit.WKNavigation! navigation, Foundation.NSError! error) -> void
+*REMOVED*Microsoft.Maui.Platform.MauiWebViewNavigationDelegate.DidFinishNavigation(WebKit.WKWebView! webView, WebKit.WKNavigation! navigation) -> void
+Microsoft.Maui.Platform.TextInputExtensions
+Microsoft.Maui.Platform.UIApplicationExtensions
+Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.SafeAreaEdges.Bottom.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Bottom.set -> void
+Microsoft.Maui.SafeAreaEdges.Equals(Microsoft.Maui.SafeAreaEdges other) -> bool
+Microsoft.Maui.SafeAreaEdges.GetEdge(int edge) -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Left.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Left.set -> void
+Microsoft.Maui.SafeAreaEdges.Right.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Right.set -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges() -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions horizontal, Microsoft.Maui.SafeAreaRegions vertical) -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions left, Microsoft.Maui.SafeAreaRegions top, Microsoft.Maui.SafeAreaRegions right, Microsoft.Maui.SafeAreaRegions bottom) -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions uniformValue) -> void
+Microsoft.Maui.SafeAreaEdges.SetEdge(int edge, Microsoft.Maui.SafeAreaRegions value) -> void
+Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Top.set -> void
+Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.All = Microsoft.Maui.SafeAreaRegions.SoftInput | Microsoft.Maui.SafeAreaRegions.Container -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Default = 4 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.None = 0 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.SoftInput = 1 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.ScrollToRequest.Deconstruct(out double HorizontalOffset, out double VerticalOffset, out bool Instant) -> void
+Microsoft.Maui.ScrollToRequest.ScrollToRequest(Microsoft.Maui.ScrollToRequest! original) -> void
+Microsoft.Maui.SwipeViewCloseRequest.Deconstruct(out bool Animated) -> void
+Microsoft.Maui.SwipeViewCloseRequest.SwipeViewCloseRequest(Microsoft.Maui.SwipeViewCloseRequest! original) -> void
+Microsoft.Maui.SwipeViewOpenRequest.Deconstruct(out Microsoft.Maui.OpenSwipeItem OpenSwipeItem, out bool Animated) -> void
+Microsoft.Maui.SwipeViewOpenRequest.SwipeViewOpenRequest(Microsoft.Maui.SwipeViewOpenRequest! original) -> void
+Microsoft.Maui.SwipeViewSwipeChanging.Deconstruct(out Microsoft.Maui.SwipeDirection SwipeDirection, out double Offset) -> void
+Microsoft.Maui.SwipeViewSwipeChanging.SwipeViewSwipeChanging(Microsoft.Maui.SwipeViewSwipeChanging! original) -> void
+Microsoft.Maui.SwipeViewSwipeEnded.Deconstruct(out Microsoft.Maui.SwipeDirection SwipeDirection, out bool IsOpen) -> void
+Microsoft.Maui.SwipeViewSwipeEnded.SwipeViewSwipeEnded(Microsoft.Maui.SwipeViewSwipeEnded! original) -> void
+Microsoft.Maui.SwipeViewSwipeStarted.Deconstruct(out Microsoft.Maui.SwipeDirection SwipeDirection) -> void
+Microsoft.Maui.SwipeViewSwipeStarted.SwipeViewSwipeStarted(Microsoft.Maui.SwipeViewSwipeStarted! original) -> void
+Microsoft.Maui.WebResourceRequestedEventArgs
+Microsoft.Maui.WebResourceRequestedEventArgs.Sender.get -> WebKit.WKWebView!
+Microsoft.Maui.WebResourceRequestedEventArgs.UrlSchemeTask.get -> WebKit.IWKUrlSchemeTask!
+override Microsoft.Maui.Converters.EasingTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.EasingTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.EasingTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.EasingTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.EasingTypeConverter.GetStandardValues(System.ComponentModel.ITypeDescriptorContext? context) -> System.ComponentModel.TypeConverter.StandardValuesCollection?
+override Microsoft.Maui.Converters.EasingTypeConverter.GetStandardValuesExclusive(System.ComponentModel.ITypeDescriptorContext? context) -> bool
+override Microsoft.Maui.Converters.EasingTypeConverter.GetStandardValuesSupported(System.ComponentModel.ITypeDescriptorContext? context) -> bool
+override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.FlexBasisTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexBasisTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexBasisTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexBasisTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.FlexDirectionTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexDirectionTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexDirectionTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexDirectionTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.FlexJustifyTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexJustifyTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexJustifyTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexJustifyTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value) -> object!
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object!
+override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.ThicknessTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.ThicknessTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Equals(object? obj) -> bool
+override Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.GetHashCode() -> int
+override Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.ToString() -> string!
+override Microsoft.Maui.Handlers.LayoutHandlerUpdate.Equals(object? obj) -> bool
+override Microsoft.Maui.Handlers.LayoutHandlerUpdate.GetHashCode() -> int
+override Microsoft.Maui.Handlers.LayoutHandlerUpdate.ToString() -> string!
+override Microsoft.Maui.Handlers.MenuBarHandlerUpdate.Equals(object? obj) -> bool
+override Microsoft.Maui.Handlers.MenuBarHandlerUpdate.GetHashCode() -> int
+override Microsoft.Maui.Handlers.MenuBarHandlerUpdate.ToString() -> string!
+override Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.Equals(object? obj) -> bool
+override Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.GetHashCode() -> int
+override Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.ToString() -> string!
+override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.Equals(object? obj) -> bool
+override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.GetHashCode() -> int
+override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.ToString() -> string!
+override Microsoft.Maui.Handlers.OpenWindowRequest.Equals(object? obj) -> bool
+override Microsoft.Maui.Handlers.OpenWindowRequest.GetHashCode() -> int
+override Microsoft.Maui.Handlers.OpenWindowRequest.ToString() -> string!
+override Microsoft.Maui.Handlers.ScrollViewHandler.SetVirtualView(Microsoft.Maui.IView! view) -> void
+override Microsoft.Maui.Platform.MauiScrollView.AdjustedContentInsetDidChange() -> void
+override Microsoft.Maui.Platform.MauiScrollView.SafeAreaInsetsDidChange() -> void
+*REMOVED*override Microsoft.Maui.Platform.MauiView.SafeAreaInsetsDidChange() -> void
+override Microsoft.Maui.SafeAreaEdges.Equals(object? obj) -> bool
+override Microsoft.Maui.SafeAreaEdges.GetHashCode() -> int
+override Microsoft.Maui.SafeAreaEdges.ToString() -> string!
+override Microsoft.Maui.ScrollToRequest.Equals(object? obj) -> bool
+override Microsoft.Maui.ScrollToRequest.GetHashCode() -> int
+override Microsoft.Maui.ScrollToRequest.ToString() -> string!
+override Microsoft.Maui.SwipeViewCloseRequest.Equals(object? obj) -> bool
+override Microsoft.Maui.SwipeViewCloseRequest.GetHashCode() -> int
+override Microsoft.Maui.SwipeViewCloseRequest.ToString() -> string!
+override Microsoft.Maui.SwipeViewOpenRequest.Equals(object? obj) -> bool
+override Microsoft.Maui.SwipeViewOpenRequest.GetHashCode() -> int
+override Microsoft.Maui.SwipeViewOpenRequest.ToString() -> string!
+override Microsoft.Maui.SwipeViewSwipeChanging.Equals(object? obj) -> bool
+override Microsoft.Maui.SwipeViewSwipeChanging.GetHashCode() -> int
+override Microsoft.Maui.SwipeViewSwipeChanging.ToString() -> string!
+override Microsoft.Maui.SwipeViewSwipeEnded.Equals(object? obj) -> bool
+override Microsoft.Maui.SwipeViewSwipeEnded.GetHashCode() -> int
+override Microsoft.Maui.SwipeViewSwipeEnded.ToString() -> string!
+override Microsoft.Maui.SwipeViewSwipeStarted.Equals(object? obj) -> bool
+override Microsoft.Maui.SwipeViewSwipeStarted.GetHashCode() -> int
+override Microsoft.Maui.SwipeViewSwipeStarted.ToString() -> string!
+*REMOVED*readonly Microsoft.Maui.PropertyMapper._mapper -> System.Collections.Generic.Dictionary<string!, System.Action<Microsoft.Maui.IElementHandler!, Microsoft.Maui.IElement!>!>!
+static Microsoft.Maui.Handlers.ButtonHandler.MapBackground(Microsoft.Maui.Handlers.IButtonHandler! handler, Microsoft.Maui.IButton! button) -> void
+static Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.operator !=(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? left, Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.operator ==(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? left, Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.GraphicsViewHandler.MapBackground(Microsoft.Maui.Handlers.IGraphicsViewHandler! handler, Microsoft.Maui.IGraphicsView! graphicsView) -> void
+static Microsoft.Maui.Handlers.LayoutHandlerUpdate.operator !=(Microsoft.Maui.Handlers.LayoutHandlerUpdate? left, Microsoft.Maui.Handlers.LayoutHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.LayoutHandlerUpdate.operator ==(Microsoft.Maui.Handlers.LayoutHandlerUpdate? left, Microsoft.Maui.Handlers.LayoutHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.MenuBarHandlerUpdate.operator !=(Microsoft.Maui.Handlers.MenuBarHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.MenuBarHandlerUpdate.operator ==(Microsoft.Maui.Handlers.MenuBarHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.operator !=(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.operator ==(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.operator !=(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.operator ==(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.OpenWindowRequest.operator !=(Microsoft.Maui.Handlers.OpenWindowRequest? left, Microsoft.Maui.Handlers.OpenWindowRequest? right) -> bool
+static Microsoft.Maui.Handlers.OpenWindowRequest.operator ==(Microsoft.Maui.Handlers.OpenWindowRequest? left, Microsoft.Maui.Handlers.OpenWindowRequest? right) -> bool
+static Microsoft.Maui.Handlers.SearchBarHandler.MapReturnType(Microsoft.Maui.Handlers.ISearchBarHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
+static Microsoft.Maui.Hosting.AppHostBuilderExtensions.ConfigureEnvironmentVariables(this Microsoft.Maui.Hosting.MauiAppBuilder! builder) -> Microsoft.Maui.Hosting.MauiAppBuilder!
+*REMOVED*static Microsoft.Maui.Platform.ApplicationExtensions.CreatePlatformWindow(this UIKit.IUIApplicationDelegate! platformApplication, Microsoft.Maui.IApplication! application, UIKit.UIApplication! uiApplication, Foundation.NSDictionary! launchOptions) -> void
+static Microsoft.Maui.Platform.ApplicationExtensions.CreatePlatformWindow(this UIKit.IUIApplicationDelegate! platformApplication, Microsoft.Maui.IApplication! application, UIKit.UIApplication! uiApplication, Foundation.NSDictionary? launchOptions) -> void
+static Microsoft.Maui.Platform.SearchBarExtensions.UpdateReturnType(this UIKit.UISearchBar! uiSearchBar, Microsoft.Maui.ISearchBar! searchBar) -> void
+static Microsoft.Maui.Platform.TextInputExtensions.GetCursorPosition(this UIKit.IUITextInput! platformView, int cursorOffset = 0) -> int
+static Microsoft.Maui.Platform.TextInputExtensions.GetSelectedTextLength(this UIKit.IUITextInput! platformView) -> int
+static Microsoft.Maui.Platform.TextInputExtensions.SetTextRange(this UIKit.IUITextInput! platformView, int start, int selectedTextLength) -> void
+static Microsoft.Maui.Platform.UIApplicationExtensions.GetKeyWindow(this UIKit.UIApplication! application) -> UIKit.UIWindow?
+static Microsoft.Maui.Platform.UIApplicationExtensions.GetWindow(this UIKit.UIApplication! application) -> Microsoft.Maui.IWindow?
+static Microsoft.Maui.SafeAreaEdges.All.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.Default.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.None.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.operator !=(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
+static Microsoft.Maui.SafeAreaEdges.operator ==(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
+static Microsoft.Maui.ScrollToRequest.operator !=(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
+static Microsoft.Maui.ScrollToRequest.operator ==(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
+static Microsoft.Maui.SwipeViewCloseRequest.operator !=(Microsoft.Maui.SwipeViewCloseRequest? left, Microsoft.Maui.SwipeViewCloseRequest? right) -> bool
+static Microsoft.Maui.SwipeViewCloseRequest.operator ==(Microsoft.Maui.SwipeViewCloseRequest? left, Microsoft.Maui.SwipeViewCloseRequest? right) -> bool
+static Microsoft.Maui.SwipeViewOpenRequest.operator !=(Microsoft.Maui.SwipeViewOpenRequest? left, Microsoft.Maui.SwipeViewOpenRequest? right) -> bool
+static Microsoft.Maui.SwipeViewOpenRequest.operator ==(Microsoft.Maui.SwipeViewOpenRequest? left, Microsoft.Maui.SwipeViewOpenRequest? right) -> bool
+static Microsoft.Maui.SwipeViewSwipeChanging.operator !=(Microsoft.Maui.SwipeViewSwipeChanging? left, Microsoft.Maui.SwipeViewSwipeChanging? right) -> bool
+static Microsoft.Maui.SwipeViewSwipeChanging.operator ==(Microsoft.Maui.SwipeViewSwipeChanging? left, Microsoft.Maui.SwipeViewSwipeChanging? right) -> bool
+static Microsoft.Maui.SwipeViewSwipeEnded.operator !=(Microsoft.Maui.SwipeViewSwipeEnded? left, Microsoft.Maui.SwipeViewSwipeEnded? right) -> bool
+static Microsoft.Maui.SwipeViewSwipeEnded.operator ==(Microsoft.Maui.SwipeViewSwipeEnded? left, Microsoft.Maui.SwipeViewSwipeEnded? right) -> bool
+static Microsoft.Maui.SwipeViewSwipeStarted.operator !=(Microsoft.Maui.SwipeViewSwipeStarted? left, Microsoft.Maui.SwipeViewSwipeStarted? right) -> bool
+static Microsoft.Maui.SwipeViewSwipeStarted.operator ==(Microsoft.Maui.SwipeViewSwipeStarted? left, Microsoft.Maui.SwipeViewSwipeStarted? right) -> bool
+virtual Microsoft.Maui.Animations.Lerp.LerpDelegate.Invoke(object! start, object! end, double progress) -> object!
+virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate!
+virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Equals(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? other) -> bool
+virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.LayoutHandlerUpdate!
+virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.Equals(Microsoft.Maui.Handlers.LayoutHandlerUpdate? other) -> bool
+virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.MenuBarHandlerUpdate!
+virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.Equals(Microsoft.Maui.Handlers.MenuBarHandlerUpdate? other) -> bool
+virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate!
+virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.Equals(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? other) -> bool
+virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate!
+virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.Equals(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? other) -> bool
+virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.Handlers.OpenWindowRequest.<Clone>$() -> Microsoft.Maui.Handlers.OpenWindowRequest!
+virtual Microsoft.Maui.Handlers.OpenWindowRequest.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.Handlers.OpenWindowRequest.Equals(Microsoft.Maui.Handlers.OpenWindowRequest? other) -> bool
+virtual Microsoft.Maui.Handlers.OpenWindowRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.ApplicationSignificantTimeChange.Invoke(UIKit.UIApplication! application) -> void
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.ContinueUserActivity.Invoke(UIKit.UIApplication! application, Foundation.NSUserActivity! userActivity, UIKit.UIApplicationRestorationHandler! completionHandler) -> bool
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.DidEnterBackground.Invoke(UIKit.UIApplication! application) -> void
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.FinishedLaunching.Invoke(UIKit.UIApplication! application, Foundation.NSDictionary! launchOptions) -> bool
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.OnActivated.Invoke(UIKit.UIApplication! application) -> void
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.OnResignActivation.Invoke(UIKit.UIApplication! application) -> void
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.OpenUrl.Invoke(UIKit.UIApplication! app, Foundation.NSUrl! url, Foundation.NSDictionary! options) -> bool
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.PerformActionForShortcutItem.Invoke(UIKit.UIApplication! application, UIKit.UIApplicationShortcutItem! shortcutItem, UIKit.UIOperationHandler! completionHandler) -> void
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.PerformFetch.Invoke(UIKit.UIApplication! application, System.Action<UIKit.UIBackgroundFetchResult>! completionHandler) -> void
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneContinueUserActivity.Invoke(UIKit.UIScene! scene, Foundation.NSUserActivity! userActivity) -> bool
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneDidDisconnect.Invoke(UIKit.UIScene! scene) -> void
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneDidEnterBackground.Invoke(UIKit.UIScene! scene) -> void
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneDidFailToContinueUserActivity.Invoke(UIKit.UIScene! scene, string! userActivityType, Foundation.NSError! error) -> void
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneDidUpdateUserActivity.Invoke(UIKit.UIScene! scene, Foundation.NSUserActivity! userActivity) -> void
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneOnActivated.Invoke(UIKit.UIScene! scene) -> void
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneOnResignActivation.Invoke(UIKit.UIScene! scene) -> void
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneOpenUrl.Invoke(UIKit.UIScene! scene, Foundation.NSSet<UIKit.UIOpenUrlContext!>! urlContexts) -> bool
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneRestoreInteractionState.Invoke(UIKit.UIScene! scene, Foundation.NSUserActivity! stateRestorationActivity) -> void
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneWillConnect.Invoke(UIKit.UIScene! scene, UIKit.UISceneSession! session, UIKit.UISceneConnectionOptions! connectionOptions) -> void
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneWillContinueUserActivity.Invoke(UIKit.UIScene! scene, string! userActivityType) -> void
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneWillEnterForeground.Invoke(UIKit.UIScene! scene) -> void
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.WillEnterForeground.Invoke(UIKit.UIApplication! application) -> void
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.WillFinishLaunching.Invoke(UIKit.UIApplication! application, Foundation.NSDictionary? launchOptions) -> bool
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.WillTerminate.Invoke(UIKit.UIApplication! application) -> void
+virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.WindowSceneDidUpdateCoordinateSpace.Invoke(UIKit.UIWindowScene! windowScene, UIKit.IUICoordinateSpace! previousCoordinateSpace, UIKit.UIInterfaceOrientation previousInterfaceOrientation, UIKit.UITraitCollection! previousTraitCollection) -> void
+*REMOVED*virtual Microsoft.Maui.MauiUIApplicationDelegate.FinishedLaunching(UIKit.UIApplication! application, Foundation.NSDictionary! launchOptions) -> bool
+virtual Microsoft.Maui.MauiUIApplicationDelegate.FinishedLaunching(UIKit.UIApplication! application, Foundation.NSDictionary? launchOptions) -> bool
+*REMOVED*virtual Microsoft.Maui.MauiUIApplicationDelegate.WillFinishLaunching(UIKit.UIApplication! application, Foundation.NSDictionary! launchOptions) -> bool
+virtual Microsoft.Maui.MauiUIApplicationDelegate.WillFinishLaunching(UIKit.UIApplication! application, Foundation.NSDictionary? launchOptions) -> bool
+virtual Microsoft.Maui.Platform.MauiWebViewNavigationDelegate.DecidePolicy(WebKit.WKWebView! webView, WebKit.WKNavigationAction! navigationAction, System.Action<WebKit.WKNavigationActionPolicy>! decisionHandler) -> void
+virtual Microsoft.Maui.Platform.MauiWebViewNavigationDelegate.DidFailNavigation(WebKit.WKWebView! webView, WebKit.WKNavigation! navigation, Foundation.NSError! error) -> void
+virtual Microsoft.Maui.Platform.MauiWebViewNavigationDelegate.DidFailProvisionalNavigation(WebKit.WKWebView! webView, WebKit.WKNavigation! navigation, Foundation.NSError! error) -> void
+virtual Microsoft.Maui.Platform.MauiWebViewNavigationDelegate.DidFinishNavigation(WebKit.WKWebView! webView, WebKit.WKNavigation! navigation) -> void
+*REMOVED*virtual Microsoft.Maui.PropertyMapper.ClearKeyCache() -> void
+*REMOVED*virtual Microsoft.Maui.PropertyMapper.UpdateKeys.get -> System.Collections.Generic.IReadOnlyCollection<string!>!
+virtual Microsoft.Maui.ScrollToRequest.<Clone>$() -> Microsoft.Maui.ScrollToRequest!
+virtual Microsoft.Maui.ScrollToRequest.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.ScrollToRequest.Equals(Microsoft.Maui.ScrollToRequest? other) -> bool
+virtual Microsoft.Maui.ScrollToRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.SwipeViewCloseRequest.<Clone>$() -> Microsoft.Maui.SwipeViewCloseRequest!
+virtual Microsoft.Maui.SwipeViewCloseRequest.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.SwipeViewCloseRequest.Equals(Microsoft.Maui.SwipeViewCloseRequest? other) -> bool
+virtual Microsoft.Maui.SwipeViewCloseRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.SwipeViewOpenRequest.<Clone>$() -> Microsoft.Maui.SwipeViewOpenRequest!
+virtual Microsoft.Maui.SwipeViewOpenRequest.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.SwipeViewOpenRequest.Equals(Microsoft.Maui.SwipeViewOpenRequest? other) -> bool
+virtual Microsoft.Maui.SwipeViewOpenRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.SwipeViewSwipeChanging.<Clone>$() -> Microsoft.Maui.SwipeViewSwipeChanging!
+virtual Microsoft.Maui.SwipeViewSwipeChanging.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.SwipeViewSwipeChanging.Equals(Microsoft.Maui.SwipeViewSwipeChanging? other) -> bool
+virtual Microsoft.Maui.SwipeViewSwipeChanging.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.SwipeViewSwipeEnded.<Clone>$() -> Microsoft.Maui.SwipeViewSwipeEnded!
+virtual Microsoft.Maui.SwipeViewSwipeEnded.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.SwipeViewSwipeEnded.Equals(Microsoft.Maui.SwipeViewSwipeEnded? other) -> bool
+virtual Microsoft.Maui.SwipeViewSwipeEnded.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.SwipeViewSwipeStarted.<Clone>$() -> Microsoft.Maui.SwipeViewSwipeStarted!
+virtual Microsoft.Maui.SwipeViewSwipeStarted.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.SwipeViewSwipeStarted.Equals(Microsoft.Maui.SwipeViewSwipeStarted? other) -> bool
+virtual Microsoft.Maui.SwipeViewSwipeStarted.PrintMembers(System.Text.StringBuilder! builder) -> bool
diff --git a/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt.bak b/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt.bak
new file mode 100644
index 000000000000..e7572c1b3e2b
--- /dev/null
+++ b/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt.bak
@@ -0,0 +1,222 @@
+#nullable enable
+Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter
+Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.SafeAreaEdgesTypeConverter() -> void
+Microsoft.Maui.FontManager.GetFontFamily(string? fontFamily) -> string!
+*REMOVED*Microsoft.Maui.FontManager.GetFontFamily(string? fontFamliy) -> string!
+Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.ContextFlyoutItemHandlerUpdate(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate! original) -> void
+Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
+Microsoft.Maui.Handlers.DataFlowDirection
+Microsoft.Maui.Handlers.DataFlowDirection.FromPlatform = 1 -> Microsoft.Maui.Handlers.DataFlowDirection
+Microsoft.Maui.Handlers.DataFlowDirection.ToPlatform = 0 -> Microsoft.Maui.Handlers.DataFlowDirection
+Microsoft.Maui.Handlers.LayoutHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IView! View) -> void
+Microsoft.Maui.Handlers.LayoutHandlerUpdate.LayoutHandlerUpdate(Microsoft.Maui.Handlers.LayoutHandlerUpdate! original) -> void
+Microsoft.Maui.Handlers.MenuBarHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuBarItem! MenuBarItem) -> void
+Microsoft.Maui.Handlers.MenuBarHandlerUpdate.MenuBarHandlerUpdate(Microsoft.Maui.Handlers.MenuBarHandlerUpdate! original) -> void
+Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
+Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.MenuBarItemHandlerUpdate(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate! original) -> void
+Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
+Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.MenuFlyoutSubItemHandlerUpdate(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate! original) -> void
+Microsoft.Maui.Handlers.OpenWindowRequest.Deconstruct(out Microsoft.Maui.IPersistedState? State) -> void
+Microsoft.Maui.Handlers.OpenWindowRequest.OpenWindowRequest(Microsoft.Maui.Handlers.OpenWindowRequest! original) -> void
+Microsoft.Maui.Hosting.MauiAppBuilder.Environment.get -> Microsoft.Maui.Hosting.MauiHostEnvironment!
+Microsoft.Maui.Hosting.MauiAppBuilder.Properties.get -> System.Collections.Generic.IDictionary<object!, object!>!
+Microsoft.Maui.Hosting.MauiHostEnvironment
+Microsoft.Maui.Hosting.MauiHostEnvironment.ApplicationName.get -> string!
+Microsoft.Maui.Hosting.MauiHostEnvironment.ApplicationName.set -> void
+Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootFileProvider.get -> Microsoft.Extensions.FileProviders.IFileProvider!
+Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootFileProvider.set -> void
+Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootPath.get -> string!
+Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootPath.set -> void
+Microsoft.Maui.Hosting.MauiHostEnvironment.EnvironmentName.get -> string!
+Microsoft.Maui.Hosting.MauiHostEnvironment.EnvironmentName.set -> void
+Microsoft.Maui.Hosting.MauiHostEnvironment.MauiHostEnvironment() -> void
+*REMOVED*Microsoft.Maui.IDatePicker.Date.get -> System.DateTime
+Microsoft.Maui.IDatePicker.Date.get -> System.DateTime?
+*REMOVED*Microsoft.Maui.IDatePicker.MaximumDate.get -> System.DateTime
+Microsoft.Maui.IDatePicker.MaximumDate.get -> System.DateTime?
+*REMOVED*Microsoft.Maui.IDatePicker.MinimumDate.get -> System.DateTime
+Microsoft.Maui.IDatePicker.MinimumDate.get -> System.DateTime?
+Microsoft.Maui.ISearchBar.ReturnType.get -> Microsoft.Maui.ReturnType
+Microsoft.Maui.ISearchBar.SearchIconColor.get -> Microsoft.Maui.Graphics.Color!
+*REMOVED*Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan
+Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan?
+Microsoft.Maui.ScrollToRequest.Deconstruct(out double HorizontalOffset, out double VerticalOffset, out bool Instant) -> void
+Microsoft.Maui.ScrollToRequest.ScrollToRequest(Microsoft.Maui.ScrollToRequest! original) -> void
+Microsoft.Maui.SwipeViewCloseRequest.Deconstruct(out bool Animated) -> void
+Microsoft.Maui.SwipeViewCloseRequest.SwipeViewCloseRequest(Microsoft.Maui.SwipeViewCloseRequest! original) -> void
+Microsoft.Maui.SwipeViewOpenRequest.Deconstruct(out Microsoft.Maui.OpenSwipeItem OpenSwipeItem, out bool Animated) -> void
+Microsoft.Maui.SwipeViewOpenRequest.SwipeViewOpenRequest(Microsoft.Maui.SwipeViewOpenRequest! original) -> void
+Microsoft.Maui.SwipeViewSwipeChanging.Deconstruct(out Microsoft.Maui.SwipeDirection SwipeDirection, out double Offset) -> void
+Microsoft.Maui.SwipeViewSwipeChanging.SwipeViewSwipeChanging(Microsoft.Maui.SwipeViewSwipeChanging! original) -> void
+Microsoft.Maui.SwipeViewSwipeEnded.Deconstruct(out Microsoft.Maui.SwipeDirection SwipeDirection, out bool IsOpen) -> void
+Microsoft.Maui.SwipeViewSwipeEnded.SwipeViewSwipeEnded(Microsoft.Maui.SwipeViewSwipeEnded! original) -> void
+Microsoft.Maui.SwipeViewSwipeStarted.Deconstruct(out Microsoft.Maui.SwipeDirection SwipeDirection) -> void
+Microsoft.Maui.SwipeViewSwipeStarted.SwipeViewSwipeStarted(Microsoft.Maui.SwipeViewSwipeStarted! original) -> void
+override Microsoft.Maui.Converters.EasingTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.EasingTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.EasingTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.EasingTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.EasingTypeConverter.GetStandardValues(System.ComponentModel.ITypeDescriptorContext? context) -> System.ComponentModel.TypeConverter.StandardValuesCollection?
+override Microsoft.Maui.Converters.EasingTypeConverter.GetStandardValuesExclusive(System.ComponentModel.ITypeDescriptorContext? context) -> bool
+override Microsoft.Maui.Converters.EasingTypeConverter.GetStandardValuesSupported(System.ComponentModel.ITypeDescriptorContext? context) -> bool
+override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.FlexBasisTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexBasisTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexBasisTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexBasisTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.FlexDirectionTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexDirectionTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexDirectionTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexDirectionTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.FlexJustifyTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexJustifyTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexJustifyTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexJustifyTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value) -> object!
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object!
+override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.ThicknessTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.ThicknessTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Equals(object? obj) -> bool
+override Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.GetHashCode() -> int
+override Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.ToString() -> string!
+override Microsoft.Maui.Handlers.LayoutHandlerUpdate.Equals(object? obj) -> bool
+override Microsoft.Maui.Handlers.LayoutHandlerUpdate.GetHashCode() -> int
+override Microsoft.Maui.Handlers.LayoutHandlerUpdate.ToString() -> string!
+override Microsoft.Maui.Handlers.MenuBarHandlerUpdate.Equals(object? obj) -> bool
+override Microsoft.Maui.Handlers.MenuBarHandlerUpdate.GetHashCode() -> int
+override Microsoft.Maui.Handlers.MenuBarHandlerUpdate.ToString() -> string!
+override Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.Equals(object? obj) -> bool
+override Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.GetHashCode() -> int
+override Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.ToString() -> string!
+override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.Equals(object? obj) -> bool
+override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.GetHashCode() -> int
+override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.ToString() -> string!
+override Microsoft.Maui.Handlers.OpenWindowRequest.Equals(object? obj) -> bool
+override Microsoft.Maui.Handlers.OpenWindowRequest.GetHashCode() -> int
+override Microsoft.Maui.Handlers.OpenWindowRequest.ToString() -> string!
+override Microsoft.Maui.ScrollToRequest.Equals(object? obj) -> bool
+override Microsoft.Maui.ScrollToRequest.GetHashCode() -> int
+override Microsoft.Maui.ScrollToRequest.ToString() -> string!
+override Microsoft.Maui.SwipeViewCloseRequest.Equals(object? obj) -> bool
+override Microsoft.Maui.SwipeViewCloseRequest.GetHashCode() -> int
+override Microsoft.Maui.SwipeViewCloseRequest.ToString() -> string!
+override Microsoft.Maui.SwipeViewOpenRequest.Equals(object? obj) -> bool
+override Microsoft.Maui.SwipeViewOpenRequest.GetHashCode() -> int
+override Microsoft.Maui.SwipeViewOpenRequest.ToString() -> string!
+override Microsoft.Maui.SwipeViewSwipeChanging.Equals(object? obj) -> bool
+override Microsoft.Maui.SwipeViewSwipeChanging.GetHashCode() -> int
+override Microsoft.Maui.SwipeViewSwipeChanging.ToString() -> string!
+override Microsoft.Maui.SwipeViewSwipeEnded.Equals(object? obj) -> bool
+override Microsoft.Maui.SwipeViewSwipeEnded.GetHashCode() -> int
+override Microsoft.Maui.SwipeViewSwipeEnded.ToString() -> string!
+override Microsoft.Maui.SwipeViewSwipeStarted.Equals(object? obj) -> bool
+override Microsoft.Maui.SwipeViewSwipeStarted.GetHashCode() -> int
+override Microsoft.Maui.SwipeViewSwipeStarted.ToString() -> string!
+*REMOVED*readonly Microsoft.Maui.PropertyMapper._mapper -> System.Collections.Generic.Dictionary<string!, System.Action<Microsoft.Maui.IElementHandler!, Microsoft.Maui.IElement!>!>!
+static Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.operator !=(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? left, Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.operator ==(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? left, Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.LayoutHandlerUpdate.operator !=(Microsoft.Maui.Handlers.LayoutHandlerUpdate? left, Microsoft.Maui.Handlers.LayoutHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.LayoutHandlerUpdate.operator ==(Microsoft.Maui.Handlers.LayoutHandlerUpdate? left, Microsoft.Maui.Handlers.LayoutHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.MenuBarHandlerUpdate.operator !=(Microsoft.Maui.Handlers.MenuBarHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.MenuBarHandlerUpdate.operator ==(Microsoft.Maui.Handlers.MenuBarHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.operator !=(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.operator ==(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.operator !=(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.operator ==(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.OpenWindowRequest.operator !=(Microsoft.Maui.Handlers.OpenWindowRequest? left, Microsoft.Maui.Handlers.OpenWindowRequest? right) -> bool
+static Microsoft.Maui.Handlers.OpenWindowRequest.operator ==(Microsoft.Maui.Handlers.OpenWindowRequest? left, Microsoft.Maui.Handlers.OpenWindowRequest? right) -> bool
+static Microsoft.Maui.Handlers.SearchBarHandler.MapReturnType(Microsoft.Maui.Handlers.ISearchBarHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
+static Microsoft.Maui.Hosting.AppHostBuilderExtensions.ConfigureEnvironmentVariables(this Microsoft.Maui.Hosting.MauiAppBuilder! builder) -> Microsoft.Maui.Hosting.MauiAppBuilder!
+static Microsoft.Maui.ScrollToRequest.operator !=(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
+static Microsoft.Maui.ScrollToRequest.operator ==(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
+static Microsoft.Maui.SwipeViewCloseRequest.operator !=(Microsoft.Maui.SwipeViewCloseRequest? left, Microsoft.Maui.SwipeViewCloseRequest? right) -> bool
+static Microsoft.Maui.SwipeViewCloseRequest.operator ==(Microsoft.Maui.SwipeViewCloseRequest? left, Microsoft.Maui.SwipeViewCloseRequest? right) -> bool
+static Microsoft.Maui.SwipeViewOpenRequest.operator !=(Microsoft.Maui.SwipeViewOpenRequest? left, Microsoft.Maui.SwipeViewOpenRequest? right) -> bool
+static Microsoft.Maui.SwipeViewOpenRequest.operator ==(Microsoft.Maui.SwipeViewOpenRequest? left, Microsoft.Maui.SwipeViewOpenRequest? right) -> bool
+static Microsoft.Maui.SwipeViewSwipeChanging.operator !=(Microsoft.Maui.SwipeViewSwipeChanging? left, Microsoft.Maui.SwipeViewSwipeChanging? right) -> bool
+static Microsoft.Maui.SwipeViewSwipeChanging.operator ==(Microsoft.Maui.SwipeViewSwipeChanging? left, Microsoft.Maui.SwipeViewSwipeChanging? right) -> bool
+static Microsoft.Maui.SwipeViewSwipeEnded.operator !=(Microsoft.Maui.SwipeViewSwipeEnded? left, Microsoft.Maui.SwipeViewSwipeEnded? right) -> bool
+static Microsoft.Maui.SwipeViewSwipeEnded.operator ==(Microsoft.Maui.SwipeViewSwipeEnded? left, Microsoft.Maui.SwipeViewSwipeEnded? right) -> bool
+static Microsoft.Maui.SwipeViewSwipeStarted.operator !=(Microsoft.Maui.SwipeViewSwipeStarted? left, Microsoft.Maui.SwipeViewSwipeStarted? right) -> bool
+static Microsoft.Maui.SwipeViewSwipeStarted.operator ==(Microsoft.Maui.SwipeViewSwipeStarted? left, Microsoft.Maui.SwipeViewSwipeStarted? right) -> bool
+virtual Microsoft.Maui.Animations.Lerp.LerpDelegate.Invoke(object! start, object! end, double progress) -> object!
+virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate!
+virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Equals(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? other) -> bool
+virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.LayoutHandlerUpdate!
+virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.Equals(Microsoft.Maui.Handlers.LayoutHandlerUpdate? other) -> bool
+virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.MenuBarHandlerUpdate!
+virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.Equals(Microsoft.Maui.Handlers.MenuBarHandlerUpdate? other) -> bool
+virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate!
+virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.Equals(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? other) -> bool
+virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate!
+virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.Equals(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? other) -> bool
+virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.Handlers.OpenWindowRequest.<Clone>$() -> Microsoft.Maui.Handlers.OpenWindowRequest!
+virtual Microsoft.Maui.Handlers.OpenWindowRequest.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.Handlers.OpenWindowRequest.Equals(Microsoft.Maui.Handlers.OpenWindowRequest? other) -> bool
+virtual Microsoft.Maui.Handlers.OpenWindowRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.LifecycleEvents.TizenLifecycle.OnAppControlReceived.Invoke(Tizen.Applications.CoreApplication! application, Tizen.Applications.AppControlReceivedEventArgs! e) -> void
+virtual Microsoft.Maui.LifecycleEvents.TizenLifecycle.OnCreate.Invoke(Tizen.Applications.CoreApplication! application) -> void
+virtual Microsoft.Maui.LifecycleEvents.TizenLifecycle.OnDeviceOrientationChanged.Invoke(Tizen.Applications.CoreApplication! application, Tizen.Applications.DeviceOrientationEventArgs! e) -> void
+virtual Microsoft.Maui.LifecycleEvents.TizenLifecycle.OnLocaleChanged.Invoke(Tizen.Applications.CoreApplication! application, Tizen.Applications.LocaleChangedEventArgs! e) -> void
+virtual Microsoft.Maui.LifecycleEvents.TizenLifecycle.OnLowBattery.Invoke(Tizen.Applications.CoreApplication! application, Tizen.Applications.LowBatteryEventArgs! e) -> void
+virtual Microsoft.Maui.LifecycleEvents.TizenLifecycle.OnLowMemory.Invoke(Tizen.Applications.CoreApplication! application, Tizen.Applications.LowMemoryEventArgs! e) -> void
+virtual Microsoft.Maui.LifecycleEvents.TizenLifecycle.OnPause.Invoke(Tizen.Applications.CoreApplication! application) -> void
+virtual Microsoft.Maui.LifecycleEvents.TizenLifecycle.OnPreCreate.Invoke(Tizen.Applications.CoreApplication! application) -> void
+virtual Microsoft.Maui.LifecycleEvents.TizenLifecycle.OnRegionFormatChanged.Invoke(Tizen.Applications.CoreApplication! application, Tizen.Applications.RegionFormatChangedEventArgs! e) -> void
+virtual Microsoft.Maui.LifecycleEvents.TizenLifecycle.OnResume.Invoke(Tizen.Applications.CoreApplication! application) -> void
+virtual Microsoft.Maui.LifecycleEvents.TizenLifecycle.OnTerminate.Invoke(Tizen.Applications.CoreApplication! application) -> void
+*REMOVED*virtual Microsoft.Maui.PropertyMapper.ClearKeyCache() -> void
+*REMOVED*virtual Microsoft.Maui.PropertyMapper.UpdateKeys.get -> System.Collections.Generic.IReadOnlyCollection<string!>!
+virtual Microsoft.Maui.ScrollToRequest.<Clone>$() -> Microsoft.Maui.ScrollToRequest!
+virtual Microsoft.Maui.ScrollToRequest.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.ScrollToRequest.Equals(Microsoft.Maui.ScrollToRequest? other) -> bool
+virtual Microsoft.Maui.ScrollToRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.SwipeViewCloseRequest.<Clone>$() -> Microsoft.Maui.SwipeViewCloseRequest!
+virtual Microsoft.Maui.SwipeViewCloseRequest.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.SwipeViewCloseRequest.Equals(Microsoft.Maui.SwipeViewCloseRequest? other) -> bool
+virtual Microsoft.Maui.SwipeViewCloseRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.SwipeViewOpenRequest.<Clone>$() -> Microsoft.Maui.SwipeViewOpenRequest!
+virtual Microsoft.Maui.SwipeViewOpenRequest.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.SwipeViewOpenRequest.Equals(Microsoft.Maui.SwipeViewOpenRequest? other) -> bool
+virtual Microsoft.Maui.SwipeViewOpenRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.SwipeViewSwipeChanging.<Clone>$() -> Microsoft.Maui.SwipeViewSwipeChanging!
+virtual Microsoft.Maui.SwipeViewSwipeChanging.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.SwipeViewSwipeChanging.Equals(Microsoft.Maui.SwipeViewSwipeChanging? other) -> bool
+virtual Microsoft.Maui.SwipeViewSwipeChanging.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.SwipeViewSwipeEnded.<Clone>$() -> Microsoft.Maui.SwipeViewSwipeEnded!
+virtual Microsoft.Maui.SwipeViewSwipeEnded.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.SwipeViewSwipeEnded.Equals(Microsoft.Maui.SwipeViewSwipeEnded? other) -> bool
+virtual Microsoft.Maui.SwipeViewSwipeEnded.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.SwipeViewSwipeStarted.<Clone>$() -> Microsoft.Maui.SwipeViewSwipeStarted!
+virtual Microsoft.Maui.SwipeViewSwipeStarted.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.SwipeViewSwipeStarted.Equals(Microsoft.Maui.SwipeViewSwipeStarted? other) -> bool
+virtual Microsoft.Maui.SwipeViewSwipeStarted.PrintMembers(System.Text.StringBuilder! builder) -> bool
diff --git a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index e0d0f8973c9e..585b1f998bb4 100644
--- a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -51,20 +51,15 @@ Microsoft.Maui.IWindow.IsMinimizable.get -> bool
 Microsoft.Maui.Platform.CalendarDatePickerExtensions
 Microsoft.Maui.SafeAreaEdges
 Microsoft.Maui.SafeAreaEdges.Bottom.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Bottom.set -> void
 Microsoft.Maui.SafeAreaEdges.Equals(Microsoft.Maui.SafeAreaEdges other) -> bool
 Microsoft.Maui.SafeAreaEdges.GetEdge(int edge) -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaEdges.Left.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Left.set -> void
 Microsoft.Maui.SafeAreaEdges.Right.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Right.set -> void
 Microsoft.Maui.SafeAreaEdges.SafeAreaEdges() -> void
 Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions horizontal, Microsoft.Maui.SafeAreaRegions vertical) -> void
 Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions left, Microsoft.Maui.SafeAreaRegions top, Microsoft.Maui.SafeAreaRegions right, Microsoft.Maui.SafeAreaRegions bottom) -> void
 Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions uniformValue) -> void
-Microsoft.Maui.SafeAreaEdges.SetEdge(int edge, Microsoft.Maui.SafeAreaRegions value) -> void
 Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Top.set -> void
 Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.All = Microsoft.Maui.SafeAreaRegions.SoftInput | Microsoft.Maui.SafeAreaRegions.Container -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
diff --git a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt.bak b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt.bak
new file mode 100644
index 000000000000..e0d0f8973c9e
--- /dev/null
+++ b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt.bak
@@ -0,0 +1,273 @@
+#nullable enable
+Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter
+Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.SafeAreaEdgesTypeConverter() -> void
+Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.ContextFlyoutItemHandlerUpdate(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate! original) -> void
+Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
+Microsoft.Maui.Handlers.DataFlowDirection
+Microsoft.Maui.Handlers.DataFlowDirection.FromPlatform = 1 -> Microsoft.Maui.Handlers.DataFlowDirection
+Microsoft.Maui.Handlers.DataFlowDirection.ToPlatform = 0 -> Microsoft.Maui.Handlers.DataFlowDirection
+Microsoft.Maui.Handlers.LayoutHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IView! View) -> void
+Microsoft.Maui.Handlers.LayoutHandlerUpdate.LayoutHandlerUpdate(Microsoft.Maui.Handlers.LayoutHandlerUpdate! original) -> void
+Microsoft.Maui.Handlers.MenuBarHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuBarItem! MenuBarItem) -> void
+Microsoft.Maui.Handlers.MenuBarHandlerUpdate.MenuBarHandlerUpdate(Microsoft.Maui.Handlers.MenuBarHandlerUpdate! original) -> void
+Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
+Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.MenuBarItemHandlerUpdate(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate! original) -> void
+Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
+Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.MenuFlyoutSubItemHandlerUpdate(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate! original) -> void
+Microsoft.Maui.Handlers.OpenWindowRequest.Deconstruct(out Microsoft.Maui.IPersistedState? State, out Microsoft.UI.Xaml.LaunchActivatedEventArgs? LaunchArgs) -> void
+Microsoft.Maui.Handlers.OpenWindowRequest.OpenWindowRequest(Microsoft.Maui.Handlers.OpenWindowRequest! original) -> void
+Microsoft.Maui.Hosting.MauiAppBuilder.Environment.get -> Microsoft.Maui.Hosting.MauiHostEnvironment!
+Microsoft.Maui.Hosting.MauiAppBuilder.Properties.get -> System.Collections.Generic.IDictionary<object!, object!>!
+Microsoft.Maui.Hosting.MauiHostEnvironment
+Microsoft.Maui.Hosting.MauiHostEnvironment.ApplicationName.get -> string!
+Microsoft.Maui.Hosting.MauiHostEnvironment.ApplicationName.set -> void
+Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootFileProvider.get -> Microsoft.Extensions.FileProviders.IFileProvider!
+Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootFileProvider.set -> void
+Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootPath.get -> string!
+Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootPath.set -> void
+Microsoft.Maui.Hosting.MauiHostEnvironment.EnvironmentName.get -> string!
+Microsoft.Maui.Hosting.MauiHostEnvironment.EnvironmentName.set -> void
+Microsoft.Maui.Hosting.MauiHostEnvironment.MauiHostEnvironment() -> void
+*REMOVED*Microsoft.Maui.IDatePicker.Date.get -> System.DateTime
+Microsoft.Maui.IDatePicker.Date.get -> System.DateTime?
+Microsoft.Maui.IDatePicker.IsOpen.get -> bool
+Microsoft.Maui.IDatePicker.IsOpen.set -> void
+*REMOVED*Microsoft.Maui.IDatePicker.MaximumDate.get -> System.DateTime
+Microsoft.Maui.IDatePicker.MaximumDate.get -> System.DateTime?
+*REMOVED*Microsoft.Maui.IDatePicker.MinimumDate.get -> System.DateTime
+Microsoft.Maui.IDatePicker.MinimumDate.get -> System.DateTime?
+Microsoft.Maui.IPicker.IsOpen.get -> bool
+Microsoft.Maui.IPicker.IsOpen.set -> void
+Microsoft.Maui.ISearchBar.ReturnType.get -> Microsoft.Maui.ReturnType
+Microsoft.Maui.ISearchBar.SearchIconColor.get -> Microsoft.Maui.Graphics.Color!
+Microsoft.Maui.ITimePicker.IsOpen.get -> bool
+Microsoft.Maui.ITimePicker.IsOpen.set -> void
+*REMOVED*Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan
+Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan?
+Microsoft.Maui.IWebRequestInterceptingWebView
+Microsoft.Maui.IWebRequestInterceptingWebView.WebResourceRequested(Microsoft.Maui.WebResourceRequestedEventArgs! args) -> bool
+Microsoft.Maui.IWindow.IsMaximizable.get -> bool
+Microsoft.Maui.IWindow.IsMinimizable.get -> bool
+Microsoft.Maui.Platform.CalendarDatePickerExtensions
+Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.SafeAreaEdges.Bottom.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Bottom.set -> void
+Microsoft.Maui.SafeAreaEdges.Equals(Microsoft.Maui.SafeAreaEdges other) -> bool
+Microsoft.Maui.SafeAreaEdges.GetEdge(int edge) -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Left.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Left.set -> void
+Microsoft.Maui.SafeAreaEdges.Right.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Right.set -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges() -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions horizontal, Microsoft.Maui.SafeAreaRegions vertical) -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions left, Microsoft.Maui.SafeAreaRegions top, Microsoft.Maui.SafeAreaRegions right, Microsoft.Maui.SafeAreaRegions bottom) -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions uniformValue) -> void
+Microsoft.Maui.SafeAreaEdges.SetEdge(int edge, Microsoft.Maui.SafeAreaRegions value) -> void
+Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Top.set -> void
+Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.All = Microsoft.Maui.SafeAreaRegions.SoftInput | Microsoft.Maui.SafeAreaRegions.Container -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Default = 4 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.None = 0 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.SoftInput = 1 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.ScrollToRequest.Deconstruct(out double HorizontalOffset, out double VerticalOffset, out bool Instant) -> void
+Microsoft.Maui.ScrollToRequest.ScrollToRequest(Microsoft.Maui.ScrollToRequest! original) -> void
+Microsoft.Maui.SwipeViewCloseRequest.Deconstruct(out bool Animated) -> void
+Microsoft.Maui.SwipeViewCloseRequest.SwipeViewCloseRequest(Microsoft.Maui.SwipeViewCloseRequest! original) -> void
+Microsoft.Maui.SwipeViewOpenRequest.Deconstruct(out Microsoft.Maui.OpenSwipeItem OpenSwipeItem, out bool Animated) -> void
+Microsoft.Maui.SwipeViewOpenRequest.SwipeViewOpenRequest(Microsoft.Maui.SwipeViewOpenRequest! original) -> void
+Microsoft.Maui.SwipeViewSwipeChanging.Deconstruct(out Microsoft.Maui.SwipeDirection SwipeDirection, out double Offset) -> void
+Microsoft.Maui.SwipeViewSwipeChanging.SwipeViewSwipeChanging(Microsoft.Maui.SwipeViewSwipeChanging! original) -> void
+Microsoft.Maui.SwipeViewSwipeEnded.Deconstruct(out Microsoft.Maui.SwipeDirection SwipeDirection, out bool IsOpen) -> void
+Microsoft.Maui.SwipeViewSwipeEnded.SwipeViewSwipeEnded(Microsoft.Maui.SwipeViewSwipeEnded! original) -> void
+Microsoft.Maui.SwipeViewSwipeStarted.Deconstruct(out Microsoft.Maui.SwipeDirection SwipeDirection) -> void
+Microsoft.Maui.SwipeViewSwipeStarted.SwipeViewSwipeStarted(Microsoft.Maui.SwipeViewSwipeStarted! original) -> void
+Microsoft.Maui.WebResourceRequestedEventArgs
+Microsoft.Maui.WebResourceRequestedEventArgs.RequestEventArgs.get -> Microsoft.Web.WebView2.Core.CoreWebView2WebResourceRequestedEventArgs!
+Microsoft.Maui.WebResourceRequestedEventArgs.Sender.get -> Microsoft.Web.WebView2.Core.CoreWebView2!
+override Microsoft.Maui.Converters.EasingTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.EasingTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.EasingTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.EasingTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.EasingTypeConverter.GetStandardValues(System.ComponentModel.ITypeDescriptorContext? context) -> System.ComponentModel.TypeConverter.StandardValuesCollection?
+override Microsoft.Maui.Converters.EasingTypeConverter.GetStandardValuesExclusive(System.ComponentModel.ITypeDescriptorContext? context) -> bool
+override Microsoft.Maui.Converters.EasingTypeConverter.GetStandardValuesSupported(System.ComponentModel.ITypeDescriptorContext? context) -> bool
+override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.FlexBasisTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexBasisTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexBasisTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexBasisTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.FlexDirectionTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexDirectionTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexDirectionTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexDirectionTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.FlexJustifyTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexJustifyTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexJustifyTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexJustifyTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value) -> object!
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object!
+override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.ThicknessTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.ThicknessTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Equals(object? obj) -> bool
+override Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.GetHashCode() -> int
+override Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.ToString() -> string!
+override Microsoft.Maui.Handlers.LayoutHandlerUpdate.Equals(object? obj) -> bool
+override Microsoft.Maui.Handlers.LayoutHandlerUpdate.GetHashCode() -> int
+override Microsoft.Maui.Handlers.LayoutHandlerUpdate.ToString() -> string!
+override Microsoft.Maui.Handlers.MenuBarHandlerUpdate.Equals(object? obj) -> bool
+override Microsoft.Maui.Handlers.MenuBarHandlerUpdate.GetHashCode() -> int
+override Microsoft.Maui.Handlers.MenuBarHandlerUpdate.ToString() -> string!
+override Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.Equals(object? obj) -> bool
+override Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.GetHashCode() -> int
+override Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.ToString() -> string!
+override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.Equals(object? obj) -> bool
+override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.GetHashCode() -> int
+override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.ToString() -> string!
+override Microsoft.Maui.Handlers.OpenWindowRequest.Equals(object? obj) -> bool
+override Microsoft.Maui.Handlers.OpenWindowRequest.GetHashCode() -> int
+override Microsoft.Maui.Handlers.OpenWindowRequest.ToString() -> string!
+override Microsoft.Maui.SafeAreaEdges.Equals(object? obj) -> bool
+override Microsoft.Maui.SafeAreaEdges.GetHashCode() -> int
+override Microsoft.Maui.SafeAreaEdges.ToString() -> string!
+override Microsoft.Maui.ScrollToRequest.Equals(object? obj) -> bool
+override Microsoft.Maui.ScrollToRequest.GetHashCode() -> int
+override Microsoft.Maui.ScrollToRequest.ToString() -> string!
+override Microsoft.Maui.SwipeViewCloseRequest.Equals(object? obj) -> bool
+override Microsoft.Maui.SwipeViewCloseRequest.GetHashCode() -> int
+override Microsoft.Maui.SwipeViewCloseRequest.ToString() -> string!
+override Microsoft.Maui.SwipeViewOpenRequest.Equals(object? obj) -> bool
+override Microsoft.Maui.SwipeViewOpenRequest.GetHashCode() -> int
+override Microsoft.Maui.SwipeViewOpenRequest.ToString() -> string!
+override Microsoft.Maui.SwipeViewSwipeChanging.Equals(object? obj) -> bool
+override Microsoft.Maui.SwipeViewSwipeChanging.GetHashCode() -> int
+override Microsoft.Maui.SwipeViewSwipeChanging.ToString() -> string!
+override Microsoft.Maui.SwipeViewSwipeEnded.Equals(object? obj) -> bool
+override Microsoft.Maui.SwipeViewSwipeEnded.GetHashCode() -> int
+override Microsoft.Maui.SwipeViewSwipeEnded.ToString() -> string!
+override Microsoft.Maui.SwipeViewSwipeStarted.Equals(object? obj) -> bool
+override Microsoft.Maui.SwipeViewSwipeStarted.GetHashCode() -> int
+override Microsoft.Maui.SwipeViewSwipeStarted.ToString() -> string!
+*REMOVED*readonly Microsoft.Maui.PropertyMapper._mapper -> System.Collections.Generic.Dictionary<string!, System.Action<Microsoft.Maui.IElementHandler!, Microsoft.Maui.IElement!>!>!
+static Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.operator !=(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? left, Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.operator ==(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? left, Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.GraphicsViewHandler.MapBackground(Microsoft.Maui.Handlers.IGraphicsViewHandler! handler, Microsoft.Maui.IGraphicsView! graphicsView) -> void
+static Microsoft.Maui.Handlers.LayoutHandlerUpdate.operator !=(Microsoft.Maui.Handlers.LayoutHandlerUpdate? left, Microsoft.Maui.Handlers.LayoutHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.LayoutHandlerUpdate.operator ==(Microsoft.Maui.Handlers.LayoutHandlerUpdate? left, Microsoft.Maui.Handlers.LayoutHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.MenuBarHandlerUpdate.operator !=(Microsoft.Maui.Handlers.MenuBarHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.MenuBarHandlerUpdate.operator ==(Microsoft.Maui.Handlers.MenuBarHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.operator !=(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.operator ==(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.operator !=(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.operator ==(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.OpenWindowRequest.operator !=(Microsoft.Maui.Handlers.OpenWindowRequest? left, Microsoft.Maui.Handlers.OpenWindowRequest? right) -> bool
+static Microsoft.Maui.Handlers.OpenWindowRequest.operator ==(Microsoft.Maui.Handlers.OpenWindowRequest? left, Microsoft.Maui.Handlers.OpenWindowRequest? right) -> bool
+static Microsoft.Maui.Handlers.SearchBarHandler.MapReturnType(Microsoft.Maui.Handlers.ISearchBarHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
+static Microsoft.Maui.Handlers.TimePickerHandler.MapBackground(Microsoft.Maui.Handlers.ITimePickerHandler! handler, Microsoft.Maui.ITimePicker! timePicker) -> void
+static Microsoft.Maui.Handlers.WindowHandler.MapIsMaximizable(Microsoft.Maui.Handlers.IWindowHandler! handler, Microsoft.Maui.IWindow! window) -> void
+static Microsoft.Maui.Handlers.WindowHandler.MapIsMinimizable(Microsoft.Maui.Handlers.IWindowHandler! handler, Microsoft.Maui.IWindow! window) -> void
+static Microsoft.Maui.Hosting.AppHostBuilderExtensions.ConfigureEnvironmentVariables(this Microsoft.Maui.Hosting.MauiAppBuilder! builder) -> Microsoft.Maui.Hosting.MauiAppBuilder!
+static Microsoft.Maui.Platform.CalendarDatePickerExtensions.ToDateFormat(this string! dateFormat) -> string!
+static Microsoft.Maui.Platform.DatePickerExtensions.UpdateBackground(this Microsoft.UI.Xaml.Controls.CalendarDatePicker! platformDatePicker, Microsoft.Maui.IDatePicker! datePicker) -> void
+*REMOVED*static Microsoft.Maui.Platform.ScrollViewerExtensions.UpdateScrollBarVisibility(this Microsoft.UI.Xaml.Controls.ScrollViewer! scrollViewer, Microsoft.Maui.ScrollOrientation orientation, Microsoft.Maui.ScrollBarVisibility horizontalScrollBarVisibility) -> void
+static Microsoft.Maui.Platform.ScrollViewerExtensions.UpdateScrollBarVisibility(this Microsoft.UI.Xaml.Controls.ScrollViewer! scrollViewer, Microsoft.Maui.ScrollOrientation orientation, Microsoft.Maui.ScrollBarVisibility visibility) -> void
+static Microsoft.Maui.Platform.SearchBarExtensions.UpdateReturnType(this Microsoft.UI.Xaml.Controls.AutoSuggestBox! platformControl, Microsoft.Maui.ISearchBar! searchBar) -> void
+static Microsoft.Maui.Platform.TextBoxExtensions.GetCursorPosition(this Microsoft.UI.Xaml.Controls.TextBox! textBox, int cursorOffset = 0) -> int
+static Microsoft.Maui.Platform.TimePickerExtensions.UpdateBackground(this Microsoft.UI.Xaml.Controls.TimePicker! platformTimePicker, Microsoft.Maui.ITimePicker! timePicker) -> void
+static Microsoft.Maui.SafeAreaEdges.All.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.Default.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.None.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.operator !=(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
+static Microsoft.Maui.SafeAreaEdges.operator ==(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
+static Microsoft.Maui.ScrollToRequest.operator !=(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
+static Microsoft.Maui.ScrollToRequest.operator ==(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
+static Microsoft.Maui.SwipeViewCloseRequest.operator !=(Microsoft.Maui.SwipeViewCloseRequest? left, Microsoft.Maui.SwipeViewCloseRequest? right) -> bool
+static Microsoft.Maui.SwipeViewCloseRequest.operator ==(Microsoft.Maui.SwipeViewCloseRequest? left, Microsoft.Maui.SwipeViewCloseRequest? right) -> bool
+static Microsoft.Maui.SwipeViewOpenRequest.operator !=(Microsoft.Maui.SwipeViewOpenRequest? left, Microsoft.Maui.SwipeViewOpenRequest? right) -> bool
+static Microsoft.Maui.SwipeViewOpenRequest.operator ==(Microsoft.Maui.SwipeViewOpenRequest? left, Microsoft.Maui.SwipeViewOpenRequest? right) -> bool
+static Microsoft.Maui.SwipeViewSwipeChanging.operator !=(Microsoft.Maui.SwipeViewSwipeChanging? left, Microsoft.Maui.SwipeViewSwipeChanging? right) -> bool
+static Microsoft.Maui.SwipeViewSwipeChanging.operator ==(Microsoft.Maui.SwipeViewSwipeChanging? left, Microsoft.Maui.SwipeViewSwipeChanging? right) -> bool
+static Microsoft.Maui.SwipeViewSwipeEnded.operator !=(Microsoft.Maui.SwipeViewSwipeEnded? left, Microsoft.Maui.SwipeViewSwipeEnded? right) -> bool
+static Microsoft.Maui.SwipeViewSwipeEnded.operator ==(Microsoft.Maui.SwipeViewSwipeEnded? left, Microsoft.Maui.SwipeViewSwipeEnded? right) -> bool
+static Microsoft.Maui.SwipeViewSwipeStarted.operator !=(Microsoft.Maui.SwipeViewSwipeStarted? left, Microsoft.Maui.SwipeViewSwipeStarted? right) -> bool
+static Microsoft.Maui.SwipeViewSwipeStarted.operator ==(Microsoft.Maui.SwipeViewSwipeStarted? left, Microsoft.Maui.SwipeViewSwipeStarted? right) -> bool
+virtual Microsoft.Maui.Animations.Lerp.LerpDelegate.Invoke(object! start, object! end, double progress) -> object!
+virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate!
+virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Equals(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? other) -> bool
+virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.LayoutHandlerUpdate!
+virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.Equals(Microsoft.Maui.Handlers.LayoutHandlerUpdate? other) -> bool
+virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.MenuBarHandlerUpdate!
+virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.Equals(Microsoft.Maui.Handlers.MenuBarHandlerUpdate? other) -> bool
+virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate!
+virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.Equals(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? other) -> bool
+virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate!
+virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.Equals(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? other) -> bool
+virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.Handlers.OpenWindowRequest.<Clone>$() -> Microsoft.Maui.Handlers.OpenWindowRequest!
+virtual Microsoft.Maui.Handlers.OpenWindowRequest.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.Handlers.OpenWindowRequest.Equals(Microsoft.Maui.Handlers.OpenWindowRequest? other) -> bool
+virtual Microsoft.Maui.Handlers.OpenWindowRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.LifecycleEvents.WindowsLifecycle.OnActivated.Invoke(Microsoft.UI.Xaml.Window! window, Microsoft.UI.Xaml.WindowActivatedEventArgs! args) -> void
+virtual Microsoft.Maui.LifecycleEvents.WindowsLifecycle.OnClosed.Invoke(Microsoft.UI.Xaml.Window! window, Microsoft.UI.Xaml.WindowEventArgs! args) -> void
+virtual Microsoft.Maui.LifecycleEvents.WindowsLifecycle.OnLaunched.Invoke(Microsoft.UI.Xaml.Application! application, Microsoft.UI.Xaml.LaunchActivatedEventArgs! args) -> void
+virtual Microsoft.Maui.LifecycleEvents.WindowsLifecycle.OnLaunching.Invoke(Microsoft.UI.Xaml.Application! application, Microsoft.UI.Xaml.LaunchActivatedEventArgs! args) -> void
+virtual Microsoft.Maui.LifecycleEvents.WindowsLifecycle.OnPlatformMessage.Invoke(Microsoft.UI.Xaml.Window! window, Microsoft.Maui.Platform.WindowsPlatformMessageEventArgs! args) -> void
+virtual Microsoft.Maui.LifecycleEvents.WindowsLifecycle.OnPlatformWindowSubclassed.Invoke(Microsoft.UI.Xaml.Window! window, Microsoft.Maui.Platform.WindowsPlatformWindowSubclassedEventArgs! args) -> void
+virtual Microsoft.Maui.LifecycleEvents.WindowsLifecycle.OnResumed.Invoke(Microsoft.UI.Xaml.Window! window) -> void
+virtual Microsoft.Maui.LifecycleEvents.WindowsLifecycle.OnVisibilityChanged.Invoke(Microsoft.UI.Xaml.Window! window, Microsoft.UI.Xaml.WindowVisibilityChangedEventArgs! args) -> void
+virtual Microsoft.Maui.LifecycleEvents.WindowsLifecycle.OnWindowCreated.Invoke(Microsoft.UI.Xaml.Window! window) -> void
+*REMOVED*virtual Microsoft.Maui.PropertyMapper.ClearKeyCache() -> void
+*REMOVED*virtual Microsoft.Maui.PropertyMapper.UpdateKeys.get -> System.Collections.Generic.IReadOnlyCollection<string!>!
+virtual Microsoft.Maui.ScrollToRequest.<Clone>$() -> Microsoft.Maui.ScrollToRequest!
+virtual Microsoft.Maui.ScrollToRequest.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.ScrollToRequest.Equals(Microsoft.Maui.ScrollToRequest? other) -> bool
+virtual Microsoft.Maui.ScrollToRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.SwipeViewCloseRequest.<Clone>$() -> Microsoft.Maui.SwipeViewCloseRequest!
+virtual Microsoft.Maui.SwipeViewCloseRequest.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.SwipeViewCloseRequest.Equals(Microsoft.Maui.SwipeViewCloseRequest? other) -> bool
+virtual Microsoft.Maui.SwipeViewCloseRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.SwipeViewOpenRequest.<Clone>$() -> Microsoft.Maui.SwipeViewOpenRequest!
+virtual Microsoft.Maui.SwipeViewOpenRequest.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.SwipeViewOpenRequest.Equals(Microsoft.Maui.SwipeViewOpenRequest? other) -> bool
+virtual Microsoft.Maui.SwipeViewOpenRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.SwipeViewSwipeChanging.<Clone>$() -> Microsoft.Maui.SwipeViewSwipeChanging!
+virtual Microsoft.Maui.SwipeViewSwipeChanging.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.SwipeViewSwipeChanging.Equals(Microsoft.Maui.SwipeViewSwipeChanging? other) -> bool
+virtual Microsoft.Maui.SwipeViewSwipeChanging.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.SwipeViewSwipeEnded.<Clone>$() -> Microsoft.Maui.SwipeViewSwipeEnded!
+virtual Microsoft.Maui.SwipeViewSwipeEnded.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.SwipeViewSwipeEnded.Equals(Microsoft.Maui.SwipeViewSwipeEnded? other) -> bool
+virtual Microsoft.Maui.SwipeViewSwipeEnded.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.SwipeViewSwipeStarted.<Clone>$() -> Microsoft.Maui.SwipeViewSwipeStarted!
+virtual Microsoft.Maui.SwipeViewSwipeStarted.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.SwipeViewSwipeStarted.Equals(Microsoft.Maui.SwipeViewSwipeStarted? other) -> bool
+virtual Microsoft.Maui.SwipeViewSwipeStarted.PrintMembers(System.Text.StringBuilder! builder) -> bool
diff --git a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
index b1e783e9d28c..cd4975fc3d7a 100644
--- a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -48,20 +48,15 @@ Microsoft.Maui.IWebRequestInterceptingWebView
 Microsoft.Maui.IWebRequestInterceptingWebView.WebResourceRequested(Microsoft.Maui.WebResourceRequestedEventArgs! args) -> bool
 Microsoft.Maui.SafeAreaEdges
 Microsoft.Maui.SafeAreaEdges.Bottom.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Bottom.set -> void
 Microsoft.Maui.SafeAreaEdges.Equals(Microsoft.Maui.SafeAreaEdges other) -> bool
 Microsoft.Maui.SafeAreaEdges.GetEdge(int edge) -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaEdges.Left.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Left.set -> void
 Microsoft.Maui.SafeAreaEdges.Right.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Right.set -> void
 Microsoft.Maui.SafeAreaEdges.SafeAreaEdges() -> void
 Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions horizontal, Microsoft.Maui.SafeAreaRegions vertical) -> void
 Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions left, Microsoft.Maui.SafeAreaRegions top, Microsoft.Maui.SafeAreaRegions right, Microsoft.Maui.SafeAreaRegions bottom) -> void
 Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions uniformValue) -> void
-Microsoft.Maui.SafeAreaEdges.SetEdge(int edge, Microsoft.Maui.SafeAreaRegions value) -> void
 Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Top.set -> void
 Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.All = Microsoft.Maui.SafeAreaRegions.SoftInput | Microsoft.Maui.SafeAreaRegions.Container -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
diff --git a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
index b1e783e9d28c..cd4975fc3d7a 100644
--- a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -48,20 +48,15 @@ Microsoft.Maui.IWebRequestInterceptingWebView
 Microsoft.Maui.IWebRequestInterceptingWebView.WebResourceRequested(Microsoft.Maui.WebResourceRequestedEventArgs! args) -> bool
 Microsoft.Maui.SafeAreaEdges
 Microsoft.Maui.SafeAreaEdges.Bottom.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Bottom.set -> void
 Microsoft.Maui.SafeAreaEdges.Equals(Microsoft.Maui.SafeAreaEdges other) -> bool
 Microsoft.Maui.SafeAreaEdges.GetEdge(int edge) -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaEdges.Left.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Left.set -> void
 Microsoft.Maui.SafeAreaEdges.Right.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Right.set -> void
 Microsoft.Maui.SafeAreaEdges.SafeAreaEdges() -> void
 Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions horizontal, Microsoft.Maui.SafeAreaRegions vertical) -> void
 Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions left, Microsoft.Maui.SafeAreaRegions top, Microsoft.Maui.SafeAreaRegions right, Microsoft.Maui.SafeAreaRegions bottom) -> void
 Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions uniformValue) -> void
-Microsoft.Maui.SafeAreaEdges.SetEdge(int edge, Microsoft.Maui.SafeAreaRegions value) -> void
 Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Top.set -> void
 Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.All = Microsoft.Maui.SafeAreaRegions.SoftInput | Microsoft.Maui.SafeAreaRegions.Container -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
diff --git a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt.bak b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt.bak
new file mode 100644
index 000000000000..b1e783e9d28c
--- /dev/null
+++ b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt.bak
@@ -0,0 +1,248 @@
+#nullable enable
+Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter
+Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.SafeAreaEdgesTypeConverter() -> void
+Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.ContextFlyoutItemHandlerUpdate(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate! original) -> void
+Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
+Microsoft.Maui.Handlers.DataFlowDirection
+Microsoft.Maui.Handlers.DataFlowDirection.FromPlatform = 1 -> Microsoft.Maui.Handlers.DataFlowDirection
+Microsoft.Maui.Handlers.DataFlowDirection.ToPlatform = 0 -> Microsoft.Maui.Handlers.DataFlowDirection
+Microsoft.Maui.Handlers.LayoutHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IView! View) -> void
+Microsoft.Maui.Handlers.LayoutHandlerUpdate.LayoutHandlerUpdate(Microsoft.Maui.Handlers.LayoutHandlerUpdate! original) -> void
+Microsoft.Maui.Handlers.MenuBarHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuBarItem! MenuBarItem) -> void
+Microsoft.Maui.Handlers.MenuBarHandlerUpdate.MenuBarHandlerUpdate(Microsoft.Maui.Handlers.MenuBarHandlerUpdate! original) -> void
+Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
+Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.MenuBarItemHandlerUpdate(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate! original) -> void
+Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
+Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.MenuFlyoutSubItemHandlerUpdate(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate! original) -> void
+Microsoft.Maui.Handlers.OpenWindowRequest.Deconstruct(out Microsoft.Maui.IPersistedState? State) -> void
+Microsoft.Maui.Handlers.OpenWindowRequest.OpenWindowRequest(Microsoft.Maui.Handlers.OpenWindowRequest! original) -> void
+Microsoft.Maui.Hosting.MauiAppBuilder.Environment.get -> Microsoft.Maui.Hosting.MauiHostEnvironment!
+Microsoft.Maui.Hosting.MauiAppBuilder.Properties.get -> System.Collections.Generic.IDictionary<object!, object!>!
+Microsoft.Maui.Hosting.MauiHostEnvironment
+Microsoft.Maui.Hosting.MauiHostEnvironment.ApplicationName.get -> string!
+Microsoft.Maui.Hosting.MauiHostEnvironment.ApplicationName.set -> void
+Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootFileProvider.get -> Microsoft.Extensions.FileProviders.IFileProvider!
+Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootFileProvider.set -> void
+Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootPath.get -> string!
+Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootPath.set -> void
+Microsoft.Maui.Hosting.MauiHostEnvironment.EnvironmentName.get -> string!
+Microsoft.Maui.Hosting.MauiHostEnvironment.EnvironmentName.set -> void
+Microsoft.Maui.Hosting.MauiHostEnvironment.MauiHostEnvironment() -> void
+*REMOVED*Microsoft.Maui.IDatePicker.Date.get -> System.DateTime
+Microsoft.Maui.IDatePicker.Date.get -> System.DateTime?
+Microsoft.Maui.IDatePicker.IsOpen.get -> bool
+Microsoft.Maui.IDatePicker.IsOpen.set -> void
+*REMOVED*Microsoft.Maui.IDatePicker.MaximumDate.get -> System.DateTime
+Microsoft.Maui.IDatePicker.MaximumDate.get -> System.DateTime?
+*REMOVED*Microsoft.Maui.IDatePicker.MinimumDate.get -> System.DateTime
+Microsoft.Maui.IDatePicker.MinimumDate.get -> System.DateTime?
+Microsoft.Maui.IPicker.IsOpen.get -> bool
+Microsoft.Maui.IPicker.IsOpen.set -> void
+Microsoft.Maui.ISearchBar.ReturnType.get -> Microsoft.Maui.ReturnType
+Microsoft.Maui.ISearchBar.SearchIconColor.get -> Microsoft.Maui.Graphics.Color!
+Microsoft.Maui.ITimePicker.IsOpen.get -> bool
+Microsoft.Maui.ITimePicker.IsOpen.set -> void
+*REMOVED*Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan
+Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan?
+Microsoft.Maui.IWebRequestInterceptingWebView
+Microsoft.Maui.IWebRequestInterceptingWebView.WebResourceRequested(Microsoft.Maui.WebResourceRequestedEventArgs! args) -> bool
+Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.SafeAreaEdges.Bottom.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Bottom.set -> void
+Microsoft.Maui.SafeAreaEdges.Equals(Microsoft.Maui.SafeAreaEdges other) -> bool
+Microsoft.Maui.SafeAreaEdges.GetEdge(int edge) -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Left.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Left.set -> void
+Microsoft.Maui.SafeAreaEdges.Right.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Right.set -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges() -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions horizontal, Microsoft.Maui.SafeAreaRegions vertical) -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions left, Microsoft.Maui.SafeAreaRegions top, Microsoft.Maui.SafeAreaRegions right, Microsoft.Maui.SafeAreaRegions bottom) -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions uniformValue) -> void
+Microsoft.Maui.SafeAreaEdges.SetEdge(int edge, Microsoft.Maui.SafeAreaRegions value) -> void
+Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Top.set -> void
+Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.All = Microsoft.Maui.SafeAreaRegions.SoftInput | Microsoft.Maui.SafeAreaRegions.Container -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Default = 4 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.None = 0 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.SoftInput = 1 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.ScrollToRequest.Deconstruct(out double HorizontalOffset, out double VerticalOffset, out bool Instant) -> void
+Microsoft.Maui.ScrollToRequest.ScrollToRequest(Microsoft.Maui.ScrollToRequest! original) -> void
+Microsoft.Maui.SwipeViewCloseRequest.Deconstruct(out bool Animated) -> void
+Microsoft.Maui.SwipeViewCloseRequest.SwipeViewCloseRequest(Microsoft.Maui.SwipeViewCloseRequest! original) -> void
+Microsoft.Maui.SwipeViewOpenRequest.Deconstruct(out Microsoft.Maui.OpenSwipeItem OpenSwipeItem, out bool Animated) -> void
+Microsoft.Maui.SwipeViewOpenRequest.SwipeViewOpenRequest(Microsoft.Maui.SwipeViewOpenRequest! original) -> void
+Microsoft.Maui.SwipeViewSwipeChanging.Deconstruct(out Microsoft.Maui.SwipeDirection SwipeDirection, out double Offset) -> void
+Microsoft.Maui.SwipeViewSwipeChanging.SwipeViewSwipeChanging(Microsoft.Maui.SwipeViewSwipeChanging! original) -> void
+Microsoft.Maui.SwipeViewSwipeEnded.Deconstruct(out Microsoft.Maui.SwipeDirection SwipeDirection, out bool IsOpen) -> void
+Microsoft.Maui.SwipeViewSwipeEnded.SwipeViewSwipeEnded(Microsoft.Maui.SwipeViewSwipeEnded! original) -> void
+Microsoft.Maui.SwipeViewSwipeStarted.Deconstruct(out Microsoft.Maui.SwipeDirection SwipeDirection) -> void
+Microsoft.Maui.SwipeViewSwipeStarted.SwipeViewSwipeStarted(Microsoft.Maui.SwipeViewSwipeStarted! original) -> void
+Microsoft.Maui.WebResourceRequestedEventArgs
+override Microsoft.Maui.Converters.EasingTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.EasingTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.EasingTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.EasingTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.EasingTypeConverter.GetStandardValues(System.ComponentModel.ITypeDescriptorContext? context) -> System.ComponentModel.TypeConverter.StandardValuesCollection?
+override Microsoft.Maui.Converters.EasingTypeConverter.GetStandardValuesExclusive(System.ComponentModel.ITypeDescriptorContext? context) -> bool
+override Microsoft.Maui.Converters.EasingTypeConverter.GetStandardValuesSupported(System.ComponentModel.ITypeDescriptorContext? context) -> bool
+override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.FlexBasisTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexBasisTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexBasisTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexBasisTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.FlexDirectionTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexDirectionTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexDirectionTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexDirectionTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.FlexJustifyTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexJustifyTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexJustifyTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexJustifyTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value) -> object!
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object!
+override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.ThicknessTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.ThicknessTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Equals(object? obj) -> bool
+override Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.GetHashCode() -> int
+override Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.ToString() -> string!
+override Microsoft.Maui.Handlers.LayoutHandlerUpdate.Equals(object? obj) -> bool
+override Microsoft.Maui.Handlers.LayoutHandlerUpdate.GetHashCode() -> int
+override Microsoft.Maui.Handlers.LayoutHandlerUpdate.ToString() -> string!
+override Microsoft.Maui.Handlers.MenuBarHandlerUpdate.Equals(object? obj) -> bool
+override Microsoft.Maui.Handlers.MenuBarHandlerUpdate.GetHashCode() -> int
+override Microsoft.Maui.Handlers.MenuBarHandlerUpdate.ToString() -> string!
+override Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.Equals(object? obj) -> bool
+override Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.GetHashCode() -> int
+override Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.ToString() -> string!
+override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.Equals(object? obj) -> bool
+override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.GetHashCode() -> int
+override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.ToString() -> string!
+override Microsoft.Maui.Handlers.OpenWindowRequest.Equals(object? obj) -> bool
+override Microsoft.Maui.Handlers.OpenWindowRequest.GetHashCode() -> int
+override Microsoft.Maui.Handlers.OpenWindowRequest.ToString() -> string!
+override Microsoft.Maui.SafeAreaEdges.Equals(object? obj) -> bool
+override Microsoft.Maui.SafeAreaEdges.GetHashCode() -> int
+override Microsoft.Maui.SafeAreaEdges.ToString() -> string!
+override Microsoft.Maui.ScrollToRequest.Equals(object? obj) -> bool
+override Microsoft.Maui.ScrollToRequest.GetHashCode() -> int
+override Microsoft.Maui.ScrollToRequest.ToString() -> string!
+override Microsoft.Maui.SwipeViewCloseRequest.Equals(object? obj) -> bool
+override Microsoft.Maui.SwipeViewCloseRequest.GetHashCode() -> int
+override Microsoft.Maui.SwipeViewCloseRequest.ToString() -> string!
+override Microsoft.Maui.SwipeViewOpenRequest.Equals(object? obj) -> bool
+override Microsoft.Maui.SwipeViewOpenRequest.GetHashCode() -> int
+override Microsoft.Maui.SwipeViewOpenRequest.ToString() -> string!
+override Microsoft.Maui.SwipeViewSwipeChanging.Equals(object? obj) -> bool
+override Microsoft.Maui.SwipeViewSwipeChanging.GetHashCode() -> int
+override Microsoft.Maui.SwipeViewSwipeChanging.ToString() -> string!
+override Microsoft.Maui.SwipeViewSwipeEnded.Equals(object? obj) -> bool
+override Microsoft.Maui.SwipeViewSwipeEnded.GetHashCode() -> int
+override Microsoft.Maui.SwipeViewSwipeEnded.ToString() -> string!
+override Microsoft.Maui.SwipeViewSwipeStarted.Equals(object? obj) -> bool
+override Microsoft.Maui.SwipeViewSwipeStarted.GetHashCode() -> int
+override Microsoft.Maui.SwipeViewSwipeStarted.ToString() -> string!
+*REMOVED*readonly Microsoft.Maui.PropertyMapper._mapper -> System.Collections.Generic.Dictionary<string!, System.Action<Microsoft.Maui.IElementHandler!, Microsoft.Maui.IElement!>!>!
+static Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.operator !=(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? left, Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.operator ==(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? left, Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.LayoutHandlerUpdate.operator !=(Microsoft.Maui.Handlers.LayoutHandlerUpdate? left, Microsoft.Maui.Handlers.LayoutHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.LayoutHandlerUpdate.operator ==(Microsoft.Maui.Handlers.LayoutHandlerUpdate? left, Microsoft.Maui.Handlers.LayoutHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.MenuBarHandlerUpdate.operator !=(Microsoft.Maui.Handlers.MenuBarHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.MenuBarHandlerUpdate.operator ==(Microsoft.Maui.Handlers.MenuBarHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.operator !=(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.operator ==(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.operator !=(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.operator ==(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.OpenWindowRequest.operator !=(Microsoft.Maui.Handlers.OpenWindowRequest? left, Microsoft.Maui.Handlers.OpenWindowRequest? right) -> bool
+static Microsoft.Maui.Handlers.OpenWindowRequest.operator ==(Microsoft.Maui.Handlers.OpenWindowRequest? left, Microsoft.Maui.Handlers.OpenWindowRequest? right) -> bool
+static Microsoft.Maui.Handlers.SearchBarHandler.MapReturnType(Microsoft.Maui.IViewHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
+static Microsoft.Maui.Hosting.AppHostBuilderExtensions.ConfigureEnvironmentVariables(this Microsoft.Maui.Hosting.MauiAppBuilder! builder) -> Microsoft.Maui.Hosting.MauiAppBuilder!
+static Microsoft.Maui.SafeAreaEdges.All.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.Default.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.None.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.operator !=(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
+static Microsoft.Maui.SafeAreaEdges.operator ==(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
+static Microsoft.Maui.ScrollToRequest.operator !=(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
+static Microsoft.Maui.ScrollToRequest.operator ==(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
+static Microsoft.Maui.SwipeViewCloseRequest.operator !=(Microsoft.Maui.SwipeViewCloseRequest? left, Microsoft.Maui.SwipeViewCloseRequest? right) -> bool
+static Microsoft.Maui.SwipeViewCloseRequest.operator ==(Microsoft.Maui.SwipeViewCloseRequest? left, Microsoft.Maui.SwipeViewCloseRequest? right) -> bool
+static Microsoft.Maui.SwipeViewOpenRequest.operator !=(Microsoft.Maui.SwipeViewOpenRequest? left, Microsoft.Maui.SwipeViewOpenRequest? right) -> bool
+static Microsoft.Maui.SwipeViewOpenRequest.operator ==(Microsoft.Maui.SwipeViewOpenRequest? left, Microsoft.Maui.SwipeViewOpenRequest? right) -> bool
+static Microsoft.Maui.SwipeViewSwipeChanging.operator !=(Microsoft.Maui.SwipeViewSwipeChanging? left, Microsoft.Maui.SwipeViewSwipeChanging? right) -> bool
+static Microsoft.Maui.SwipeViewSwipeChanging.operator ==(Microsoft.Maui.SwipeViewSwipeChanging? left, Microsoft.Maui.SwipeViewSwipeChanging? right) -> bool
+static Microsoft.Maui.SwipeViewSwipeEnded.operator !=(Microsoft.Maui.SwipeViewSwipeEnded? left, Microsoft.Maui.SwipeViewSwipeEnded? right) -> bool
+static Microsoft.Maui.SwipeViewSwipeEnded.operator ==(Microsoft.Maui.SwipeViewSwipeEnded? left, Microsoft.Maui.SwipeViewSwipeEnded? right) -> bool
+static Microsoft.Maui.SwipeViewSwipeStarted.operator !=(Microsoft.Maui.SwipeViewSwipeStarted? left, Microsoft.Maui.SwipeViewSwipeStarted? right) -> bool
+static Microsoft.Maui.SwipeViewSwipeStarted.operator ==(Microsoft.Maui.SwipeViewSwipeStarted? left, Microsoft.Maui.SwipeViewSwipeStarted? right) -> bool
+virtual Microsoft.Maui.Animations.Lerp.LerpDelegate.Invoke(object! start, object! end, double progress) -> object!
+virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate!
+virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Equals(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? other) -> bool
+virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.LayoutHandlerUpdate!
+virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.Equals(Microsoft.Maui.Handlers.LayoutHandlerUpdate? other) -> bool
+virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.MenuBarHandlerUpdate!
+virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.Equals(Microsoft.Maui.Handlers.MenuBarHandlerUpdate? other) -> bool
+virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate!
+virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.Equals(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? other) -> bool
+virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate!
+virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.Equals(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? other) -> bool
+virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.Handlers.OpenWindowRequest.<Clone>$() -> Microsoft.Maui.Handlers.OpenWindowRequest!
+virtual Microsoft.Maui.Handlers.OpenWindowRequest.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.Handlers.OpenWindowRequest.Equals(Microsoft.Maui.Handlers.OpenWindowRequest? other) -> bool
+virtual Microsoft.Maui.Handlers.OpenWindowRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
+*REMOVED*virtual Microsoft.Maui.PropertyMapper.ClearKeyCache() -> void
+*REMOVED*virtual Microsoft.Maui.PropertyMapper.UpdateKeys.get -> System.Collections.Generic.IReadOnlyCollection<string!>!
+virtual Microsoft.Maui.ScrollToRequest.<Clone>$() -> Microsoft.Maui.ScrollToRequest!
+virtual Microsoft.Maui.ScrollToRequest.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.ScrollToRequest.Equals(Microsoft.Maui.ScrollToRequest? other) -> bool
+virtual Microsoft.Maui.ScrollToRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.SwipeViewCloseRequest.<Clone>$() -> Microsoft.Maui.SwipeViewCloseRequest!
+virtual Microsoft.Maui.SwipeViewCloseRequest.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.SwipeViewCloseRequest.Equals(Microsoft.Maui.SwipeViewCloseRequest? other) -> bool
+virtual Microsoft.Maui.SwipeViewCloseRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.SwipeViewOpenRequest.<Clone>$() -> Microsoft.Maui.SwipeViewOpenRequest!
+virtual Microsoft.Maui.SwipeViewOpenRequest.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.SwipeViewOpenRequest.Equals(Microsoft.Maui.SwipeViewOpenRequest? other) -> bool
+virtual Microsoft.Maui.SwipeViewOpenRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.SwipeViewSwipeChanging.<Clone>$() -> Microsoft.Maui.SwipeViewSwipeChanging!
+virtual Microsoft.Maui.SwipeViewSwipeChanging.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.SwipeViewSwipeChanging.Equals(Microsoft.Maui.SwipeViewSwipeChanging? other) -> bool
+virtual Microsoft.Maui.SwipeViewSwipeChanging.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.SwipeViewSwipeEnded.<Clone>$() -> Microsoft.Maui.SwipeViewSwipeEnded!
+virtual Microsoft.Maui.SwipeViewSwipeEnded.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.SwipeViewSwipeEnded.Equals(Microsoft.Maui.SwipeViewSwipeEnded? other) -> bool
+virtual Microsoft.Maui.SwipeViewSwipeEnded.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.SwipeViewSwipeStarted.<Clone>$() -> Microsoft.Maui.SwipeViewSwipeStarted!
+virtual Microsoft.Maui.SwipeViewSwipeStarted.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.SwipeViewSwipeStarted.Equals(Microsoft.Maui.SwipeViewSwipeStarted? other) -> bool
+virtual Microsoft.Maui.SwipeViewSwipeStarted.PrintMembers(System.Text.StringBuilder! builder) -> bool
diff --git a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
index b1e783e9d28c..cd4975fc3d7a 100644
--- a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
@@ -48,20 +48,15 @@ Microsoft.Maui.IWebRequestInterceptingWebView
 Microsoft.Maui.IWebRequestInterceptingWebView.WebResourceRequested(Microsoft.Maui.WebResourceRequestedEventArgs! args) -> bool
 Microsoft.Maui.SafeAreaEdges
 Microsoft.Maui.SafeAreaEdges.Bottom.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Bottom.set -> void
 Microsoft.Maui.SafeAreaEdges.Equals(Microsoft.Maui.SafeAreaEdges other) -> bool
 Microsoft.Maui.SafeAreaEdges.GetEdge(int edge) -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaEdges.Left.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Left.set -> void
 Microsoft.Maui.SafeAreaEdges.Right.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Right.set -> void
 Microsoft.Maui.SafeAreaEdges.SafeAreaEdges() -> void
 Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions horizontal, Microsoft.Maui.SafeAreaRegions vertical) -> void
 Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions left, Microsoft.Maui.SafeAreaRegions top, Microsoft.Maui.SafeAreaRegions right, Microsoft.Maui.SafeAreaRegions bottom) -> void
 Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions uniformValue) -> void
-Microsoft.Maui.SafeAreaEdges.SetEdge(int edge, Microsoft.Maui.SafeAreaRegions value) -> void
 Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Top.set -> void
 Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.All = Microsoft.Maui.SafeAreaRegions.SoftInput | Microsoft.Maui.SafeAreaRegions.Container -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
diff --git a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt.bak b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt.bak
new file mode 100644
index 000000000000..b1e783e9d28c
--- /dev/null
+++ b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt.bak
@@ -0,0 +1,248 @@
+#nullable enable
+Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter
+Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.SafeAreaEdgesTypeConverter() -> void
+Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.ContextFlyoutItemHandlerUpdate(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate! original) -> void
+Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
+Microsoft.Maui.Handlers.DataFlowDirection
+Microsoft.Maui.Handlers.DataFlowDirection.FromPlatform = 1 -> Microsoft.Maui.Handlers.DataFlowDirection
+Microsoft.Maui.Handlers.DataFlowDirection.ToPlatform = 0 -> Microsoft.Maui.Handlers.DataFlowDirection
+Microsoft.Maui.Handlers.LayoutHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IView! View) -> void
+Microsoft.Maui.Handlers.LayoutHandlerUpdate.LayoutHandlerUpdate(Microsoft.Maui.Handlers.LayoutHandlerUpdate! original) -> void
+Microsoft.Maui.Handlers.MenuBarHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuBarItem! MenuBarItem) -> void
+Microsoft.Maui.Handlers.MenuBarHandlerUpdate.MenuBarHandlerUpdate(Microsoft.Maui.Handlers.MenuBarHandlerUpdate! original) -> void
+Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
+Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.MenuBarItemHandlerUpdate(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate! original) -> void
+Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
+Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.MenuFlyoutSubItemHandlerUpdate(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate! original) -> void
+Microsoft.Maui.Handlers.OpenWindowRequest.Deconstruct(out Microsoft.Maui.IPersistedState? State) -> void
+Microsoft.Maui.Handlers.OpenWindowRequest.OpenWindowRequest(Microsoft.Maui.Handlers.OpenWindowRequest! original) -> void
+Microsoft.Maui.Hosting.MauiAppBuilder.Environment.get -> Microsoft.Maui.Hosting.MauiHostEnvironment!
+Microsoft.Maui.Hosting.MauiAppBuilder.Properties.get -> System.Collections.Generic.IDictionary<object!, object!>!
+Microsoft.Maui.Hosting.MauiHostEnvironment
+Microsoft.Maui.Hosting.MauiHostEnvironment.ApplicationName.get -> string!
+Microsoft.Maui.Hosting.MauiHostEnvironment.ApplicationName.set -> void
+Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootFileProvider.get -> Microsoft.Extensions.FileProviders.IFileProvider!
+Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootFileProvider.set -> void
+Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootPath.get -> string!
+Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootPath.set -> void
+Microsoft.Maui.Hosting.MauiHostEnvironment.EnvironmentName.get -> string!
+Microsoft.Maui.Hosting.MauiHostEnvironment.EnvironmentName.set -> void
+Microsoft.Maui.Hosting.MauiHostEnvironment.MauiHostEnvironment() -> void
+*REMOVED*Microsoft.Maui.IDatePicker.Date.get -> System.DateTime
+Microsoft.Maui.IDatePicker.Date.get -> System.DateTime?
+Microsoft.Maui.IDatePicker.IsOpen.get -> bool
+Microsoft.Maui.IDatePicker.IsOpen.set -> void
+*REMOVED*Microsoft.Maui.IDatePicker.MaximumDate.get -> System.DateTime
+Microsoft.Maui.IDatePicker.MaximumDate.get -> System.DateTime?
+*REMOVED*Microsoft.Maui.IDatePicker.MinimumDate.get -> System.DateTime
+Microsoft.Maui.IDatePicker.MinimumDate.get -> System.DateTime?
+Microsoft.Maui.IPicker.IsOpen.get -> bool
+Microsoft.Maui.IPicker.IsOpen.set -> void
+Microsoft.Maui.ISearchBar.ReturnType.get -> Microsoft.Maui.ReturnType
+Microsoft.Maui.ISearchBar.SearchIconColor.get -> Microsoft.Maui.Graphics.Color!
+Microsoft.Maui.ITimePicker.IsOpen.get -> bool
+Microsoft.Maui.ITimePicker.IsOpen.set -> void
+*REMOVED*Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan
+Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan?
+Microsoft.Maui.IWebRequestInterceptingWebView
+Microsoft.Maui.IWebRequestInterceptingWebView.WebResourceRequested(Microsoft.Maui.WebResourceRequestedEventArgs! args) -> bool
+Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.SafeAreaEdges.Bottom.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Bottom.set -> void
+Microsoft.Maui.SafeAreaEdges.Equals(Microsoft.Maui.SafeAreaEdges other) -> bool
+Microsoft.Maui.SafeAreaEdges.GetEdge(int edge) -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Left.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Left.set -> void
+Microsoft.Maui.SafeAreaEdges.Right.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Right.set -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges() -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions horizontal, Microsoft.Maui.SafeAreaRegions vertical) -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions left, Microsoft.Maui.SafeAreaRegions top, Microsoft.Maui.SafeAreaRegions right, Microsoft.Maui.SafeAreaRegions bottom) -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions uniformValue) -> void
+Microsoft.Maui.SafeAreaEdges.SetEdge(int edge, Microsoft.Maui.SafeAreaRegions value) -> void
+Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Top.set -> void
+Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.All = Microsoft.Maui.SafeAreaRegions.SoftInput | Microsoft.Maui.SafeAreaRegions.Container -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Default = 4 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.None = 0 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.SoftInput = 1 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.ScrollToRequest.Deconstruct(out double HorizontalOffset, out double VerticalOffset, out bool Instant) -> void
+Microsoft.Maui.ScrollToRequest.ScrollToRequest(Microsoft.Maui.ScrollToRequest! original) -> void
+Microsoft.Maui.SwipeViewCloseRequest.Deconstruct(out bool Animated) -> void
+Microsoft.Maui.SwipeViewCloseRequest.SwipeViewCloseRequest(Microsoft.Maui.SwipeViewCloseRequest! original) -> void
+Microsoft.Maui.SwipeViewOpenRequest.Deconstruct(out Microsoft.Maui.OpenSwipeItem OpenSwipeItem, out bool Animated) -> void
+Microsoft.Maui.SwipeViewOpenRequest.SwipeViewOpenRequest(Microsoft.Maui.SwipeViewOpenRequest! original) -> void
+Microsoft.Maui.SwipeViewSwipeChanging.Deconstruct(out Microsoft.Maui.SwipeDirection SwipeDirection, out double Offset) -> void
+Microsoft.Maui.SwipeViewSwipeChanging.SwipeViewSwipeChanging(Microsoft.Maui.SwipeViewSwipeChanging! original) -> void
+Microsoft.Maui.SwipeViewSwipeEnded.Deconstruct(out Microsoft.Maui.SwipeDirection SwipeDirection, out bool IsOpen) -> void
+Microsoft.Maui.SwipeViewSwipeEnded.SwipeViewSwipeEnded(Microsoft.Maui.SwipeViewSwipeEnded! original) -> void
+Microsoft.Maui.SwipeViewSwipeStarted.Deconstruct(out Microsoft.Maui.SwipeDirection SwipeDirection) -> void
+Microsoft.Maui.SwipeViewSwipeStarted.SwipeViewSwipeStarted(Microsoft.Maui.SwipeViewSwipeStarted! original) -> void
+Microsoft.Maui.WebResourceRequestedEventArgs
+override Microsoft.Maui.Converters.EasingTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.EasingTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.EasingTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.EasingTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.EasingTypeConverter.GetStandardValues(System.ComponentModel.ITypeDescriptorContext? context) -> System.ComponentModel.TypeConverter.StandardValuesCollection?
+override Microsoft.Maui.Converters.EasingTypeConverter.GetStandardValuesExclusive(System.ComponentModel.ITypeDescriptorContext? context) -> bool
+override Microsoft.Maui.Converters.EasingTypeConverter.GetStandardValuesSupported(System.ComponentModel.ITypeDescriptorContext? context) -> bool
+override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.FlexBasisTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexBasisTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexBasisTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexBasisTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.FlexDirectionTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexDirectionTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexDirectionTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexDirectionTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.FlexJustifyTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexJustifyTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexJustifyTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexJustifyTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value) -> object!
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object!
+override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.ThicknessTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
+override Microsoft.Maui.Converters.ThicknessTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Equals(object? obj) -> bool
+override Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.GetHashCode() -> int
+override Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.ToString() -> string!
+override Microsoft.Maui.Handlers.LayoutHandlerUpdate.Equals(object? obj) -> bool
+override Microsoft.Maui.Handlers.LayoutHandlerUpdate.GetHashCode() -> int
+override Microsoft.Maui.Handlers.LayoutHandlerUpdate.ToString() -> string!
+override Microsoft.Maui.Handlers.MenuBarHandlerUpdate.Equals(object? obj) -> bool
+override Microsoft.Maui.Handlers.MenuBarHandlerUpdate.GetHashCode() -> int
+override Microsoft.Maui.Handlers.MenuBarHandlerUpdate.ToString() -> string!
+override Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.Equals(object? obj) -> bool
+override Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.GetHashCode() -> int
+override Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.ToString() -> string!
+override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.Equals(object? obj) -> bool
+override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.GetHashCode() -> int
+override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.ToString() -> string!
+override Microsoft.Maui.Handlers.OpenWindowRequest.Equals(object? obj) -> bool
+override Microsoft.Maui.Handlers.OpenWindowRequest.GetHashCode() -> int
+override Microsoft.Maui.Handlers.OpenWindowRequest.ToString() -> string!
+override Microsoft.Maui.SafeAreaEdges.Equals(object? obj) -> bool
+override Microsoft.Maui.SafeAreaEdges.GetHashCode() -> int
+override Microsoft.Maui.SafeAreaEdges.ToString() -> string!
+override Microsoft.Maui.ScrollToRequest.Equals(object? obj) -> bool
+override Microsoft.Maui.ScrollToRequest.GetHashCode() -> int
+override Microsoft.Maui.ScrollToRequest.ToString() -> string!
+override Microsoft.Maui.SwipeViewCloseRequest.Equals(object? obj) -> bool
+override Microsoft.Maui.SwipeViewCloseRequest.GetHashCode() -> int
+override Microsoft.Maui.SwipeViewCloseRequest.ToString() -> string!
+override Microsoft.Maui.SwipeViewOpenRequest.Equals(object? obj) -> bool
+override Microsoft.Maui.SwipeViewOpenRequest.GetHashCode() -> int
+override Microsoft.Maui.SwipeViewOpenRequest.ToString() -> string!
+override Microsoft.Maui.SwipeViewSwipeChanging.Equals(object? obj) -> bool
+override Microsoft.Maui.SwipeViewSwipeChanging.GetHashCode() -> int
+override Microsoft.Maui.SwipeViewSwipeChanging.ToString() -> string!
+override Microsoft.Maui.SwipeViewSwipeEnded.Equals(object? obj) -> bool
+override Microsoft.Maui.SwipeViewSwipeEnded.GetHashCode() -> int
+override Microsoft.Maui.SwipeViewSwipeEnded.ToString() -> string!
+override Microsoft.Maui.SwipeViewSwipeStarted.Equals(object? obj) -> bool
+override Microsoft.Maui.SwipeViewSwipeStarted.GetHashCode() -> int
+override Microsoft.Maui.SwipeViewSwipeStarted.ToString() -> string!
+*REMOVED*readonly Microsoft.Maui.PropertyMapper._mapper -> System.Collections.Generic.Dictionary<string!, System.Action<Microsoft.Maui.IElementHandler!, Microsoft.Maui.IElement!>!>!
+static Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.operator !=(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? left, Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.operator ==(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? left, Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.LayoutHandlerUpdate.operator !=(Microsoft.Maui.Handlers.LayoutHandlerUpdate? left, Microsoft.Maui.Handlers.LayoutHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.LayoutHandlerUpdate.operator ==(Microsoft.Maui.Handlers.LayoutHandlerUpdate? left, Microsoft.Maui.Handlers.LayoutHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.MenuBarHandlerUpdate.operator !=(Microsoft.Maui.Handlers.MenuBarHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.MenuBarHandlerUpdate.operator ==(Microsoft.Maui.Handlers.MenuBarHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.operator !=(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.operator ==(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.operator !=(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.operator ==(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? right) -> bool
+static Microsoft.Maui.Handlers.OpenWindowRequest.operator !=(Microsoft.Maui.Handlers.OpenWindowRequest? left, Microsoft.Maui.Handlers.OpenWindowRequest? right) -> bool
+static Microsoft.Maui.Handlers.OpenWindowRequest.operator ==(Microsoft.Maui.Handlers.OpenWindowRequest? left, Microsoft.Maui.Handlers.OpenWindowRequest? right) -> bool
+static Microsoft.Maui.Handlers.SearchBarHandler.MapReturnType(Microsoft.Maui.IViewHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
+static Microsoft.Maui.Hosting.AppHostBuilderExtensions.ConfigureEnvironmentVariables(this Microsoft.Maui.Hosting.MauiAppBuilder! builder) -> Microsoft.Maui.Hosting.MauiAppBuilder!
+static Microsoft.Maui.SafeAreaEdges.All.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.Default.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.None.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.operator !=(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
+static Microsoft.Maui.SafeAreaEdges.operator ==(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
+static Microsoft.Maui.ScrollToRequest.operator !=(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
+static Microsoft.Maui.ScrollToRequest.operator ==(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
+static Microsoft.Maui.SwipeViewCloseRequest.operator !=(Microsoft.Maui.SwipeViewCloseRequest? left, Microsoft.Maui.SwipeViewCloseRequest? right) -> bool
+static Microsoft.Maui.SwipeViewCloseRequest.operator ==(Microsoft.Maui.SwipeViewCloseRequest? left, Microsoft.Maui.SwipeViewCloseRequest? right) -> bool
+static Microsoft.Maui.SwipeViewOpenRequest.operator !=(Microsoft.Maui.SwipeViewOpenRequest? left, Microsoft.Maui.SwipeViewOpenRequest? right) -> bool
+static Microsoft.Maui.SwipeViewOpenRequest.operator ==(Microsoft.Maui.SwipeViewOpenRequest? left, Microsoft.Maui.SwipeViewOpenRequest? right) -> bool
+static Microsoft.Maui.SwipeViewSwipeChanging.operator !=(Microsoft.Maui.SwipeViewSwipeChanging? left, Microsoft.Maui.SwipeViewSwipeChanging? right) -> bool
+static Microsoft.Maui.SwipeViewSwipeChanging.operator ==(Microsoft.Maui.SwipeViewSwipeChanging? left, Microsoft.Maui.SwipeViewSwipeChanging? right) -> bool
+static Microsoft.Maui.SwipeViewSwipeEnded.operator !=(Microsoft.Maui.SwipeViewSwipeEnded? left, Microsoft.Maui.SwipeViewSwipeEnded? right) -> bool
+static Microsoft.Maui.SwipeViewSwipeEnded.operator ==(Microsoft.Maui.SwipeViewSwipeEnded? left, Microsoft.Maui.SwipeViewSwipeEnded? right) -> bool
+static Microsoft.Maui.SwipeViewSwipeStarted.operator !=(Microsoft.Maui.SwipeViewSwipeStarted? left, Microsoft.Maui.SwipeViewSwipeStarted? right) -> bool
+static Microsoft.Maui.SwipeViewSwipeStarted.operator ==(Microsoft.Maui.SwipeViewSwipeStarted? left, Microsoft.Maui.SwipeViewSwipeStarted? right) -> bool
+virtual Microsoft.Maui.Animations.Lerp.LerpDelegate.Invoke(object! start, object! end, double progress) -> object!
+virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate!
+virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Equals(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? other) -> bool
+virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.LayoutHandlerUpdate!
+virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.Equals(Microsoft.Maui.Handlers.LayoutHandlerUpdate? other) -> bool
+virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.MenuBarHandlerUpdate!
+virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.Equals(Microsoft.Maui.Handlers.MenuBarHandlerUpdate? other) -> bool
+virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate!
+virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.Equals(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? other) -> bool
+virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate!
+virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.Equals(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? other) -> bool
+virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.Handlers.OpenWindowRequest.<Clone>$() -> Microsoft.Maui.Handlers.OpenWindowRequest!
+virtual Microsoft.Maui.Handlers.OpenWindowRequest.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.Handlers.OpenWindowRequest.Equals(Microsoft.Maui.Handlers.OpenWindowRequest? other) -> bool
+virtual Microsoft.Maui.Handlers.OpenWindowRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
+*REMOVED*virtual Microsoft.Maui.PropertyMapper.ClearKeyCache() -> void
+*REMOVED*virtual Microsoft.Maui.PropertyMapper.UpdateKeys.get -> System.Collections.Generic.IReadOnlyCollection<string!>!
+virtual Microsoft.Maui.ScrollToRequest.<Clone>$() -> Microsoft.Maui.ScrollToRequest!
+virtual Microsoft.Maui.ScrollToRequest.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.ScrollToRequest.Equals(Microsoft.Maui.ScrollToRequest? other) -> bool
+virtual Microsoft.Maui.ScrollToRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.SwipeViewCloseRequest.<Clone>$() -> Microsoft.Maui.SwipeViewCloseRequest!
+virtual Microsoft.Maui.SwipeViewCloseRequest.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.SwipeViewCloseRequest.Equals(Microsoft.Maui.SwipeViewCloseRequest? other) -> bool
+virtual Microsoft.Maui.SwipeViewCloseRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.SwipeViewOpenRequest.<Clone>$() -> Microsoft.Maui.SwipeViewOpenRequest!
+virtual Microsoft.Maui.SwipeViewOpenRequest.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.SwipeViewOpenRequest.Equals(Microsoft.Maui.SwipeViewOpenRequest? other) -> bool
+virtual Microsoft.Maui.SwipeViewOpenRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.SwipeViewSwipeChanging.<Clone>$() -> Microsoft.Maui.SwipeViewSwipeChanging!
+virtual Microsoft.Maui.SwipeViewSwipeChanging.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.SwipeViewSwipeChanging.Equals(Microsoft.Maui.SwipeViewSwipeChanging? other) -> bool
+virtual Microsoft.Maui.SwipeViewSwipeChanging.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.SwipeViewSwipeEnded.<Clone>$() -> Microsoft.Maui.SwipeViewSwipeEnded!
+virtual Microsoft.Maui.SwipeViewSwipeEnded.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.SwipeViewSwipeEnded.Equals(Microsoft.Maui.SwipeViewSwipeEnded? other) -> bool
+virtual Microsoft.Maui.SwipeViewSwipeEnded.PrintMembers(System.Text.StringBuilder! builder) -> bool
+virtual Microsoft.Maui.SwipeViewSwipeStarted.<Clone>$() -> Microsoft.Maui.SwipeViewSwipeStarted!
+virtual Microsoft.Maui.SwipeViewSwipeStarted.EqualityContract.get -> System.Type!
+virtual Microsoft.Maui.SwipeViewSwipeStarted.Equals(Microsoft.Maui.SwipeViewSwipeStarted? other) -> bool
+virtual Microsoft.Maui.SwipeViewSwipeStarted.PrintMembers(System.Text.StringBuilder! builder) -> bool
diff --git a/src/Core/src/RuntimeFeature.cs b/src/Core/src/RuntimeFeature.cs
index 6fd15435e382..f9641a261143 100644
--- a/src/Core/src/RuntimeFeature.cs
+++ b/src/Core/src/RuntimeFeature.cs
@@ -129,5 +129,5 @@ internal set
 			}
 		}
 #pragma warning restore IL4000
-    }
+	}
 }
diff --git a/src/Core/tests/DeviceTests.Shared/ImageAnalysis/RawBitmap.cs b/src/Core/tests/DeviceTests.Shared/ImageAnalysis/RawBitmap.cs
index ef4760329da2..2239ca4f25c3 100644
--- a/src/Core/tests/DeviceTests.Shared/ImageAnalysis/RawBitmap.cs
+++ b/src/Core/tests/DeviceTests.Shared/ImageAnalysis/RawBitmap.cs
@@ -128,7 +128,7 @@ private static async Task<RawBitmap> CaptureView(global::Android.Views.View view
 				await Task.Delay(10); // Wait for Android to render the view
 #pragma warning restore CS0618 // Obsolete				
 			var bitmap = global::Android.Graphics.Bitmap.CreateBitmap(view.Width, view.Height, global::Android.Graphics.Bitmap.Config.Argb8888);
-			global::Android.Graphics.Canvas canvas = new (bitmap);
+			global::Android.Graphics.Canvas canvas = new(bitmap);
 			view.Draw(canvas);
 			int[] pixels = new int[bitmap.Width * bitmap.Height];
 			bitmap.GetPixels(pixels, 0, bitmap.Width, 0, 0, bitmap.Width, bitmap.Height);
diff --git a/src/Graphics/src/Graphics.Skia/SkiaCanvas.cs b/src/Graphics/src/Graphics.Skia/SkiaCanvas.cs
index 094bab7d4df6..382cfd4bb41d 100644
--- a/src/Graphics/src/Graphics.Skia/SkiaCanvas.cs
+++ b/src/Graphics/src/Graphics.Skia/SkiaCanvas.cs
@@ -747,22 +747,16 @@ public override void ResetState()
 		{
 			base.ResetState();
 
-			if (_shader != null)
-			{
-				_shader.Dispose();
-				_shader = null;
-			}
+			_shader?.Dispose();
+			_shader = null;
 
 			_stateService.Reset(CurrentState);
 		}
 
 		public override bool RestoreState()
 		{
-			if (_shader != null)
-			{
-				_shader.Dispose();
-				_shader = null;
-			}
+			_shader?.Dispose();
+			_shader = null;
 
 			return base.RestoreState();
 		}
diff --git a/src/Graphics/src/Graphics.Skia/SkiaCanvasState.cs b/src/Graphics/src/Graphics.Skia/SkiaCanvasState.cs
index 2f6cbc9dc264..4438cd9b2bc4 100644
--- a/src/Graphics/src/Graphics.Skia/SkiaCanvasState.cs
+++ b/src/Graphics/src/Graphics.Skia/SkiaCanvasState.cs
@@ -197,11 +197,8 @@ public void SetBlur(float radius)
 		{
 			if (radius != _blurRadius)
 			{
-				if (_blurFilter != null)
-				{
-					_blurFilter.Dispose();
-					_blurFilter = null;
-				}
+				_blurFilter?.Dispose();
+				_blurFilter = null;
 
 				if (radius > 0)
 				{
diff --git a/src/Graphics/src/Graphics/AbstractCanvas.cs b/src/Graphics/src/Graphics/AbstractCanvas.cs
index 29f866afaa4b..714607995731 100644
--- a/src/Graphics/src/Graphics/AbstractCanvas.cs
+++ b/src/Graphics/src/Graphics/AbstractCanvas.cs
@@ -52,11 +52,8 @@ protected AbstractCanvas(ICanvasStateService<TState> stateService, IStringSizeSe
 
 		public virtual void Dispose()
 		{
-			if (_currentState != null)
-			{
-				_currentState.Dispose();
-				_currentState = null;
-			}
+			_currentState?.Dispose();
+			_currentState = null;
 		}
 
 		public bool LimitStrokeScaling
@@ -215,21 +212,15 @@ public virtual void ResetState()
 		{
 			while (_stateStack.Count > 0)
 			{
-				if (_currentState != null)
-				{
-					_currentState.Dispose();
-					_currentState = null;
-				}
+				_currentState?.Dispose();
+				_currentState = null;
 
 				_currentState = _stateStack.Pop();
 				StateRestored(_currentState);
 			}
 
-			if (_currentState != null)
-			{
-				_currentState.Dispose();
-				_currentState = null;
-			}
+			_currentState?.Dispose();
+			_currentState = null;
 
 			_currentState = _stateService.CreateNew(this);
 		}
@@ -243,11 +234,8 @@ public virtual bool RestoreState()
 		{
 			_strokeDashPatternDirty = true;
 
-			if (_currentState != null)
-			{
-				_currentState.Dispose();
-				_currentState = null;
-			}
+			_currentState?.Dispose();
+			_currentState = null;
 
 			if (_stateStack.Count > 0)
 			{
diff --git a/src/Graphics/src/Graphics/Platforms/Android/PlatformBitmapExportContext.cs b/src/Graphics/src/Graphics/Platforms/Android/PlatformBitmapExportContext.cs
index a4a638437528..178d4ff9dbd8 100644
--- a/src/Graphics/src/Graphics/Platforms/Android/PlatformBitmapExportContext.cs
+++ b/src/Graphics/src/Graphics/Platforms/Android/PlatformBitmapExportContext.cs
@@ -41,11 +41,8 @@ public PlatformBitmapExportContext(int width, int height, float displayScale = 1
 
 		public override void Dispose()
 		{
-			if (_androidCanvas != null)
-			{
-				_androidCanvas.Dispose();
-				_androidCanvas = null;
-			}
+			_androidCanvas?.Dispose();
+			_androidCanvas = null;
 
 			if (_bitmap != null && _disposeBitmap)
 			{
diff --git a/src/Graphics/src/Graphics/Platforms/Android/PlatformCanvas.cs b/src/Graphics/src/Graphics/Platforms/Android/PlatformCanvas.cs
index 49ae1157e90e..2dc201b749a2 100644
--- a/src/Graphics/src/Graphics/Platforms/Android/PlatformCanvas.cs
+++ b/src/Graphics/src/Graphics/Platforms/Android/PlatformCanvas.cs
@@ -668,22 +668,16 @@ public override void ResetState()
 		{
 			base.ResetState();
 
-			if (_shader != null)
-			{
-				_shader.Dispose();
-				_shader = null;
-			}
+			_shader?.Dispose();
+			_shader = null;
 
 			_stateService.Reset(CurrentState);
 		}
 
 		public override bool RestoreState()
 		{
-			if (_shader != null)
-			{
-				_shader.Dispose();
-				_shader = null;
-			}
+			_shader?.Dispose();
+			_shader = null;
 
 			return base.RestoreState();
 		}
diff --git a/src/Graphics/src/Graphics/Platforms/Android/PlatformCanvasState.cs b/src/Graphics/src/Graphics/Platforms/Android/PlatformCanvasState.cs
index 4828a7db7bf6..52cdc2b56f00 100644
--- a/src/Graphics/src/Graphics/Platforms/Android/PlatformCanvasState.cs
+++ b/src/Graphics/src/Graphics/Platforms/Android/PlatformCanvasState.cs
@@ -150,11 +150,8 @@ public void SetBlur(float aRadius)
 		{
 			if (aRadius != _blurRadius)
 			{
-				if (_blurFilter != null)
-				{
-					_blurFilter.Dispose();
-					_blurFilter = null;
-				}
+				_blurFilter?.Dispose();
+				_blurFilter = null;
 
 				if (aRadius > 0)
 				{
@@ -327,23 +324,14 @@ public void SetFillPaintFilterBitmap(bool value)
 
 		public override void Dispose()
 		{
-			if (_fontPaint != null)
-			{
-				_fontPaint.Dispose();
-				_fontPaint = null;
-			}
+			_fontPaint?.Dispose();
+			_fontPaint = null;
 
-			if (_strokePaint != null)
-			{
-				_strokePaint.Dispose();
-				_strokePaint = null;
-			}
+			_strokePaint?.Dispose();
+			_strokePaint = null;
 
-			if (_fillPaint != null)
-			{
-				_fillPaint.Dispose();
-				_fillPaint = null;
-			}
+			_fillPaint?.Dispose();
+			_fillPaint = null;
 
 			base.Dispose();
 		}

From 48f80fb646e7f71b469f7aafc0e83e5e20e08b4e Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 25 Jul 2025 13:50:19 +0000
Subject: [PATCH 14/34] Add *.bak to .gitignore to exclude backup files

Co-authored-by: PureWeen <5375137+PureWeen@users.noreply.github.com>
---
 .gitignore                                    |   1 +
 .../net-android/PublicAPI.Unshipped.txt.bak   | 315 ------------------
 .../net-ios/PublicAPI.Unshipped.txt.bak       | 306 -----------------
 .../PublicAPI.Unshipped.txt.bak               | 309 -----------------
 .../net-tizen/PublicAPI.Unshipped.txt.bak     | 222 ------------
 .../net-windows/PublicAPI.Unshipped.txt.bak   | 273 ---------------
 .../netstandard/PublicAPI.Unshipped.txt.bak   | 248 --------------
 .../PublicAPI.Unshipped.txt.bak               | 248 --------------
 8 files changed, 1 insertion(+), 1921 deletions(-)
 delete mode 100644 src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt.bak
 delete mode 100644 src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt.bak
 delete mode 100644 src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt.bak
 delete mode 100644 src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt.bak
 delete mode 100644 src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt.bak
 delete mode 100644 src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt.bak
 delete mode 100644 src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt.bak

diff --git a/.gitignore b/.gitignore
index 5a048174d6c3..f290a755fda4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 .nuspec/
 .buildtasks/
 templatesTest/
+*.bak
 
 # User-specific files
 *.rsuser
diff --git a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt.bak b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt.bak
deleted file mode 100644
index d63fc630af8d..000000000000
--- a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt.bak
+++ /dev/null
@@ -1,315 +0,0 @@
-#nullable enable
-Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter
-Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.SafeAreaEdgesTypeConverter() -> void
-Microsoft.Maui.Graphics.MauiDrawable.SetEmptyBorderBrush() -> void
-Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.ContextFlyoutItemHandlerUpdate(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate! original) -> void
-Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
-Microsoft.Maui.Handlers.DataFlowDirection
-Microsoft.Maui.Handlers.DataFlowDirection.FromPlatform = 1 -> Microsoft.Maui.Handlers.DataFlowDirection
-Microsoft.Maui.Handlers.DataFlowDirection.ToPlatform = 0 -> Microsoft.Maui.Handlers.DataFlowDirection
-Microsoft.Maui.Handlers.LayoutHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IView! View) -> void
-Microsoft.Maui.Handlers.LayoutHandlerUpdate.LayoutHandlerUpdate(Microsoft.Maui.Handlers.LayoutHandlerUpdate! original) -> void
-Microsoft.Maui.Handlers.MenuBarHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuBarItem! MenuBarItem) -> void
-Microsoft.Maui.Handlers.MenuBarHandlerUpdate.MenuBarHandlerUpdate(Microsoft.Maui.Handlers.MenuBarHandlerUpdate! original) -> void
-Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
-Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.MenuBarItemHandlerUpdate(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate! original) -> void
-Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
-Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.MenuFlyoutSubItemHandlerUpdate(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate! original) -> void
-Microsoft.Maui.Handlers.OpenWindowRequest.Deconstruct(out Microsoft.Maui.IPersistedState? State) -> void
-Microsoft.Maui.Handlers.OpenWindowRequest.OpenWindowRequest(Microsoft.Maui.Handlers.OpenWindowRequest! original) -> void
-Microsoft.Maui.Hosting.MauiAppBuilder.Environment.get -> Microsoft.Maui.Hosting.MauiHostEnvironment!
-Microsoft.Maui.Hosting.MauiAppBuilder.Properties.get -> System.Collections.Generic.IDictionary<object!, object!>!
-Microsoft.Maui.Hosting.MauiHostEnvironment
-Microsoft.Maui.Hosting.MauiHostEnvironment.ApplicationName.get -> string!
-Microsoft.Maui.Hosting.MauiHostEnvironment.ApplicationName.set -> void
-Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootFileProvider.get -> Microsoft.Extensions.FileProviders.IFileProvider!
-Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootFileProvider.set -> void
-Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootPath.get -> string!
-Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootPath.set -> void
-Microsoft.Maui.Hosting.MauiHostEnvironment.EnvironmentName.get -> string!
-Microsoft.Maui.Hosting.MauiHostEnvironment.EnvironmentName.set -> void
-Microsoft.Maui.Hosting.MauiHostEnvironment.MauiHostEnvironment() -> void
-*REMOVED*Microsoft.Maui.IDatePicker.Date.get -> System.DateTime
-Microsoft.Maui.IDatePicker.Date.get -> System.DateTime?
-Microsoft.Maui.IDatePicker.IsOpen.get -> bool
-Microsoft.Maui.IDatePicker.IsOpen.set -> void
-*REMOVED*Microsoft.Maui.IDatePicker.MaximumDate.get -> System.DateTime
-Microsoft.Maui.IDatePicker.MaximumDate.get -> System.DateTime?
-*REMOVED*Microsoft.Maui.IDatePicker.MinimumDate.get -> System.DateTime
-Microsoft.Maui.IDatePicker.MinimumDate.get -> System.DateTime?
-Microsoft.Maui.IPicker.IsOpen.get -> bool
-Microsoft.Maui.IPicker.IsOpen.set -> void
-Microsoft.Maui.ISearchBar.ReturnType.get -> Microsoft.Maui.ReturnType
-Microsoft.Maui.ISearchBar.SearchIconColor.get -> Microsoft.Maui.Graphics.Color!
-Microsoft.Maui.ITimePicker.IsOpen.get -> bool
-Microsoft.Maui.ITimePicker.IsOpen.set -> void
-*REMOVED*Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan
-Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan?
-Microsoft.Maui.IWebRequestInterceptingWebView
-Microsoft.Maui.IWebRequestInterceptingWebView.WebResourceRequested(Microsoft.Maui.WebResourceRequestedEventArgs! args) -> bool
-*REMOVED*Microsoft.Maui.Platform.MauiPicker.ShowPopupOnFocus.get -> bool
-*REMOVED*Microsoft.Maui.Platform.MauiPicker.ShowPopupOnFocus.set -> void
-Microsoft.Maui.Platform.MauiSwipeRefreshLayout.CrossPlatformLayout.get -> Microsoft.Maui.ICrossPlatformLayout?
-Microsoft.Maui.Platform.MauiSwipeRefreshLayout.CrossPlatformLayout.set -> void
-*REMOVED*Microsoft.Maui.PlatformWrapperView.SetHasShadow(bool hasShadow) -> void
-Microsoft.Maui.SafeAreaEdges
-Microsoft.Maui.SafeAreaEdges.Bottom.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Bottom.set -> void
-Microsoft.Maui.SafeAreaEdges.Equals(Microsoft.Maui.SafeAreaEdges other) -> bool
-Microsoft.Maui.SafeAreaEdges.GetEdge(int edge) -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Left.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Left.set -> void
-Microsoft.Maui.SafeAreaEdges.Right.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Right.set -> void
-Microsoft.Maui.SafeAreaEdges.SafeAreaEdges() -> void
-Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions horizontal, Microsoft.Maui.SafeAreaRegions vertical) -> void
-Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions left, Microsoft.Maui.SafeAreaRegions top, Microsoft.Maui.SafeAreaRegions right, Microsoft.Maui.SafeAreaRegions bottom) -> void
-Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions uniformValue) -> void
-Microsoft.Maui.SafeAreaEdges.SetEdge(int edge, Microsoft.Maui.SafeAreaRegions value) -> void
-Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Top.set -> void
-Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.All = Microsoft.Maui.SafeAreaRegions.SoftInput | Microsoft.Maui.SafeAreaRegions.Container -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.Default = 4 -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.None = 0 -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.SoftInput = 1 -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.ScrollToRequest.Deconstruct(out double HorizontalOffset, out double VerticalOffset, out bool Instant) -> void
-Microsoft.Maui.ScrollToRequest.ScrollToRequest(Microsoft.Maui.ScrollToRequest! original) -> void
-Microsoft.Maui.SwipeViewCloseRequest.Deconstruct(out bool Animated) -> void
-Microsoft.Maui.SwipeViewCloseRequest.SwipeViewCloseRequest(Microsoft.Maui.SwipeViewCloseRequest! original) -> void
-Microsoft.Maui.SwipeViewOpenRequest.Deconstruct(out Microsoft.Maui.OpenSwipeItem OpenSwipeItem, out bool Animated) -> void
-Microsoft.Maui.SwipeViewOpenRequest.SwipeViewOpenRequest(Microsoft.Maui.SwipeViewOpenRequest! original) -> void
-Microsoft.Maui.SwipeViewSwipeChanging.Deconstruct(out Microsoft.Maui.SwipeDirection SwipeDirection, out double Offset) -> void
-Microsoft.Maui.SwipeViewSwipeChanging.SwipeViewSwipeChanging(Microsoft.Maui.SwipeViewSwipeChanging! original) -> void
-Microsoft.Maui.SwipeViewSwipeEnded.Deconstruct(out Microsoft.Maui.SwipeDirection SwipeDirection, out bool IsOpen) -> void
-Microsoft.Maui.SwipeViewSwipeEnded.SwipeViewSwipeEnded(Microsoft.Maui.SwipeViewSwipeEnded! original) -> void
-Microsoft.Maui.SwipeViewSwipeStarted.Deconstruct(out Microsoft.Maui.SwipeDirection SwipeDirection) -> void
-Microsoft.Maui.SwipeViewSwipeStarted.SwipeViewSwipeStarted(Microsoft.Maui.SwipeViewSwipeStarted! original) -> void
-Microsoft.Maui.WebResourceRequestedEventArgs
-Microsoft.Maui.WebResourceRequestedEventArgs.Request.get -> Android.Webkit.IWebResourceRequest!
-Microsoft.Maui.WebResourceRequestedEventArgs.Response.get -> Android.Webkit.WebResourceResponse?
-Microsoft.Maui.WebResourceRequestedEventArgs.Response.set -> void
-Microsoft.Maui.WebResourceRequestedEventArgs.Sender.get -> Android.Webkit.WebView!
-override Microsoft.Maui.Converters.EasingTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.EasingTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.EasingTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.EasingTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.EasingTypeConverter.GetStandardValues(System.ComponentModel.ITypeDescriptorContext? context) -> System.ComponentModel.TypeConverter.StandardValuesCollection?
-override Microsoft.Maui.Converters.EasingTypeConverter.GetStandardValuesExclusive(System.ComponentModel.ITypeDescriptorContext? context) -> bool
-override Microsoft.Maui.Converters.EasingTypeConverter.GetStandardValuesSupported(System.ComponentModel.ITypeDescriptorContext? context) -> bool
-override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.FlexBasisTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexBasisTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexBasisTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexBasisTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.FlexDirectionTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexDirectionTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexDirectionTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexDirectionTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.FlexJustifyTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexJustifyTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexJustifyTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexJustifyTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value) -> object!
-override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object!
-override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.ThicknessTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.ThicknessTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Equals(object? obj) -> bool
-override Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.GetHashCode() -> int
-override Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.ToString() -> string!
-*REMOVED*override Microsoft.Maui.Handlers.EditorHandler.ConnectHandler(AndroidX.AppCompat.Widget.AppCompatEditText! platformView) -> void
-override Microsoft.Maui.Handlers.EditorHandler.ConnectHandler(Microsoft.Maui.Platform.MauiAppCompatEditText! platformView) -> void
-*REMOVED*override Microsoft.Maui.Handlers.EditorHandler.CreatePlatformView() -> AndroidX.AppCompat.Widget.AppCompatEditText!
-override Microsoft.Maui.Handlers.EditorHandler.CreatePlatformView() -> Microsoft.Maui.Platform.MauiAppCompatEditText!
-*REMOVED*override Microsoft.Maui.Handlers.EditorHandler.DisconnectHandler(AndroidX.AppCompat.Widget.AppCompatEditText! platformView) -> void
-override Microsoft.Maui.Handlers.EditorHandler.DisconnectHandler(Microsoft.Maui.Platform.MauiAppCompatEditText! platformView) -> void
-*REMOVED*override Microsoft.Maui.Handlers.EntryHandler.ConnectHandler(AndroidX.AppCompat.Widget.AppCompatEditText! platformView) -> void
-override Microsoft.Maui.Handlers.EntryHandler.ConnectHandler(Microsoft.Maui.Platform.MauiAppCompatEditText! platformView) -> void
-*REMOVED*override Microsoft.Maui.Handlers.EntryHandler.CreatePlatformView() -> AndroidX.AppCompat.Widget.AppCompatEditText!
-override Microsoft.Maui.Handlers.EntryHandler.CreatePlatformView() -> Microsoft.Maui.Platform.MauiAppCompatEditText!
-*REMOVED*override Microsoft.Maui.Handlers.EntryHandler.DisconnectHandler(AndroidX.AppCompat.Widget.AppCompatEditText! platformView) -> void
-override Microsoft.Maui.Handlers.EntryHandler.DisconnectHandler(Microsoft.Maui.Platform.MauiAppCompatEditText! platformView) -> void
-override Microsoft.Maui.Handlers.LayoutHandlerUpdate.Equals(object? obj) -> bool
-override Microsoft.Maui.Handlers.LayoutHandlerUpdate.GetHashCode() -> int
-override Microsoft.Maui.Handlers.LayoutHandlerUpdate.ToString() -> string!
-override Microsoft.Maui.Handlers.MenuBarHandlerUpdate.Equals(object? obj) -> bool
-override Microsoft.Maui.Handlers.MenuBarHandlerUpdate.GetHashCode() -> int
-override Microsoft.Maui.Handlers.MenuBarHandlerUpdate.ToString() -> string!
-override Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.Equals(object? obj) -> bool
-override Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.GetHashCode() -> int
-override Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.ToString() -> string!
-override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.Equals(object? obj) -> bool
-override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.GetHashCode() -> int
-override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.ToString() -> string!
-override Microsoft.Maui.Handlers.OpenWindowRequest.Equals(object? obj) -> bool
-override Microsoft.Maui.Handlers.OpenWindowRequest.GetHashCode() -> int
-override Microsoft.Maui.Handlers.OpenWindowRequest.ToString() -> string!
-override Microsoft.Maui.Handlers.RefreshViewHandler.SetVirtualView(Microsoft.Maui.IView! view) -> void
-override Microsoft.Maui.Handlers.TimePickerHandler.ConnectHandler(Microsoft.Maui.Platform.MauiTimePicker! platformView) -> void
-override Microsoft.Maui.Platform.MauiDatePicker.DefaultMovementMethod.get -> Android.Text.Method.IMovementMethod?
-*REMOVED*override Microsoft.Maui.Platform.MauiPicker.OnFocusChanged(bool gainFocus, Android.Views.FocusSearchDirection direction, Android.Graphics.Rect? previouslyFocusedRect) -> void
-*REMOVED*override Microsoft.Maui.Platform.MauiPicker.OnTouchEvent(Android.Views.MotionEvent? e) -> bool
-override Microsoft.Maui.Platform.MauiPickerBase.DefaultMovementMethod.get -> Android.Text.Method.IMovementMethod?
-override Microsoft.Maui.Platform.MauiSwipeRefreshLayout.OnLayout(bool changed, int left, int top, int right, int bottom) -> void
-override Microsoft.Maui.Platform.MauiSwipeRefreshLayout.OnMeasure(int widthMeasureSpec, int heightMeasureSpec) -> void
-*REMOVED*override Microsoft.Maui.Platform.MauiTextView.OnMeasure(int widthMeasureSpec, int heightMeasureSpec) -> void
-override Microsoft.Maui.Platform.MauiTimePicker.DefaultMovementMethod.get -> Android.Text.Method.IMovementMethod?
-override Microsoft.Maui.Platform.MauiWebChromeClient.OnHideCustomView() -> void
-~override Microsoft.Maui.Platform.MauiWebChromeClient.OnShowCustomView(Android.Views.View view, Android.Webkit.WebChromeClient.ICustomViewCallback callback) -> void
-override Microsoft.Maui.SafeAreaEdges.Equals(object? obj) -> bool
-override Microsoft.Maui.SafeAreaEdges.GetHashCode() -> int
-override Microsoft.Maui.SafeAreaEdges.ToString() -> string!
-override Microsoft.Maui.ScrollToRequest.Equals(object? obj) -> bool
-override Microsoft.Maui.ScrollToRequest.GetHashCode() -> int
-override Microsoft.Maui.ScrollToRequest.ToString() -> string!
-override Microsoft.Maui.SwipeViewCloseRequest.Equals(object? obj) -> bool
-override Microsoft.Maui.SwipeViewCloseRequest.GetHashCode() -> int
-override Microsoft.Maui.SwipeViewCloseRequest.ToString() -> string!
-override Microsoft.Maui.SwipeViewOpenRequest.Equals(object? obj) -> bool
-override Microsoft.Maui.SwipeViewOpenRequest.GetHashCode() -> int
-override Microsoft.Maui.SwipeViewOpenRequest.ToString() -> string!
-override Microsoft.Maui.SwipeViewSwipeChanging.Equals(object? obj) -> bool
-override Microsoft.Maui.SwipeViewSwipeChanging.GetHashCode() -> int
-override Microsoft.Maui.SwipeViewSwipeChanging.ToString() -> string!
-override Microsoft.Maui.SwipeViewSwipeEnded.Equals(object? obj) -> bool
-override Microsoft.Maui.SwipeViewSwipeEnded.GetHashCode() -> int
-override Microsoft.Maui.SwipeViewSwipeEnded.ToString() -> string!
-override Microsoft.Maui.SwipeViewSwipeStarted.Equals(object? obj) -> bool
-override Microsoft.Maui.SwipeViewSwipeStarted.GetHashCode() -> int
-override Microsoft.Maui.SwipeViewSwipeStarted.ToString() -> string!
-*REMOVED*readonly Microsoft.Maui.PropertyMapper._mapper -> System.Collections.Generic.Dictionary<string!, System.Action<Microsoft.Maui.IElementHandler!, Microsoft.Maui.IElement!>!>!
-static Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.operator !=(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? left, Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.operator ==(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? left, Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.GraphicsViewHandler.MapBackground(Microsoft.Maui.Handlers.IGraphicsViewHandler! handler, Microsoft.Maui.IGraphicsView! graphicsView) -> void
-static Microsoft.Maui.Handlers.LayoutHandlerUpdate.operator !=(Microsoft.Maui.Handlers.LayoutHandlerUpdate? left, Microsoft.Maui.Handlers.LayoutHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.LayoutHandlerUpdate.operator ==(Microsoft.Maui.Handlers.LayoutHandlerUpdate? left, Microsoft.Maui.Handlers.LayoutHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.MenuBarHandlerUpdate.operator !=(Microsoft.Maui.Handlers.MenuBarHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.MenuBarHandlerUpdate.operator ==(Microsoft.Maui.Handlers.MenuBarHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.operator !=(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.operator ==(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.operator !=(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.operator ==(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.OpenWindowRequest.operator !=(Microsoft.Maui.Handlers.OpenWindowRequest? left, Microsoft.Maui.Handlers.OpenWindowRequest? right) -> bool
-static Microsoft.Maui.Handlers.OpenWindowRequest.operator ==(Microsoft.Maui.Handlers.OpenWindowRequest? left, Microsoft.Maui.Handlers.OpenWindowRequest? right) -> bool
-static Microsoft.Maui.Handlers.SearchBarHandler.MapReturnType(Microsoft.Maui.Handlers.ISearchBarHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
-static Microsoft.Maui.Hosting.AppHostBuilderExtensions.ConfigureEnvironmentVariables(this Microsoft.Maui.Hosting.MauiAppBuilder! builder) -> Microsoft.Maui.Hosting.MauiAppBuilder!
-static Microsoft.Maui.Platform.ButtonExtensions.UpdateRippleColor(this Google.Android.Material.Button.MaterialButton! platformView, Microsoft.Maui.Graphics.Color? rippleColor) -> void
-static Microsoft.Maui.Platform.EditTextExtensions.GetCursorPosition(this Android.Widget.EditText! editText, int cursorOffset = 0) -> int
-static Microsoft.Maui.Platform.EditTextExtensions.GetSelectedTextLength(this Android.Widget.EditText! editText) -> int
-static Microsoft.Maui.Platform.EditTextExtensions.UpdateClearButtonVisibility(this Android.Widget.EditText! editText, Microsoft.Maui.IEntry! entry) -> void
-*REMOVED*static Microsoft.Maui.Platform.EditTextExtensions.UpdateClearButtonVisibility(this Android.Widget.EditText! editText, Microsoft.Maui.IEntry! entry, Android.Graphics.Drawables.Drawable? clearButtonDrawable) -> void
-*REMOVED*static Microsoft.Maui.Platform.EditTextExtensions.UpdateClearButtonVisibility(this Android.Widget.EditText! editText, Microsoft.Maui.IEntry! entry, System.Func<Android.Graphics.Drawables.Drawable?>? getClearButtonDrawable) -> void
-static Microsoft.Maui.Platform.ImageButtonExtensions.UpdateBackground(this Google.Android.Material.ImageView.ShapeableImageView! platformButton, Microsoft.Maui.IImageButton! imageButton) -> void
-static Microsoft.Maui.Platform.ImageButtonExtensions.UpdateButtonBackground(this Google.Android.Material.ImageView.ShapeableImageView! platformView, Microsoft.Maui.IImageButton! button) -> void
-static Microsoft.Maui.Platform.ImageButtonExtensions.UpdateButtonStroke(this Google.Android.Material.ImageView.ShapeableImageView! platformView, Microsoft.Maui.IButtonStroke! button) -> void
-static Microsoft.Maui.Platform.ImageButtonExtensions.UpdateRippleColor(this Google.Android.Material.ImageView.ShapeableImageView! platformView, Microsoft.Maui.Graphics.Color! rippleColor) -> void
-static Microsoft.Maui.Platform.SearchViewExtensions.UpdateReturnType(this AndroidX.AppCompat.Widget.SearchView! searchView, Microsoft.Maui.ISearchBar! searchBar) -> void
-static Microsoft.Maui.SafeAreaEdges.All.get -> Microsoft.Maui.SafeAreaEdges
-static Microsoft.Maui.SafeAreaEdges.Default.get -> Microsoft.Maui.SafeAreaEdges
-static Microsoft.Maui.SafeAreaEdges.None.get -> Microsoft.Maui.SafeAreaEdges
-static Microsoft.Maui.SafeAreaEdges.operator !=(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
-static Microsoft.Maui.SafeAreaEdges.operator ==(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
-static Microsoft.Maui.ScrollToRequest.operator !=(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
-static Microsoft.Maui.ScrollToRequest.operator ==(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
-static Microsoft.Maui.SwipeViewCloseRequest.operator !=(Microsoft.Maui.SwipeViewCloseRequest? left, Microsoft.Maui.SwipeViewCloseRequest? right) -> bool
-static Microsoft.Maui.SwipeViewCloseRequest.operator ==(Microsoft.Maui.SwipeViewCloseRequest? left, Microsoft.Maui.SwipeViewCloseRequest? right) -> bool
-static Microsoft.Maui.SwipeViewOpenRequest.operator !=(Microsoft.Maui.SwipeViewOpenRequest? left, Microsoft.Maui.SwipeViewOpenRequest? right) -> bool
-static Microsoft.Maui.SwipeViewOpenRequest.operator ==(Microsoft.Maui.SwipeViewOpenRequest? left, Microsoft.Maui.SwipeViewOpenRequest? right) -> bool
-static Microsoft.Maui.SwipeViewSwipeChanging.operator !=(Microsoft.Maui.SwipeViewSwipeChanging? left, Microsoft.Maui.SwipeViewSwipeChanging? right) -> bool
-static Microsoft.Maui.SwipeViewSwipeChanging.operator ==(Microsoft.Maui.SwipeViewSwipeChanging? left, Microsoft.Maui.SwipeViewSwipeChanging? right) -> bool
-static Microsoft.Maui.SwipeViewSwipeEnded.operator !=(Microsoft.Maui.SwipeViewSwipeEnded? left, Microsoft.Maui.SwipeViewSwipeEnded? right) -> bool
-static Microsoft.Maui.SwipeViewSwipeEnded.operator ==(Microsoft.Maui.SwipeViewSwipeEnded? left, Microsoft.Maui.SwipeViewSwipeEnded? right) -> bool
-static Microsoft.Maui.SwipeViewSwipeStarted.operator !=(Microsoft.Maui.SwipeViewSwipeStarted? left, Microsoft.Maui.SwipeViewSwipeStarted? right) -> bool
-static Microsoft.Maui.SwipeViewSwipeStarted.operator ==(Microsoft.Maui.SwipeViewSwipeStarted? left, Microsoft.Maui.SwipeViewSwipeStarted? right) -> bool
-virtual Microsoft.Maui.Animations.Lerp.LerpDelegate.Invoke(object! start, object! end, double progress) -> object!
-virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate!
-virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Equals(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? other) -> bool
-virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.LayoutHandlerUpdate!
-virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.Equals(Microsoft.Maui.Handlers.LayoutHandlerUpdate? other) -> bool
-virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.MenuBarHandlerUpdate!
-virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.Equals(Microsoft.Maui.Handlers.MenuBarHandlerUpdate? other) -> bool
-virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate!
-virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.Equals(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? other) -> bool
-virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate!
-virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.Equals(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? other) -> bool
-virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.Handlers.OpenWindowRequest.<Clone>$() -> Microsoft.Maui.Handlers.OpenWindowRequest!
-virtual Microsoft.Maui.Handlers.OpenWindowRequest.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.Handlers.OpenWindowRequest.Equals(Microsoft.Maui.Handlers.OpenWindowRequest? other) -> bool
-virtual Microsoft.Maui.Handlers.OpenWindowRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.LifecycleEvents.AndroidLifecycle.OnActivityResult.Invoke(Android.App.Activity! activity, int requestCode, Android.App.Result resultCode, Android.Content.Intent? data) -> void
-virtual Microsoft.Maui.LifecycleEvents.AndroidLifecycle.OnApplicationConfigurationChanged.Invoke(Android.App.Application! application, Android.Content.Res.Configuration! newConfig) -> void
-virtual Microsoft.Maui.LifecycleEvents.AndroidLifecycle.OnApplicationCreate.Invoke(Android.App.Application! application) -> void
-virtual Microsoft.Maui.LifecycleEvents.AndroidLifecycle.OnApplicationCreating.Invoke(Android.App.Application! application) -> void
-virtual Microsoft.Maui.LifecycleEvents.AndroidLifecycle.OnApplicationLowMemory.Invoke(Android.App.Application! application) -> void
-virtual Microsoft.Maui.LifecycleEvents.AndroidLifecycle.OnApplicationTrimMemory.Invoke(Android.App.Application! application, Android.Content.TrimMemory level) -> void
-virtual Microsoft.Maui.LifecycleEvents.AndroidLifecycle.OnBackPressed.Invoke(Android.App.Activity! activity) -> bool
-virtual Microsoft.Maui.LifecycleEvents.AndroidLifecycle.OnConfigurationChanged.Invoke(Android.App.Activity! activity, Android.Content.Res.Configuration! newConfig) -> void
-virtual Microsoft.Maui.LifecycleEvents.AndroidLifecycle.OnCreate.Invoke(Android.App.Activity! activity, Android.OS.Bundle? savedInstanceState) -> void
-virtual Microsoft.Maui.LifecycleEvents.AndroidLifecycle.OnDestroy.Invoke(Android.App.Activity! activity) -> void
-virtual Microsoft.Maui.LifecycleEvents.AndroidLifecycle.OnNewIntent.Invoke(Android.App.Activity! activity, Android.Content.Intent? intent) -> void
-virtual Microsoft.Maui.LifecycleEvents.AndroidLifecycle.OnPause.Invoke(Android.App.Activity! activity) -> void
-virtual Microsoft.Maui.LifecycleEvents.AndroidLifecycle.OnPostCreate.Invoke(Android.App.Activity! activity, Android.OS.Bundle? savedInstanceState) -> void
-virtual Microsoft.Maui.LifecycleEvents.AndroidLifecycle.OnPostResume.Invoke(Android.App.Activity! activity) -> void
-virtual Microsoft.Maui.LifecycleEvents.AndroidLifecycle.OnRequestPermissionsResult.Invoke(Android.App.Activity! activity, int requestCode, string![]! permissions, Android.Content.PM.Permission[]! grantResults) -> void
-virtual Microsoft.Maui.LifecycleEvents.AndroidLifecycle.OnRestart.Invoke(Android.App.Activity! activity) -> void
-virtual Microsoft.Maui.LifecycleEvents.AndroidLifecycle.OnRestoreInstanceState.Invoke(Android.App.Activity! activity, Android.OS.Bundle! savedInstanceState) -> void
-virtual Microsoft.Maui.LifecycleEvents.AndroidLifecycle.OnResume.Invoke(Android.App.Activity! activity) -> void
-virtual Microsoft.Maui.LifecycleEvents.AndroidLifecycle.OnSaveInstanceState.Invoke(Android.App.Activity! activity, Android.OS.Bundle! outState) -> void
-virtual Microsoft.Maui.LifecycleEvents.AndroidLifecycle.OnStart.Invoke(Android.App.Activity! activity) -> void
-virtual Microsoft.Maui.LifecycleEvents.AndroidLifecycle.OnStop.Invoke(Android.App.Activity! activity) -> void
-*REMOVED*virtual Microsoft.Maui.PropertyMapper.ClearKeyCache() -> void
-*REMOVED*virtual Microsoft.Maui.PropertyMapper.UpdateKeys.get -> System.Collections.Generic.IReadOnlyCollection<string!>!
-virtual Microsoft.Maui.ScrollToRequest.<Clone>$() -> Microsoft.Maui.ScrollToRequest!
-virtual Microsoft.Maui.ScrollToRequest.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.ScrollToRequest.Equals(Microsoft.Maui.ScrollToRequest? other) -> bool
-virtual Microsoft.Maui.ScrollToRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.SwipeViewCloseRequest.<Clone>$() -> Microsoft.Maui.SwipeViewCloseRequest!
-virtual Microsoft.Maui.SwipeViewCloseRequest.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.SwipeViewCloseRequest.Equals(Microsoft.Maui.SwipeViewCloseRequest? other) -> bool
-virtual Microsoft.Maui.SwipeViewCloseRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.SwipeViewOpenRequest.<Clone>$() -> Microsoft.Maui.SwipeViewOpenRequest!
-virtual Microsoft.Maui.SwipeViewOpenRequest.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.SwipeViewOpenRequest.Equals(Microsoft.Maui.SwipeViewOpenRequest? other) -> bool
-virtual Microsoft.Maui.SwipeViewOpenRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.SwipeViewSwipeChanging.<Clone>$() -> Microsoft.Maui.SwipeViewSwipeChanging!
-virtual Microsoft.Maui.SwipeViewSwipeChanging.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.SwipeViewSwipeChanging.Equals(Microsoft.Maui.SwipeViewSwipeChanging? other) -> bool
-virtual Microsoft.Maui.SwipeViewSwipeChanging.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.SwipeViewSwipeEnded.<Clone>$() -> Microsoft.Maui.SwipeViewSwipeEnded!
-virtual Microsoft.Maui.SwipeViewSwipeEnded.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.SwipeViewSwipeEnded.Equals(Microsoft.Maui.SwipeViewSwipeEnded? other) -> bool
-virtual Microsoft.Maui.SwipeViewSwipeEnded.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.SwipeViewSwipeStarted.<Clone>$() -> Microsoft.Maui.SwipeViewSwipeStarted!
-virtual Microsoft.Maui.SwipeViewSwipeStarted.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.SwipeViewSwipeStarted.Equals(Microsoft.Maui.SwipeViewSwipeStarted? other) -> bool
-virtual Microsoft.Maui.SwipeViewSwipeStarted.PrintMembers(System.Text.StringBuilder! builder) -> bool
diff --git a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt.bak b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt.bak
deleted file mode 100644
index 2170ef116130..000000000000
--- a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt.bak
+++ /dev/null
@@ -1,306 +0,0 @@
-#nullable enable
-Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter
-Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.SafeAreaEdgesTypeConverter() -> void
-Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.ContextFlyoutItemHandlerUpdate(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate! original) -> void
-Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
-Microsoft.Maui.Handlers.DataFlowDirection
-Microsoft.Maui.Handlers.DataFlowDirection.FromPlatform = 1 -> Microsoft.Maui.Handlers.DataFlowDirection
-Microsoft.Maui.Handlers.DataFlowDirection.ToPlatform = 0 -> Microsoft.Maui.Handlers.DataFlowDirection
-Microsoft.Maui.Handlers.LayoutHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IView! View) -> void
-Microsoft.Maui.Handlers.LayoutHandlerUpdate.LayoutHandlerUpdate(Microsoft.Maui.Handlers.LayoutHandlerUpdate! original) -> void
-Microsoft.Maui.Handlers.MenuBarHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuBarItem! MenuBarItem) -> void
-Microsoft.Maui.Handlers.MenuBarHandlerUpdate.MenuBarHandlerUpdate(Microsoft.Maui.Handlers.MenuBarHandlerUpdate! original) -> void
-Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
-Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.MenuBarItemHandlerUpdate(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate! original) -> void
-Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
-Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.MenuFlyoutSubItemHandlerUpdate(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate! original) -> void
-Microsoft.Maui.Handlers.OpenWindowRequest.Deconstruct(out Microsoft.Maui.IPersistedState? State) -> void
-Microsoft.Maui.Handlers.OpenWindowRequest.OpenWindowRequest(Microsoft.Maui.Handlers.OpenWindowRequest! original) -> void
-Microsoft.Maui.Hosting.MauiAppBuilder.Environment.get -> Microsoft.Maui.Hosting.MauiHostEnvironment!
-Microsoft.Maui.Hosting.MauiAppBuilder.Properties.get -> System.Collections.Generic.IDictionary<object!, object!>!
-Microsoft.Maui.Hosting.MauiHostEnvironment
-Microsoft.Maui.Hosting.MauiHostEnvironment.ApplicationName.get -> string!
-Microsoft.Maui.Hosting.MauiHostEnvironment.ApplicationName.set -> void
-Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootFileProvider.get -> Microsoft.Extensions.FileProviders.IFileProvider!
-Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootFileProvider.set -> void
-Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootPath.get -> string!
-Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootPath.set -> void
-Microsoft.Maui.Hosting.MauiHostEnvironment.EnvironmentName.get -> string!
-Microsoft.Maui.Hosting.MauiHostEnvironment.EnvironmentName.set -> void
-Microsoft.Maui.Hosting.MauiHostEnvironment.MauiHostEnvironment() -> void
-*REMOVED*Microsoft.Maui.IDatePicker.Date.get -> System.DateTime
-Microsoft.Maui.IDatePicker.Date.get -> System.DateTime?
-Microsoft.Maui.IDatePicker.IsOpen.get -> bool
-Microsoft.Maui.IDatePicker.IsOpen.set -> void
-*REMOVED*Microsoft.Maui.IDatePicker.MaximumDate.get -> System.DateTime
-Microsoft.Maui.IDatePicker.MaximumDate.get -> System.DateTime?
-*REMOVED*Microsoft.Maui.IDatePicker.MinimumDate.get -> System.DateTime
-Microsoft.Maui.IDatePicker.MinimumDate.get -> System.DateTime?
-Microsoft.Maui.IPicker.IsOpen.get -> bool
-Microsoft.Maui.IPicker.IsOpen.set -> void
-Microsoft.Maui.ISearchBar.ReturnType.get -> Microsoft.Maui.ReturnType
-Microsoft.Maui.ISearchBar.SearchIconColor.get -> Microsoft.Maui.Graphics.Color!
-Microsoft.Maui.ITimePicker.IsOpen.get -> bool
-Microsoft.Maui.ITimePicker.IsOpen.set -> void
-*REMOVED*Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan
-Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan?
-Microsoft.Maui.IWebRequestInterceptingWebView
-Microsoft.Maui.IWebRequestInterceptingWebView.WebResourceRequested(Microsoft.Maui.WebResourceRequestedEventArgs! args) -> bool
-Microsoft.Maui.Platform.IAutoSizableCALayer
-Microsoft.Maui.Platform.IAutoSizableCALayer.AutoSizeToSuperLayer() -> void
-*REMOVED*Microsoft.Maui.Platform.MauiTimePicker.UpdateTime(System.TimeSpan time) -> void
-Microsoft.Maui.Platform.MauiTimePicker.UpdateTime(System.TimeSpan? time) -> void
-*REMOVED*Microsoft.Maui.Platform.MauiWebViewNavigationDelegate.DecidePolicy(WebKit.WKWebView! webView, WebKit.WKNavigationAction! navigationAction, System.Action<WebKit.WKNavigationActionPolicy>! decisionHandler) -> void
-*REMOVED*Microsoft.Maui.Platform.MauiWebViewNavigationDelegate.DidFailNavigation(WebKit.WKWebView! webView, WebKit.WKNavigation! navigation, Foundation.NSError! error) -> void
-*REMOVED*Microsoft.Maui.Platform.MauiWebViewNavigationDelegate.DidFailProvisionalNavigation(WebKit.WKWebView! webView, WebKit.WKNavigation! navigation, Foundation.NSError! error) -> void
-*REMOVED*Microsoft.Maui.Platform.MauiWebViewNavigationDelegate.DidFinishNavigation(WebKit.WKWebView! webView, WebKit.WKNavigation! navigation) -> void
-Microsoft.Maui.Platform.TextInputExtensions
-Microsoft.Maui.Platform.UIApplicationExtensions
-Microsoft.Maui.SafeAreaEdges
-Microsoft.Maui.SafeAreaEdges.Bottom.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Bottom.set -> void
-Microsoft.Maui.SafeAreaEdges.Equals(Microsoft.Maui.SafeAreaEdges other) -> bool
-Microsoft.Maui.SafeAreaEdges.GetEdge(int edge) -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Left.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Left.set -> void
-Microsoft.Maui.SafeAreaEdges.Right.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Right.set -> void
-Microsoft.Maui.SafeAreaEdges.SafeAreaEdges() -> void
-Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions horizontal, Microsoft.Maui.SafeAreaRegions vertical) -> void
-Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions left, Microsoft.Maui.SafeAreaRegions top, Microsoft.Maui.SafeAreaRegions right, Microsoft.Maui.SafeAreaRegions bottom) -> void
-Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions uniformValue) -> void
-Microsoft.Maui.SafeAreaEdges.SetEdge(int edge, Microsoft.Maui.SafeAreaRegions value) -> void
-Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Top.set -> void
-Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.All = Microsoft.Maui.SafeAreaRegions.SoftInput | Microsoft.Maui.SafeAreaRegions.Container -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.Default = 4 -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.None = 0 -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.SoftInput = 1 -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.ScrollToRequest.Deconstruct(out double HorizontalOffset, out double VerticalOffset, out bool Instant) -> void
-Microsoft.Maui.ScrollToRequest.ScrollToRequest(Microsoft.Maui.ScrollToRequest! original) -> void
-Microsoft.Maui.SwipeViewCloseRequest.Deconstruct(out bool Animated) -> void
-Microsoft.Maui.SwipeViewCloseRequest.SwipeViewCloseRequest(Microsoft.Maui.SwipeViewCloseRequest! original) -> void
-Microsoft.Maui.SwipeViewOpenRequest.Deconstruct(out Microsoft.Maui.OpenSwipeItem OpenSwipeItem, out bool Animated) -> void
-Microsoft.Maui.SwipeViewOpenRequest.SwipeViewOpenRequest(Microsoft.Maui.SwipeViewOpenRequest! original) -> void
-Microsoft.Maui.SwipeViewSwipeChanging.Deconstruct(out Microsoft.Maui.SwipeDirection SwipeDirection, out double Offset) -> void
-Microsoft.Maui.SwipeViewSwipeChanging.SwipeViewSwipeChanging(Microsoft.Maui.SwipeViewSwipeChanging! original) -> void
-Microsoft.Maui.SwipeViewSwipeEnded.Deconstruct(out Microsoft.Maui.SwipeDirection SwipeDirection, out bool IsOpen) -> void
-Microsoft.Maui.SwipeViewSwipeEnded.SwipeViewSwipeEnded(Microsoft.Maui.SwipeViewSwipeEnded! original) -> void
-Microsoft.Maui.SwipeViewSwipeStarted.Deconstruct(out Microsoft.Maui.SwipeDirection SwipeDirection) -> void
-Microsoft.Maui.SwipeViewSwipeStarted.SwipeViewSwipeStarted(Microsoft.Maui.SwipeViewSwipeStarted! original) -> void
-Microsoft.Maui.WebResourceRequestedEventArgs
-Microsoft.Maui.WebResourceRequestedEventArgs.Sender.get -> WebKit.WKWebView!
-Microsoft.Maui.WebResourceRequestedEventArgs.UrlSchemeTask.get -> WebKit.IWKUrlSchemeTask!
-override Microsoft.Maui.Converters.EasingTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.EasingTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.EasingTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.EasingTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.EasingTypeConverter.GetStandardValues(System.ComponentModel.ITypeDescriptorContext? context) -> System.ComponentModel.TypeConverter.StandardValuesCollection?
-override Microsoft.Maui.Converters.EasingTypeConverter.GetStandardValuesExclusive(System.ComponentModel.ITypeDescriptorContext? context) -> bool
-override Microsoft.Maui.Converters.EasingTypeConverter.GetStandardValuesSupported(System.ComponentModel.ITypeDescriptorContext? context) -> bool
-override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.FlexBasisTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexBasisTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexBasisTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexBasisTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.FlexDirectionTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexDirectionTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexDirectionTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexDirectionTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.FlexJustifyTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexJustifyTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexJustifyTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexJustifyTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value) -> object!
-override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object!
-override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.ThicknessTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.ThicknessTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Equals(object? obj) -> bool
-override Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.GetHashCode() -> int
-override Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.ToString() -> string!
-override Microsoft.Maui.Handlers.LayoutHandlerUpdate.Equals(object? obj) -> bool
-override Microsoft.Maui.Handlers.LayoutHandlerUpdate.GetHashCode() -> int
-override Microsoft.Maui.Handlers.LayoutHandlerUpdate.ToString() -> string!
-override Microsoft.Maui.Handlers.MenuBarHandlerUpdate.Equals(object? obj) -> bool
-override Microsoft.Maui.Handlers.MenuBarHandlerUpdate.GetHashCode() -> int
-override Microsoft.Maui.Handlers.MenuBarHandlerUpdate.ToString() -> string!
-override Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.Equals(object? obj) -> bool
-override Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.GetHashCode() -> int
-override Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.ToString() -> string!
-override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.Equals(object? obj) -> bool
-override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.GetHashCode() -> int
-override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.ToString() -> string!
-override Microsoft.Maui.Handlers.OpenWindowRequest.Equals(object? obj) -> bool
-override Microsoft.Maui.Handlers.OpenWindowRequest.GetHashCode() -> int
-override Microsoft.Maui.Handlers.OpenWindowRequest.ToString() -> string!
-override Microsoft.Maui.Handlers.ScrollViewHandler.SetVirtualView(Microsoft.Maui.IView! view) -> void
-override Microsoft.Maui.Platform.MauiScrollView.AdjustedContentInsetDidChange() -> void
-override Microsoft.Maui.Platform.MauiScrollView.SafeAreaInsetsDidChange() -> void
-*REMOVED*override Microsoft.Maui.Platform.MauiView.SafeAreaInsetsDidChange() -> void
-override Microsoft.Maui.SafeAreaEdges.Equals(object? obj) -> bool
-override Microsoft.Maui.SafeAreaEdges.GetHashCode() -> int
-override Microsoft.Maui.SafeAreaEdges.ToString() -> string!
-override Microsoft.Maui.ScrollToRequest.Equals(object? obj) -> bool
-override Microsoft.Maui.ScrollToRequest.GetHashCode() -> int
-override Microsoft.Maui.ScrollToRequest.ToString() -> string!
-override Microsoft.Maui.SwipeViewCloseRequest.Equals(object? obj) -> bool
-override Microsoft.Maui.SwipeViewCloseRequest.GetHashCode() -> int
-override Microsoft.Maui.SwipeViewCloseRequest.ToString() -> string!
-override Microsoft.Maui.SwipeViewOpenRequest.Equals(object? obj) -> bool
-override Microsoft.Maui.SwipeViewOpenRequest.GetHashCode() -> int
-override Microsoft.Maui.SwipeViewOpenRequest.ToString() -> string!
-override Microsoft.Maui.SwipeViewSwipeChanging.Equals(object? obj) -> bool
-override Microsoft.Maui.SwipeViewSwipeChanging.GetHashCode() -> int
-override Microsoft.Maui.SwipeViewSwipeChanging.ToString() -> string!
-override Microsoft.Maui.SwipeViewSwipeEnded.Equals(object? obj) -> bool
-override Microsoft.Maui.SwipeViewSwipeEnded.GetHashCode() -> int
-override Microsoft.Maui.SwipeViewSwipeEnded.ToString() -> string!
-override Microsoft.Maui.SwipeViewSwipeStarted.Equals(object? obj) -> bool
-override Microsoft.Maui.SwipeViewSwipeStarted.GetHashCode() -> int
-override Microsoft.Maui.SwipeViewSwipeStarted.ToString() -> string!
-*REMOVED*readonly Microsoft.Maui.PropertyMapper._mapper -> System.Collections.Generic.Dictionary<string!, System.Action<Microsoft.Maui.IElementHandler!, Microsoft.Maui.IElement!>!>!
-static Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.operator !=(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? left, Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.operator ==(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? left, Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.GraphicsViewHandler.MapBackground(Microsoft.Maui.Handlers.IGraphicsViewHandler! handler, Microsoft.Maui.IGraphicsView! graphicsView) -> void
-static Microsoft.Maui.Handlers.LayoutHandlerUpdate.operator !=(Microsoft.Maui.Handlers.LayoutHandlerUpdate? left, Microsoft.Maui.Handlers.LayoutHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.LayoutHandlerUpdate.operator ==(Microsoft.Maui.Handlers.LayoutHandlerUpdate? left, Microsoft.Maui.Handlers.LayoutHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.MenuBarHandlerUpdate.operator !=(Microsoft.Maui.Handlers.MenuBarHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.MenuBarHandlerUpdate.operator ==(Microsoft.Maui.Handlers.MenuBarHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.operator !=(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.operator ==(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.operator !=(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.operator ==(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.OpenWindowRequest.operator !=(Microsoft.Maui.Handlers.OpenWindowRequest? left, Microsoft.Maui.Handlers.OpenWindowRequest? right) -> bool
-static Microsoft.Maui.Handlers.OpenWindowRequest.operator ==(Microsoft.Maui.Handlers.OpenWindowRequest? left, Microsoft.Maui.Handlers.OpenWindowRequest? right) -> bool
-static Microsoft.Maui.Handlers.SearchBarHandler.MapReturnType(Microsoft.Maui.Handlers.ISearchBarHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
-static Microsoft.Maui.Hosting.AppHostBuilderExtensions.ConfigureEnvironmentVariables(this Microsoft.Maui.Hosting.MauiAppBuilder! builder) -> Microsoft.Maui.Hosting.MauiAppBuilder!
-*REMOVED*static Microsoft.Maui.Platform.ApplicationExtensions.CreatePlatformWindow(this UIKit.IUIApplicationDelegate! platformApplication, Microsoft.Maui.IApplication! application, UIKit.UIApplication! uiApplication, Foundation.NSDictionary! launchOptions) -> void
-static Microsoft.Maui.Platform.ApplicationExtensions.CreatePlatformWindow(this UIKit.IUIApplicationDelegate! platformApplication, Microsoft.Maui.IApplication! application, UIKit.UIApplication! uiApplication, Foundation.NSDictionary? launchOptions) -> void
-static Microsoft.Maui.Platform.SearchBarExtensions.UpdateReturnType(this UIKit.UISearchBar! uiSearchBar, Microsoft.Maui.ISearchBar! searchBar) -> void
-static Microsoft.Maui.Platform.TextInputExtensions.GetCursorPosition(this UIKit.IUITextInput! platformView, int cursorOffset = 0) -> int
-static Microsoft.Maui.Platform.TextInputExtensions.GetSelectedTextLength(this UIKit.IUITextInput! platformView) -> int
-static Microsoft.Maui.Platform.TextInputExtensions.SetTextRange(this UIKit.IUITextInput! platformView, int start, int selectedTextLength) -> void
-static Microsoft.Maui.Platform.UIApplicationExtensions.GetKeyWindow(this UIKit.UIApplication! application) -> UIKit.UIWindow?
-static Microsoft.Maui.Platform.UIApplicationExtensions.GetWindow(this UIKit.UIApplication! application) -> Microsoft.Maui.IWindow?
-static Microsoft.Maui.SafeAreaEdges.All.get -> Microsoft.Maui.SafeAreaEdges
-static Microsoft.Maui.SafeAreaEdges.Default.get -> Microsoft.Maui.SafeAreaEdges
-static Microsoft.Maui.SafeAreaEdges.None.get -> Microsoft.Maui.SafeAreaEdges
-static Microsoft.Maui.SafeAreaEdges.operator !=(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
-static Microsoft.Maui.SafeAreaEdges.operator ==(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
-static Microsoft.Maui.ScrollToRequest.operator !=(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
-static Microsoft.Maui.ScrollToRequest.operator ==(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
-static Microsoft.Maui.SwipeViewCloseRequest.operator !=(Microsoft.Maui.SwipeViewCloseRequest? left, Microsoft.Maui.SwipeViewCloseRequest? right) -> bool
-static Microsoft.Maui.SwipeViewCloseRequest.operator ==(Microsoft.Maui.SwipeViewCloseRequest? left, Microsoft.Maui.SwipeViewCloseRequest? right) -> bool
-static Microsoft.Maui.SwipeViewOpenRequest.operator !=(Microsoft.Maui.SwipeViewOpenRequest? left, Microsoft.Maui.SwipeViewOpenRequest? right) -> bool
-static Microsoft.Maui.SwipeViewOpenRequest.operator ==(Microsoft.Maui.SwipeViewOpenRequest? left, Microsoft.Maui.SwipeViewOpenRequest? right) -> bool
-static Microsoft.Maui.SwipeViewSwipeChanging.operator !=(Microsoft.Maui.SwipeViewSwipeChanging? left, Microsoft.Maui.SwipeViewSwipeChanging? right) -> bool
-static Microsoft.Maui.SwipeViewSwipeChanging.operator ==(Microsoft.Maui.SwipeViewSwipeChanging? left, Microsoft.Maui.SwipeViewSwipeChanging? right) -> bool
-static Microsoft.Maui.SwipeViewSwipeEnded.operator !=(Microsoft.Maui.SwipeViewSwipeEnded? left, Microsoft.Maui.SwipeViewSwipeEnded? right) -> bool
-static Microsoft.Maui.SwipeViewSwipeEnded.operator ==(Microsoft.Maui.SwipeViewSwipeEnded? left, Microsoft.Maui.SwipeViewSwipeEnded? right) -> bool
-static Microsoft.Maui.SwipeViewSwipeStarted.operator !=(Microsoft.Maui.SwipeViewSwipeStarted? left, Microsoft.Maui.SwipeViewSwipeStarted? right) -> bool
-static Microsoft.Maui.SwipeViewSwipeStarted.operator ==(Microsoft.Maui.SwipeViewSwipeStarted? left, Microsoft.Maui.SwipeViewSwipeStarted? right) -> bool
-virtual Microsoft.Maui.Animations.Lerp.LerpDelegate.Invoke(object! start, object! end, double progress) -> object!
-virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate!
-virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Equals(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? other) -> bool
-virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.LayoutHandlerUpdate!
-virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.Equals(Microsoft.Maui.Handlers.LayoutHandlerUpdate? other) -> bool
-virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.MenuBarHandlerUpdate!
-virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.Equals(Microsoft.Maui.Handlers.MenuBarHandlerUpdate? other) -> bool
-virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate!
-virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.Equals(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? other) -> bool
-virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate!
-virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.Equals(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? other) -> bool
-virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.Handlers.OpenWindowRequest.<Clone>$() -> Microsoft.Maui.Handlers.OpenWindowRequest!
-virtual Microsoft.Maui.Handlers.OpenWindowRequest.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.Handlers.OpenWindowRequest.Equals(Microsoft.Maui.Handlers.OpenWindowRequest? other) -> bool
-virtual Microsoft.Maui.Handlers.OpenWindowRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.ApplicationSignificantTimeChange.Invoke(UIKit.UIApplication! application) -> void
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.ContinueUserActivity.Invoke(UIKit.UIApplication! application, Foundation.NSUserActivity! userActivity, UIKit.UIApplicationRestorationHandler! completionHandler) -> bool
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.DidEnterBackground.Invoke(UIKit.UIApplication! application) -> void
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.FinishedLaunching.Invoke(UIKit.UIApplication! application, Foundation.NSDictionary! launchOptions) -> bool
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.OnActivated.Invoke(UIKit.UIApplication! application) -> void
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.OnResignActivation.Invoke(UIKit.UIApplication! application) -> void
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.OpenUrl.Invoke(UIKit.UIApplication! app, Foundation.NSUrl! url, Foundation.NSDictionary! options) -> bool
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.PerformActionForShortcutItem.Invoke(UIKit.UIApplication! application, UIKit.UIApplicationShortcutItem! shortcutItem, UIKit.UIOperationHandler! completionHandler) -> void
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.PerformFetch.Invoke(UIKit.UIApplication! application, System.Action<UIKit.UIBackgroundFetchResult>! completionHandler) -> void
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneContinueUserActivity.Invoke(UIKit.UIScene! scene, Foundation.NSUserActivity! userActivity) -> bool
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneDidDisconnect.Invoke(UIKit.UIScene! scene) -> void
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneDidEnterBackground.Invoke(UIKit.UIScene! scene) -> void
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneDidFailToContinueUserActivity.Invoke(UIKit.UIScene! scene, string! userActivityType, Foundation.NSError! error) -> void
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneDidUpdateUserActivity.Invoke(UIKit.UIScene! scene, Foundation.NSUserActivity! userActivity) -> void
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneOnActivated.Invoke(UIKit.UIScene! scene) -> void
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneOnResignActivation.Invoke(UIKit.UIScene! scene) -> void
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneOpenUrl.Invoke(UIKit.UIScene! scene, Foundation.NSSet<UIKit.UIOpenUrlContext!>! urlContexts) -> bool
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneRestoreInteractionState.Invoke(UIKit.UIScene! scene, Foundation.NSUserActivity! stateRestorationActivity) -> void
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneWillConnect.Invoke(UIKit.UIScene! scene, UIKit.UISceneSession! session, UIKit.UISceneConnectionOptions! connectionOptions) -> void
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneWillContinueUserActivity.Invoke(UIKit.UIScene! scene, string! userActivityType) -> void
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneWillEnterForeground.Invoke(UIKit.UIScene! scene) -> void
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.WillEnterForeground.Invoke(UIKit.UIApplication! application) -> void
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.WillFinishLaunching.Invoke(UIKit.UIApplication! application, Foundation.NSDictionary? launchOptions) -> bool
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.WillTerminate.Invoke(UIKit.UIApplication! application) -> void
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.WindowSceneDidUpdateCoordinateSpace.Invoke(UIKit.UIWindowScene! windowScene, UIKit.IUICoordinateSpace! previousCoordinateSpace, UIKit.UIInterfaceOrientation previousInterfaceOrientation, UIKit.UITraitCollection! previousTraitCollection) -> void
-*REMOVED*virtual Microsoft.Maui.MauiUIApplicationDelegate.FinishedLaunching(UIKit.UIApplication! application, Foundation.NSDictionary! launchOptions) -> bool
-virtual Microsoft.Maui.MauiUIApplicationDelegate.FinishedLaunching(UIKit.UIApplication! application, Foundation.NSDictionary? launchOptions) -> bool
-*REMOVED*virtual Microsoft.Maui.MauiUIApplicationDelegate.WillFinishLaunching(UIKit.UIApplication! application, Foundation.NSDictionary! launchOptions) -> bool
-virtual Microsoft.Maui.MauiUIApplicationDelegate.WillFinishLaunching(UIKit.UIApplication! application, Foundation.NSDictionary? launchOptions) -> bool
-virtual Microsoft.Maui.Platform.MauiWebViewNavigationDelegate.DecidePolicy(WebKit.WKWebView! webView, WebKit.WKNavigationAction! navigationAction, System.Action<WebKit.WKNavigationActionPolicy>! decisionHandler) -> void
-virtual Microsoft.Maui.Platform.MauiWebViewNavigationDelegate.DidFailNavigation(WebKit.WKWebView! webView, WebKit.WKNavigation! navigation, Foundation.NSError! error) -> void
-virtual Microsoft.Maui.Platform.MauiWebViewNavigationDelegate.DidFailProvisionalNavigation(WebKit.WKWebView! webView, WebKit.WKNavigation! navigation, Foundation.NSError! error) -> void
-virtual Microsoft.Maui.Platform.MauiWebViewNavigationDelegate.DidFinishNavigation(WebKit.WKWebView! webView, WebKit.WKNavigation! navigation) -> void
-*REMOVED*virtual Microsoft.Maui.PropertyMapper.ClearKeyCache() -> void
-*REMOVED*virtual Microsoft.Maui.PropertyMapper.UpdateKeys.get -> System.Collections.Generic.IReadOnlyCollection<string!>!
-virtual Microsoft.Maui.ScrollToRequest.<Clone>$() -> Microsoft.Maui.ScrollToRequest!
-virtual Microsoft.Maui.ScrollToRequest.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.ScrollToRequest.Equals(Microsoft.Maui.ScrollToRequest? other) -> bool
-virtual Microsoft.Maui.ScrollToRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.SwipeViewCloseRequest.<Clone>$() -> Microsoft.Maui.SwipeViewCloseRequest!
-virtual Microsoft.Maui.SwipeViewCloseRequest.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.SwipeViewCloseRequest.Equals(Microsoft.Maui.SwipeViewCloseRequest? other) -> bool
-virtual Microsoft.Maui.SwipeViewCloseRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.SwipeViewOpenRequest.<Clone>$() -> Microsoft.Maui.SwipeViewOpenRequest!
-virtual Microsoft.Maui.SwipeViewOpenRequest.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.SwipeViewOpenRequest.Equals(Microsoft.Maui.SwipeViewOpenRequest? other) -> bool
-virtual Microsoft.Maui.SwipeViewOpenRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.SwipeViewSwipeChanging.<Clone>$() -> Microsoft.Maui.SwipeViewSwipeChanging!
-virtual Microsoft.Maui.SwipeViewSwipeChanging.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.SwipeViewSwipeChanging.Equals(Microsoft.Maui.SwipeViewSwipeChanging? other) -> bool
-virtual Microsoft.Maui.SwipeViewSwipeChanging.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.SwipeViewSwipeEnded.<Clone>$() -> Microsoft.Maui.SwipeViewSwipeEnded!
-virtual Microsoft.Maui.SwipeViewSwipeEnded.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.SwipeViewSwipeEnded.Equals(Microsoft.Maui.SwipeViewSwipeEnded? other) -> bool
-virtual Microsoft.Maui.SwipeViewSwipeEnded.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.SwipeViewSwipeStarted.<Clone>$() -> Microsoft.Maui.SwipeViewSwipeStarted!
-virtual Microsoft.Maui.SwipeViewSwipeStarted.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.SwipeViewSwipeStarted.Equals(Microsoft.Maui.SwipeViewSwipeStarted? other) -> bool
-virtual Microsoft.Maui.SwipeViewSwipeStarted.PrintMembers(System.Text.StringBuilder! builder) -> bool
diff --git a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt.bak b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt.bak
deleted file mode 100644
index df1199186606..000000000000
--- a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt.bak
+++ /dev/null
@@ -1,309 +0,0 @@
-#nullable enable
-Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter
-Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.SafeAreaEdgesTypeConverter() -> void
-Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.ContextFlyoutItemHandlerUpdate(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate! original) -> void
-Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
-Microsoft.Maui.Handlers.DataFlowDirection
-Microsoft.Maui.Handlers.DataFlowDirection.FromPlatform = 1 -> Microsoft.Maui.Handlers.DataFlowDirection
-Microsoft.Maui.Handlers.DataFlowDirection.ToPlatform = 0 -> Microsoft.Maui.Handlers.DataFlowDirection
-Microsoft.Maui.Handlers.LayoutHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IView! View) -> void
-Microsoft.Maui.Handlers.LayoutHandlerUpdate.LayoutHandlerUpdate(Microsoft.Maui.Handlers.LayoutHandlerUpdate! original) -> void
-Microsoft.Maui.Handlers.MenuBarHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuBarItem! MenuBarItem) -> void
-Microsoft.Maui.Handlers.MenuBarHandlerUpdate.MenuBarHandlerUpdate(Microsoft.Maui.Handlers.MenuBarHandlerUpdate! original) -> void
-Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
-Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.MenuBarItemHandlerUpdate(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate! original) -> void
-Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
-Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.MenuFlyoutSubItemHandlerUpdate(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate! original) -> void
-Microsoft.Maui.Handlers.OpenWindowRequest.Deconstruct(out Microsoft.Maui.IPersistedState? State) -> void
-Microsoft.Maui.Handlers.OpenWindowRequest.OpenWindowRequest(Microsoft.Maui.Handlers.OpenWindowRequest! original) -> void
-Microsoft.Maui.Hosting.MauiAppBuilder.Environment.get -> Microsoft.Maui.Hosting.MauiHostEnvironment!
-Microsoft.Maui.Hosting.MauiAppBuilder.Properties.get -> System.Collections.Generic.IDictionary<object!, object!>!
-Microsoft.Maui.Hosting.MauiHostEnvironment
-Microsoft.Maui.Hosting.MauiHostEnvironment.ApplicationName.get -> string!
-Microsoft.Maui.Hosting.MauiHostEnvironment.ApplicationName.set -> void
-Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootFileProvider.get -> Microsoft.Extensions.FileProviders.IFileProvider!
-Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootFileProvider.set -> void
-Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootPath.get -> string!
-Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootPath.set -> void
-Microsoft.Maui.Hosting.MauiHostEnvironment.EnvironmentName.get -> string!
-Microsoft.Maui.Hosting.MauiHostEnvironment.EnvironmentName.set -> void
-Microsoft.Maui.Hosting.MauiHostEnvironment.MauiHostEnvironment() -> void
-*REMOVED*Microsoft.Maui.IDatePicker.Date.get -> System.DateTime
-Microsoft.Maui.IDatePicker.Date.get -> System.DateTime?
-Microsoft.Maui.IDatePicker.IsOpen.get -> bool
-Microsoft.Maui.IDatePicker.IsOpen.set -> void
-*REMOVED*Microsoft.Maui.IDatePicker.MaximumDate.get -> System.DateTime
-Microsoft.Maui.IDatePicker.MaximumDate.get -> System.DateTime?
-*REMOVED*Microsoft.Maui.IDatePicker.MinimumDate.get -> System.DateTime
-Microsoft.Maui.IDatePicker.MinimumDate.get -> System.DateTime?
-Microsoft.Maui.IPicker.IsOpen.get -> bool
-Microsoft.Maui.IPicker.IsOpen.set -> void
-Microsoft.Maui.ISearchBar.ReturnType.get -> Microsoft.Maui.ReturnType
-Microsoft.Maui.ISearchBar.SearchIconColor.get -> Microsoft.Maui.Graphics.Color!
-Microsoft.Maui.ITimePicker.IsOpen.get -> bool
-Microsoft.Maui.ITimePicker.IsOpen.set -> void
-*REMOVED*Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan
-Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan?
-Microsoft.Maui.IWebRequestInterceptingWebView
-Microsoft.Maui.IWebRequestInterceptingWebView.WebResourceRequested(Microsoft.Maui.WebResourceRequestedEventArgs! args) -> bool
-Microsoft.Maui.IWindow.IsMaximizable.get -> bool
-Microsoft.Maui.IWindow.IsMinimizable.get -> bool
-Microsoft.Maui.Platform.IAutoSizableCALayer
-Microsoft.Maui.Platform.IAutoSizableCALayer.AutoSizeToSuperLayer() -> void
-*REMOVED*Microsoft.Maui.Platform.MauiTimePicker.UpdateTime(System.TimeSpan time) -> void
-Microsoft.Maui.Platform.MauiTimePicker.UpdateTime(System.TimeSpan? time) -> void
-*REMOVED*Microsoft.Maui.Platform.MauiWebViewNavigationDelegate.DecidePolicy(WebKit.WKWebView! webView, WebKit.WKNavigationAction! navigationAction, System.Action<WebKit.WKNavigationActionPolicy>! decisionHandler) -> void
-*REMOVED*Microsoft.Maui.Platform.MauiWebViewNavigationDelegate.DidFailNavigation(WebKit.WKWebView! webView, WebKit.WKNavigation! navigation, Foundation.NSError! error) -> void
-*REMOVED*Microsoft.Maui.Platform.MauiWebViewNavigationDelegate.DidFailProvisionalNavigation(WebKit.WKWebView! webView, WebKit.WKNavigation! navigation, Foundation.NSError! error) -> void
-*REMOVED*Microsoft.Maui.Platform.MauiWebViewNavigationDelegate.DidFinishNavigation(WebKit.WKWebView! webView, WebKit.WKNavigation! navigation) -> void
-Microsoft.Maui.Platform.TextInputExtensions
-Microsoft.Maui.Platform.UIApplicationExtensions
-Microsoft.Maui.SafeAreaEdges
-Microsoft.Maui.SafeAreaEdges.Bottom.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Bottom.set -> void
-Microsoft.Maui.SafeAreaEdges.Equals(Microsoft.Maui.SafeAreaEdges other) -> bool
-Microsoft.Maui.SafeAreaEdges.GetEdge(int edge) -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Left.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Left.set -> void
-Microsoft.Maui.SafeAreaEdges.Right.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Right.set -> void
-Microsoft.Maui.SafeAreaEdges.SafeAreaEdges() -> void
-Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions horizontal, Microsoft.Maui.SafeAreaRegions vertical) -> void
-Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions left, Microsoft.Maui.SafeAreaRegions top, Microsoft.Maui.SafeAreaRegions right, Microsoft.Maui.SafeAreaRegions bottom) -> void
-Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions uniformValue) -> void
-Microsoft.Maui.SafeAreaEdges.SetEdge(int edge, Microsoft.Maui.SafeAreaRegions value) -> void
-Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Top.set -> void
-Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.All = Microsoft.Maui.SafeAreaRegions.SoftInput | Microsoft.Maui.SafeAreaRegions.Container -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.Default = 4 -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.None = 0 -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.SoftInput = 1 -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.ScrollToRequest.Deconstruct(out double HorizontalOffset, out double VerticalOffset, out bool Instant) -> void
-Microsoft.Maui.ScrollToRequest.ScrollToRequest(Microsoft.Maui.ScrollToRequest! original) -> void
-Microsoft.Maui.SwipeViewCloseRequest.Deconstruct(out bool Animated) -> void
-Microsoft.Maui.SwipeViewCloseRequest.SwipeViewCloseRequest(Microsoft.Maui.SwipeViewCloseRequest! original) -> void
-Microsoft.Maui.SwipeViewOpenRequest.Deconstruct(out Microsoft.Maui.OpenSwipeItem OpenSwipeItem, out bool Animated) -> void
-Microsoft.Maui.SwipeViewOpenRequest.SwipeViewOpenRequest(Microsoft.Maui.SwipeViewOpenRequest! original) -> void
-Microsoft.Maui.SwipeViewSwipeChanging.Deconstruct(out Microsoft.Maui.SwipeDirection SwipeDirection, out double Offset) -> void
-Microsoft.Maui.SwipeViewSwipeChanging.SwipeViewSwipeChanging(Microsoft.Maui.SwipeViewSwipeChanging! original) -> void
-Microsoft.Maui.SwipeViewSwipeEnded.Deconstruct(out Microsoft.Maui.SwipeDirection SwipeDirection, out bool IsOpen) -> void
-Microsoft.Maui.SwipeViewSwipeEnded.SwipeViewSwipeEnded(Microsoft.Maui.SwipeViewSwipeEnded! original) -> void
-Microsoft.Maui.SwipeViewSwipeStarted.Deconstruct(out Microsoft.Maui.SwipeDirection SwipeDirection) -> void
-Microsoft.Maui.SwipeViewSwipeStarted.SwipeViewSwipeStarted(Microsoft.Maui.SwipeViewSwipeStarted! original) -> void
-Microsoft.Maui.WebResourceRequestedEventArgs
-Microsoft.Maui.WebResourceRequestedEventArgs.Sender.get -> WebKit.WKWebView!
-Microsoft.Maui.WebResourceRequestedEventArgs.UrlSchemeTask.get -> WebKit.IWKUrlSchemeTask!
-override Microsoft.Maui.Converters.EasingTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.EasingTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.EasingTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.EasingTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.EasingTypeConverter.GetStandardValues(System.ComponentModel.ITypeDescriptorContext? context) -> System.ComponentModel.TypeConverter.StandardValuesCollection?
-override Microsoft.Maui.Converters.EasingTypeConverter.GetStandardValuesExclusive(System.ComponentModel.ITypeDescriptorContext? context) -> bool
-override Microsoft.Maui.Converters.EasingTypeConverter.GetStandardValuesSupported(System.ComponentModel.ITypeDescriptorContext? context) -> bool
-override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.FlexBasisTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexBasisTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexBasisTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexBasisTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.FlexDirectionTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexDirectionTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexDirectionTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexDirectionTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.FlexJustifyTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexJustifyTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexJustifyTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexJustifyTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value) -> object!
-override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object!
-override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.ThicknessTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.ThicknessTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Equals(object? obj) -> bool
-override Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.GetHashCode() -> int
-override Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.ToString() -> string!
-override Microsoft.Maui.Handlers.LayoutHandlerUpdate.Equals(object? obj) -> bool
-override Microsoft.Maui.Handlers.LayoutHandlerUpdate.GetHashCode() -> int
-override Microsoft.Maui.Handlers.LayoutHandlerUpdate.ToString() -> string!
-override Microsoft.Maui.Handlers.MenuBarHandlerUpdate.Equals(object? obj) -> bool
-override Microsoft.Maui.Handlers.MenuBarHandlerUpdate.GetHashCode() -> int
-override Microsoft.Maui.Handlers.MenuBarHandlerUpdate.ToString() -> string!
-override Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.Equals(object? obj) -> bool
-override Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.GetHashCode() -> int
-override Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.ToString() -> string!
-override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.Equals(object? obj) -> bool
-override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.GetHashCode() -> int
-override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.ToString() -> string!
-override Microsoft.Maui.Handlers.OpenWindowRequest.Equals(object? obj) -> bool
-override Microsoft.Maui.Handlers.OpenWindowRequest.GetHashCode() -> int
-override Microsoft.Maui.Handlers.OpenWindowRequest.ToString() -> string!
-override Microsoft.Maui.Handlers.ScrollViewHandler.SetVirtualView(Microsoft.Maui.IView! view) -> void
-override Microsoft.Maui.Platform.MauiScrollView.AdjustedContentInsetDidChange() -> void
-override Microsoft.Maui.Platform.MauiScrollView.SafeAreaInsetsDidChange() -> void
-*REMOVED*override Microsoft.Maui.Platform.MauiView.SafeAreaInsetsDidChange() -> void
-override Microsoft.Maui.SafeAreaEdges.Equals(object? obj) -> bool
-override Microsoft.Maui.SafeAreaEdges.GetHashCode() -> int
-override Microsoft.Maui.SafeAreaEdges.ToString() -> string!
-override Microsoft.Maui.ScrollToRequest.Equals(object? obj) -> bool
-override Microsoft.Maui.ScrollToRequest.GetHashCode() -> int
-override Microsoft.Maui.ScrollToRequest.ToString() -> string!
-override Microsoft.Maui.SwipeViewCloseRequest.Equals(object? obj) -> bool
-override Microsoft.Maui.SwipeViewCloseRequest.GetHashCode() -> int
-override Microsoft.Maui.SwipeViewCloseRequest.ToString() -> string!
-override Microsoft.Maui.SwipeViewOpenRequest.Equals(object? obj) -> bool
-override Microsoft.Maui.SwipeViewOpenRequest.GetHashCode() -> int
-override Microsoft.Maui.SwipeViewOpenRequest.ToString() -> string!
-override Microsoft.Maui.SwipeViewSwipeChanging.Equals(object? obj) -> bool
-override Microsoft.Maui.SwipeViewSwipeChanging.GetHashCode() -> int
-override Microsoft.Maui.SwipeViewSwipeChanging.ToString() -> string!
-override Microsoft.Maui.SwipeViewSwipeEnded.Equals(object? obj) -> bool
-override Microsoft.Maui.SwipeViewSwipeEnded.GetHashCode() -> int
-override Microsoft.Maui.SwipeViewSwipeEnded.ToString() -> string!
-override Microsoft.Maui.SwipeViewSwipeStarted.Equals(object? obj) -> bool
-override Microsoft.Maui.SwipeViewSwipeStarted.GetHashCode() -> int
-override Microsoft.Maui.SwipeViewSwipeStarted.ToString() -> string!
-*REMOVED*readonly Microsoft.Maui.PropertyMapper._mapper -> System.Collections.Generic.Dictionary<string!, System.Action<Microsoft.Maui.IElementHandler!, Microsoft.Maui.IElement!>!>!
-static Microsoft.Maui.Handlers.ButtonHandler.MapBackground(Microsoft.Maui.Handlers.IButtonHandler! handler, Microsoft.Maui.IButton! button) -> void
-static Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.operator !=(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? left, Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.operator ==(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? left, Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.GraphicsViewHandler.MapBackground(Microsoft.Maui.Handlers.IGraphicsViewHandler! handler, Microsoft.Maui.IGraphicsView! graphicsView) -> void
-static Microsoft.Maui.Handlers.LayoutHandlerUpdate.operator !=(Microsoft.Maui.Handlers.LayoutHandlerUpdate? left, Microsoft.Maui.Handlers.LayoutHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.LayoutHandlerUpdate.operator ==(Microsoft.Maui.Handlers.LayoutHandlerUpdate? left, Microsoft.Maui.Handlers.LayoutHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.MenuBarHandlerUpdate.operator !=(Microsoft.Maui.Handlers.MenuBarHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.MenuBarHandlerUpdate.operator ==(Microsoft.Maui.Handlers.MenuBarHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.operator !=(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.operator ==(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.operator !=(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.operator ==(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.OpenWindowRequest.operator !=(Microsoft.Maui.Handlers.OpenWindowRequest? left, Microsoft.Maui.Handlers.OpenWindowRequest? right) -> bool
-static Microsoft.Maui.Handlers.OpenWindowRequest.operator ==(Microsoft.Maui.Handlers.OpenWindowRequest? left, Microsoft.Maui.Handlers.OpenWindowRequest? right) -> bool
-static Microsoft.Maui.Handlers.SearchBarHandler.MapReturnType(Microsoft.Maui.Handlers.ISearchBarHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
-static Microsoft.Maui.Hosting.AppHostBuilderExtensions.ConfigureEnvironmentVariables(this Microsoft.Maui.Hosting.MauiAppBuilder! builder) -> Microsoft.Maui.Hosting.MauiAppBuilder!
-*REMOVED*static Microsoft.Maui.Platform.ApplicationExtensions.CreatePlatformWindow(this UIKit.IUIApplicationDelegate! platformApplication, Microsoft.Maui.IApplication! application, UIKit.UIApplication! uiApplication, Foundation.NSDictionary! launchOptions) -> void
-static Microsoft.Maui.Platform.ApplicationExtensions.CreatePlatformWindow(this UIKit.IUIApplicationDelegate! platformApplication, Microsoft.Maui.IApplication! application, UIKit.UIApplication! uiApplication, Foundation.NSDictionary? launchOptions) -> void
-static Microsoft.Maui.Platform.SearchBarExtensions.UpdateReturnType(this UIKit.UISearchBar! uiSearchBar, Microsoft.Maui.ISearchBar! searchBar) -> void
-static Microsoft.Maui.Platform.TextInputExtensions.GetCursorPosition(this UIKit.IUITextInput! platformView, int cursorOffset = 0) -> int
-static Microsoft.Maui.Platform.TextInputExtensions.GetSelectedTextLength(this UIKit.IUITextInput! platformView) -> int
-static Microsoft.Maui.Platform.TextInputExtensions.SetTextRange(this UIKit.IUITextInput! platformView, int start, int selectedTextLength) -> void
-static Microsoft.Maui.Platform.UIApplicationExtensions.GetKeyWindow(this UIKit.UIApplication! application) -> UIKit.UIWindow?
-static Microsoft.Maui.Platform.UIApplicationExtensions.GetWindow(this UIKit.UIApplication! application) -> Microsoft.Maui.IWindow?
-static Microsoft.Maui.SafeAreaEdges.All.get -> Microsoft.Maui.SafeAreaEdges
-static Microsoft.Maui.SafeAreaEdges.Default.get -> Microsoft.Maui.SafeAreaEdges
-static Microsoft.Maui.SafeAreaEdges.None.get -> Microsoft.Maui.SafeAreaEdges
-static Microsoft.Maui.SafeAreaEdges.operator !=(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
-static Microsoft.Maui.SafeAreaEdges.operator ==(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
-static Microsoft.Maui.ScrollToRequest.operator !=(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
-static Microsoft.Maui.ScrollToRequest.operator ==(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
-static Microsoft.Maui.SwipeViewCloseRequest.operator !=(Microsoft.Maui.SwipeViewCloseRequest? left, Microsoft.Maui.SwipeViewCloseRequest? right) -> bool
-static Microsoft.Maui.SwipeViewCloseRequest.operator ==(Microsoft.Maui.SwipeViewCloseRequest? left, Microsoft.Maui.SwipeViewCloseRequest? right) -> bool
-static Microsoft.Maui.SwipeViewOpenRequest.operator !=(Microsoft.Maui.SwipeViewOpenRequest? left, Microsoft.Maui.SwipeViewOpenRequest? right) -> bool
-static Microsoft.Maui.SwipeViewOpenRequest.operator ==(Microsoft.Maui.SwipeViewOpenRequest? left, Microsoft.Maui.SwipeViewOpenRequest? right) -> bool
-static Microsoft.Maui.SwipeViewSwipeChanging.operator !=(Microsoft.Maui.SwipeViewSwipeChanging? left, Microsoft.Maui.SwipeViewSwipeChanging? right) -> bool
-static Microsoft.Maui.SwipeViewSwipeChanging.operator ==(Microsoft.Maui.SwipeViewSwipeChanging? left, Microsoft.Maui.SwipeViewSwipeChanging? right) -> bool
-static Microsoft.Maui.SwipeViewSwipeEnded.operator !=(Microsoft.Maui.SwipeViewSwipeEnded? left, Microsoft.Maui.SwipeViewSwipeEnded? right) -> bool
-static Microsoft.Maui.SwipeViewSwipeEnded.operator ==(Microsoft.Maui.SwipeViewSwipeEnded? left, Microsoft.Maui.SwipeViewSwipeEnded? right) -> bool
-static Microsoft.Maui.SwipeViewSwipeStarted.operator !=(Microsoft.Maui.SwipeViewSwipeStarted? left, Microsoft.Maui.SwipeViewSwipeStarted? right) -> bool
-static Microsoft.Maui.SwipeViewSwipeStarted.operator ==(Microsoft.Maui.SwipeViewSwipeStarted? left, Microsoft.Maui.SwipeViewSwipeStarted? right) -> bool
-virtual Microsoft.Maui.Animations.Lerp.LerpDelegate.Invoke(object! start, object! end, double progress) -> object!
-virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate!
-virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Equals(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? other) -> bool
-virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.LayoutHandlerUpdate!
-virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.Equals(Microsoft.Maui.Handlers.LayoutHandlerUpdate? other) -> bool
-virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.MenuBarHandlerUpdate!
-virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.Equals(Microsoft.Maui.Handlers.MenuBarHandlerUpdate? other) -> bool
-virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate!
-virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.Equals(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? other) -> bool
-virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate!
-virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.Equals(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? other) -> bool
-virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.Handlers.OpenWindowRequest.<Clone>$() -> Microsoft.Maui.Handlers.OpenWindowRequest!
-virtual Microsoft.Maui.Handlers.OpenWindowRequest.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.Handlers.OpenWindowRequest.Equals(Microsoft.Maui.Handlers.OpenWindowRequest? other) -> bool
-virtual Microsoft.Maui.Handlers.OpenWindowRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.ApplicationSignificantTimeChange.Invoke(UIKit.UIApplication! application) -> void
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.ContinueUserActivity.Invoke(UIKit.UIApplication! application, Foundation.NSUserActivity! userActivity, UIKit.UIApplicationRestorationHandler! completionHandler) -> bool
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.DidEnterBackground.Invoke(UIKit.UIApplication! application) -> void
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.FinishedLaunching.Invoke(UIKit.UIApplication! application, Foundation.NSDictionary! launchOptions) -> bool
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.OnActivated.Invoke(UIKit.UIApplication! application) -> void
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.OnResignActivation.Invoke(UIKit.UIApplication! application) -> void
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.OpenUrl.Invoke(UIKit.UIApplication! app, Foundation.NSUrl! url, Foundation.NSDictionary! options) -> bool
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.PerformActionForShortcutItem.Invoke(UIKit.UIApplication! application, UIKit.UIApplicationShortcutItem! shortcutItem, UIKit.UIOperationHandler! completionHandler) -> void
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.PerformFetch.Invoke(UIKit.UIApplication! application, System.Action<UIKit.UIBackgroundFetchResult>! completionHandler) -> void
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneContinueUserActivity.Invoke(UIKit.UIScene! scene, Foundation.NSUserActivity! userActivity) -> bool
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneDidDisconnect.Invoke(UIKit.UIScene! scene) -> void
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneDidEnterBackground.Invoke(UIKit.UIScene! scene) -> void
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneDidFailToContinueUserActivity.Invoke(UIKit.UIScene! scene, string! userActivityType, Foundation.NSError! error) -> void
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneDidUpdateUserActivity.Invoke(UIKit.UIScene! scene, Foundation.NSUserActivity! userActivity) -> void
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneOnActivated.Invoke(UIKit.UIScene! scene) -> void
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneOnResignActivation.Invoke(UIKit.UIScene! scene) -> void
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneOpenUrl.Invoke(UIKit.UIScene! scene, Foundation.NSSet<UIKit.UIOpenUrlContext!>! urlContexts) -> bool
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneRestoreInteractionState.Invoke(UIKit.UIScene! scene, Foundation.NSUserActivity! stateRestorationActivity) -> void
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneWillConnect.Invoke(UIKit.UIScene! scene, UIKit.UISceneSession! session, UIKit.UISceneConnectionOptions! connectionOptions) -> void
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneWillContinueUserActivity.Invoke(UIKit.UIScene! scene, string! userActivityType) -> void
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.SceneWillEnterForeground.Invoke(UIKit.UIScene! scene) -> void
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.WillEnterForeground.Invoke(UIKit.UIApplication! application) -> void
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.WillFinishLaunching.Invoke(UIKit.UIApplication! application, Foundation.NSDictionary? launchOptions) -> bool
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.WillTerminate.Invoke(UIKit.UIApplication! application) -> void
-virtual Microsoft.Maui.LifecycleEvents.iOSLifecycle.WindowSceneDidUpdateCoordinateSpace.Invoke(UIKit.UIWindowScene! windowScene, UIKit.IUICoordinateSpace! previousCoordinateSpace, UIKit.UIInterfaceOrientation previousInterfaceOrientation, UIKit.UITraitCollection! previousTraitCollection) -> void
-*REMOVED*virtual Microsoft.Maui.MauiUIApplicationDelegate.FinishedLaunching(UIKit.UIApplication! application, Foundation.NSDictionary! launchOptions) -> bool
-virtual Microsoft.Maui.MauiUIApplicationDelegate.FinishedLaunching(UIKit.UIApplication! application, Foundation.NSDictionary? launchOptions) -> bool
-*REMOVED*virtual Microsoft.Maui.MauiUIApplicationDelegate.WillFinishLaunching(UIKit.UIApplication! application, Foundation.NSDictionary! launchOptions) -> bool
-virtual Microsoft.Maui.MauiUIApplicationDelegate.WillFinishLaunching(UIKit.UIApplication! application, Foundation.NSDictionary? launchOptions) -> bool
-virtual Microsoft.Maui.Platform.MauiWebViewNavigationDelegate.DecidePolicy(WebKit.WKWebView! webView, WebKit.WKNavigationAction! navigationAction, System.Action<WebKit.WKNavigationActionPolicy>! decisionHandler) -> void
-virtual Microsoft.Maui.Platform.MauiWebViewNavigationDelegate.DidFailNavigation(WebKit.WKWebView! webView, WebKit.WKNavigation! navigation, Foundation.NSError! error) -> void
-virtual Microsoft.Maui.Platform.MauiWebViewNavigationDelegate.DidFailProvisionalNavigation(WebKit.WKWebView! webView, WebKit.WKNavigation! navigation, Foundation.NSError! error) -> void
-virtual Microsoft.Maui.Platform.MauiWebViewNavigationDelegate.DidFinishNavigation(WebKit.WKWebView! webView, WebKit.WKNavigation! navigation) -> void
-*REMOVED*virtual Microsoft.Maui.PropertyMapper.ClearKeyCache() -> void
-*REMOVED*virtual Microsoft.Maui.PropertyMapper.UpdateKeys.get -> System.Collections.Generic.IReadOnlyCollection<string!>!
-virtual Microsoft.Maui.ScrollToRequest.<Clone>$() -> Microsoft.Maui.ScrollToRequest!
-virtual Microsoft.Maui.ScrollToRequest.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.ScrollToRequest.Equals(Microsoft.Maui.ScrollToRequest? other) -> bool
-virtual Microsoft.Maui.ScrollToRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.SwipeViewCloseRequest.<Clone>$() -> Microsoft.Maui.SwipeViewCloseRequest!
-virtual Microsoft.Maui.SwipeViewCloseRequest.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.SwipeViewCloseRequest.Equals(Microsoft.Maui.SwipeViewCloseRequest? other) -> bool
-virtual Microsoft.Maui.SwipeViewCloseRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.SwipeViewOpenRequest.<Clone>$() -> Microsoft.Maui.SwipeViewOpenRequest!
-virtual Microsoft.Maui.SwipeViewOpenRequest.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.SwipeViewOpenRequest.Equals(Microsoft.Maui.SwipeViewOpenRequest? other) -> bool
-virtual Microsoft.Maui.SwipeViewOpenRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.SwipeViewSwipeChanging.<Clone>$() -> Microsoft.Maui.SwipeViewSwipeChanging!
-virtual Microsoft.Maui.SwipeViewSwipeChanging.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.SwipeViewSwipeChanging.Equals(Microsoft.Maui.SwipeViewSwipeChanging? other) -> bool
-virtual Microsoft.Maui.SwipeViewSwipeChanging.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.SwipeViewSwipeEnded.<Clone>$() -> Microsoft.Maui.SwipeViewSwipeEnded!
-virtual Microsoft.Maui.SwipeViewSwipeEnded.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.SwipeViewSwipeEnded.Equals(Microsoft.Maui.SwipeViewSwipeEnded? other) -> bool
-virtual Microsoft.Maui.SwipeViewSwipeEnded.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.SwipeViewSwipeStarted.<Clone>$() -> Microsoft.Maui.SwipeViewSwipeStarted!
-virtual Microsoft.Maui.SwipeViewSwipeStarted.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.SwipeViewSwipeStarted.Equals(Microsoft.Maui.SwipeViewSwipeStarted? other) -> bool
-virtual Microsoft.Maui.SwipeViewSwipeStarted.PrintMembers(System.Text.StringBuilder! builder) -> bool
diff --git a/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt.bak b/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt.bak
deleted file mode 100644
index e7572c1b3e2b..000000000000
--- a/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt.bak
+++ /dev/null
@@ -1,222 +0,0 @@
-#nullable enable
-Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter
-Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.SafeAreaEdgesTypeConverter() -> void
-Microsoft.Maui.FontManager.GetFontFamily(string? fontFamily) -> string!
-*REMOVED*Microsoft.Maui.FontManager.GetFontFamily(string? fontFamliy) -> string!
-Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.ContextFlyoutItemHandlerUpdate(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate! original) -> void
-Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
-Microsoft.Maui.Handlers.DataFlowDirection
-Microsoft.Maui.Handlers.DataFlowDirection.FromPlatform = 1 -> Microsoft.Maui.Handlers.DataFlowDirection
-Microsoft.Maui.Handlers.DataFlowDirection.ToPlatform = 0 -> Microsoft.Maui.Handlers.DataFlowDirection
-Microsoft.Maui.Handlers.LayoutHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IView! View) -> void
-Microsoft.Maui.Handlers.LayoutHandlerUpdate.LayoutHandlerUpdate(Microsoft.Maui.Handlers.LayoutHandlerUpdate! original) -> void
-Microsoft.Maui.Handlers.MenuBarHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuBarItem! MenuBarItem) -> void
-Microsoft.Maui.Handlers.MenuBarHandlerUpdate.MenuBarHandlerUpdate(Microsoft.Maui.Handlers.MenuBarHandlerUpdate! original) -> void
-Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
-Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.MenuBarItemHandlerUpdate(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate! original) -> void
-Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
-Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.MenuFlyoutSubItemHandlerUpdate(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate! original) -> void
-Microsoft.Maui.Handlers.OpenWindowRequest.Deconstruct(out Microsoft.Maui.IPersistedState? State) -> void
-Microsoft.Maui.Handlers.OpenWindowRequest.OpenWindowRequest(Microsoft.Maui.Handlers.OpenWindowRequest! original) -> void
-Microsoft.Maui.Hosting.MauiAppBuilder.Environment.get -> Microsoft.Maui.Hosting.MauiHostEnvironment!
-Microsoft.Maui.Hosting.MauiAppBuilder.Properties.get -> System.Collections.Generic.IDictionary<object!, object!>!
-Microsoft.Maui.Hosting.MauiHostEnvironment
-Microsoft.Maui.Hosting.MauiHostEnvironment.ApplicationName.get -> string!
-Microsoft.Maui.Hosting.MauiHostEnvironment.ApplicationName.set -> void
-Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootFileProvider.get -> Microsoft.Extensions.FileProviders.IFileProvider!
-Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootFileProvider.set -> void
-Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootPath.get -> string!
-Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootPath.set -> void
-Microsoft.Maui.Hosting.MauiHostEnvironment.EnvironmentName.get -> string!
-Microsoft.Maui.Hosting.MauiHostEnvironment.EnvironmentName.set -> void
-Microsoft.Maui.Hosting.MauiHostEnvironment.MauiHostEnvironment() -> void
-*REMOVED*Microsoft.Maui.IDatePicker.Date.get -> System.DateTime
-Microsoft.Maui.IDatePicker.Date.get -> System.DateTime?
-*REMOVED*Microsoft.Maui.IDatePicker.MaximumDate.get -> System.DateTime
-Microsoft.Maui.IDatePicker.MaximumDate.get -> System.DateTime?
-*REMOVED*Microsoft.Maui.IDatePicker.MinimumDate.get -> System.DateTime
-Microsoft.Maui.IDatePicker.MinimumDate.get -> System.DateTime?
-Microsoft.Maui.ISearchBar.ReturnType.get -> Microsoft.Maui.ReturnType
-Microsoft.Maui.ISearchBar.SearchIconColor.get -> Microsoft.Maui.Graphics.Color!
-*REMOVED*Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan
-Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan?
-Microsoft.Maui.ScrollToRequest.Deconstruct(out double HorizontalOffset, out double VerticalOffset, out bool Instant) -> void
-Microsoft.Maui.ScrollToRequest.ScrollToRequest(Microsoft.Maui.ScrollToRequest! original) -> void
-Microsoft.Maui.SwipeViewCloseRequest.Deconstruct(out bool Animated) -> void
-Microsoft.Maui.SwipeViewCloseRequest.SwipeViewCloseRequest(Microsoft.Maui.SwipeViewCloseRequest! original) -> void
-Microsoft.Maui.SwipeViewOpenRequest.Deconstruct(out Microsoft.Maui.OpenSwipeItem OpenSwipeItem, out bool Animated) -> void
-Microsoft.Maui.SwipeViewOpenRequest.SwipeViewOpenRequest(Microsoft.Maui.SwipeViewOpenRequest! original) -> void
-Microsoft.Maui.SwipeViewSwipeChanging.Deconstruct(out Microsoft.Maui.SwipeDirection SwipeDirection, out double Offset) -> void
-Microsoft.Maui.SwipeViewSwipeChanging.SwipeViewSwipeChanging(Microsoft.Maui.SwipeViewSwipeChanging! original) -> void
-Microsoft.Maui.SwipeViewSwipeEnded.Deconstruct(out Microsoft.Maui.SwipeDirection SwipeDirection, out bool IsOpen) -> void
-Microsoft.Maui.SwipeViewSwipeEnded.SwipeViewSwipeEnded(Microsoft.Maui.SwipeViewSwipeEnded! original) -> void
-Microsoft.Maui.SwipeViewSwipeStarted.Deconstruct(out Microsoft.Maui.SwipeDirection SwipeDirection) -> void
-Microsoft.Maui.SwipeViewSwipeStarted.SwipeViewSwipeStarted(Microsoft.Maui.SwipeViewSwipeStarted! original) -> void
-override Microsoft.Maui.Converters.EasingTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.EasingTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.EasingTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.EasingTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.EasingTypeConverter.GetStandardValues(System.ComponentModel.ITypeDescriptorContext? context) -> System.ComponentModel.TypeConverter.StandardValuesCollection?
-override Microsoft.Maui.Converters.EasingTypeConverter.GetStandardValuesExclusive(System.ComponentModel.ITypeDescriptorContext? context) -> bool
-override Microsoft.Maui.Converters.EasingTypeConverter.GetStandardValuesSupported(System.ComponentModel.ITypeDescriptorContext? context) -> bool
-override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.FlexBasisTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexBasisTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexBasisTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexBasisTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.FlexDirectionTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexDirectionTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexDirectionTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexDirectionTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.FlexJustifyTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexJustifyTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexJustifyTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexJustifyTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value) -> object!
-override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object!
-override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.ThicknessTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.ThicknessTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Equals(object? obj) -> bool
-override Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.GetHashCode() -> int
-override Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.ToString() -> string!
-override Microsoft.Maui.Handlers.LayoutHandlerUpdate.Equals(object? obj) -> bool
-override Microsoft.Maui.Handlers.LayoutHandlerUpdate.GetHashCode() -> int
-override Microsoft.Maui.Handlers.LayoutHandlerUpdate.ToString() -> string!
-override Microsoft.Maui.Handlers.MenuBarHandlerUpdate.Equals(object? obj) -> bool
-override Microsoft.Maui.Handlers.MenuBarHandlerUpdate.GetHashCode() -> int
-override Microsoft.Maui.Handlers.MenuBarHandlerUpdate.ToString() -> string!
-override Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.Equals(object? obj) -> bool
-override Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.GetHashCode() -> int
-override Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.ToString() -> string!
-override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.Equals(object? obj) -> bool
-override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.GetHashCode() -> int
-override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.ToString() -> string!
-override Microsoft.Maui.Handlers.OpenWindowRequest.Equals(object? obj) -> bool
-override Microsoft.Maui.Handlers.OpenWindowRequest.GetHashCode() -> int
-override Microsoft.Maui.Handlers.OpenWindowRequest.ToString() -> string!
-override Microsoft.Maui.ScrollToRequest.Equals(object? obj) -> bool
-override Microsoft.Maui.ScrollToRequest.GetHashCode() -> int
-override Microsoft.Maui.ScrollToRequest.ToString() -> string!
-override Microsoft.Maui.SwipeViewCloseRequest.Equals(object? obj) -> bool
-override Microsoft.Maui.SwipeViewCloseRequest.GetHashCode() -> int
-override Microsoft.Maui.SwipeViewCloseRequest.ToString() -> string!
-override Microsoft.Maui.SwipeViewOpenRequest.Equals(object? obj) -> bool
-override Microsoft.Maui.SwipeViewOpenRequest.GetHashCode() -> int
-override Microsoft.Maui.SwipeViewOpenRequest.ToString() -> string!
-override Microsoft.Maui.SwipeViewSwipeChanging.Equals(object? obj) -> bool
-override Microsoft.Maui.SwipeViewSwipeChanging.GetHashCode() -> int
-override Microsoft.Maui.SwipeViewSwipeChanging.ToString() -> string!
-override Microsoft.Maui.SwipeViewSwipeEnded.Equals(object? obj) -> bool
-override Microsoft.Maui.SwipeViewSwipeEnded.GetHashCode() -> int
-override Microsoft.Maui.SwipeViewSwipeEnded.ToString() -> string!
-override Microsoft.Maui.SwipeViewSwipeStarted.Equals(object? obj) -> bool
-override Microsoft.Maui.SwipeViewSwipeStarted.GetHashCode() -> int
-override Microsoft.Maui.SwipeViewSwipeStarted.ToString() -> string!
-*REMOVED*readonly Microsoft.Maui.PropertyMapper._mapper -> System.Collections.Generic.Dictionary<string!, System.Action<Microsoft.Maui.IElementHandler!, Microsoft.Maui.IElement!>!>!
-static Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.operator !=(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? left, Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.operator ==(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? left, Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.LayoutHandlerUpdate.operator !=(Microsoft.Maui.Handlers.LayoutHandlerUpdate? left, Microsoft.Maui.Handlers.LayoutHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.LayoutHandlerUpdate.operator ==(Microsoft.Maui.Handlers.LayoutHandlerUpdate? left, Microsoft.Maui.Handlers.LayoutHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.MenuBarHandlerUpdate.operator !=(Microsoft.Maui.Handlers.MenuBarHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.MenuBarHandlerUpdate.operator ==(Microsoft.Maui.Handlers.MenuBarHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.operator !=(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.operator ==(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.operator !=(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.operator ==(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.OpenWindowRequest.operator !=(Microsoft.Maui.Handlers.OpenWindowRequest? left, Microsoft.Maui.Handlers.OpenWindowRequest? right) -> bool
-static Microsoft.Maui.Handlers.OpenWindowRequest.operator ==(Microsoft.Maui.Handlers.OpenWindowRequest? left, Microsoft.Maui.Handlers.OpenWindowRequest? right) -> bool
-static Microsoft.Maui.Handlers.SearchBarHandler.MapReturnType(Microsoft.Maui.Handlers.ISearchBarHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
-static Microsoft.Maui.Hosting.AppHostBuilderExtensions.ConfigureEnvironmentVariables(this Microsoft.Maui.Hosting.MauiAppBuilder! builder) -> Microsoft.Maui.Hosting.MauiAppBuilder!
-static Microsoft.Maui.ScrollToRequest.operator !=(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
-static Microsoft.Maui.ScrollToRequest.operator ==(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
-static Microsoft.Maui.SwipeViewCloseRequest.operator !=(Microsoft.Maui.SwipeViewCloseRequest? left, Microsoft.Maui.SwipeViewCloseRequest? right) -> bool
-static Microsoft.Maui.SwipeViewCloseRequest.operator ==(Microsoft.Maui.SwipeViewCloseRequest? left, Microsoft.Maui.SwipeViewCloseRequest? right) -> bool
-static Microsoft.Maui.SwipeViewOpenRequest.operator !=(Microsoft.Maui.SwipeViewOpenRequest? left, Microsoft.Maui.SwipeViewOpenRequest? right) -> bool
-static Microsoft.Maui.SwipeViewOpenRequest.operator ==(Microsoft.Maui.SwipeViewOpenRequest? left, Microsoft.Maui.SwipeViewOpenRequest? right) -> bool
-static Microsoft.Maui.SwipeViewSwipeChanging.operator !=(Microsoft.Maui.SwipeViewSwipeChanging? left, Microsoft.Maui.SwipeViewSwipeChanging? right) -> bool
-static Microsoft.Maui.SwipeViewSwipeChanging.operator ==(Microsoft.Maui.SwipeViewSwipeChanging? left, Microsoft.Maui.SwipeViewSwipeChanging? right) -> bool
-static Microsoft.Maui.SwipeViewSwipeEnded.operator !=(Microsoft.Maui.SwipeViewSwipeEnded? left, Microsoft.Maui.SwipeViewSwipeEnded? right) -> bool
-static Microsoft.Maui.SwipeViewSwipeEnded.operator ==(Microsoft.Maui.SwipeViewSwipeEnded? left, Microsoft.Maui.SwipeViewSwipeEnded? right) -> bool
-static Microsoft.Maui.SwipeViewSwipeStarted.operator !=(Microsoft.Maui.SwipeViewSwipeStarted? left, Microsoft.Maui.SwipeViewSwipeStarted? right) -> bool
-static Microsoft.Maui.SwipeViewSwipeStarted.operator ==(Microsoft.Maui.SwipeViewSwipeStarted? left, Microsoft.Maui.SwipeViewSwipeStarted? right) -> bool
-virtual Microsoft.Maui.Animations.Lerp.LerpDelegate.Invoke(object! start, object! end, double progress) -> object!
-virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate!
-virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Equals(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? other) -> bool
-virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.LayoutHandlerUpdate!
-virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.Equals(Microsoft.Maui.Handlers.LayoutHandlerUpdate? other) -> bool
-virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.MenuBarHandlerUpdate!
-virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.Equals(Microsoft.Maui.Handlers.MenuBarHandlerUpdate? other) -> bool
-virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate!
-virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.Equals(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? other) -> bool
-virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate!
-virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.Equals(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? other) -> bool
-virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.Handlers.OpenWindowRequest.<Clone>$() -> Microsoft.Maui.Handlers.OpenWindowRequest!
-virtual Microsoft.Maui.Handlers.OpenWindowRequest.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.Handlers.OpenWindowRequest.Equals(Microsoft.Maui.Handlers.OpenWindowRequest? other) -> bool
-virtual Microsoft.Maui.Handlers.OpenWindowRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.LifecycleEvents.TizenLifecycle.OnAppControlReceived.Invoke(Tizen.Applications.CoreApplication! application, Tizen.Applications.AppControlReceivedEventArgs! e) -> void
-virtual Microsoft.Maui.LifecycleEvents.TizenLifecycle.OnCreate.Invoke(Tizen.Applications.CoreApplication! application) -> void
-virtual Microsoft.Maui.LifecycleEvents.TizenLifecycle.OnDeviceOrientationChanged.Invoke(Tizen.Applications.CoreApplication! application, Tizen.Applications.DeviceOrientationEventArgs! e) -> void
-virtual Microsoft.Maui.LifecycleEvents.TizenLifecycle.OnLocaleChanged.Invoke(Tizen.Applications.CoreApplication! application, Tizen.Applications.LocaleChangedEventArgs! e) -> void
-virtual Microsoft.Maui.LifecycleEvents.TizenLifecycle.OnLowBattery.Invoke(Tizen.Applications.CoreApplication! application, Tizen.Applications.LowBatteryEventArgs! e) -> void
-virtual Microsoft.Maui.LifecycleEvents.TizenLifecycle.OnLowMemory.Invoke(Tizen.Applications.CoreApplication! application, Tizen.Applications.LowMemoryEventArgs! e) -> void
-virtual Microsoft.Maui.LifecycleEvents.TizenLifecycle.OnPause.Invoke(Tizen.Applications.CoreApplication! application) -> void
-virtual Microsoft.Maui.LifecycleEvents.TizenLifecycle.OnPreCreate.Invoke(Tizen.Applications.CoreApplication! application) -> void
-virtual Microsoft.Maui.LifecycleEvents.TizenLifecycle.OnRegionFormatChanged.Invoke(Tizen.Applications.CoreApplication! application, Tizen.Applications.RegionFormatChangedEventArgs! e) -> void
-virtual Microsoft.Maui.LifecycleEvents.TizenLifecycle.OnResume.Invoke(Tizen.Applications.CoreApplication! application) -> void
-virtual Microsoft.Maui.LifecycleEvents.TizenLifecycle.OnTerminate.Invoke(Tizen.Applications.CoreApplication! application) -> void
-*REMOVED*virtual Microsoft.Maui.PropertyMapper.ClearKeyCache() -> void
-*REMOVED*virtual Microsoft.Maui.PropertyMapper.UpdateKeys.get -> System.Collections.Generic.IReadOnlyCollection<string!>!
-virtual Microsoft.Maui.ScrollToRequest.<Clone>$() -> Microsoft.Maui.ScrollToRequest!
-virtual Microsoft.Maui.ScrollToRequest.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.ScrollToRequest.Equals(Microsoft.Maui.ScrollToRequest? other) -> bool
-virtual Microsoft.Maui.ScrollToRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.SwipeViewCloseRequest.<Clone>$() -> Microsoft.Maui.SwipeViewCloseRequest!
-virtual Microsoft.Maui.SwipeViewCloseRequest.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.SwipeViewCloseRequest.Equals(Microsoft.Maui.SwipeViewCloseRequest? other) -> bool
-virtual Microsoft.Maui.SwipeViewCloseRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.SwipeViewOpenRequest.<Clone>$() -> Microsoft.Maui.SwipeViewOpenRequest!
-virtual Microsoft.Maui.SwipeViewOpenRequest.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.SwipeViewOpenRequest.Equals(Microsoft.Maui.SwipeViewOpenRequest? other) -> bool
-virtual Microsoft.Maui.SwipeViewOpenRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.SwipeViewSwipeChanging.<Clone>$() -> Microsoft.Maui.SwipeViewSwipeChanging!
-virtual Microsoft.Maui.SwipeViewSwipeChanging.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.SwipeViewSwipeChanging.Equals(Microsoft.Maui.SwipeViewSwipeChanging? other) -> bool
-virtual Microsoft.Maui.SwipeViewSwipeChanging.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.SwipeViewSwipeEnded.<Clone>$() -> Microsoft.Maui.SwipeViewSwipeEnded!
-virtual Microsoft.Maui.SwipeViewSwipeEnded.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.SwipeViewSwipeEnded.Equals(Microsoft.Maui.SwipeViewSwipeEnded? other) -> bool
-virtual Microsoft.Maui.SwipeViewSwipeEnded.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.SwipeViewSwipeStarted.<Clone>$() -> Microsoft.Maui.SwipeViewSwipeStarted!
-virtual Microsoft.Maui.SwipeViewSwipeStarted.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.SwipeViewSwipeStarted.Equals(Microsoft.Maui.SwipeViewSwipeStarted? other) -> bool
-virtual Microsoft.Maui.SwipeViewSwipeStarted.PrintMembers(System.Text.StringBuilder! builder) -> bool
diff --git a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt.bak b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt.bak
deleted file mode 100644
index e0d0f8973c9e..000000000000
--- a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt.bak
+++ /dev/null
@@ -1,273 +0,0 @@
-#nullable enable
-Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter
-Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.SafeAreaEdgesTypeConverter() -> void
-Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.ContextFlyoutItemHandlerUpdate(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate! original) -> void
-Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
-Microsoft.Maui.Handlers.DataFlowDirection
-Microsoft.Maui.Handlers.DataFlowDirection.FromPlatform = 1 -> Microsoft.Maui.Handlers.DataFlowDirection
-Microsoft.Maui.Handlers.DataFlowDirection.ToPlatform = 0 -> Microsoft.Maui.Handlers.DataFlowDirection
-Microsoft.Maui.Handlers.LayoutHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IView! View) -> void
-Microsoft.Maui.Handlers.LayoutHandlerUpdate.LayoutHandlerUpdate(Microsoft.Maui.Handlers.LayoutHandlerUpdate! original) -> void
-Microsoft.Maui.Handlers.MenuBarHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuBarItem! MenuBarItem) -> void
-Microsoft.Maui.Handlers.MenuBarHandlerUpdate.MenuBarHandlerUpdate(Microsoft.Maui.Handlers.MenuBarHandlerUpdate! original) -> void
-Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
-Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.MenuBarItemHandlerUpdate(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate! original) -> void
-Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
-Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.MenuFlyoutSubItemHandlerUpdate(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate! original) -> void
-Microsoft.Maui.Handlers.OpenWindowRequest.Deconstruct(out Microsoft.Maui.IPersistedState? State, out Microsoft.UI.Xaml.LaunchActivatedEventArgs? LaunchArgs) -> void
-Microsoft.Maui.Handlers.OpenWindowRequest.OpenWindowRequest(Microsoft.Maui.Handlers.OpenWindowRequest! original) -> void
-Microsoft.Maui.Hosting.MauiAppBuilder.Environment.get -> Microsoft.Maui.Hosting.MauiHostEnvironment!
-Microsoft.Maui.Hosting.MauiAppBuilder.Properties.get -> System.Collections.Generic.IDictionary<object!, object!>!
-Microsoft.Maui.Hosting.MauiHostEnvironment
-Microsoft.Maui.Hosting.MauiHostEnvironment.ApplicationName.get -> string!
-Microsoft.Maui.Hosting.MauiHostEnvironment.ApplicationName.set -> void
-Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootFileProvider.get -> Microsoft.Extensions.FileProviders.IFileProvider!
-Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootFileProvider.set -> void
-Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootPath.get -> string!
-Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootPath.set -> void
-Microsoft.Maui.Hosting.MauiHostEnvironment.EnvironmentName.get -> string!
-Microsoft.Maui.Hosting.MauiHostEnvironment.EnvironmentName.set -> void
-Microsoft.Maui.Hosting.MauiHostEnvironment.MauiHostEnvironment() -> void
-*REMOVED*Microsoft.Maui.IDatePicker.Date.get -> System.DateTime
-Microsoft.Maui.IDatePicker.Date.get -> System.DateTime?
-Microsoft.Maui.IDatePicker.IsOpen.get -> bool
-Microsoft.Maui.IDatePicker.IsOpen.set -> void
-*REMOVED*Microsoft.Maui.IDatePicker.MaximumDate.get -> System.DateTime
-Microsoft.Maui.IDatePicker.MaximumDate.get -> System.DateTime?
-*REMOVED*Microsoft.Maui.IDatePicker.MinimumDate.get -> System.DateTime
-Microsoft.Maui.IDatePicker.MinimumDate.get -> System.DateTime?
-Microsoft.Maui.IPicker.IsOpen.get -> bool
-Microsoft.Maui.IPicker.IsOpen.set -> void
-Microsoft.Maui.ISearchBar.ReturnType.get -> Microsoft.Maui.ReturnType
-Microsoft.Maui.ISearchBar.SearchIconColor.get -> Microsoft.Maui.Graphics.Color!
-Microsoft.Maui.ITimePicker.IsOpen.get -> bool
-Microsoft.Maui.ITimePicker.IsOpen.set -> void
-*REMOVED*Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan
-Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan?
-Microsoft.Maui.IWebRequestInterceptingWebView
-Microsoft.Maui.IWebRequestInterceptingWebView.WebResourceRequested(Microsoft.Maui.WebResourceRequestedEventArgs! args) -> bool
-Microsoft.Maui.IWindow.IsMaximizable.get -> bool
-Microsoft.Maui.IWindow.IsMinimizable.get -> bool
-Microsoft.Maui.Platform.CalendarDatePickerExtensions
-Microsoft.Maui.SafeAreaEdges
-Microsoft.Maui.SafeAreaEdges.Bottom.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Bottom.set -> void
-Microsoft.Maui.SafeAreaEdges.Equals(Microsoft.Maui.SafeAreaEdges other) -> bool
-Microsoft.Maui.SafeAreaEdges.GetEdge(int edge) -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Left.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Left.set -> void
-Microsoft.Maui.SafeAreaEdges.Right.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Right.set -> void
-Microsoft.Maui.SafeAreaEdges.SafeAreaEdges() -> void
-Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions horizontal, Microsoft.Maui.SafeAreaRegions vertical) -> void
-Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions left, Microsoft.Maui.SafeAreaRegions top, Microsoft.Maui.SafeAreaRegions right, Microsoft.Maui.SafeAreaRegions bottom) -> void
-Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions uniformValue) -> void
-Microsoft.Maui.SafeAreaEdges.SetEdge(int edge, Microsoft.Maui.SafeAreaRegions value) -> void
-Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Top.set -> void
-Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.All = Microsoft.Maui.SafeAreaRegions.SoftInput | Microsoft.Maui.SafeAreaRegions.Container -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.Default = 4 -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.None = 0 -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.SoftInput = 1 -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.ScrollToRequest.Deconstruct(out double HorizontalOffset, out double VerticalOffset, out bool Instant) -> void
-Microsoft.Maui.ScrollToRequest.ScrollToRequest(Microsoft.Maui.ScrollToRequest! original) -> void
-Microsoft.Maui.SwipeViewCloseRequest.Deconstruct(out bool Animated) -> void
-Microsoft.Maui.SwipeViewCloseRequest.SwipeViewCloseRequest(Microsoft.Maui.SwipeViewCloseRequest! original) -> void
-Microsoft.Maui.SwipeViewOpenRequest.Deconstruct(out Microsoft.Maui.OpenSwipeItem OpenSwipeItem, out bool Animated) -> void
-Microsoft.Maui.SwipeViewOpenRequest.SwipeViewOpenRequest(Microsoft.Maui.SwipeViewOpenRequest! original) -> void
-Microsoft.Maui.SwipeViewSwipeChanging.Deconstruct(out Microsoft.Maui.SwipeDirection SwipeDirection, out double Offset) -> void
-Microsoft.Maui.SwipeViewSwipeChanging.SwipeViewSwipeChanging(Microsoft.Maui.SwipeViewSwipeChanging! original) -> void
-Microsoft.Maui.SwipeViewSwipeEnded.Deconstruct(out Microsoft.Maui.SwipeDirection SwipeDirection, out bool IsOpen) -> void
-Microsoft.Maui.SwipeViewSwipeEnded.SwipeViewSwipeEnded(Microsoft.Maui.SwipeViewSwipeEnded! original) -> void
-Microsoft.Maui.SwipeViewSwipeStarted.Deconstruct(out Microsoft.Maui.SwipeDirection SwipeDirection) -> void
-Microsoft.Maui.SwipeViewSwipeStarted.SwipeViewSwipeStarted(Microsoft.Maui.SwipeViewSwipeStarted! original) -> void
-Microsoft.Maui.WebResourceRequestedEventArgs
-Microsoft.Maui.WebResourceRequestedEventArgs.RequestEventArgs.get -> Microsoft.Web.WebView2.Core.CoreWebView2WebResourceRequestedEventArgs!
-Microsoft.Maui.WebResourceRequestedEventArgs.Sender.get -> Microsoft.Web.WebView2.Core.CoreWebView2!
-override Microsoft.Maui.Converters.EasingTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.EasingTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.EasingTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.EasingTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.EasingTypeConverter.GetStandardValues(System.ComponentModel.ITypeDescriptorContext? context) -> System.ComponentModel.TypeConverter.StandardValuesCollection?
-override Microsoft.Maui.Converters.EasingTypeConverter.GetStandardValuesExclusive(System.ComponentModel.ITypeDescriptorContext? context) -> bool
-override Microsoft.Maui.Converters.EasingTypeConverter.GetStandardValuesSupported(System.ComponentModel.ITypeDescriptorContext? context) -> bool
-override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.FlexBasisTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexBasisTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexBasisTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexBasisTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.FlexDirectionTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexDirectionTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexDirectionTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexDirectionTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.FlexJustifyTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexJustifyTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexJustifyTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexJustifyTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value) -> object!
-override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object!
-override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.ThicknessTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.ThicknessTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Equals(object? obj) -> bool
-override Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.GetHashCode() -> int
-override Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.ToString() -> string!
-override Microsoft.Maui.Handlers.LayoutHandlerUpdate.Equals(object? obj) -> bool
-override Microsoft.Maui.Handlers.LayoutHandlerUpdate.GetHashCode() -> int
-override Microsoft.Maui.Handlers.LayoutHandlerUpdate.ToString() -> string!
-override Microsoft.Maui.Handlers.MenuBarHandlerUpdate.Equals(object? obj) -> bool
-override Microsoft.Maui.Handlers.MenuBarHandlerUpdate.GetHashCode() -> int
-override Microsoft.Maui.Handlers.MenuBarHandlerUpdate.ToString() -> string!
-override Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.Equals(object? obj) -> bool
-override Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.GetHashCode() -> int
-override Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.ToString() -> string!
-override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.Equals(object? obj) -> bool
-override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.GetHashCode() -> int
-override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.ToString() -> string!
-override Microsoft.Maui.Handlers.OpenWindowRequest.Equals(object? obj) -> bool
-override Microsoft.Maui.Handlers.OpenWindowRequest.GetHashCode() -> int
-override Microsoft.Maui.Handlers.OpenWindowRequest.ToString() -> string!
-override Microsoft.Maui.SafeAreaEdges.Equals(object? obj) -> bool
-override Microsoft.Maui.SafeAreaEdges.GetHashCode() -> int
-override Microsoft.Maui.SafeAreaEdges.ToString() -> string!
-override Microsoft.Maui.ScrollToRequest.Equals(object? obj) -> bool
-override Microsoft.Maui.ScrollToRequest.GetHashCode() -> int
-override Microsoft.Maui.ScrollToRequest.ToString() -> string!
-override Microsoft.Maui.SwipeViewCloseRequest.Equals(object? obj) -> bool
-override Microsoft.Maui.SwipeViewCloseRequest.GetHashCode() -> int
-override Microsoft.Maui.SwipeViewCloseRequest.ToString() -> string!
-override Microsoft.Maui.SwipeViewOpenRequest.Equals(object? obj) -> bool
-override Microsoft.Maui.SwipeViewOpenRequest.GetHashCode() -> int
-override Microsoft.Maui.SwipeViewOpenRequest.ToString() -> string!
-override Microsoft.Maui.SwipeViewSwipeChanging.Equals(object? obj) -> bool
-override Microsoft.Maui.SwipeViewSwipeChanging.GetHashCode() -> int
-override Microsoft.Maui.SwipeViewSwipeChanging.ToString() -> string!
-override Microsoft.Maui.SwipeViewSwipeEnded.Equals(object? obj) -> bool
-override Microsoft.Maui.SwipeViewSwipeEnded.GetHashCode() -> int
-override Microsoft.Maui.SwipeViewSwipeEnded.ToString() -> string!
-override Microsoft.Maui.SwipeViewSwipeStarted.Equals(object? obj) -> bool
-override Microsoft.Maui.SwipeViewSwipeStarted.GetHashCode() -> int
-override Microsoft.Maui.SwipeViewSwipeStarted.ToString() -> string!
-*REMOVED*readonly Microsoft.Maui.PropertyMapper._mapper -> System.Collections.Generic.Dictionary<string!, System.Action<Microsoft.Maui.IElementHandler!, Microsoft.Maui.IElement!>!>!
-static Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.operator !=(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? left, Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.operator ==(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? left, Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.GraphicsViewHandler.MapBackground(Microsoft.Maui.Handlers.IGraphicsViewHandler! handler, Microsoft.Maui.IGraphicsView! graphicsView) -> void
-static Microsoft.Maui.Handlers.LayoutHandlerUpdate.operator !=(Microsoft.Maui.Handlers.LayoutHandlerUpdate? left, Microsoft.Maui.Handlers.LayoutHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.LayoutHandlerUpdate.operator ==(Microsoft.Maui.Handlers.LayoutHandlerUpdate? left, Microsoft.Maui.Handlers.LayoutHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.MenuBarHandlerUpdate.operator !=(Microsoft.Maui.Handlers.MenuBarHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.MenuBarHandlerUpdate.operator ==(Microsoft.Maui.Handlers.MenuBarHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.operator !=(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.operator ==(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.operator !=(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.operator ==(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.OpenWindowRequest.operator !=(Microsoft.Maui.Handlers.OpenWindowRequest? left, Microsoft.Maui.Handlers.OpenWindowRequest? right) -> bool
-static Microsoft.Maui.Handlers.OpenWindowRequest.operator ==(Microsoft.Maui.Handlers.OpenWindowRequest? left, Microsoft.Maui.Handlers.OpenWindowRequest? right) -> bool
-static Microsoft.Maui.Handlers.SearchBarHandler.MapReturnType(Microsoft.Maui.Handlers.ISearchBarHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
-static Microsoft.Maui.Handlers.TimePickerHandler.MapBackground(Microsoft.Maui.Handlers.ITimePickerHandler! handler, Microsoft.Maui.ITimePicker! timePicker) -> void
-static Microsoft.Maui.Handlers.WindowHandler.MapIsMaximizable(Microsoft.Maui.Handlers.IWindowHandler! handler, Microsoft.Maui.IWindow! window) -> void
-static Microsoft.Maui.Handlers.WindowHandler.MapIsMinimizable(Microsoft.Maui.Handlers.IWindowHandler! handler, Microsoft.Maui.IWindow! window) -> void
-static Microsoft.Maui.Hosting.AppHostBuilderExtensions.ConfigureEnvironmentVariables(this Microsoft.Maui.Hosting.MauiAppBuilder! builder) -> Microsoft.Maui.Hosting.MauiAppBuilder!
-static Microsoft.Maui.Platform.CalendarDatePickerExtensions.ToDateFormat(this string! dateFormat) -> string!
-static Microsoft.Maui.Platform.DatePickerExtensions.UpdateBackground(this Microsoft.UI.Xaml.Controls.CalendarDatePicker! platformDatePicker, Microsoft.Maui.IDatePicker! datePicker) -> void
-*REMOVED*static Microsoft.Maui.Platform.ScrollViewerExtensions.UpdateScrollBarVisibility(this Microsoft.UI.Xaml.Controls.ScrollViewer! scrollViewer, Microsoft.Maui.ScrollOrientation orientation, Microsoft.Maui.ScrollBarVisibility horizontalScrollBarVisibility) -> void
-static Microsoft.Maui.Platform.ScrollViewerExtensions.UpdateScrollBarVisibility(this Microsoft.UI.Xaml.Controls.ScrollViewer! scrollViewer, Microsoft.Maui.ScrollOrientation orientation, Microsoft.Maui.ScrollBarVisibility visibility) -> void
-static Microsoft.Maui.Platform.SearchBarExtensions.UpdateReturnType(this Microsoft.UI.Xaml.Controls.AutoSuggestBox! platformControl, Microsoft.Maui.ISearchBar! searchBar) -> void
-static Microsoft.Maui.Platform.TextBoxExtensions.GetCursorPosition(this Microsoft.UI.Xaml.Controls.TextBox! textBox, int cursorOffset = 0) -> int
-static Microsoft.Maui.Platform.TimePickerExtensions.UpdateBackground(this Microsoft.UI.Xaml.Controls.TimePicker! platformTimePicker, Microsoft.Maui.ITimePicker! timePicker) -> void
-static Microsoft.Maui.SafeAreaEdges.All.get -> Microsoft.Maui.SafeAreaEdges
-static Microsoft.Maui.SafeAreaEdges.Default.get -> Microsoft.Maui.SafeAreaEdges
-static Microsoft.Maui.SafeAreaEdges.None.get -> Microsoft.Maui.SafeAreaEdges
-static Microsoft.Maui.SafeAreaEdges.operator !=(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
-static Microsoft.Maui.SafeAreaEdges.operator ==(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
-static Microsoft.Maui.ScrollToRequest.operator !=(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
-static Microsoft.Maui.ScrollToRequest.operator ==(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
-static Microsoft.Maui.SwipeViewCloseRequest.operator !=(Microsoft.Maui.SwipeViewCloseRequest? left, Microsoft.Maui.SwipeViewCloseRequest? right) -> bool
-static Microsoft.Maui.SwipeViewCloseRequest.operator ==(Microsoft.Maui.SwipeViewCloseRequest? left, Microsoft.Maui.SwipeViewCloseRequest? right) -> bool
-static Microsoft.Maui.SwipeViewOpenRequest.operator !=(Microsoft.Maui.SwipeViewOpenRequest? left, Microsoft.Maui.SwipeViewOpenRequest? right) -> bool
-static Microsoft.Maui.SwipeViewOpenRequest.operator ==(Microsoft.Maui.SwipeViewOpenRequest? left, Microsoft.Maui.SwipeViewOpenRequest? right) -> bool
-static Microsoft.Maui.SwipeViewSwipeChanging.operator !=(Microsoft.Maui.SwipeViewSwipeChanging? left, Microsoft.Maui.SwipeViewSwipeChanging? right) -> bool
-static Microsoft.Maui.SwipeViewSwipeChanging.operator ==(Microsoft.Maui.SwipeViewSwipeChanging? left, Microsoft.Maui.SwipeViewSwipeChanging? right) -> bool
-static Microsoft.Maui.SwipeViewSwipeEnded.operator !=(Microsoft.Maui.SwipeViewSwipeEnded? left, Microsoft.Maui.SwipeViewSwipeEnded? right) -> bool
-static Microsoft.Maui.SwipeViewSwipeEnded.operator ==(Microsoft.Maui.SwipeViewSwipeEnded? left, Microsoft.Maui.SwipeViewSwipeEnded? right) -> bool
-static Microsoft.Maui.SwipeViewSwipeStarted.operator !=(Microsoft.Maui.SwipeViewSwipeStarted? left, Microsoft.Maui.SwipeViewSwipeStarted? right) -> bool
-static Microsoft.Maui.SwipeViewSwipeStarted.operator ==(Microsoft.Maui.SwipeViewSwipeStarted? left, Microsoft.Maui.SwipeViewSwipeStarted? right) -> bool
-virtual Microsoft.Maui.Animations.Lerp.LerpDelegate.Invoke(object! start, object! end, double progress) -> object!
-virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate!
-virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Equals(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? other) -> bool
-virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.LayoutHandlerUpdate!
-virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.Equals(Microsoft.Maui.Handlers.LayoutHandlerUpdate? other) -> bool
-virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.MenuBarHandlerUpdate!
-virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.Equals(Microsoft.Maui.Handlers.MenuBarHandlerUpdate? other) -> bool
-virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate!
-virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.Equals(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? other) -> bool
-virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate!
-virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.Equals(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? other) -> bool
-virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.Handlers.OpenWindowRequest.<Clone>$() -> Microsoft.Maui.Handlers.OpenWindowRequest!
-virtual Microsoft.Maui.Handlers.OpenWindowRequest.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.Handlers.OpenWindowRequest.Equals(Microsoft.Maui.Handlers.OpenWindowRequest? other) -> bool
-virtual Microsoft.Maui.Handlers.OpenWindowRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.LifecycleEvents.WindowsLifecycle.OnActivated.Invoke(Microsoft.UI.Xaml.Window! window, Microsoft.UI.Xaml.WindowActivatedEventArgs! args) -> void
-virtual Microsoft.Maui.LifecycleEvents.WindowsLifecycle.OnClosed.Invoke(Microsoft.UI.Xaml.Window! window, Microsoft.UI.Xaml.WindowEventArgs! args) -> void
-virtual Microsoft.Maui.LifecycleEvents.WindowsLifecycle.OnLaunched.Invoke(Microsoft.UI.Xaml.Application! application, Microsoft.UI.Xaml.LaunchActivatedEventArgs! args) -> void
-virtual Microsoft.Maui.LifecycleEvents.WindowsLifecycle.OnLaunching.Invoke(Microsoft.UI.Xaml.Application! application, Microsoft.UI.Xaml.LaunchActivatedEventArgs! args) -> void
-virtual Microsoft.Maui.LifecycleEvents.WindowsLifecycle.OnPlatformMessage.Invoke(Microsoft.UI.Xaml.Window! window, Microsoft.Maui.Platform.WindowsPlatformMessageEventArgs! args) -> void
-virtual Microsoft.Maui.LifecycleEvents.WindowsLifecycle.OnPlatformWindowSubclassed.Invoke(Microsoft.UI.Xaml.Window! window, Microsoft.Maui.Platform.WindowsPlatformWindowSubclassedEventArgs! args) -> void
-virtual Microsoft.Maui.LifecycleEvents.WindowsLifecycle.OnResumed.Invoke(Microsoft.UI.Xaml.Window! window) -> void
-virtual Microsoft.Maui.LifecycleEvents.WindowsLifecycle.OnVisibilityChanged.Invoke(Microsoft.UI.Xaml.Window! window, Microsoft.UI.Xaml.WindowVisibilityChangedEventArgs! args) -> void
-virtual Microsoft.Maui.LifecycleEvents.WindowsLifecycle.OnWindowCreated.Invoke(Microsoft.UI.Xaml.Window! window) -> void
-*REMOVED*virtual Microsoft.Maui.PropertyMapper.ClearKeyCache() -> void
-*REMOVED*virtual Microsoft.Maui.PropertyMapper.UpdateKeys.get -> System.Collections.Generic.IReadOnlyCollection<string!>!
-virtual Microsoft.Maui.ScrollToRequest.<Clone>$() -> Microsoft.Maui.ScrollToRequest!
-virtual Microsoft.Maui.ScrollToRequest.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.ScrollToRequest.Equals(Microsoft.Maui.ScrollToRequest? other) -> bool
-virtual Microsoft.Maui.ScrollToRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.SwipeViewCloseRequest.<Clone>$() -> Microsoft.Maui.SwipeViewCloseRequest!
-virtual Microsoft.Maui.SwipeViewCloseRequest.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.SwipeViewCloseRequest.Equals(Microsoft.Maui.SwipeViewCloseRequest? other) -> bool
-virtual Microsoft.Maui.SwipeViewCloseRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.SwipeViewOpenRequest.<Clone>$() -> Microsoft.Maui.SwipeViewOpenRequest!
-virtual Microsoft.Maui.SwipeViewOpenRequest.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.SwipeViewOpenRequest.Equals(Microsoft.Maui.SwipeViewOpenRequest? other) -> bool
-virtual Microsoft.Maui.SwipeViewOpenRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.SwipeViewSwipeChanging.<Clone>$() -> Microsoft.Maui.SwipeViewSwipeChanging!
-virtual Microsoft.Maui.SwipeViewSwipeChanging.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.SwipeViewSwipeChanging.Equals(Microsoft.Maui.SwipeViewSwipeChanging? other) -> bool
-virtual Microsoft.Maui.SwipeViewSwipeChanging.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.SwipeViewSwipeEnded.<Clone>$() -> Microsoft.Maui.SwipeViewSwipeEnded!
-virtual Microsoft.Maui.SwipeViewSwipeEnded.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.SwipeViewSwipeEnded.Equals(Microsoft.Maui.SwipeViewSwipeEnded? other) -> bool
-virtual Microsoft.Maui.SwipeViewSwipeEnded.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.SwipeViewSwipeStarted.<Clone>$() -> Microsoft.Maui.SwipeViewSwipeStarted!
-virtual Microsoft.Maui.SwipeViewSwipeStarted.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.SwipeViewSwipeStarted.Equals(Microsoft.Maui.SwipeViewSwipeStarted? other) -> bool
-virtual Microsoft.Maui.SwipeViewSwipeStarted.PrintMembers(System.Text.StringBuilder! builder) -> bool
diff --git a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt.bak b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt.bak
deleted file mode 100644
index b1e783e9d28c..000000000000
--- a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt.bak
+++ /dev/null
@@ -1,248 +0,0 @@
-#nullable enable
-Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter
-Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.SafeAreaEdgesTypeConverter() -> void
-Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.ContextFlyoutItemHandlerUpdate(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate! original) -> void
-Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
-Microsoft.Maui.Handlers.DataFlowDirection
-Microsoft.Maui.Handlers.DataFlowDirection.FromPlatform = 1 -> Microsoft.Maui.Handlers.DataFlowDirection
-Microsoft.Maui.Handlers.DataFlowDirection.ToPlatform = 0 -> Microsoft.Maui.Handlers.DataFlowDirection
-Microsoft.Maui.Handlers.LayoutHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IView! View) -> void
-Microsoft.Maui.Handlers.LayoutHandlerUpdate.LayoutHandlerUpdate(Microsoft.Maui.Handlers.LayoutHandlerUpdate! original) -> void
-Microsoft.Maui.Handlers.MenuBarHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuBarItem! MenuBarItem) -> void
-Microsoft.Maui.Handlers.MenuBarHandlerUpdate.MenuBarHandlerUpdate(Microsoft.Maui.Handlers.MenuBarHandlerUpdate! original) -> void
-Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
-Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.MenuBarItemHandlerUpdate(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate! original) -> void
-Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
-Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.MenuFlyoutSubItemHandlerUpdate(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate! original) -> void
-Microsoft.Maui.Handlers.OpenWindowRequest.Deconstruct(out Microsoft.Maui.IPersistedState? State) -> void
-Microsoft.Maui.Handlers.OpenWindowRequest.OpenWindowRequest(Microsoft.Maui.Handlers.OpenWindowRequest! original) -> void
-Microsoft.Maui.Hosting.MauiAppBuilder.Environment.get -> Microsoft.Maui.Hosting.MauiHostEnvironment!
-Microsoft.Maui.Hosting.MauiAppBuilder.Properties.get -> System.Collections.Generic.IDictionary<object!, object!>!
-Microsoft.Maui.Hosting.MauiHostEnvironment
-Microsoft.Maui.Hosting.MauiHostEnvironment.ApplicationName.get -> string!
-Microsoft.Maui.Hosting.MauiHostEnvironment.ApplicationName.set -> void
-Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootFileProvider.get -> Microsoft.Extensions.FileProviders.IFileProvider!
-Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootFileProvider.set -> void
-Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootPath.get -> string!
-Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootPath.set -> void
-Microsoft.Maui.Hosting.MauiHostEnvironment.EnvironmentName.get -> string!
-Microsoft.Maui.Hosting.MauiHostEnvironment.EnvironmentName.set -> void
-Microsoft.Maui.Hosting.MauiHostEnvironment.MauiHostEnvironment() -> void
-*REMOVED*Microsoft.Maui.IDatePicker.Date.get -> System.DateTime
-Microsoft.Maui.IDatePicker.Date.get -> System.DateTime?
-Microsoft.Maui.IDatePicker.IsOpen.get -> bool
-Microsoft.Maui.IDatePicker.IsOpen.set -> void
-*REMOVED*Microsoft.Maui.IDatePicker.MaximumDate.get -> System.DateTime
-Microsoft.Maui.IDatePicker.MaximumDate.get -> System.DateTime?
-*REMOVED*Microsoft.Maui.IDatePicker.MinimumDate.get -> System.DateTime
-Microsoft.Maui.IDatePicker.MinimumDate.get -> System.DateTime?
-Microsoft.Maui.IPicker.IsOpen.get -> bool
-Microsoft.Maui.IPicker.IsOpen.set -> void
-Microsoft.Maui.ISearchBar.ReturnType.get -> Microsoft.Maui.ReturnType
-Microsoft.Maui.ISearchBar.SearchIconColor.get -> Microsoft.Maui.Graphics.Color!
-Microsoft.Maui.ITimePicker.IsOpen.get -> bool
-Microsoft.Maui.ITimePicker.IsOpen.set -> void
-*REMOVED*Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan
-Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan?
-Microsoft.Maui.IWebRequestInterceptingWebView
-Microsoft.Maui.IWebRequestInterceptingWebView.WebResourceRequested(Microsoft.Maui.WebResourceRequestedEventArgs! args) -> bool
-Microsoft.Maui.SafeAreaEdges
-Microsoft.Maui.SafeAreaEdges.Bottom.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Bottom.set -> void
-Microsoft.Maui.SafeAreaEdges.Equals(Microsoft.Maui.SafeAreaEdges other) -> bool
-Microsoft.Maui.SafeAreaEdges.GetEdge(int edge) -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Left.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Left.set -> void
-Microsoft.Maui.SafeAreaEdges.Right.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Right.set -> void
-Microsoft.Maui.SafeAreaEdges.SafeAreaEdges() -> void
-Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions horizontal, Microsoft.Maui.SafeAreaRegions vertical) -> void
-Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions left, Microsoft.Maui.SafeAreaRegions top, Microsoft.Maui.SafeAreaRegions right, Microsoft.Maui.SafeAreaRegions bottom) -> void
-Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions uniformValue) -> void
-Microsoft.Maui.SafeAreaEdges.SetEdge(int edge, Microsoft.Maui.SafeAreaRegions value) -> void
-Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Top.set -> void
-Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.All = Microsoft.Maui.SafeAreaRegions.SoftInput | Microsoft.Maui.SafeAreaRegions.Container -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.Default = 4 -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.None = 0 -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.SoftInput = 1 -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.ScrollToRequest.Deconstruct(out double HorizontalOffset, out double VerticalOffset, out bool Instant) -> void
-Microsoft.Maui.ScrollToRequest.ScrollToRequest(Microsoft.Maui.ScrollToRequest! original) -> void
-Microsoft.Maui.SwipeViewCloseRequest.Deconstruct(out bool Animated) -> void
-Microsoft.Maui.SwipeViewCloseRequest.SwipeViewCloseRequest(Microsoft.Maui.SwipeViewCloseRequest! original) -> void
-Microsoft.Maui.SwipeViewOpenRequest.Deconstruct(out Microsoft.Maui.OpenSwipeItem OpenSwipeItem, out bool Animated) -> void
-Microsoft.Maui.SwipeViewOpenRequest.SwipeViewOpenRequest(Microsoft.Maui.SwipeViewOpenRequest! original) -> void
-Microsoft.Maui.SwipeViewSwipeChanging.Deconstruct(out Microsoft.Maui.SwipeDirection SwipeDirection, out double Offset) -> void
-Microsoft.Maui.SwipeViewSwipeChanging.SwipeViewSwipeChanging(Microsoft.Maui.SwipeViewSwipeChanging! original) -> void
-Microsoft.Maui.SwipeViewSwipeEnded.Deconstruct(out Microsoft.Maui.SwipeDirection SwipeDirection, out bool IsOpen) -> void
-Microsoft.Maui.SwipeViewSwipeEnded.SwipeViewSwipeEnded(Microsoft.Maui.SwipeViewSwipeEnded! original) -> void
-Microsoft.Maui.SwipeViewSwipeStarted.Deconstruct(out Microsoft.Maui.SwipeDirection SwipeDirection) -> void
-Microsoft.Maui.SwipeViewSwipeStarted.SwipeViewSwipeStarted(Microsoft.Maui.SwipeViewSwipeStarted! original) -> void
-Microsoft.Maui.WebResourceRequestedEventArgs
-override Microsoft.Maui.Converters.EasingTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.EasingTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.EasingTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.EasingTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.EasingTypeConverter.GetStandardValues(System.ComponentModel.ITypeDescriptorContext? context) -> System.ComponentModel.TypeConverter.StandardValuesCollection?
-override Microsoft.Maui.Converters.EasingTypeConverter.GetStandardValuesExclusive(System.ComponentModel.ITypeDescriptorContext? context) -> bool
-override Microsoft.Maui.Converters.EasingTypeConverter.GetStandardValuesSupported(System.ComponentModel.ITypeDescriptorContext? context) -> bool
-override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.FlexBasisTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexBasisTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexBasisTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexBasisTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.FlexDirectionTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexDirectionTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexDirectionTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexDirectionTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.FlexJustifyTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexJustifyTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexJustifyTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexJustifyTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value) -> object!
-override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object!
-override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.ThicknessTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.ThicknessTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Equals(object? obj) -> bool
-override Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.GetHashCode() -> int
-override Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.ToString() -> string!
-override Microsoft.Maui.Handlers.LayoutHandlerUpdate.Equals(object? obj) -> bool
-override Microsoft.Maui.Handlers.LayoutHandlerUpdate.GetHashCode() -> int
-override Microsoft.Maui.Handlers.LayoutHandlerUpdate.ToString() -> string!
-override Microsoft.Maui.Handlers.MenuBarHandlerUpdate.Equals(object? obj) -> bool
-override Microsoft.Maui.Handlers.MenuBarHandlerUpdate.GetHashCode() -> int
-override Microsoft.Maui.Handlers.MenuBarHandlerUpdate.ToString() -> string!
-override Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.Equals(object? obj) -> bool
-override Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.GetHashCode() -> int
-override Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.ToString() -> string!
-override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.Equals(object? obj) -> bool
-override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.GetHashCode() -> int
-override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.ToString() -> string!
-override Microsoft.Maui.Handlers.OpenWindowRequest.Equals(object? obj) -> bool
-override Microsoft.Maui.Handlers.OpenWindowRequest.GetHashCode() -> int
-override Microsoft.Maui.Handlers.OpenWindowRequest.ToString() -> string!
-override Microsoft.Maui.SafeAreaEdges.Equals(object? obj) -> bool
-override Microsoft.Maui.SafeAreaEdges.GetHashCode() -> int
-override Microsoft.Maui.SafeAreaEdges.ToString() -> string!
-override Microsoft.Maui.ScrollToRequest.Equals(object? obj) -> bool
-override Microsoft.Maui.ScrollToRequest.GetHashCode() -> int
-override Microsoft.Maui.ScrollToRequest.ToString() -> string!
-override Microsoft.Maui.SwipeViewCloseRequest.Equals(object? obj) -> bool
-override Microsoft.Maui.SwipeViewCloseRequest.GetHashCode() -> int
-override Microsoft.Maui.SwipeViewCloseRequest.ToString() -> string!
-override Microsoft.Maui.SwipeViewOpenRequest.Equals(object? obj) -> bool
-override Microsoft.Maui.SwipeViewOpenRequest.GetHashCode() -> int
-override Microsoft.Maui.SwipeViewOpenRequest.ToString() -> string!
-override Microsoft.Maui.SwipeViewSwipeChanging.Equals(object? obj) -> bool
-override Microsoft.Maui.SwipeViewSwipeChanging.GetHashCode() -> int
-override Microsoft.Maui.SwipeViewSwipeChanging.ToString() -> string!
-override Microsoft.Maui.SwipeViewSwipeEnded.Equals(object? obj) -> bool
-override Microsoft.Maui.SwipeViewSwipeEnded.GetHashCode() -> int
-override Microsoft.Maui.SwipeViewSwipeEnded.ToString() -> string!
-override Microsoft.Maui.SwipeViewSwipeStarted.Equals(object? obj) -> bool
-override Microsoft.Maui.SwipeViewSwipeStarted.GetHashCode() -> int
-override Microsoft.Maui.SwipeViewSwipeStarted.ToString() -> string!
-*REMOVED*readonly Microsoft.Maui.PropertyMapper._mapper -> System.Collections.Generic.Dictionary<string!, System.Action<Microsoft.Maui.IElementHandler!, Microsoft.Maui.IElement!>!>!
-static Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.operator !=(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? left, Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.operator ==(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? left, Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.LayoutHandlerUpdate.operator !=(Microsoft.Maui.Handlers.LayoutHandlerUpdate? left, Microsoft.Maui.Handlers.LayoutHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.LayoutHandlerUpdate.operator ==(Microsoft.Maui.Handlers.LayoutHandlerUpdate? left, Microsoft.Maui.Handlers.LayoutHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.MenuBarHandlerUpdate.operator !=(Microsoft.Maui.Handlers.MenuBarHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.MenuBarHandlerUpdate.operator ==(Microsoft.Maui.Handlers.MenuBarHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.operator !=(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.operator ==(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.operator !=(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.operator ==(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.OpenWindowRequest.operator !=(Microsoft.Maui.Handlers.OpenWindowRequest? left, Microsoft.Maui.Handlers.OpenWindowRequest? right) -> bool
-static Microsoft.Maui.Handlers.OpenWindowRequest.operator ==(Microsoft.Maui.Handlers.OpenWindowRequest? left, Microsoft.Maui.Handlers.OpenWindowRequest? right) -> bool
-static Microsoft.Maui.Handlers.SearchBarHandler.MapReturnType(Microsoft.Maui.IViewHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
-static Microsoft.Maui.Hosting.AppHostBuilderExtensions.ConfigureEnvironmentVariables(this Microsoft.Maui.Hosting.MauiAppBuilder! builder) -> Microsoft.Maui.Hosting.MauiAppBuilder!
-static Microsoft.Maui.SafeAreaEdges.All.get -> Microsoft.Maui.SafeAreaEdges
-static Microsoft.Maui.SafeAreaEdges.Default.get -> Microsoft.Maui.SafeAreaEdges
-static Microsoft.Maui.SafeAreaEdges.None.get -> Microsoft.Maui.SafeAreaEdges
-static Microsoft.Maui.SafeAreaEdges.operator !=(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
-static Microsoft.Maui.SafeAreaEdges.operator ==(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
-static Microsoft.Maui.ScrollToRequest.operator !=(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
-static Microsoft.Maui.ScrollToRequest.operator ==(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
-static Microsoft.Maui.SwipeViewCloseRequest.operator !=(Microsoft.Maui.SwipeViewCloseRequest? left, Microsoft.Maui.SwipeViewCloseRequest? right) -> bool
-static Microsoft.Maui.SwipeViewCloseRequest.operator ==(Microsoft.Maui.SwipeViewCloseRequest? left, Microsoft.Maui.SwipeViewCloseRequest? right) -> bool
-static Microsoft.Maui.SwipeViewOpenRequest.operator !=(Microsoft.Maui.SwipeViewOpenRequest? left, Microsoft.Maui.SwipeViewOpenRequest? right) -> bool
-static Microsoft.Maui.SwipeViewOpenRequest.operator ==(Microsoft.Maui.SwipeViewOpenRequest? left, Microsoft.Maui.SwipeViewOpenRequest? right) -> bool
-static Microsoft.Maui.SwipeViewSwipeChanging.operator !=(Microsoft.Maui.SwipeViewSwipeChanging? left, Microsoft.Maui.SwipeViewSwipeChanging? right) -> bool
-static Microsoft.Maui.SwipeViewSwipeChanging.operator ==(Microsoft.Maui.SwipeViewSwipeChanging? left, Microsoft.Maui.SwipeViewSwipeChanging? right) -> bool
-static Microsoft.Maui.SwipeViewSwipeEnded.operator !=(Microsoft.Maui.SwipeViewSwipeEnded? left, Microsoft.Maui.SwipeViewSwipeEnded? right) -> bool
-static Microsoft.Maui.SwipeViewSwipeEnded.operator ==(Microsoft.Maui.SwipeViewSwipeEnded? left, Microsoft.Maui.SwipeViewSwipeEnded? right) -> bool
-static Microsoft.Maui.SwipeViewSwipeStarted.operator !=(Microsoft.Maui.SwipeViewSwipeStarted? left, Microsoft.Maui.SwipeViewSwipeStarted? right) -> bool
-static Microsoft.Maui.SwipeViewSwipeStarted.operator ==(Microsoft.Maui.SwipeViewSwipeStarted? left, Microsoft.Maui.SwipeViewSwipeStarted? right) -> bool
-virtual Microsoft.Maui.Animations.Lerp.LerpDelegate.Invoke(object! start, object! end, double progress) -> object!
-virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate!
-virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Equals(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? other) -> bool
-virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.LayoutHandlerUpdate!
-virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.Equals(Microsoft.Maui.Handlers.LayoutHandlerUpdate? other) -> bool
-virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.MenuBarHandlerUpdate!
-virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.Equals(Microsoft.Maui.Handlers.MenuBarHandlerUpdate? other) -> bool
-virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate!
-virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.Equals(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? other) -> bool
-virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate!
-virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.Equals(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? other) -> bool
-virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.Handlers.OpenWindowRequest.<Clone>$() -> Microsoft.Maui.Handlers.OpenWindowRequest!
-virtual Microsoft.Maui.Handlers.OpenWindowRequest.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.Handlers.OpenWindowRequest.Equals(Microsoft.Maui.Handlers.OpenWindowRequest? other) -> bool
-virtual Microsoft.Maui.Handlers.OpenWindowRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
-*REMOVED*virtual Microsoft.Maui.PropertyMapper.ClearKeyCache() -> void
-*REMOVED*virtual Microsoft.Maui.PropertyMapper.UpdateKeys.get -> System.Collections.Generic.IReadOnlyCollection<string!>!
-virtual Microsoft.Maui.ScrollToRequest.<Clone>$() -> Microsoft.Maui.ScrollToRequest!
-virtual Microsoft.Maui.ScrollToRequest.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.ScrollToRequest.Equals(Microsoft.Maui.ScrollToRequest? other) -> bool
-virtual Microsoft.Maui.ScrollToRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.SwipeViewCloseRequest.<Clone>$() -> Microsoft.Maui.SwipeViewCloseRequest!
-virtual Microsoft.Maui.SwipeViewCloseRequest.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.SwipeViewCloseRequest.Equals(Microsoft.Maui.SwipeViewCloseRequest? other) -> bool
-virtual Microsoft.Maui.SwipeViewCloseRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.SwipeViewOpenRequest.<Clone>$() -> Microsoft.Maui.SwipeViewOpenRequest!
-virtual Microsoft.Maui.SwipeViewOpenRequest.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.SwipeViewOpenRequest.Equals(Microsoft.Maui.SwipeViewOpenRequest? other) -> bool
-virtual Microsoft.Maui.SwipeViewOpenRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.SwipeViewSwipeChanging.<Clone>$() -> Microsoft.Maui.SwipeViewSwipeChanging!
-virtual Microsoft.Maui.SwipeViewSwipeChanging.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.SwipeViewSwipeChanging.Equals(Microsoft.Maui.SwipeViewSwipeChanging? other) -> bool
-virtual Microsoft.Maui.SwipeViewSwipeChanging.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.SwipeViewSwipeEnded.<Clone>$() -> Microsoft.Maui.SwipeViewSwipeEnded!
-virtual Microsoft.Maui.SwipeViewSwipeEnded.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.SwipeViewSwipeEnded.Equals(Microsoft.Maui.SwipeViewSwipeEnded? other) -> bool
-virtual Microsoft.Maui.SwipeViewSwipeEnded.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.SwipeViewSwipeStarted.<Clone>$() -> Microsoft.Maui.SwipeViewSwipeStarted!
-virtual Microsoft.Maui.SwipeViewSwipeStarted.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.SwipeViewSwipeStarted.Equals(Microsoft.Maui.SwipeViewSwipeStarted? other) -> bool
-virtual Microsoft.Maui.SwipeViewSwipeStarted.PrintMembers(System.Text.StringBuilder! builder) -> bool
diff --git a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt.bak b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt.bak
deleted file mode 100644
index b1e783e9d28c..000000000000
--- a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt.bak
+++ /dev/null
@@ -1,248 +0,0 @@
-#nullable enable
-Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter
-Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.SafeAreaEdgesTypeConverter() -> void
-Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.ContextFlyoutItemHandlerUpdate(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate! original) -> void
-Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
-Microsoft.Maui.Handlers.DataFlowDirection
-Microsoft.Maui.Handlers.DataFlowDirection.FromPlatform = 1 -> Microsoft.Maui.Handlers.DataFlowDirection
-Microsoft.Maui.Handlers.DataFlowDirection.ToPlatform = 0 -> Microsoft.Maui.Handlers.DataFlowDirection
-Microsoft.Maui.Handlers.LayoutHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IView! View) -> void
-Microsoft.Maui.Handlers.LayoutHandlerUpdate.LayoutHandlerUpdate(Microsoft.Maui.Handlers.LayoutHandlerUpdate! original) -> void
-Microsoft.Maui.Handlers.MenuBarHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuBarItem! MenuBarItem) -> void
-Microsoft.Maui.Handlers.MenuBarHandlerUpdate.MenuBarHandlerUpdate(Microsoft.Maui.Handlers.MenuBarHandlerUpdate! original) -> void
-Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
-Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.MenuBarItemHandlerUpdate(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate! original) -> void
-Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
-Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.MenuFlyoutSubItemHandlerUpdate(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate! original) -> void
-Microsoft.Maui.Handlers.OpenWindowRequest.Deconstruct(out Microsoft.Maui.IPersistedState? State) -> void
-Microsoft.Maui.Handlers.OpenWindowRequest.OpenWindowRequest(Microsoft.Maui.Handlers.OpenWindowRequest! original) -> void
-Microsoft.Maui.Hosting.MauiAppBuilder.Environment.get -> Microsoft.Maui.Hosting.MauiHostEnvironment!
-Microsoft.Maui.Hosting.MauiAppBuilder.Properties.get -> System.Collections.Generic.IDictionary<object!, object!>!
-Microsoft.Maui.Hosting.MauiHostEnvironment
-Microsoft.Maui.Hosting.MauiHostEnvironment.ApplicationName.get -> string!
-Microsoft.Maui.Hosting.MauiHostEnvironment.ApplicationName.set -> void
-Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootFileProvider.get -> Microsoft.Extensions.FileProviders.IFileProvider!
-Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootFileProvider.set -> void
-Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootPath.get -> string!
-Microsoft.Maui.Hosting.MauiHostEnvironment.ContentRootPath.set -> void
-Microsoft.Maui.Hosting.MauiHostEnvironment.EnvironmentName.get -> string!
-Microsoft.Maui.Hosting.MauiHostEnvironment.EnvironmentName.set -> void
-Microsoft.Maui.Hosting.MauiHostEnvironment.MauiHostEnvironment() -> void
-*REMOVED*Microsoft.Maui.IDatePicker.Date.get -> System.DateTime
-Microsoft.Maui.IDatePicker.Date.get -> System.DateTime?
-Microsoft.Maui.IDatePicker.IsOpen.get -> bool
-Microsoft.Maui.IDatePicker.IsOpen.set -> void
-*REMOVED*Microsoft.Maui.IDatePicker.MaximumDate.get -> System.DateTime
-Microsoft.Maui.IDatePicker.MaximumDate.get -> System.DateTime?
-*REMOVED*Microsoft.Maui.IDatePicker.MinimumDate.get -> System.DateTime
-Microsoft.Maui.IDatePicker.MinimumDate.get -> System.DateTime?
-Microsoft.Maui.IPicker.IsOpen.get -> bool
-Microsoft.Maui.IPicker.IsOpen.set -> void
-Microsoft.Maui.ISearchBar.ReturnType.get -> Microsoft.Maui.ReturnType
-Microsoft.Maui.ISearchBar.SearchIconColor.get -> Microsoft.Maui.Graphics.Color!
-Microsoft.Maui.ITimePicker.IsOpen.get -> bool
-Microsoft.Maui.ITimePicker.IsOpen.set -> void
-*REMOVED*Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan
-Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan?
-Microsoft.Maui.IWebRequestInterceptingWebView
-Microsoft.Maui.IWebRequestInterceptingWebView.WebResourceRequested(Microsoft.Maui.WebResourceRequestedEventArgs! args) -> bool
-Microsoft.Maui.SafeAreaEdges
-Microsoft.Maui.SafeAreaEdges.Bottom.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Bottom.set -> void
-Microsoft.Maui.SafeAreaEdges.Equals(Microsoft.Maui.SafeAreaEdges other) -> bool
-Microsoft.Maui.SafeAreaEdges.GetEdge(int edge) -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Left.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Left.set -> void
-Microsoft.Maui.SafeAreaEdges.Right.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Right.set -> void
-Microsoft.Maui.SafeAreaEdges.SafeAreaEdges() -> void
-Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions horizontal, Microsoft.Maui.SafeAreaRegions vertical) -> void
-Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions left, Microsoft.Maui.SafeAreaRegions top, Microsoft.Maui.SafeAreaRegions right, Microsoft.Maui.SafeAreaRegions bottom) -> void
-Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions uniformValue) -> void
-Microsoft.Maui.SafeAreaEdges.SetEdge(int edge, Microsoft.Maui.SafeAreaRegions value) -> void
-Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaEdges.Top.set -> void
-Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.All = Microsoft.Maui.SafeAreaRegions.SoftInput | Microsoft.Maui.SafeAreaRegions.Container -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.Default = 4 -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.None = 0 -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.SoftInput = 1 -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.ScrollToRequest.Deconstruct(out double HorizontalOffset, out double VerticalOffset, out bool Instant) -> void
-Microsoft.Maui.ScrollToRequest.ScrollToRequest(Microsoft.Maui.ScrollToRequest! original) -> void
-Microsoft.Maui.SwipeViewCloseRequest.Deconstruct(out bool Animated) -> void
-Microsoft.Maui.SwipeViewCloseRequest.SwipeViewCloseRequest(Microsoft.Maui.SwipeViewCloseRequest! original) -> void
-Microsoft.Maui.SwipeViewOpenRequest.Deconstruct(out Microsoft.Maui.OpenSwipeItem OpenSwipeItem, out bool Animated) -> void
-Microsoft.Maui.SwipeViewOpenRequest.SwipeViewOpenRequest(Microsoft.Maui.SwipeViewOpenRequest! original) -> void
-Microsoft.Maui.SwipeViewSwipeChanging.Deconstruct(out Microsoft.Maui.SwipeDirection SwipeDirection, out double Offset) -> void
-Microsoft.Maui.SwipeViewSwipeChanging.SwipeViewSwipeChanging(Microsoft.Maui.SwipeViewSwipeChanging! original) -> void
-Microsoft.Maui.SwipeViewSwipeEnded.Deconstruct(out Microsoft.Maui.SwipeDirection SwipeDirection, out bool IsOpen) -> void
-Microsoft.Maui.SwipeViewSwipeEnded.SwipeViewSwipeEnded(Microsoft.Maui.SwipeViewSwipeEnded! original) -> void
-Microsoft.Maui.SwipeViewSwipeStarted.Deconstruct(out Microsoft.Maui.SwipeDirection SwipeDirection) -> void
-Microsoft.Maui.SwipeViewSwipeStarted.SwipeViewSwipeStarted(Microsoft.Maui.SwipeViewSwipeStarted! original) -> void
-Microsoft.Maui.WebResourceRequestedEventArgs
-override Microsoft.Maui.Converters.EasingTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.EasingTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.EasingTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.EasingTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.EasingTypeConverter.GetStandardValues(System.ComponentModel.ITypeDescriptorContext? context) -> System.ComponentModel.TypeConverter.StandardValuesCollection?
-override Microsoft.Maui.Converters.EasingTypeConverter.GetStandardValuesExclusive(System.ComponentModel.ITypeDescriptorContext? context) -> bool
-override Microsoft.Maui.Converters.EasingTypeConverter.GetStandardValuesSupported(System.ComponentModel.ITypeDescriptorContext? context) -> bool
-override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexAlignContentTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexAlignItemsTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexAlignSelfTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.FlexBasisTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexBasisTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexBasisTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexBasisTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.FlexDirectionTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexDirectionTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexDirectionTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexDirectionTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.FlexJustifyTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexJustifyTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexJustifyTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexJustifyTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value) -> object!
-override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object!
-override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
-override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
-override Microsoft.Maui.Converters.ThicknessTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Converters.ThicknessTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
-override Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Equals(object? obj) -> bool
-override Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.GetHashCode() -> int
-override Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.ToString() -> string!
-override Microsoft.Maui.Handlers.LayoutHandlerUpdate.Equals(object? obj) -> bool
-override Microsoft.Maui.Handlers.LayoutHandlerUpdate.GetHashCode() -> int
-override Microsoft.Maui.Handlers.LayoutHandlerUpdate.ToString() -> string!
-override Microsoft.Maui.Handlers.MenuBarHandlerUpdate.Equals(object? obj) -> bool
-override Microsoft.Maui.Handlers.MenuBarHandlerUpdate.GetHashCode() -> int
-override Microsoft.Maui.Handlers.MenuBarHandlerUpdate.ToString() -> string!
-override Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.Equals(object? obj) -> bool
-override Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.GetHashCode() -> int
-override Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.ToString() -> string!
-override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.Equals(object? obj) -> bool
-override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.GetHashCode() -> int
-override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.ToString() -> string!
-override Microsoft.Maui.Handlers.OpenWindowRequest.Equals(object? obj) -> bool
-override Microsoft.Maui.Handlers.OpenWindowRequest.GetHashCode() -> int
-override Microsoft.Maui.Handlers.OpenWindowRequest.ToString() -> string!
-override Microsoft.Maui.SafeAreaEdges.Equals(object? obj) -> bool
-override Microsoft.Maui.SafeAreaEdges.GetHashCode() -> int
-override Microsoft.Maui.SafeAreaEdges.ToString() -> string!
-override Microsoft.Maui.ScrollToRequest.Equals(object? obj) -> bool
-override Microsoft.Maui.ScrollToRequest.GetHashCode() -> int
-override Microsoft.Maui.ScrollToRequest.ToString() -> string!
-override Microsoft.Maui.SwipeViewCloseRequest.Equals(object? obj) -> bool
-override Microsoft.Maui.SwipeViewCloseRequest.GetHashCode() -> int
-override Microsoft.Maui.SwipeViewCloseRequest.ToString() -> string!
-override Microsoft.Maui.SwipeViewOpenRequest.Equals(object? obj) -> bool
-override Microsoft.Maui.SwipeViewOpenRequest.GetHashCode() -> int
-override Microsoft.Maui.SwipeViewOpenRequest.ToString() -> string!
-override Microsoft.Maui.SwipeViewSwipeChanging.Equals(object? obj) -> bool
-override Microsoft.Maui.SwipeViewSwipeChanging.GetHashCode() -> int
-override Microsoft.Maui.SwipeViewSwipeChanging.ToString() -> string!
-override Microsoft.Maui.SwipeViewSwipeEnded.Equals(object? obj) -> bool
-override Microsoft.Maui.SwipeViewSwipeEnded.GetHashCode() -> int
-override Microsoft.Maui.SwipeViewSwipeEnded.ToString() -> string!
-override Microsoft.Maui.SwipeViewSwipeStarted.Equals(object? obj) -> bool
-override Microsoft.Maui.SwipeViewSwipeStarted.GetHashCode() -> int
-override Microsoft.Maui.SwipeViewSwipeStarted.ToString() -> string!
-*REMOVED*readonly Microsoft.Maui.PropertyMapper._mapper -> System.Collections.Generic.Dictionary<string!, System.Action<Microsoft.Maui.IElementHandler!, Microsoft.Maui.IElement!>!>!
-static Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.operator !=(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? left, Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.operator ==(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? left, Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.LayoutHandlerUpdate.operator !=(Microsoft.Maui.Handlers.LayoutHandlerUpdate? left, Microsoft.Maui.Handlers.LayoutHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.LayoutHandlerUpdate.operator ==(Microsoft.Maui.Handlers.LayoutHandlerUpdate? left, Microsoft.Maui.Handlers.LayoutHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.MenuBarHandlerUpdate.operator !=(Microsoft.Maui.Handlers.MenuBarHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.MenuBarHandlerUpdate.operator ==(Microsoft.Maui.Handlers.MenuBarHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.operator !=(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.operator ==(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.operator !=(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.operator ==(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? left, Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? right) -> bool
-static Microsoft.Maui.Handlers.OpenWindowRequest.operator !=(Microsoft.Maui.Handlers.OpenWindowRequest? left, Microsoft.Maui.Handlers.OpenWindowRequest? right) -> bool
-static Microsoft.Maui.Handlers.OpenWindowRequest.operator ==(Microsoft.Maui.Handlers.OpenWindowRequest? left, Microsoft.Maui.Handlers.OpenWindowRequest? right) -> bool
-static Microsoft.Maui.Handlers.SearchBarHandler.MapReturnType(Microsoft.Maui.IViewHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
-static Microsoft.Maui.Hosting.AppHostBuilderExtensions.ConfigureEnvironmentVariables(this Microsoft.Maui.Hosting.MauiAppBuilder! builder) -> Microsoft.Maui.Hosting.MauiAppBuilder!
-static Microsoft.Maui.SafeAreaEdges.All.get -> Microsoft.Maui.SafeAreaEdges
-static Microsoft.Maui.SafeAreaEdges.Default.get -> Microsoft.Maui.SafeAreaEdges
-static Microsoft.Maui.SafeAreaEdges.None.get -> Microsoft.Maui.SafeAreaEdges
-static Microsoft.Maui.SafeAreaEdges.operator !=(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
-static Microsoft.Maui.SafeAreaEdges.operator ==(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
-static Microsoft.Maui.ScrollToRequest.operator !=(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
-static Microsoft.Maui.ScrollToRequest.operator ==(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
-static Microsoft.Maui.SwipeViewCloseRequest.operator !=(Microsoft.Maui.SwipeViewCloseRequest? left, Microsoft.Maui.SwipeViewCloseRequest? right) -> bool
-static Microsoft.Maui.SwipeViewCloseRequest.operator ==(Microsoft.Maui.SwipeViewCloseRequest? left, Microsoft.Maui.SwipeViewCloseRequest? right) -> bool
-static Microsoft.Maui.SwipeViewOpenRequest.operator !=(Microsoft.Maui.SwipeViewOpenRequest? left, Microsoft.Maui.SwipeViewOpenRequest? right) -> bool
-static Microsoft.Maui.SwipeViewOpenRequest.operator ==(Microsoft.Maui.SwipeViewOpenRequest? left, Microsoft.Maui.SwipeViewOpenRequest? right) -> bool
-static Microsoft.Maui.SwipeViewSwipeChanging.operator !=(Microsoft.Maui.SwipeViewSwipeChanging? left, Microsoft.Maui.SwipeViewSwipeChanging? right) -> bool
-static Microsoft.Maui.SwipeViewSwipeChanging.operator ==(Microsoft.Maui.SwipeViewSwipeChanging? left, Microsoft.Maui.SwipeViewSwipeChanging? right) -> bool
-static Microsoft.Maui.SwipeViewSwipeEnded.operator !=(Microsoft.Maui.SwipeViewSwipeEnded? left, Microsoft.Maui.SwipeViewSwipeEnded? right) -> bool
-static Microsoft.Maui.SwipeViewSwipeEnded.operator ==(Microsoft.Maui.SwipeViewSwipeEnded? left, Microsoft.Maui.SwipeViewSwipeEnded? right) -> bool
-static Microsoft.Maui.SwipeViewSwipeStarted.operator !=(Microsoft.Maui.SwipeViewSwipeStarted? left, Microsoft.Maui.SwipeViewSwipeStarted? right) -> bool
-static Microsoft.Maui.SwipeViewSwipeStarted.operator ==(Microsoft.Maui.SwipeViewSwipeStarted? left, Microsoft.Maui.SwipeViewSwipeStarted? right) -> bool
-virtual Microsoft.Maui.Animations.Lerp.LerpDelegate.Invoke(object! start, object! end, double progress) -> object!
-virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate!
-virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Equals(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? other) -> bool
-virtual Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.LayoutHandlerUpdate!
-virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.Equals(Microsoft.Maui.Handlers.LayoutHandlerUpdate? other) -> bool
-virtual Microsoft.Maui.Handlers.LayoutHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.MenuBarHandlerUpdate!
-virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.Equals(Microsoft.Maui.Handlers.MenuBarHandlerUpdate? other) -> bool
-virtual Microsoft.Maui.Handlers.MenuBarHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate!
-virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.Equals(Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate? other) -> bool
-virtual Microsoft.Maui.Handlers.MenuBarItemHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.<Clone>$() -> Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate!
-virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.Equals(Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate? other) -> bool
-virtual Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.Handlers.OpenWindowRequest.<Clone>$() -> Microsoft.Maui.Handlers.OpenWindowRequest!
-virtual Microsoft.Maui.Handlers.OpenWindowRequest.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.Handlers.OpenWindowRequest.Equals(Microsoft.Maui.Handlers.OpenWindowRequest? other) -> bool
-virtual Microsoft.Maui.Handlers.OpenWindowRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
-*REMOVED*virtual Microsoft.Maui.PropertyMapper.ClearKeyCache() -> void
-*REMOVED*virtual Microsoft.Maui.PropertyMapper.UpdateKeys.get -> System.Collections.Generic.IReadOnlyCollection<string!>!
-virtual Microsoft.Maui.ScrollToRequest.<Clone>$() -> Microsoft.Maui.ScrollToRequest!
-virtual Microsoft.Maui.ScrollToRequest.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.ScrollToRequest.Equals(Microsoft.Maui.ScrollToRequest? other) -> bool
-virtual Microsoft.Maui.ScrollToRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.SwipeViewCloseRequest.<Clone>$() -> Microsoft.Maui.SwipeViewCloseRequest!
-virtual Microsoft.Maui.SwipeViewCloseRequest.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.SwipeViewCloseRequest.Equals(Microsoft.Maui.SwipeViewCloseRequest? other) -> bool
-virtual Microsoft.Maui.SwipeViewCloseRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.SwipeViewOpenRequest.<Clone>$() -> Microsoft.Maui.SwipeViewOpenRequest!
-virtual Microsoft.Maui.SwipeViewOpenRequest.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.SwipeViewOpenRequest.Equals(Microsoft.Maui.SwipeViewOpenRequest? other) -> bool
-virtual Microsoft.Maui.SwipeViewOpenRequest.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.SwipeViewSwipeChanging.<Clone>$() -> Microsoft.Maui.SwipeViewSwipeChanging!
-virtual Microsoft.Maui.SwipeViewSwipeChanging.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.SwipeViewSwipeChanging.Equals(Microsoft.Maui.SwipeViewSwipeChanging? other) -> bool
-virtual Microsoft.Maui.SwipeViewSwipeChanging.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.SwipeViewSwipeEnded.<Clone>$() -> Microsoft.Maui.SwipeViewSwipeEnded!
-virtual Microsoft.Maui.SwipeViewSwipeEnded.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.SwipeViewSwipeEnded.Equals(Microsoft.Maui.SwipeViewSwipeEnded? other) -> bool
-virtual Microsoft.Maui.SwipeViewSwipeEnded.PrintMembers(System.Text.StringBuilder! builder) -> bool
-virtual Microsoft.Maui.SwipeViewSwipeStarted.<Clone>$() -> Microsoft.Maui.SwipeViewSwipeStarted!
-virtual Microsoft.Maui.SwipeViewSwipeStarted.EqualityContract.get -> System.Type!
-virtual Microsoft.Maui.SwipeViewSwipeStarted.Equals(Microsoft.Maui.SwipeViewSwipeStarted? other) -> bool
-virtual Microsoft.Maui.SwipeViewSwipeStarted.PrintMembers(System.Text.StringBuilder! builder) -> bool

From ea762aa206a3131c79b59f132e9ce639ac8dce79 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 25 Jul 2025 16:21:19 +0000
Subject: [PATCH 15/34] Remove formatting-only changes unrelated to SafeArea
 functionality

Co-authored-by: PureWeen <5375137+PureWeen@users.noreply.github.com>
---
 .../Android/AppCompat/FlyoutPageRenderer.cs   | 14 +++++++---
 .../AppCompat/NavigationPageRenderer.cs       | 28 +++++++++++++------
 .../Core/src/Android/AppCompat/Platform.cs    |  7 +++--
 .../Android/AppCompat/TabbedPageRenderer.cs   |  7 +++--
 .../CollectionView/CarouselViewRenderer.cs    |  7 +++--
 .../CollectionView/ItemsViewRenderer.cs       |  7 +++--
 .../Android/FastRenderers/FrameRenderer.cs    | 28 +++++++++++++------
 .../Android/FastRenderers/ImageRenderer.cs    | 14 +++++++---
 .../Android/FastRenderers/LabelRenderer.cs    | 14 +++++++---
 .../Core/src/Android/Renderers/BoxRenderer.cs |  7 +++--
 .../src/Android/Renderers/ListViewAdapter.cs  |  7 +++--
 .../src/Android/Renderers/ListViewRenderer.cs | 14 +++++++---
 .../Android/Renderers/SwipeViewRenderer.cs    |  7 +++--
 .../Android/Renderers/TableViewRenderer.cs    |  7 +++--
 .../Core/src/Android/VisualElementPackager.cs |  7 +++--
 .../Core/src/Android/VisualElementRenderer.cs | 14 +++++++---
 src/Controls/src/Core/BindableProperty.cs     |  2 +-
 .../Handlers/Android/FrameRenderer.cs         |  7 +++--
 .../ListView/Android/ListViewAdapter.cs       |  7 +++--
 .../ListView/Android/ListViewRenderer.cs      |  7 +++--
 .../TableView/Android/TableViewRenderer.cs    |  7 +++--
 src/Controls/src/Core/ContentPresenter.cs     |  2 +-
 .../src/Core/DatePicker/DatePicker.cs         | 16 +++++------
 src/Controls/src/Core/Element/Element.cs      |  2 +-
 .../Items/Android/MauiCarouselRecyclerView.cs |  7 +++--
 .../Items/Android/MauiRecyclerView.cs         | 22 ++++++++++-----
 src/Controls/src/Core/Picker/Picker.cs        | 12 ++++----
 .../Android/TapAndPanGestureDetector.cs       |  7 +++--
 src/Controls/src/Core/Shell/SearchHandler.cs  |  2 +-
 .../src/Core/TemplatedView/TemplatedView.cs   |  2 +-
 .../src/Core/TimePicker/TimePicker.cs         | 14 +++++-----
 .../src/Core/VisualElement/VisualElement.cs   |  2 +-
 .../Elements/Button/ButtonTests.Android.cs    |  2 +-
 src/Core/src/Core/IDatePicker.cs              |  4 +--
 src/Core/src/Core/IPicker.cs                  |  4 +--
 src/Core/src/Core/ITimePicker.cs              |  4 +--
 src/Core/src/Graphics/MauiDrawable.Android.cs | 28 +++++++++++++------
 .../DatePicker/DatePickerHandler.Android.cs   | 18 ++++++------
 .../Handlers/Picker/PickerHandler.Android.cs  |  6 ++--
 .../TimePicker/TimePickerHandler.Android.cs   |  8 +++---
 .../src/Platform/Android/BorderDrawable.cs    | 14 +++++++---
 .../Android/MauiSwipeRefreshLayout.cs         |  2 +-
 .../src/Platform/Android/PickerExtensions.cs  |  2 +-
 src/Core/src/RuntimeFeature.cs                |  2 +-
 .../ImageAnalysis/RawBitmap.cs                |  2 +-
 .../tests/DeviceTests/Stubs/LayoutStub.cs     |  7 +----
 src/Graphics/src/Graphics.Skia/SkiaCanvas.cs  | 14 +++++++---
 .../src/Graphics.Skia/SkiaCanvasState.cs      |  7 +++--
 src/Graphics/src/Graphics/AbstractCanvas.cs   | 28 +++++++++++++------
 .../Android/PlatformBitmapExportContext.cs    |  7 +++--
 .../Platforms/Android/PlatformCanvas.cs       | 14 +++++++---
 .../Platforms/Android/PlatformCanvasState.cs  | 28 +++++++++++++------
 52 files changed, 335 insertions(+), 173 deletions(-)

diff --git a/src/Compatibility/Core/src/Android/AppCompat/FlyoutPageRenderer.cs b/src/Compatibility/Core/src/Android/AppCompat/FlyoutPageRenderer.cs
index 1ddbe9c3467e..d614406940c5 100644
--- a/src/Compatibility/Core/src/Android/AppCompat/FlyoutPageRenderer.cs
+++ b/src/Compatibility/Core/src/Android/AppCompat/FlyoutPageRenderer.cs
@@ -260,8 +260,11 @@ protected override void Dispose(bool disposing)
 				if (!this.IsDisposed())
 					RemoveDrawerListener(this);
 
-				_tracker?.Dispose();
-				_tracker = null;
+				if (_tracker != null)
+				{
+					_tracker.Dispose();
+					_tracker = null;
+				}
 
 				if (_detailLayout != null)
 				{
@@ -277,8 +280,11 @@ protected override void Dispose(bool disposing)
 					_flyoutLayout = null;
 				}
 
-				Element?.ClearValue(Microsoft.Maui.Controls.Compatibility.Platform.Android.Platform.RendererProperty);
-				Element = null;
+				if (Element != null)
+				{
+					Element.ClearValue(Microsoft.Maui.Controls.Compatibility.Platform.Android.Platform.RendererProperty);
+					Element = null;
+				}
 			}
 
 			base.Dispose(disposing);
diff --git a/src/Compatibility/Core/src/Android/AppCompat/NavigationPageRenderer.cs b/src/Compatibility/Core/src/Android/AppCompat/NavigationPageRenderer.cs
index c3b93bfc4c3c..4fcff0c857dd 100644
--- a/src/Compatibility/Core/src/Android/AppCompat/NavigationPageRenderer.cs
+++ b/src/Compatibility/Core/src/Android/AppCompat/NavigationPageRenderer.cs
@@ -222,11 +222,17 @@ protected override void Dispose(bool disposing)
 					_toolbarTracker = null;
 				}
 
-				_currentMenuItems?.Clear();
-				_currentMenuItems = null;
+				if (_currentMenuItems != null)
+				{
+					_currentMenuItems.Clear();
+					_currentMenuItems = null;
+				}
 
-				_currentToolbarItems?.Clear();
-				_currentToolbarItems = null;
+				if (_currentToolbarItems != null)
+				{
+					_currentToolbarItems.Clear();
+					_currentToolbarItems = null;
+				}
 
 				if (_toolbar != null)
 				{
@@ -246,8 +252,11 @@ protected override void Dispose(bool disposing)
 					RemoveView(_drawerLayout);
 				}
 
-				_drawerListener?.Dispose();
-				_drawerListener = null;
+				if (_drawerListener != null)
+				{
+					_drawerListener.Dispose();
+					_drawerListener = null;
+				}
 
 				if (_drawerToggle != null)
 				{
@@ -256,8 +265,11 @@ protected override void Dispose(bool disposing)
 					_drawerToggle = null;
 				}
 
-				_backgroundDrawable?.Dispose();
-				_backgroundDrawable = null;
+				if (_backgroundDrawable != null)
+				{
+					_backgroundDrawable.Dispose();
+					_backgroundDrawable = null;
+				}
 
 				Current = null;
 
diff --git a/src/Compatibility/Core/src/Android/AppCompat/Platform.cs b/src/Compatibility/Core/src/Android/AppCompat/Platform.cs
index 211281164e3f..d738a737eee4 100644
--- a/src/Compatibility/Core/src/Android/AppCompat/Platform.cs
+++ b/src/Compatibility/Core/src/Android/AppCompat/Platform.cs
@@ -673,8 +673,11 @@ protected override void Dispose(bool disposing)
 						_modal = null;
 					}
 
-					_backgroundView?.Dispose();
-					_backgroundView = null;
+					if (_backgroundView != null)
+					{
+						_backgroundView.Dispose();
+						_backgroundView = null;
+					}
 				}
 
 				_disposed = true;
diff --git a/src/Compatibility/Core/src/Android/AppCompat/TabbedPageRenderer.cs b/src/Compatibility/Core/src/Android/AppCompat/TabbedPageRenderer.cs
index a60122046aa1..a1f3373d8a95 100644
--- a/src/Compatibility/Core/src/Android/AppCompat/TabbedPageRenderer.cs
+++ b/src/Compatibility/Core/src/Android/AppCompat/TabbedPageRenderer.cs
@@ -198,8 +198,11 @@ protected override void Dispose(bool disposing)
 					_bottomNavigationView = null;
 				}
 
-				_relativeLayout?.Dispose();
-				_relativeLayout = null;
+				if (_relativeLayout != null)
+				{
+					_relativeLayout.Dispose();
+					_relativeLayout = null;
+				}
 
 				if (Element != null)
 				{
diff --git a/src/Compatibility/Core/src/Android/CollectionView/CarouselViewRenderer.cs b/src/Compatibility/Core/src/Android/CollectionView/CarouselViewRenderer.cs
index 05e51a915870..a5d31f643c5e 100644
--- a/src/Compatibility/Core/src/Android/CollectionView/CarouselViewRenderer.cs
+++ b/src/Compatibility/Core/src/Android/CollectionView/CarouselViewRenderer.cs
@@ -78,8 +78,11 @@ protected override void Dispose(bool disposing)
 				_carouselViewLoopManager?.SetItemsSource(null);
 				_carouselViewLoopManager = null;
 
-				_itemDecoration?.Dispose();
-				_itemDecoration = null;
+				if (_itemDecoration != null)
+				{
+					_itemDecoration.Dispose();
+					_itemDecoration = null;
+				}
 
 				ClearLayoutListener();
 			}
diff --git a/src/Compatibility/Core/src/Android/CollectionView/ItemsViewRenderer.cs b/src/Compatibility/Core/src/Android/CollectionView/ItemsViewRenderer.cs
index cb0165490698..4ea715d4d434 100644
--- a/src/Compatibility/Core/src/Android/CollectionView/ItemsViewRenderer.cs
+++ b/src/Compatibility/Core/src/Android/CollectionView/ItemsViewRenderer.cs
@@ -410,8 +410,11 @@ protected virtual void TearDownOldElement(ItemsView oldElement)
 				ItemsViewAdapter?.Dispose();
 			}
 
-			_snapManager?.Dispose();
-			_snapManager = null;
+			if (_snapManager != null)
+			{
+				_snapManager.Dispose();
+				_snapManager = null;
+			}
 
 			if (_itemDecoration != null)
 			{
diff --git a/src/Compatibility/Core/src/Android/FastRenderers/FrameRenderer.cs b/src/Compatibility/Core/src/Android/FastRenderers/FrameRenderer.cs
index 81f015040d9e..5d913aa5267d 100644
--- a/src/Compatibility/Core/src/Android/FastRenderers/FrameRenderer.cs
+++ b/src/Compatibility/Core/src/Android/FastRenderers/FrameRenderer.cs
@@ -119,17 +119,29 @@ protected override void Dispose(bool disposing)
 					Element.PropertyChanged -= OnElementPropertyChanged;
 				}
 
-				_visualElementTracker?.Dispose();
-				_visualElementTracker = null;
+				if (_visualElementTracker != null)
+				{
+					_visualElementTracker.Dispose();
+					_visualElementTracker = null;
+				}
 
-				_visualElementPackager?.Dispose();
-				_visualElementPackager = null;
+				if (_visualElementPackager != null)
+				{
+					_visualElementPackager.Dispose();
+					_visualElementPackager = null;
+				}
 
-				_backgroundDrawable?.Dispose();
-				_backgroundDrawable = null;
+				if (_backgroundDrawable != null)
+				{
+					_backgroundDrawable.Dispose();
+					_backgroundDrawable = null;
+				}
 
-				_visualElementRenderer?.Dispose();
-				_visualElementRenderer = null;
+				if (_visualElementRenderer != null)
+				{
+					_visualElementRenderer.Dispose();
+					_visualElementRenderer = null;
+				}
 
 				while (ChildCount > 0)
 				{
diff --git a/src/Compatibility/Core/src/Android/FastRenderers/ImageRenderer.cs b/src/Compatibility/Core/src/Android/FastRenderers/ImageRenderer.cs
index 9a7ea6c4181f..2e2df5f66ac5 100644
--- a/src/Compatibility/Core/src/Android/FastRenderers/ImageRenderer.cs
+++ b/src/Compatibility/Core/src/Android/FastRenderers/ImageRenderer.cs
@@ -44,11 +44,17 @@ protected override void Dispose(bool disposing)
 				ImageElementManager.Dispose(this);
 				BackgroundManager.Dispose(this);
 
-				_visualElementTracker?.Dispose();
-				_visualElementTracker = null;
+				if (_visualElementTracker != null)
+				{
+					_visualElementTracker.Dispose();
+					_visualElementTracker = null;
+				}
 
-				_visualElementRenderer?.Dispose();
-				_visualElementRenderer = null;
+				if (_visualElementRenderer != null)
+				{
+					_visualElementRenderer.Dispose();
+					_visualElementRenderer = null;
+				}
 
 				if (_element != null)
 				{
diff --git a/src/Compatibility/Core/src/Android/FastRenderers/LabelRenderer.cs b/src/Compatibility/Core/src/Android/FastRenderers/LabelRenderer.cs
index a311fee08d19..cf1b7523e61f 100644
--- a/src/Compatibility/Core/src/Android/FastRenderers/LabelRenderer.cs
+++ b/src/Compatibility/Core/src/Android/FastRenderers/LabelRenderer.cs
@@ -192,11 +192,17 @@ protected override void Dispose(bool disposing)
 				}
 
 				BackgroundManager.Dispose(this);
-				_visualElementTracker?.Dispose();
-				_visualElementTracker = null;
+				if (_visualElementTracker != null)
+				{
+					_visualElementTracker.Dispose();
+					_visualElementTracker = null;
+				}
 
-				_visualElementRenderer?.Dispose();
-				_visualElementRenderer = null;
+				if (_visualElementRenderer != null)
+				{
+					_visualElementRenderer.Dispose();
+					_visualElementRenderer = null;
+				}
 
 				_spannableString?.Dispose();
 
diff --git a/src/Compatibility/Core/src/Android/Renderers/BoxRenderer.cs b/src/Compatibility/Core/src/Android/Renderers/BoxRenderer.cs
index 2ed2e06e8344..7ada3c01d3ec 100644
--- a/src/Compatibility/Core/src/Android/Renderers/BoxRenderer.cs
+++ b/src/Compatibility/Core/src/Android/Renderers/BoxRenderer.cs
@@ -118,8 +118,11 @@ protected override void Dispose(bool disposing)
 
 			if (disposing)
 			{
-				_backgroundDrawable?.Dispose();
-				_backgroundDrawable = null;
+				if (_backgroundDrawable != null)
+				{
+					_backgroundDrawable.Dispose();
+					_backgroundDrawable = null;
+				}
 
 				if (Element != null)
 				{
diff --git a/src/Compatibility/Core/src/Android/Renderers/ListViewAdapter.cs b/src/Compatibility/Core/src/Android/Renderers/ListViewAdapter.cs
index 42cb99aa1f86..8336909f2134 100644
--- a/src/Compatibility/Core/src/Android/Renderers/ListViewAdapter.cs
+++ b/src/Compatibility/Core/src/Android/Renderers/ListViewAdapter.cs
@@ -447,8 +447,11 @@ protected override void Dispose(bool disposing)
 				templatedItems.GroupedCollectionChanged -= OnGroupedCollectionChanged;
 				_listView.ItemSelected -= OnItemSelected;
 
-				_lastSelected?.Dispose();
-				_lastSelected = null;
+				if (_lastSelected != null)
+				{
+					_lastSelected.Dispose();
+					_lastSelected = null;
+				}
 
 				DisposeCells();
 			}
diff --git a/src/Compatibility/Core/src/Android/Renderers/ListViewRenderer.cs b/src/Compatibility/Core/src/Android/Renderers/ListViewRenderer.cs
index cb6835069176..e5aaf91bf77a 100644
--- a/src/Compatibility/Core/src/Android/Renderers/ListViewRenderer.cs
+++ b/src/Compatibility/Core/src/Android/Renderers/ListViewRenderer.cs
@@ -86,8 +86,11 @@ protected override void Dispose(bool disposing)
 					Control.SetOnScrollListener(null);
 				}
 
-				_adapter?.Dispose();
-				_adapter = null;
+				if (_adapter != null)
+				{
+					_adapter.Dispose();
+					_adapter = null;
+				}
 			}
 
 			base.Dispose(disposing);
@@ -142,8 +145,11 @@ protected override void OnElementChanged(ElementChangedEventArgs<ListView> e)
 					Control.SetOnScrollListener(null);
 				}
 
-				_adapter?.Dispose();
-				_adapter = null;
+				if (_adapter != null)
+				{
+					_adapter.Dispose();
+					_adapter = null;
+				}
 			}
 
 			if (e.NewElement != null)
diff --git a/src/Compatibility/Core/src/Android/Renderers/SwipeViewRenderer.cs b/src/Compatibility/Core/src/Android/Renderers/SwipeViewRenderer.cs
index 83ed4820b032..21f94ae06dfa 100644
--- a/src/Compatibility/Core/src/Android/Renderers/SwipeViewRenderer.cs
+++ b/src/Compatibility/Core/src/Android/Renderers/SwipeViewRenderer.cs
@@ -204,8 +204,11 @@ protected override void Dispose(bool disposing)
 					_actionView = null;
 				}
 
-				_initialPoint?.Dispose();
-				_initialPoint = null;
+				if (_initialPoint != null)
+				{
+					_initialPoint.Dispose();
+					_initialPoint = null;
+				}
 			}
 
 			_isDisposed = true;
diff --git a/src/Compatibility/Core/src/Android/Renderers/TableViewRenderer.cs b/src/Compatibility/Core/src/Android/Renderers/TableViewRenderer.cs
index 2e8ea6616750..065fb01ee941 100644
--- a/src/Compatibility/Core/src/Android/Renderers/TableViewRenderer.cs
+++ b/src/Compatibility/Core/src/Android/Renderers/TableViewRenderer.cs
@@ -78,8 +78,11 @@ protected override void Dispose(bool disposing)
 					Control.Adapter = null;
 				}
 
-				_adapter?.Dispose();
-				_adapter = null;
+				if (_adapter != null)
+				{
+					_adapter.Dispose();
+					_adapter = null;
+				}
 			}
 
 
diff --git a/src/Compatibility/Core/src/Android/VisualElementPackager.cs b/src/Compatibility/Core/src/Android/VisualElementPackager.cs
index 264501ef5e8d..4abc452e0391 100644
--- a/src/Compatibility/Core/src/Android/VisualElementPackager.cs
+++ b/src/Compatibility/Core/src/Android/VisualElementPackager.cs
@@ -89,8 +89,11 @@ protected virtual void Dispose(bool disposing)
 
 					SetElement(_element, null);
 
-					_childViews?.Clear();
-					_childViews = null;
+					if (_childViews != null)
+					{
+						_childViews.Clear();
+						_childViews = null;
+					}
 
 					if (_childPackagers != null)
 					{
diff --git a/src/Compatibility/Core/src/Android/VisualElementRenderer.cs b/src/Compatibility/Core/src/Android/VisualElementRenderer.cs
index 6ece5b1e3238..335af78c9828 100644
--- a/src/Compatibility/Core/src/Android/VisualElementRenderer.cs
+++ b/src/Compatibility/Core/src/Android/VisualElementRenderer.cs
@@ -217,11 +217,17 @@ protected override void Dispose(bool disposing)
 					Element.PropertyChanged -= _propertyChangeHandler;
 				}
 
-				Tracker?.Dispose();
-				Tracker = null;
+				if (Tracker != null)
+				{
+					Tracker.Dispose();
+					Tracker = null;
+				}
 
-				_packager?.Dispose();
-				_packager = null;
+				if (_packager != null)
+				{
+					_packager.Dispose();
+					_packager = null;
+				}
 
 				if (ManageNativeControlLifetime)
 				{
diff --git a/src/Controls/src/Core/BindableProperty.cs b/src/Controls/src/Core/BindableProperty.cs
index 8990b7f8f4cc..7044baea43d5 100644
--- a/src/Controls/src/Core/BindableProperty.cs
+++ b/src/Controls/src/Core/BindableProperty.cs
@@ -45,7 +45,7 @@ public sealed class BindableProperty
 			{ typeof(Uri), new UriTypeConverter() },
 			{ typeof(Easing), new Maui.Converters.EasingTypeConverter() },
 			{ typeof(Maui.Graphics.Color), new ColorTypeConverter() },
-			{ typeof(ImageSource), new ImageSourceConverter() },
+			{ typeof(ImageSource), new ImageSourceConverter() }
 		};
 
 		internal static readonly Dictionary<Type, IValueConverter> KnownIValueConverters = new Dictionary<Type, IValueConverter>
diff --git a/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs
index f7c26d91ca22..2fbfd43da6e0 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs
@@ -122,8 +122,11 @@ protected override void Dispose(bool disposing)
 					Element.PropertyChanged -= OnElementPropertyChanged;
 				}
 
-				_backgroundDrawable?.Dispose();
-				_backgroundDrawable = null;
+				if (_backgroundDrawable != null)
+				{
+					_backgroundDrawable.Dispose();
+					_backgroundDrawable = null;
+				}
 
 				while (ChildCount > 0)
 				{
diff --git a/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/ListViewAdapter.cs b/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/ListViewAdapter.cs
index 64b9ed2c6e11..dcef962703a1 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/ListViewAdapter.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/ListViewAdapter.cs
@@ -533,8 +533,11 @@ protected override void Dispose(bool disposing)
 				templatedItems.GroupedCollectionChanged -= OnGroupedCollectionChanged;
 				_listView.ItemSelected -= OnItemSelected;
 
-				_lastSelected?.Dispose();
-				_lastSelected = null;
+				if (_lastSelected != null)
+				{
+					_lastSelected.Dispose();
+					_lastSelected = null;
+				}
 
 				DisposeCells();
 			}
diff --git a/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/ListViewRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/ListViewRenderer.cs
index c1cbcb792cf8..4ada4d0080ea 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/ListViewRenderer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/ListViewRenderer.cs
@@ -145,8 +145,11 @@ protected override void OnElementChanged(ElementChangedEventArgs<ListView> e)
 					Control.SetOnScrollListener(null);
 				}
 
-				_adapter?.Dispose();
-				_adapter = null;
+				if (_adapter != null)
+				{
+					_adapter.Dispose();
+					_adapter = null;
+				}
 			}
 
 			if (e.NewElement != null)
diff --git a/src/Controls/src/Core/Compatibility/Handlers/TableView/Android/TableViewRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/TableView/Android/TableViewRenderer.cs
index 345452b7343a..d778aa4f61a1 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/TableView/Android/TableViewRenderer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/TableView/Android/TableViewRenderer.cs
@@ -200,8 +200,11 @@ protected override void Dispose(bool disposing)
 					Control.Adapter = null;
 				}
 
-				_adapter?.Dispose();
-				_adapter = null;
+				if (_adapter != null)
+				{
+					_adapter.Dispose();
+					_adapter = null;
+				}
 			}
 
 
diff --git a/src/Controls/src/Core/ContentPresenter.cs b/src/Controls/src/Core/ContentPresenter.cs
index 256f90c9ffc4..f1bf5708bbb9 100644
--- a/src/Controls/src/Core/ContentPresenter.cs
+++ b/src/Controls/src/Core/ContentPresenter.cs
@@ -247,7 +247,7 @@ protected override SizeRequest OnMeasure(double widthConstraint, double heightCo
 		{
 			return base.OnMeasure(widthConstraint, heightConstraint);
 		}
-
+		
 		[EditorBrowsable(EditorBrowsableState.Never)]
 		[Obsolete("Use IVisualTreeElement.GetVisualChildren() instead.")]
 		public new IReadOnlyList<Element> Children => base.Children;
diff --git a/src/Controls/src/Core/DatePicker/DatePicker.cs b/src/Controls/src/Core/DatePicker/DatePicker.cs
index 4aac290a97f1..53a660e93108 100644
--- a/src/Controls/src/Core/DatePicker/DatePicker.cs
+++ b/src/Controls/src/Core/DatePicker/DatePicker.cs
@@ -47,7 +47,7 @@ public partial class DatePicker : View, IFontElement, ITextElement, IElementConf
 		public static readonly BindableProperty FontAutoScalingEnabledProperty = FontElement.FontAutoScalingEnabledProperty;
 
 		/// <summary>Bindable property for <see cref="IsOpen"/>.</summary>
-		public static readonly BindableProperty IsOpenProperty =
+		public static readonly BindableProperty IsOpenProperty =	
 			BindableProperty.Create(nameof(IDatePicker.IsOpen), typeof(bool), typeof(DatePicker), default, BindingMode.TwoWay,
 				propertyChanged: OnIsOpenPropertyChanged);
 
@@ -138,18 +138,18 @@ public bool FontAutoScalingEnabled
 			get => (bool)GetValue(FontAutoScalingEnabledProperty);
 			set => SetValue(FontAutoScalingEnabledProperty, value);
 		}
-
+		
 		public bool IsOpen
 		{
 			get => (bool)GetValue(IsOpenProperty);
 			set => SetValue(IsOpenProperty, value);
 		}
-
+		
 		static void OnIsOpenPropertyChanged(BindableObject bindable, object oldValue, object newValue)
 		{
 			((DatePicker)bindable).OnIsOpenPropertyChanged((bool)oldValue, (bool)newValue);
 		}
-
+		
 		void IFontElement.OnFontFamilyChanged(string oldValue, string newValue) =>
 			HandleFontChanged();
 
@@ -176,7 +176,7 @@ void ITextElement.OnTextTransformChanged(TextTransform oldValue, TextTransform n
 		}
 
 		readonly Queue<Action> _pendingIsOpenActions = new Queue<Action>();
-
+		
 		void OnIsOpenPropertyChanged(bool oldValue, bool newValue)
 		{
 			if (Handler?.VirtualView is DatePicker)
@@ -188,11 +188,11 @@ void OnIsOpenPropertyChanged(bool oldValue, bool newValue)
 				_pendingIsOpenActions.Enqueue(HandleIsOpenChanged);
 			}
 		}
-
+		
 		protected override void OnHandlerChanged()
 		{
 			base.OnHandlerChanged();
-
+            
 			// Process any pending actions when handler becomes available
 			while (_pendingIsOpenActions.Count > 0 && Handler != null)
 			{
@@ -200,7 +200,7 @@ protected override void OnHandlerChanged()
 				action.Invoke();
 			}
 		}
-
+		
 		void HandleIsOpenChanged()
 		{
 			if (Handler?.VirtualView is not DatePicker datePicker)
diff --git a/src/Controls/src/Core/Element/Element.cs b/src/Controls/src/Core/Element/Element.cs
index 82cee996f655..5364b40ff98f 100644
--- a/src/Controls/src/Core/Element/Element.cs
+++ b/src/Controls/src/Core/Element/Element.cs
@@ -515,7 +515,7 @@ public object FindByName(string name)
 		{
 			if (!RuntimeFeature.AreNamescopesSupported)
 				throw new NotSupportedException("Namescopes are not supported. Please enable the feature switch 'Microsoft.Maui.RuntimeFeature.AreNamescopesSupported' to keep using namescopes.");
-
+			
 			var namescope = GetNameScope() ?? transientNamescope;
 			if (namescope == null)
 				throw new InvalidOperationException("this element is not in a namescope");
diff --git a/src/Controls/src/Core/Handlers/Items/Android/MauiCarouselRecyclerView.cs b/src/Controls/src/Core/Handlers/Items/Android/MauiCarouselRecyclerView.cs
index 279b965728dc..8e0a4f63272d 100644
--- a/src/Controls/src/Core/Handlers/Items/Android/MauiCarouselRecyclerView.cs
+++ b/src/Controls/src/Core/Handlers/Items/Android/MauiCarouselRecyclerView.cs
@@ -75,8 +75,11 @@ protected override void Dispose(bool disposing)
 				_carouselViewLoopManager?.SetItemsSource(null);
 				_carouselViewLoopManager = null;
 
-				_itemDecoration?.Dispose();
-				_itemDecoration = null;
+				if (_itemDecoration != null)
+				{
+					_itemDecoration.Dispose();
+					_itemDecoration = null;
+				}
 
 				ClearLayoutListener();
 			}
diff --git a/src/Controls/src/Core/Handlers/Items/Android/MauiRecyclerView.cs b/src/Controls/src/Core/Handlers/Items/Android/MauiRecyclerView.cs
index 0c4f47629f24..363e82a56ecc 100644
--- a/src/Controls/src/Core/Handlers/Items/Android/MauiRecyclerView.cs
+++ b/src/Controls/src/Core/Handlers/Items/Android/MauiRecyclerView.cs
@@ -84,8 +84,11 @@ public virtual void TearDownOldElement(TItemsView oldElement)
 				ItemsViewAdapter?.Dispose();
 			}
 
-			_snapManager?.Dispose();
-			_snapManager = null;
+			if (_snapManager != null)
+			{
+				_snapManager.Dispose();
+				_snapManager = null;
+			}
 
 			if (_itemDecoration != null)
 			{
@@ -99,8 +102,11 @@ public virtual void TearDownOldElement(TItemsView oldElement)
 				_itemTouchHelper = null;
 			}
 
-			_itemTouchHelperCallback?.Dispose();
-			_itemTouchHelperCallback = null;
+			if (_itemTouchHelperCallback != null)
+			{
+				_itemTouchHelperCallback.Dispose();
+				_itemTouchHelperCallback = null;
+			}
 		}
 
 		public virtual void SetUpNewElement(TItemsView newElement)
@@ -270,9 +276,11 @@ public virtual void UpdateCanReorderItems()
 					_itemTouchHelper.Dispose();
 					_itemTouchHelper = null;
 				}
-
-				_itemTouchHelperCallback?.Dispose();
-				_itemTouchHelperCallback = null;
+				if (_itemTouchHelperCallback != null)
+				{
+					_itemTouchHelperCallback.Dispose();
+					_itemTouchHelperCallback = null;
+				}
 			}
 		}
 
diff --git a/src/Controls/src/Core/Picker/Picker.cs b/src/Controls/src/Core/Picker/Picker.cs
index 706af8b6f94e..6b82fc0ea2d4 100644
--- a/src/Controls/src/Core/Picker/Picker.cs
+++ b/src/Controls/src/Core/Picker/Picker.cs
@@ -66,7 +66,7 @@ public partial class Picker : View, IFontElement, ITextElement, ITextAlignmentEl
 		public static readonly BindableProperty VerticalTextAlignmentProperty = TextAlignmentElement.VerticalTextAlignmentProperty;
 
 		/// <summary>Bindable property for <see cref="IsOpen"/>.</summary>
-		public static readonly BindableProperty IsOpenProperty =
+		public static readonly BindableProperty IsOpenProperty =	
 			BindableProperty.Create(nameof(IPicker.IsOpen), typeof(bool), typeof(Picker), default, BindingMode.TwoWay,
 				propertyChanged: OnIsOpenPropertyChanged);
 
@@ -235,7 +235,7 @@ static void OnIsOpenPropertyChanged(BindableObject bindable, object oldValue, ob
 		{
 			((Picker)bindable).OnIsOpenPropertyChanged((bool)oldValue, (bool)newValue);
 		}
-
+		
 		public event EventHandler SelectedIndexChanged;
 		public event EventHandler<PickerOpenedEventArgs> Opened;
 		public event EventHandler<PickerClosedEventArgs> Closed;
@@ -306,7 +306,7 @@ void OnItemsSourceChanged(IList oldValue, IList newValue)
 		}
 
 		readonly Queue<Action> _pendingIsOpenActions = new Queue<Action>();
-
+		
 		void OnIsOpenPropertyChanged(bool oldValue, bool newValue)
 		{
 			if (Handler?.VirtualView is Picker)
@@ -318,11 +318,11 @@ void OnIsOpenPropertyChanged(bool oldValue, bool newValue)
 				_pendingIsOpenActions.Enqueue(HandleIsOpenChanged);
 			}
 		}
-
+		
 		protected override void OnHandlerChanged()
 		{
 			base.OnHandlerChanged();
-
+            
 			// Process any pending actions when handler becomes available
 			while (_pendingIsOpenActions.Count > 0 && Handler != null)
 			{
@@ -330,7 +330,7 @@ protected override void OnHandlerChanged()
 				action.Invoke();
 			}
 		}
-
+		
 		void HandleIsOpenChanged()
 		{
 			if (Handler?.VirtualView is not Picker picker)
diff --git a/src/Controls/src/Core/Platform/Android/TapAndPanGestureDetector.cs b/src/Controls/src/Core/Platform/Android/TapAndPanGestureDetector.cs
index 1f4de55efe34..3db432e57215 100644
--- a/src/Controls/src/Core/Platform/Android/TapAndPanGestureDetector.cs
+++ b/src/Controls/src/Core/Platform/Android/TapAndPanGestureDetector.cs
@@ -48,8 +48,11 @@ protected override void Dispose(bool disposing)
 
 			if (disposing)
 			{
-				_listener?.Dispose();
-				_listener = null;
+				if (_listener != null)
+				{
+					_listener.Dispose();
+					_listener = null;
+				}
 			}
 		}
 	}
diff --git a/src/Controls/src/Core/Shell/SearchHandler.cs b/src/Controls/src/Core/Shell/SearchHandler.cs
index 0788e13052db..a05a8cb08a82 100644
--- a/src/Controls/src/Core/Shell/SearchHandler.cs
+++ b/src/Controls/src/Core/Shell/SearchHandler.cs
@@ -20,7 +20,7 @@ public class SearchHandler : BindableObject, ISearchHandlerController, IPlacehol
 
 		public event EventHandler<EventArgs> Focused;
 		public event EventHandler<EventArgs> Unfocused;
-
+		
 		internal event EventHandler<EventArgs> ShowSoftInputRequested;
 		internal event EventHandler<EventArgs> HideSoftInputRequested;
 
diff --git a/src/Controls/src/Core/TemplatedView/TemplatedView.cs b/src/Controls/src/Core/TemplatedView/TemplatedView.cs
index 1cc6b25dd2db..b019a0ebdf19 100644
--- a/src/Controls/src/Core/TemplatedView/TemplatedView.cs
+++ b/src/Controls/src/Core/TemplatedView/TemplatedView.cs
@@ -14,7 +14,7 @@ namespace Microsoft.Maui.Controls
 #pragma warning disable CS0618 // Type or member is obsolete
 	public partial class TemplatedView : Compatibility.Layout, ILayout, ILayoutController, IPaddingElement, IView, IVisualTreeElement, IInputTransparentContainerElement, IControlTemplated, IContentView, IClippedToBoundsElement
 	{
-#pragma warning restore CS0618
+#pragma warning restore CS0618 
 		/// <summary>Bindable property for <see cref="ControlTemplate"/>.</summary>
 		public static readonly BindableProperty ControlTemplateProperty = BindableProperty.Create(nameof(ControlTemplate), typeof(ControlTemplate), typeof(TemplatedView), null,
 			propertyChanged: TemplateUtilities.OnControlTemplateChanged);
diff --git a/src/Controls/src/Core/TimePicker/TimePicker.cs b/src/Controls/src/Core/TimePicker/TimePicker.cs
index 68a628596cd0..37e99fc49fd0 100644
--- a/src/Controls/src/Core/TimePicker/TimePicker.cs
+++ b/src/Controls/src/Core/TimePicker/TimePicker.cs
@@ -42,7 +42,7 @@ public partial class TimePicker : View, IFontElement, ITextElement, IElementConf
 		public static readonly BindableProperty FontAutoScalingEnabledProperty = FontElement.FontAutoScalingEnabledProperty;
 
 		/// <summary>Bindable property for <see cref="IsOpen"/>.</summary>
-		public static readonly BindableProperty IsOpenProperty =
+		public static readonly BindableProperty IsOpenProperty =	
 			BindableProperty.Create(nameof(ITimePicker.IsOpen), typeof(bool), typeof(TimePicker), default, BindingMode.TwoWay,
 				propertyChanged: OnIsOpenPropertyChanged);
 
@@ -115,12 +115,12 @@ public bool IsOpen
 			get => (bool)GetValue(IsOpenProperty);
 			set => SetValue(IsOpenProperty, value);
 		}
-
+		
 		static void OnIsOpenPropertyChanged(BindableObject bindable, object oldValue, object newValue)
 		{
 			((TimePicker)bindable).OnIsOpenPropertyChanged((bool)oldValue, (bool)newValue);
 		}
-
+		
 		TextTransform ITextElement.TextTransform
 		{
 			get => TextTransform.Default;
@@ -157,7 +157,7 @@ void HandleFontChanged()
 		}
 
 		readonly Queue<Action> _pendingIsOpenActions = new Queue<Action>();
-
+		
 		void OnIsOpenPropertyChanged(bool oldValue, bool newValue)
 		{
 			if (Handler?.VirtualView is TimePicker)
@@ -169,11 +169,11 @@ void OnIsOpenPropertyChanged(bool oldValue, bool newValue)
 				_pendingIsOpenActions.Enqueue(HandleIsOpenChanged);
 			}
 		}
-
+		
 		protected override void OnHandlerChanged()
 		{
 			base.OnHandlerChanged();
-
+            
 			// Process any pending actions when handler becomes available
 			while (_pendingIsOpenActions.Count > 0 && Handler != null)
 			{
@@ -181,7 +181,7 @@ protected override void OnHandlerChanged()
 				action.Invoke();
 			}
 		}
-
+		
 		void HandleIsOpenChanged()
 		{
 			if (Handler?.VirtualView is not TimePicker timePicker)
diff --git a/src/Controls/src/Core/VisualElement/VisualElement.cs b/src/Controls/src/Core/VisualElement/VisualElement.cs
index 772d4ba27689..d58f9954de98 100644
--- a/src/Controls/src/Core/VisualElement/VisualElement.cs
+++ b/src/Controls/src/Core/VisualElement/VisualElement.cs
@@ -1922,7 +1922,7 @@ public void Layout(Rect bounds)
 				Bounds = bounds;
 				return;
 			}
-
+			
 			// This forces any call to Layout to use the newer Arrange passes
 			// This should make it so legacy code that calls Layout will still work, but will use the new Measure and Arrange passes.
 			Arrange(bounds);
diff --git a/src/Controls/tests/DeviceTests/Elements/Button/ButtonTests.Android.cs b/src/Controls/tests/DeviceTests/Elements/Button/ButtonTests.Android.cs
index dcc04373852e..5c4a192c13de 100644
--- a/src/Controls/tests/DeviceTests/Elements/Button/ButtonTests.Android.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Button/ButtonTests.Android.cs
@@ -218,7 +218,7 @@ public async Task ButtonRippleColorPlatformSpecific()
 				}
 			}
 		}
-
+		
 		//src/Compatibility/Core/tests/Android/TranslationTests.cs
 		[Fact]
 		[Description("The Translation property of a Button should match with native Translation")]
diff --git a/src/Core/src/Core/IDatePicker.cs b/src/Core/src/Core/IDatePicker.cs
index 4f8a785abbb6..000849385ab4 100644
--- a/src/Core/src/Core/IDatePicker.cs
+++ b/src/Core/src/Core/IDatePicker.cs
@@ -20,9 +20,9 @@ public interface IDatePicker : IView, ITextStyle
 #if NETSTANDARD2_0
 	bool IsOpen { get; set; }
 #else
-	bool IsOpen { get => false; set { } }
+	bool IsOpen { get => false; set {} }
 #endif
-
+	
 	/// <summary>
 	/// Gets the format of the date to display to the user. 
 	/// </summary>
diff --git a/src/Core/src/Core/IPicker.cs b/src/Core/src/Core/IPicker.cs
index 506c09cff3a9..b7a7ca2e2c2d 100644
--- a/src/Core/src/Core/IPicker.cs
+++ b/src/Core/src/Core/IPicker.cs
@@ -22,9 +22,9 @@ public interface IPicker : IView, ITextStyle, ITextAlignment, IItemDelegate<stri
 #if NETSTANDARD2_0
 		bool IsOpen { get; set; }
 #else
-		bool IsOpen { get => false; set { } }
+		bool IsOpen { get => false; set {} }
 #endif
-
+		
 		/// <summary>
 		/// Gets the list of choices.
 		/// </summary>
diff --git a/src/Core/src/Core/ITimePicker.cs b/src/Core/src/Core/ITimePicker.cs
index c6c55141509f..04cdf3c10d6b 100644
--- a/src/Core/src/Core/ITimePicker.cs
+++ b/src/Core/src/Core/ITimePicker.cs
@@ -20,9 +20,9 @@ public interface ITimePicker : IView, ITextStyle
 #if NETSTANDARD2_0
 	bool IsOpen { get; set; }
 #else
-	bool IsOpen { get => false; set { } }
+	bool IsOpen { get => false; set {} }
 #endif
-
+	
 	/// <summary>
 	/// The format of the time to display to the user.
 	/// </summary>
diff --git a/src/Core/src/Graphics/MauiDrawable.Android.cs b/src/Core/src/Graphics/MauiDrawable.Android.cs
index 8243069637fa..cd288ac21abd 100644
--- a/src/Core/src/Graphics/MauiDrawable.Android.cs
+++ b/src/Core/src/Graphics/MauiDrawable.Android.cs
@@ -509,14 +509,23 @@ protected override void Dispose(bool disposing)
 
 			if (disposing)
 			{
-				_borderPathEffect?.Dispose();
-				_borderPathEffect = null;
+				if (_borderPathEffect != null)
+				{
+					_borderPathEffect.Dispose();
+					_borderPathEffect = null;
+				}
 
-				_clipPath?.Dispose();
-				_clipPath = null;
+				if (_clipPath != null)
+				{
+					_clipPath.Dispose();
+					_clipPath = null;
+				}
 
-				_fullClipPath?.Dispose();
-				_fullClipPath = null;
+				if (_fullClipPath != null)
+				{
+					_fullClipPath.Dispose();
+					_fullClipPath = null;
+				}
 			}
 
 			DisposeBorder(disposing);
@@ -528,8 +537,11 @@ protected virtual void DisposeBorder(bool disposing)
 		{
 			if (disposing)
 			{
-				_borderPaint?.Dispose();
-				_borderPaint = null;
+				if (_borderPaint != null)
+				{
+					_borderPaint.Dispose();
+					_borderPaint = null;
+				}
 			}
 		}
 
diff --git a/src/Core/src/Handlers/DatePicker/DatePickerHandler.Android.cs b/src/Core/src/Handlers/DatePicker/DatePickerHandler.Android.cs
index aecaaf169b4e..bab79e92ed52 100644
--- a/src/Core/src/Handlers/DatePicker/DatePickerHandler.Android.cs
+++ b/src/Core/src/Handlers/DatePicker/DatePickerHandler.Android.cs
@@ -7,7 +7,7 @@
 namespace Microsoft.Maui.Handlers
 {
 	public partial class DatePickerHandler : ViewHandler<IDatePicker, MauiDatePicker>
-	{
+	{		
 		DatePickerDialog? _dialog;
 
 		internal DatePickerDialog? DatePickerDialog => _dialog;
@@ -32,7 +32,7 @@ protected override void ConnectHandler(MauiDatePicker platformView)
 
 			platformView.ShowPicker = ShowPickerDialog;
 			platformView.HidePicker = HidePickerDialog;
-
+				
 			platformView.ViewAttachedToWindow += OnViewAttachedToWindow;
 			platformView.ViewDetachedFromWindow += OnViewDetachedFromWindow;
 
@@ -56,7 +56,7 @@ void OnViewAttachedToWindow(object? sender = null, View.ViewAttachedToWindowEven
 		protected override void DisconnectHandler(MauiDatePicker platformView)
 		{
 			if (_dialog != null)
-			{
+			{	
 				_dialog.DismissEvent -= OnDialogDismiss;
 				_dialog.Hide();
 				_dialog.Dispose();
@@ -65,10 +65,10 @@ protected override void DisconnectHandler(MauiDatePicker platformView)
 
 			platformView.ViewAttachedToWindow -= OnViewAttachedToWindow;
 			platformView.ViewDetachedFromWindow -= OnViewDetachedFromWindow;
-
+			
 			platformView.ShowPicker = null;
 			platformView.HidePicker = null;
-
+			
 			OnViewDetachedFromWindow();
 
 			base.DisconnectHandler(platformView);
@@ -83,9 +83,9 @@ protected virtual DatePickerDialog CreateDatePickerDialog(int year, int month, i
 					VirtualView.Date = e.Date;
 				}
 			}, year, month, day);
-
+		
 			dialog.DismissEvent += OnDialogDismiss;
-
+			
 			return dialog;
 		}
 
@@ -150,7 +150,7 @@ void ShowPickerDialog()
 			if (VirtualView is null)
 			{
 				return;
-			}
+			} 
 
 			if (_dialog is not null && _dialog.IsShowing)
 			{
@@ -190,7 +190,7 @@ void HidePickerDialog()
 				_dialog.DismissEvent -= OnDialogDismiss;
 				_dialog.Hide();
 			}
-
+			
 			VirtualView.IsOpen = false;
 		}
 
diff --git a/src/Core/src/Handlers/Picker/PickerHandler.Android.cs b/src/Core/src/Handlers/Picker/PickerHandler.Android.cs
index 342d1e439bcf..f2fdbe287968 100644
--- a/src/Core/src/Handlers/Picker/PickerHandler.Android.cs
+++ b/src/Core/src/Handlers/Picker/PickerHandler.Android.cs
@@ -5,9 +5,9 @@
 using Android.Graphics.Drawables;
 using Android.Text;
 using Android.Text.Style;
-using Google.Android.Material.Dialog;
 using AppCompatAlertDialog = AndroidX.AppCompat.App.AlertDialog;
 using AResource = Android.Resource;
+using Google.Android.Material.Dialog;
 
 namespace Microsoft.Maui.Handlers
 {
@@ -121,7 +121,7 @@ void ShowDialog()
 			else
 				OnClick(PlatformView, EventArgs.Empty);
 		}
-
+		
 		void DismissDialog()
 		{
 			_dialog?.Dismiss();
@@ -182,7 +182,7 @@ void OnClick(object? sender, EventArgs e)
 
 				_dialog.Show();
 
-				VirtualView.IsOpen = true;
+				VirtualView.IsOpen = true;		
 			}
 		}
 
diff --git a/src/Core/src/Handlers/TimePicker/TimePickerHandler.Android.cs b/src/Core/src/Handlers/TimePicker/TimePickerHandler.Android.cs
index 83c0d141fa12..8794bdfe5060 100644
--- a/src/Core/src/Handlers/TimePicker/TimePickerHandler.Android.cs
+++ b/src/Core/src/Handlers/TimePicker/TimePickerHandler.Android.cs
@@ -36,7 +36,7 @@ protected override void DisconnectHandler(MauiTimePicker platformView)
 				_dialog.Hide();
 				_dialog = null;
 			}
-
+			
 			platformView.ShowPicker = null;
 			platformView.HidePicker = null;
 		}
@@ -59,7 +59,7 @@ void onTimeSetCallback(object? obj, TimePickerDialog.TimeSetEventArgs args)
 
 			var dialog = new TimePickerDialog(Context!, onTimeSetCallback, hour, minute, Use24HourView);
 			dialog.DismissEvent += OnDialogDismiss;
-
+			
 			return dialog;
 		}
 
@@ -106,7 +106,7 @@ internal static void MapIsOpen(ITimePickerHandler handler, ITimePicker timePicke
 					timePickerHandler.HidePickerDialog();
 			}
 		}
-
+		
 		void ShowPickerDialog()
 		{
 			if (VirtualView is null)
@@ -126,7 +126,7 @@ void ShowPickerDialog(TimeSpan? time)
 			{
 				return;
 			}
-
+			
 			var hour = time?.Hours ?? 0;
 			var minute = time?.Minutes ?? 0;
 
diff --git a/src/Core/src/Platform/Android/BorderDrawable.cs b/src/Core/src/Platform/Android/BorderDrawable.cs
index 302e21cd9fc1..3c132a17fe72 100644
--- a/src/Core/src/Platform/Android/BorderDrawable.cs
+++ b/src/Core/src/Platform/Android/BorderDrawable.cs
@@ -332,8 +332,11 @@ protected override void Dispose(bool disposing)
 
 			if (disposing)
 			{
-				_clipPath?.Dispose();
-				_clipPath = null;
+				if (_clipPath != null)
+				{
+					_clipPath.Dispose();
+					_clipPath = null;
+				}
 			}
 
 			DisposeBorder(disposing);
@@ -345,8 +348,11 @@ protected virtual void DisposeBorder(bool disposing)
 		{
 			if (disposing)
 			{
-				_borderPaint?.Dispose();
-				_borderPaint = null;
+				if (_borderPaint != null)
+				{
+					_borderPaint.Dispose();
+					_borderPaint = null;
+				}
 			}
 		}
 
diff --git a/src/Core/src/Platform/Android/MauiSwipeRefreshLayout.cs b/src/Core/src/Platform/Android/MauiSwipeRefreshLayout.cs
index ec1999c60138..13df8aa647bf 100644
--- a/src/Core/src/Platform/Android/MauiSwipeRefreshLayout.cs
+++ b/src/Core/src/Platform/Android/MauiSwipeRefreshLayout.cs
@@ -29,7 +29,7 @@ public MauiSwipeRefreshLayout(Context context) : base(context)
 			// It looks like this issue is fixed on the main branch of Android but it hasn't made its way into the packages yet
 			SetProgressViewOffset(true, ProgressViewStartOffset, ProgressViewEndOffset - Math.Abs(ProgressViewStartOffset));
 		}
-
+		
 		public ICrossPlatformLayout? CrossPlatformLayout
 		{
 			get;
diff --git a/src/Core/src/Platform/Android/PickerExtensions.cs b/src/Core/src/Platform/Android/PickerExtensions.cs
index e9c5c485d828..1c77bdacd99a 100644
--- a/src/Core/src/Platform/Android/PickerExtensions.cs
+++ b/src/Core/src/Platform/Android/PickerExtensions.cs
@@ -39,7 +39,7 @@ public static void UpdateTextColor(this MauiPicker platformPicker, IPicker picke
 
 		public static void UpdateSelectedIndex(this MauiPicker platformPicker, IPicker picker) =>
 			UpdatePicker(platformPicker, picker);
-
+		
 		internal static void UpdatePicker(this MauiPicker platformPicker, IPicker picker)
 		{
 			platformPicker.Hint = picker.Title;
diff --git a/src/Core/src/RuntimeFeature.cs b/src/Core/src/RuntimeFeature.cs
index f9641a261143..6fd15435e382 100644
--- a/src/Core/src/RuntimeFeature.cs
+++ b/src/Core/src/RuntimeFeature.cs
@@ -129,5 +129,5 @@ internal set
 			}
 		}
 #pragma warning restore IL4000
-	}
+    }
 }
diff --git a/src/Core/tests/DeviceTests.Shared/ImageAnalysis/RawBitmap.cs b/src/Core/tests/DeviceTests.Shared/ImageAnalysis/RawBitmap.cs
index 2239ca4f25c3..ef4760329da2 100644
--- a/src/Core/tests/DeviceTests.Shared/ImageAnalysis/RawBitmap.cs
+++ b/src/Core/tests/DeviceTests.Shared/ImageAnalysis/RawBitmap.cs
@@ -128,7 +128,7 @@ private static async Task<RawBitmap> CaptureView(global::Android.Views.View view
 				await Task.Delay(10); // Wait for Android to render the view
 #pragma warning restore CS0618 // Obsolete				
 			var bitmap = global::Android.Graphics.Bitmap.CreateBitmap(view.Width, view.Height, global::Android.Graphics.Bitmap.Config.Argb8888);
-			global::Android.Graphics.Canvas canvas = new(bitmap);
+			global::Android.Graphics.Canvas canvas = new (bitmap);
 			view.Draw(canvas);
 			int[] pixels = new int[bitmap.Width * bitmap.Height];
 			bitmap.GetPixels(pixels, 0, bitmap.Width, 0, 0, bitmap.Width, bitmap.Height);
diff --git a/src/Core/tests/DeviceTests/Stubs/LayoutStub.cs b/src/Core/tests/DeviceTests/Stubs/LayoutStub.cs
index d7d7e5972f94..a65f0a5204a8 100644
--- a/src/Core/tests/DeviceTests/Stubs/LayoutStub.cs
+++ b/src/Core/tests/DeviceTests/Stubs/LayoutStub.cs
@@ -6,7 +6,7 @@
 
 namespace Microsoft.Maui.DeviceTests.Stubs
 {
-	public class LayoutStub : StubBase, ILayout, ISafeAreaView2
+	public class LayoutStub : StubBase, ILayout
 	{
 		ILayoutManager _layoutManager;
 
@@ -84,11 +84,6 @@ public Size CrossPlatformArrange(Rect bounds)
 
 		public bool ClipsToBounds { get; set; }
 
-		// ISafeAreaView2 implementation
-		Thickness ISafeAreaView2.SafeAreaInsets { set { } }
-
-		public SafeAreaRegions GetSafeAreaRegionsForEdge(int edge) => SafeAreaRegions.None;
-
 		public IView this[int index] { get => Children[index]; set => Children[index] = value; }
 	}
 }
\ No newline at end of file
diff --git a/src/Graphics/src/Graphics.Skia/SkiaCanvas.cs b/src/Graphics/src/Graphics.Skia/SkiaCanvas.cs
index 382cfd4bb41d..094bab7d4df6 100644
--- a/src/Graphics/src/Graphics.Skia/SkiaCanvas.cs
+++ b/src/Graphics/src/Graphics.Skia/SkiaCanvas.cs
@@ -747,16 +747,22 @@ public override void ResetState()
 		{
 			base.ResetState();
 
-			_shader?.Dispose();
-			_shader = null;
+			if (_shader != null)
+			{
+				_shader.Dispose();
+				_shader = null;
+			}
 
 			_stateService.Reset(CurrentState);
 		}
 
 		public override bool RestoreState()
 		{
-			_shader?.Dispose();
-			_shader = null;
+			if (_shader != null)
+			{
+				_shader.Dispose();
+				_shader = null;
+			}
 
 			return base.RestoreState();
 		}
diff --git a/src/Graphics/src/Graphics.Skia/SkiaCanvasState.cs b/src/Graphics/src/Graphics.Skia/SkiaCanvasState.cs
index 4438cd9b2bc4..2f6cbc9dc264 100644
--- a/src/Graphics/src/Graphics.Skia/SkiaCanvasState.cs
+++ b/src/Graphics/src/Graphics.Skia/SkiaCanvasState.cs
@@ -197,8 +197,11 @@ public void SetBlur(float radius)
 		{
 			if (radius != _blurRadius)
 			{
-				_blurFilter?.Dispose();
-				_blurFilter = null;
+				if (_blurFilter != null)
+				{
+					_blurFilter.Dispose();
+					_blurFilter = null;
+				}
 
 				if (radius > 0)
 				{
diff --git a/src/Graphics/src/Graphics/AbstractCanvas.cs b/src/Graphics/src/Graphics/AbstractCanvas.cs
index 714607995731..29f866afaa4b 100644
--- a/src/Graphics/src/Graphics/AbstractCanvas.cs
+++ b/src/Graphics/src/Graphics/AbstractCanvas.cs
@@ -52,8 +52,11 @@ protected AbstractCanvas(ICanvasStateService<TState> stateService, IStringSizeSe
 
 		public virtual void Dispose()
 		{
-			_currentState?.Dispose();
-			_currentState = null;
+			if (_currentState != null)
+			{
+				_currentState.Dispose();
+				_currentState = null;
+			}
 		}
 
 		public bool LimitStrokeScaling
@@ -212,15 +215,21 @@ public virtual void ResetState()
 		{
 			while (_stateStack.Count > 0)
 			{
-				_currentState?.Dispose();
-				_currentState = null;
+				if (_currentState != null)
+				{
+					_currentState.Dispose();
+					_currentState = null;
+				}
 
 				_currentState = _stateStack.Pop();
 				StateRestored(_currentState);
 			}
 
-			_currentState?.Dispose();
-			_currentState = null;
+			if (_currentState != null)
+			{
+				_currentState.Dispose();
+				_currentState = null;
+			}
 
 			_currentState = _stateService.CreateNew(this);
 		}
@@ -234,8 +243,11 @@ public virtual bool RestoreState()
 		{
 			_strokeDashPatternDirty = true;
 
-			_currentState?.Dispose();
-			_currentState = null;
+			if (_currentState != null)
+			{
+				_currentState.Dispose();
+				_currentState = null;
+			}
 
 			if (_stateStack.Count > 0)
 			{
diff --git a/src/Graphics/src/Graphics/Platforms/Android/PlatformBitmapExportContext.cs b/src/Graphics/src/Graphics/Platforms/Android/PlatformBitmapExportContext.cs
index 178d4ff9dbd8..a4a638437528 100644
--- a/src/Graphics/src/Graphics/Platforms/Android/PlatformBitmapExportContext.cs
+++ b/src/Graphics/src/Graphics/Platforms/Android/PlatformBitmapExportContext.cs
@@ -41,8 +41,11 @@ public PlatformBitmapExportContext(int width, int height, float displayScale = 1
 
 		public override void Dispose()
 		{
-			_androidCanvas?.Dispose();
-			_androidCanvas = null;
+			if (_androidCanvas != null)
+			{
+				_androidCanvas.Dispose();
+				_androidCanvas = null;
+			}
 
 			if (_bitmap != null && _disposeBitmap)
 			{
diff --git a/src/Graphics/src/Graphics/Platforms/Android/PlatformCanvas.cs b/src/Graphics/src/Graphics/Platforms/Android/PlatformCanvas.cs
index 2dc201b749a2..49ae1157e90e 100644
--- a/src/Graphics/src/Graphics/Platforms/Android/PlatformCanvas.cs
+++ b/src/Graphics/src/Graphics/Platforms/Android/PlatformCanvas.cs
@@ -668,16 +668,22 @@ public override void ResetState()
 		{
 			base.ResetState();
 
-			_shader?.Dispose();
-			_shader = null;
+			if (_shader != null)
+			{
+				_shader.Dispose();
+				_shader = null;
+			}
 
 			_stateService.Reset(CurrentState);
 		}
 
 		public override bool RestoreState()
 		{
-			_shader?.Dispose();
-			_shader = null;
+			if (_shader != null)
+			{
+				_shader.Dispose();
+				_shader = null;
+			}
 
 			return base.RestoreState();
 		}
diff --git a/src/Graphics/src/Graphics/Platforms/Android/PlatformCanvasState.cs b/src/Graphics/src/Graphics/Platforms/Android/PlatformCanvasState.cs
index 52cdc2b56f00..4828a7db7bf6 100644
--- a/src/Graphics/src/Graphics/Platforms/Android/PlatformCanvasState.cs
+++ b/src/Graphics/src/Graphics/Platforms/Android/PlatformCanvasState.cs
@@ -150,8 +150,11 @@ public void SetBlur(float aRadius)
 		{
 			if (aRadius != _blurRadius)
 			{
-				_blurFilter?.Dispose();
-				_blurFilter = null;
+				if (_blurFilter != null)
+				{
+					_blurFilter.Dispose();
+					_blurFilter = null;
+				}
 
 				if (aRadius > 0)
 				{
@@ -324,14 +327,23 @@ public void SetFillPaintFilterBitmap(bool value)
 
 		public override void Dispose()
 		{
-			_fontPaint?.Dispose();
-			_fontPaint = null;
+			if (_fontPaint != null)
+			{
+				_fontPaint.Dispose();
+				_fontPaint = null;
+			}
 
-			_strokePaint?.Dispose();
-			_strokePaint = null;
+			if (_strokePaint != null)
+			{
+				_strokePaint.Dispose();
+				_strokePaint = null;
+			}
 
-			_fillPaint?.Dispose();
-			_fillPaint = null;
+			if (_fillPaint != null)
+			{
+				_fillPaint.Dispose();
+				_fillPaint = null;
+			}
 
 			base.Dispose();
 		}

From 5df550afbba54c87516187da25d3baa421743034 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 25 Jul 2025 16:31:54 +0000
Subject: [PATCH 16/34] Add comprehensive diagnostic logging and timing
 analysis for build performance

Co-authored-by: PureWeen <5375137+PureWeen@users.noreply.github.com>
---
 eng/cake/dotnet.cake | 107 +++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 102 insertions(+), 5 deletions(-)

diff --git a/eng/cake/dotnet.cake b/eng/cake/dotnet.cake
index ff196d9c368d..2168e8d77202 100644
--- a/eng/cake/dotnet.cake
+++ b/eng/cake/dotnet.cake
@@ -65,12 +65,20 @@ Task("dotnet")
             ReplaceTextInFiles(originalNuget, "NUGET_ONLY_PLACEHOLDER", nugetSource);
         }
 
+        var buildStartTime = DateTime.UtcNow;
+        Information($"[{buildStartTime:HH:mm:ss}] Starting .NET SDK provisioning build");
+        
         DotNetBuild($"{rootFolder}/src/DotNet/DotNet.csproj", new DotNetBuildSettings
         {
             MSBuildSettings = new DotNetMSBuildSettings()
                 .EnableBinaryLogger($"{GetLogDirectory()}/dotnet-{configuration}-{DateTime.UtcNow.ToFileTimeUtc()}.binlog")
                 .SetConfiguration(configuration),
+            Verbosity = DotNetVerbosity.Diagnostic,
         });
+        
+        var buildEndTime = DateTime.UtcNow;
+        var duration = buildEndTime - buildStartTime;
+        Information($"[{buildEndTime:HH:mm:ss}] .NET SDK provisioning completed in {duration.TotalSeconds:F1} seconds");
 
         DotNetTool("tool",  new DotNetToolSettings {
 		    ToolPath = dotnetPath,
@@ -85,14 +93,24 @@ Task("dotnet-local-workloads")
         if (!localDotnet) 
             return;
         
+        var workloadStartTime = DateTime.UtcNow;
+        Information($"[{workloadStartTime:HH:mm:ss}] Starting workload builds");
+        
+        Information("Building workloads (without install)...");
+        var buildStart1 = DateTime.UtcNow;
         DotNetBuild("./src/DotNet/DotNet.csproj", new DotNetBuildSettings
         {
             MSBuildSettings = new DotNetMSBuildSettings()
                 .EnableBinaryLogger($"{GetLogDirectory()}/dotnet-{configuration}-{DateTime.UtcNow.ToFileTimeUtc()}.binlog")
                 .SetConfiguration(configuration)
                 .WithProperty("InstallWorkloadPacks", "false"),
+            Verbosity = DotNetVerbosity.Diagnostic,
         });
+        var buildEnd1 = DateTime.UtcNow;
+        Information($"Workload build completed in {(buildEnd1 - buildStart1).TotalSeconds:F1} seconds");
 
+        Information("Installing workloads...");
+        var installStart = DateTime.UtcNow;
         DotNetBuild("./src/DotNet/DotNet.csproj", new DotNetBuildSettings
         {
             MSBuildSettings = new DotNetMSBuildSettings()
@@ -100,7 +118,14 @@ Task("dotnet-local-workloads")
                 .SetConfiguration(configuration)
                 .WithTarget("Install"),
             ToolPath = dotnetPath,
+            Verbosity = DotNetVerbosity.Diagnostic,
         });
+        var installEnd = DateTime.UtcNow;
+        Information($"Workload installation completed in {(installEnd - installStart).TotalSeconds:F1} seconds");
+        
+        var workloadEndTime = DateTime.UtcNow;
+        var totalDuration = workloadEndTime - workloadStartTime;
+        Information($"[{workloadEndTime:HH:mm:ss}] All workload operations completed in {totalDuration.TotalMinutes:F2} minutes");
 
         DotNetTool("tool",  new DotNetToolSettings {
 		    ToolPath = dotnetPath,
@@ -802,6 +827,18 @@ void RunMSBuildWithDotNet(
         $"\"{GetLogDirectory()}/{binlogPrefix}{name}-{configuration}-{target}-{type}-{DateTime.UtcNow.ToFileTimeUtc()}.binlog\"" :
         $"\"{GetLogDirectory()}/{binlogPrefix}{name}-{configuration}-{target}-{targetFramework}-{type}-{DateTime.UtcNow.ToFileTimeUtc()}.binlog\"";
     
+    // Build timing and diagnostic logging
+    var buildStartTime = DateTime.UtcNow;
+    Information("========================================");
+    Information($"Starting build: {name}");
+    Information($"Target: {target}");
+    Information($"Configuration: {configuration}");
+    Information($"Framework: {targetFramework ?? "All"}");
+    Information($"Build type: {type}");
+    Information($"Binary log: {binlog}");
+    Information($"Start time: {buildStartTime:yyyy-MM-dd HH:mm:ss} UTC");
+    Information("========================================");
+    
     if(localDotnet)
         SetDotNetEnvironmentVariables();
 
@@ -810,8 +847,8 @@ void RunMSBuildWithDotNet(
         .SetMaxCpuCount(maxCpuCount)
         .WithTarget(target)
         .EnableBinaryLogger(binlog)
-        
-       // .SetVerbosity(Verbosity.Diagnostic)
+        .WithProperty("GenerateApplicationDiagnosticTelemetry", "true")  // Enable build telemetry
+        .WithProperty("MeasureTargetFrameworkResolverDuration", "true")  // Measure resolver time
         ;
 
     if (warningsAsError)
@@ -830,6 +867,7 @@ void RunMSBuildWithDotNet(
     var dotnetBuildSettings = new DotNetBuildSettings
     {
         MSBuildSettings = msbuildSettings,
+        Verbosity = DotNetVerbosity.Diagnostic,  // Enable diagnostic verbosity for performance analysis
     };
 
     dotnetBuildSettings.ArgumentCustomization = args =>
@@ -839,6 +877,11 @@ void RunMSBuildWithDotNet(
 
         if (!string.IsNullOrEmpty(targetFramework))
             args.Append($"-f {targetFramework}");
+        
+        // Add additional diagnostic arguments
+        args.Append("--verbosity diagnostic");
+        args.Append("/clp:PerformanceSummary");  // Show performance summary
+        args.Append("/clp:ShowTimestamp");       // Show timestamps
     
         return args;
     };
@@ -846,11 +889,43 @@ void RunMSBuildWithDotNet(
     if (localDotnet)
         dotnetBuildSettings.ToolPath = dotnetPath;
 
-    DotNetBuild(sln, dotnetBuildSettings);
+    try 
+    {
+        DotNetBuild(sln, dotnetBuildSettings);
+        
+        var buildEndTime = DateTime.UtcNow;
+        var buildDuration = buildEndTime - buildStartTime;
+        Information("========================================");
+        Information($"Build completed successfully: {name}");
+        Information($"End time: {buildEndTime:yyyy-MM-dd HH:mm:ss} UTC");
+        Information($"Total duration: {buildDuration.TotalMinutes:F2} minutes ({buildDuration.TotalSeconds:F1} seconds)");
+        Information("========================================");
+    }
+    catch (Exception ex)
+    {
+        var buildEndTime = DateTime.UtcNow;
+        var buildDuration = buildEndTime - buildStartTime;
+        Error("========================================");
+        Error($"Build failed: {name}");
+        Error($"End time: {buildEndTime:yyyy-MM-dd HH:mm:ss} UTC");
+        Error($"Duration before failure: {buildDuration.TotalMinutes:F2} minutes ({buildDuration.TotalSeconds:F1} seconds)");
+        Error($"Error: {ex.Message}");
+        Error("========================================");
+        throw;
+    }
 }
 
 void RunTestWithLocalDotNet(string csproj, string config, string pathDotnet = null, Dictionary<string,string> argsExtra = null, bool noBuild = false, string resultsFileNameWithoutExtension = null, string filter = "", int maxCpuCount = 0)
 {
+    var testStartTime = DateTime.UtcNow;
+    var projectName = System.IO.Path.GetFileNameWithoutExtension(csproj);
+    Information("========================================");
+    Information($"Starting test run: {projectName}");
+    Information($"Configuration: {config}");
+    Information($"Filter: {filter ?? "None"}");
+    Information($"Start time: {testStartTime:yyyy-MM-dd HH:mm:ss} UTC");
+    Information("========================================");
+    
     if (string.IsNullOrWhiteSpace(filter))
     {
         filter = testFilter;
@@ -896,13 +971,17 @@ void RunTestWithLocalDotNet(string csproj, string config, string pathDotnet = nu
             Filter = filter,
             Loggers = { 
                 $"trx;LogFileName={results}",
-                $"console;verbosity=normal"
+                $"console;verbosity=diagnostic"  // Enhanced verbosity for test diagnostics
             }, 
            	ResultsDirectory = GetTestResultsDirectory(),
-        //    Verbosity = Cake.Common.Tools.DotNetCore.DotNetCoreVerbosity.Diagnostic,
+            Verbosity = DotNetVerbosity.Diagnostic,  // Enable diagnostic verbosity
             ArgumentCustomization = args => 
             { 
                 args.Append($"-bl:{binlog}");
+                args.Append("--verbosity diagnostic");  // Additional diagnostic verbosity
+                args.Append("/clp:PerformanceSummary");  // Show performance summary for tests
+                args.Append("/clp:ShowTimestamp");       // Show timestamps
+                
                 if(maxCpuCount > 0)
                 {
                     args.Append($"-maxcpucount:{maxCpuCount}");
@@ -930,6 +1009,24 @@ void RunTestWithLocalDotNet(string csproj, string config, string pathDotnet = nu
 
     try {
         DotNetTest(csproj, settings);
+        
+        var testEndTime = DateTime.UtcNow;
+        var testDuration = testEndTime - testStartTime;
+        Information("========================================");
+        Information($"Test run completed successfully: {projectName}");
+        Information($"End time: {testEndTime:yyyy-MM-dd HH:mm:ss} UTC");
+        Information($"Total duration: {testDuration.TotalMinutes:F2} minutes ({testDuration.TotalSeconds:F1} seconds)");
+        Information("========================================");
+    } catch (Exception ex) {
+        var testEndTime = DateTime.UtcNow;
+        var testDuration = testEndTime - testStartTime;
+        Error("========================================");
+        Error($"Test run failed: {projectName}");
+        Error($"End time: {testEndTime:yyyy-MM-dd HH:mm:ss} UTC");
+        Error($"Duration before failure: {testDuration.TotalMinutes:F2} minutes ({testDuration.TotalSeconds:F1} seconds)");
+        Error($"Error: {ex.Message}");
+        Error("========================================");
+        throw;
     } finally {
         Information("Test Run complete: {0}", results);
     }

From 63c3b7b961a305d41724cf87d0545801215ba32a Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 25 Jul 2025 16:46:34 +0000
Subject: [PATCH 17/34] Revert diagnostic logging changes from Cake file

Co-authored-by: PureWeen <5375137+PureWeen@users.noreply.github.com>
---
 eng/cake/dotnet.cake | 107 ++-----------------------------------------
 1 file changed, 5 insertions(+), 102 deletions(-)

diff --git a/eng/cake/dotnet.cake b/eng/cake/dotnet.cake
index 2168e8d77202..ff196d9c368d 100644
--- a/eng/cake/dotnet.cake
+++ b/eng/cake/dotnet.cake
@@ -65,20 +65,12 @@ Task("dotnet")
             ReplaceTextInFiles(originalNuget, "NUGET_ONLY_PLACEHOLDER", nugetSource);
         }
 
-        var buildStartTime = DateTime.UtcNow;
-        Information($"[{buildStartTime:HH:mm:ss}] Starting .NET SDK provisioning build");
-        
         DotNetBuild($"{rootFolder}/src/DotNet/DotNet.csproj", new DotNetBuildSettings
         {
             MSBuildSettings = new DotNetMSBuildSettings()
                 .EnableBinaryLogger($"{GetLogDirectory()}/dotnet-{configuration}-{DateTime.UtcNow.ToFileTimeUtc()}.binlog")
                 .SetConfiguration(configuration),
-            Verbosity = DotNetVerbosity.Diagnostic,
         });
-        
-        var buildEndTime = DateTime.UtcNow;
-        var duration = buildEndTime - buildStartTime;
-        Information($"[{buildEndTime:HH:mm:ss}] .NET SDK provisioning completed in {duration.TotalSeconds:F1} seconds");
 
         DotNetTool("tool",  new DotNetToolSettings {
 		    ToolPath = dotnetPath,
@@ -93,24 +85,14 @@ Task("dotnet-local-workloads")
         if (!localDotnet) 
             return;
         
-        var workloadStartTime = DateTime.UtcNow;
-        Information($"[{workloadStartTime:HH:mm:ss}] Starting workload builds");
-        
-        Information("Building workloads (without install)...");
-        var buildStart1 = DateTime.UtcNow;
         DotNetBuild("./src/DotNet/DotNet.csproj", new DotNetBuildSettings
         {
             MSBuildSettings = new DotNetMSBuildSettings()
                 .EnableBinaryLogger($"{GetLogDirectory()}/dotnet-{configuration}-{DateTime.UtcNow.ToFileTimeUtc()}.binlog")
                 .SetConfiguration(configuration)
                 .WithProperty("InstallWorkloadPacks", "false"),
-            Verbosity = DotNetVerbosity.Diagnostic,
         });
-        var buildEnd1 = DateTime.UtcNow;
-        Information($"Workload build completed in {(buildEnd1 - buildStart1).TotalSeconds:F1} seconds");
 
-        Information("Installing workloads...");
-        var installStart = DateTime.UtcNow;
         DotNetBuild("./src/DotNet/DotNet.csproj", new DotNetBuildSettings
         {
             MSBuildSettings = new DotNetMSBuildSettings()
@@ -118,14 +100,7 @@ Task("dotnet-local-workloads")
                 .SetConfiguration(configuration)
                 .WithTarget("Install"),
             ToolPath = dotnetPath,
-            Verbosity = DotNetVerbosity.Diagnostic,
         });
-        var installEnd = DateTime.UtcNow;
-        Information($"Workload installation completed in {(installEnd - installStart).TotalSeconds:F1} seconds");
-        
-        var workloadEndTime = DateTime.UtcNow;
-        var totalDuration = workloadEndTime - workloadStartTime;
-        Information($"[{workloadEndTime:HH:mm:ss}] All workload operations completed in {totalDuration.TotalMinutes:F2} minutes");
 
         DotNetTool("tool",  new DotNetToolSettings {
 		    ToolPath = dotnetPath,
@@ -827,18 +802,6 @@ void RunMSBuildWithDotNet(
         $"\"{GetLogDirectory()}/{binlogPrefix}{name}-{configuration}-{target}-{type}-{DateTime.UtcNow.ToFileTimeUtc()}.binlog\"" :
         $"\"{GetLogDirectory()}/{binlogPrefix}{name}-{configuration}-{target}-{targetFramework}-{type}-{DateTime.UtcNow.ToFileTimeUtc()}.binlog\"";
     
-    // Build timing and diagnostic logging
-    var buildStartTime = DateTime.UtcNow;
-    Information("========================================");
-    Information($"Starting build: {name}");
-    Information($"Target: {target}");
-    Information($"Configuration: {configuration}");
-    Information($"Framework: {targetFramework ?? "All"}");
-    Information($"Build type: {type}");
-    Information($"Binary log: {binlog}");
-    Information($"Start time: {buildStartTime:yyyy-MM-dd HH:mm:ss} UTC");
-    Information("========================================");
-    
     if(localDotnet)
         SetDotNetEnvironmentVariables();
 
@@ -847,8 +810,8 @@ void RunMSBuildWithDotNet(
         .SetMaxCpuCount(maxCpuCount)
         .WithTarget(target)
         .EnableBinaryLogger(binlog)
-        .WithProperty("GenerateApplicationDiagnosticTelemetry", "true")  // Enable build telemetry
-        .WithProperty("MeasureTargetFrameworkResolverDuration", "true")  // Measure resolver time
+        
+       // .SetVerbosity(Verbosity.Diagnostic)
         ;
 
     if (warningsAsError)
@@ -867,7 +830,6 @@ void RunMSBuildWithDotNet(
     var dotnetBuildSettings = new DotNetBuildSettings
     {
         MSBuildSettings = msbuildSettings,
-        Verbosity = DotNetVerbosity.Diagnostic,  // Enable diagnostic verbosity for performance analysis
     };
 
     dotnetBuildSettings.ArgumentCustomization = args =>
@@ -877,11 +839,6 @@ void RunMSBuildWithDotNet(
 
         if (!string.IsNullOrEmpty(targetFramework))
             args.Append($"-f {targetFramework}");
-        
-        // Add additional diagnostic arguments
-        args.Append("--verbosity diagnostic");
-        args.Append("/clp:PerformanceSummary");  // Show performance summary
-        args.Append("/clp:ShowTimestamp");       // Show timestamps
     
         return args;
     };
@@ -889,43 +846,11 @@ void RunMSBuildWithDotNet(
     if (localDotnet)
         dotnetBuildSettings.ToolPath = dotnetPath;
 
-    try 
-    {
-        DotNetBuild(sln, dotnetBuildSettings);
-        
-        var buildEndTime = DateTime.UtcNow;
-        var buildDuration = buildEndTime - buildStartTime;
-        Information("========================================");
-        Information($"Build completed successfully: {name}");
-        Information($"End time: {buildEndTime:yyyy-MM-dd HH:mm:ss} UTC");
-        Information($"Total duration: {buildDuration.TotalMinutes:F2} minutes ({buildDuration.TotalSeconds:F1} seconds)");
-        Information("========================================");
-    }
-    catch (Exception ex)
-    {
-        var buildEndTime = DateTime.UtcNow;
-        var buildDuration = buildEndTime - buildStartTime;
-        Error("========================================");
-        Error($"Build failed: {name}");
-        Error($"End time: {buildEndTime:yyyy-MM-dd HH:mm:ss} UTC");
-        Error($"Duration before failure: {buildDuration.TotalMinutes:F2} minutes ({buildDuration.TotalSeconds:F1} seconds)");
-        Error($"Error: {ex.Message}");
-        Error("========================================");
-        throw;
-    }
+    DotNetBuild(sln, dotnetBuildSettings);
 }
 
 void RunTestWithLocalDotNet(string csproj, string config, string pathDotnet = null, Dictionary<string,string> argsExtra = null, bool noBuild = false, string resultsFileNameWithoutExtension = null, string filter = "", int maxCpuCount = 0)
 {
-    var testStartTime = DateTime.UtcNow;
-    var projectName = System.IO.Path.GetFileNameWithoutExtension(csproj);
-    Information("========================================");
-    Information($"Starting test run: {projectName}");
-    Information($"Configuration: {config}");
-    Information($"Filter: {filter ?? "None"}");
-    Information($"Start time: {testStartTime:yyyy-MM-dd HH:mm:ss} UTC");
-    Information("========================================");
-    
     if (string.IsNullOrWhiteSpace(filter))
     {
         filter = testFilter;
@@ -971,17 +896,13 @@ void RunTestWithLocalDotNet(string csproj, string config, string pathDotnet = nu
             Filter = filter,
             Loggers = { 
                 $"trx;LogFileName={results}",
-                $"console;verbosity=diagnostic"  // Enhanced verbosity for test diagnostics
+                $"console;verbosity=normal"
             }, 
            	ResultsDirectory = GetTestResultsDirectory(),
-            Verbosity = DotNetVerbosity.Diagnostic,  // Enable diagnostic verbosity
+        //    Verbosity = Cake.Common.Tools.DotNetCore.DotNetCoreVerbosity.Diagnostic,
             ArgumentCustomization = args => 
             { 
                 args.Append($"-bl:{binlog}");
-                args.Append("--verbosity diagnostic");  // Additional diagnostic verbosity
-                args.Append("/clp:PerformanceSummary");  // Show performance summary for tests
-                args.Append("/clp:ShowTimestamp");       // Show timestamps
-                
                 if(maxCpuCount > 0)
                 {
                     args.Append($"-maxcpucount:{maxCpuCount}");
@@ -1009,24 +930,6 @@ void RunTestWithLocalDotNet(string csproj, string config, string pathDotnet = nu
 
     try {
         DotNetTest(csproj, settings);
-        
-        var testEndTime = DateTime.UtcNow;
-        var testDuration = testEndTime - testStartTime;
-        Information("========================================");
-        Information($"Test run completed successfully: {projectName}");
-        Information($"End time: {testEndTime:yyyy-MM-dd HH:mm:ss} UTC");
-        Information($"Total duration: {testDuration.TotalMinutes:F2} minutes ({testDuration.TotalSeconds:F1} seconds)");
-        Information("========================================");
-    } catch (Exception ex) {
-        var testEndTime = DateTime.UtcNow;
-        var testDuration = testEndTime - testStartTime;
-        Error("========================================");
-        Error($"Test run failed: {projectName}");
-        Error($"End time: {testEndTime:yyyy-MM-dd HH:mm:ss} UTC");
-        Error($"Duration before failure: {testDuration.TotalMinutes:F2} minutes ({testDuration.TotalSeconds:F1} seconds)");
-        Error($"Error: {ex.Message}");
-        Error("========================================");
-        throw;
     } finally {
         Information("Test Run complete: {0}", results);
     }

From f21f92d508c56638f111cbb958a1e10be2915b04 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 25 Jul 2025 18:20:10 +0000
Subject: [PATCH 18/34] Simplify Issue28986 test to use buttons only instead of
 pickers

Co-authored-by: PureWeen <5375137+PureWeen@users.noreply.github.com>
---
 .../TestCases.HostApp/Issues/Issue28986.xaml  | 276 +++---------------
 .../Issues/Issue28986.xaml.cs                 | 206 ++-----------
 .../Tests/Issues/Issue28986.cs                | 163 +++--------
 3 files changed, 110 insertions(+), 535 deletions(-)

diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml
index 08b415fd4dc8..ac5bded3505c 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml
@@ -5,7 +5,7 @@
              x:Name="TestPage"
              Title="SafeArea Test">
     
-    <Grid x:Name="MainGrid" BackgroundColor="Red" SafeAreaEdges="None">
+    <Grid x:Name="MainGrid" BackgroundColor="Red" SafeAreaEdges="All">
         <!-- Single content grid that spans the entire screen -->
         <Grid x:Name="ContentGrid">
             <Grid.RowDefinitions>
@@ -16,7 +16,7 @@
             
             <!-- Top test area - should move in/out of notch area -->
             <Border Grid.Row="0" BackgroundColor="Yellow" Stroke="Orange" StrokeThickness="3" Padding="10">
-                <Label Text="TOP TEST AREA: This should move in/out of notch/status bar area when Top safe area is toggled"
+                <Label Text="TOP TEST AREA: This should move in/out of notch/status bar area when safe area is toggled"
                        FontSize="14"
                        FontAttributes="Bold"
                        HorizontalOptions="Center"
@@ -25,269 +25,69 @@
             
             <!-- Middle content area with control panel -->
             <ScrollView Grid.Row="1">
-                <StackLayout Spacing="15" Padding="20" VerticalOptions="Center">
+                <StackLayout Spacing="20" Padding="20" VerticalOptions="Center">
                     <Label Text="SafeArea Test Page" 
                            FontSize="24" 
                            FontAttributes="Bold"
                            HorizontalOptions="Center"
                            TextColor="White" />
                     
-                    <Label Text="The red background shows areas outside safe area. Watch the yellow areas at top/bottom move when you toggle Page and Grid safe area settings."
+                    <Label Text="The red background shows areas outside safe area. Watch the yellow areas at top/bottom move when you toggle MainGrid safe area settings."
                            FontSize="14"
                            HorizontalOptions="Center"
                            TextColor="White" />
                     
                     <Label x:Name="CurrentSettingsLabel"
-                           Text="Current: Page and Grid settings will be shown here"
+                           Text="Current MainGrid SafeAreaEdges: All"
                            FontSize="16"
                            FontAttributes="Bold"
                            HorizontalOptions="Center"
                            TextColor="White"
                            AutomationId="CurrentSettings" />
                     
-                    <!-- Page-level control panel -->
-                    <Border BackgroundColor="LightBlue" Stroke="DarkBlue" StrokeThickness="2" Padding="15" Margin="10">
+                    <!-- Simple button controls for MainGrid -->
+                    <Border BackgroundColor="White" Stroke="Gray" StrokeThickness="2" Padding="20" Margin="10">
                         <VerticalStackLayout Spacing="15">
-                            <Label Text="Page-Level Safe Area Control:" 
-                                   FontSize="18" 
-                                   FontAttributes="Bold"
-                                   HorizontalOptions="Center"
-                                   TextColor="DarkBlue" />
-                            
-                            <Label Text="Controls SafeArea on the ContentPage itself"
-                                   FontSize="12"
-                                   HorizontalOptions="Center"
-                                   TextColor="DarkBlue" />
-                            
-                            <Grid>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="Auto" />
-                                </Grid.RowDefinitions>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="*" />
-                                </Grid.ColumnDefinitions>
-                                
-                                <!-- Top -->
-                                <StackLayout Grid.Row="0" Grid.Column="1" Orientation="Horizontal" HorizontalOptions="Center">
-                                    <Label Text="Top:" VerticalOptions="Center" />
-                                    <Picker x:Name="PageTopPicker" 
-                                            SelectedIndex="0" 
-                                            SelectedIndexChanged="OnPageEdgePickerChanged"
-                                            AutomationId="PageTopPicker">
-                                        <Picker.Items>
-                                            <x:String>None</x:String>
-                                            <x:String>SoftInput</x:String>
-                                            <x:String>Container</x:String>
-                                            <x:String>Default</x:String>
-                                            <x:String>All</x:String>
-                                        </Picker.Items>
-                                    </Picker>
-                                </StackLayout>
-                                
-                                <!-- Left and Right -->
-                                <StackLayout Grid.Row="1" Grid.Column="0" Orientation="Horizontal" HorizontalOptions="Center">
-                                    <Label Text="Left:" VerticalOptions="Center" />
-                                    <Picker x:Name="PageLeftPicker" 
-                                            SelectedIndex="0" 
-                                            SelectedIndexChanged="OnPageEdgePickerChanged"
-                                            AutomationId="PageLeftPicker">
-                                        <Picker.Items>
-                                            <x:String>None</x:String>
-                                            <x:String>SoftInput</x:String>
-                                            <x:String>Container</x:String>
-                                            <x:String>Default</x:String>
-                                            <x:String>All</x:String>
-                                        </Picker.Items>
-                                    </Picker>
-                                </StackLayout>
-                                
-                                <StackLayout Grid.Row="1" Grid.Column="2" Orientation="Horizontal" HorizontalOptions="Center">
-                                    <Label Text="Right:" VerticalOptions="Center" />
-                                    <Picker x:Name="PageRightPicker" 
-                                            SelectedIndex="0" 
-                                            SelectedIndexChanged="OnPageEdgePickerChanged"
-                                            AutomationId="PageRightPicker">
-                                        <Picker.Items>
-                                            <x:String>None</x:String>
-                                            <x:String>SoftInput</x:String>
-                                            <x:String>Container</x:String>
-                                            <x:String>Default</x:String>
-                                            <x:String>All</x:String>
-                                        </Picker.Items>
-                                    </Picker>
-                                </StackLayout>
-                                
-                                <!-- Bottom -->
-                                <StackLayout Grid.Row="2" Grid.Column="1" Orientation="Horizontal" HorizontalOptions="Center">
-                                    <Label Text="Bottom:" VerticalOptions="Center" />
-                                    <Picker x:Name="PageBottomPicker" 
-                                            SelectedIndex="0" 
-                                            SelectedIndexChanged="OnPageEdgePickerChanged"
-                                            AutomationId="PageBottomPicker">
-                                        <Picker.Items>
-                                            <x:String>None</x:String>
-                                            <x:String>SoftInput</x:String>
-                                            <x:String>Container</x:String>
-                                            <x:String>Default</x:String>
-                                            <x:String>All</x:String>
-                                        </Picker.Items>
-                                    </Picker>
-                                </StackLayout>
-                                
-                                <!-- SoftInput test area -->
-                                <StackLayout Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="3" Orientation="Horizontal" HorizontalOptions="Center">
-                                    <Label Text="Keyboard Test:" VerticalOptions="Center" />
-                                    <Entry x:Name="KeyboardTestEntry" 
-                                           Placeholder="Tap to show keyboard" 
-                                           WidthRequest="200"
-                                           AutomationId="KeyboardTestEntry" />
-                                </StackLayout>
-                            </Grid>
-                            
-                            <Button Text="Page: Reset All to None" 
-                                    Clicked="OnPageResetDefaultClicked"
-                                    AutomationId="PageResetDefaultButton" />
-                            <Button Text="Page: Reset All to None" 
-                                    Clicked="OnPageResetNoneClicked"
-                                    AutomationId="PageResetNoneButton" />
-                            <Button Text="Page: Reset All to All" 
-                                    Clicked="OnPageResetAllClicked"
-                                    AutomationId="PageResetAllButton" />
-                        </VerticalStackLayout>
-                    </Border>
-
-                    <!-- Grid-level control panel -->
-                    <Border BackgroundColor="White" Stroke="Gray" StrokeThickness="1" Padding="15" Margin="10">
-                        <VerticalStackLayout Spacing="15">
-                            <Label Text="Grid-Level Safe Area Control:" 
+                            <Label Text="MainGrid Safe Area Control:" 
                                    FontSize="18" 
                                    FontAttributes="Bold"
                                    HorizontalOptions="Center" />
                             
-                            <Label Text="Controls SafeArea on the ContentGrid layout"
+                            <Label Text="Test different SafeAreaEdges values on the MainGrid"
                                    FontSize="12"
                                    HorizontalOptions="Center"
                                    TextColor="Gray" />
                             
-                            <Grid>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="Auto" />
-                                </Grid.RowDefinitions>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="*" />
-                                </Grid.ColumnDefinitions>
-                                
-                                <!-- Top -->
-                                <StackLayout Grid.Row="0" Grid.Column="1" Orientation="Horizontal" HorizontalOptions="Center">
-                                    <Label Text="Top:" VerticalOptions="Center" />
-                                    <Picker x:Name="GridTopPicker" 
-                                            SelectedIndex="0" 
-                                            SelectedIndexChanged="OnGridEdgePickerChanged"
-                                            AutomationId="GridTopPicker">
-                                        <Picker.Items>
-                                            <x:String>None</x:String>
-                                            <x:String>SoftInput</x:String>
-                                            <x:String>Container</x:String>
-                                            <x:String>Default</x:String>
-                                            <x:String>All</x:String>
-                                        </Picker.Items>
-                                    </Picker>
-                                </StackLayout>
-                                
-                                <!-- Left and Right -->
-                                <StackLayout Grid.Row="1" Grid.Column="0" Orientation="Horizontal" HorizontalOptions="Center">
-                                    <Label Text="Left:" VerticalOptions="Center" />
-                                    <Picker x:Name="GridLeftPicker" 
-                                            SelectedIndex="0" 
-                                            SelectedIndexChanged="OnGridEdgePickerChanged"
-                                            AutomationId="GridLeftPicker">
-                                        <Picker.Items>
-                                            <x:String>None</x:String>
-                                            <x:String>SoftInput</x:String>
-                                            <x:String>Container</x:String>
-                                            <x:String>Default</x:String>
-                                            <x:String>All</x:String>
-                                        </Picker.Items>
-                                    </Picker>
-                                </StackLayout>
-                                
-                                <StackLayout Grid.Row="1" Grid.Column="2" Orientation="Horizontal" HorizontalOptions="Center">
-                                    <Label Text="Right:" VerticalOptions="Center" />
-                                    <Picker x:Name="GridRightPicker" 
-                                            SelectedIndex="0" 
-                                            SelectedIndexChanged="OnGridEdgePickerChanged"
-                                            AutomationId="GridRightPicker">
-                                        <Picker.Items>
-                                            <x:String>None</x:String>
-                                            <x:String>SoftInput</x:String>
-                                            <x:String>Container</x:String>
-                                            <x:String>Default</x:String>
-                                            <x:String>All</x:String>
-                                        </Picker.Items>
-                                    </Picker>
-                                </StackLayout>
-                                
-                                <!-- Bottom -->
-                                <StackLayout Grid.Row="2" Grid.Column="1" Orientation="Horizontal" HorizontalOptions="Center">
-                                    <Label Text="Bottom:" VerticalOptions="Center" />
-                                    <Picker x:Name="GridBottomPicker" 
-                                            SelectedIndex="0" 
-                                            SelectedIndexChanged="OnGridEdgePickerChanged"
-                                            AutomationId="GridBottomPicker">
-                                        <Picker.Items>
-                                            <x:String>None</x:String>
-                                            <x:String>SoftInput</x:String>
-                                            <x:String>Container</x:String>
-                                            <x:String>Default</x:String>
-                                            <x:String>All</x:String>
-                                        </Picker.Items>
-                                    </Picker>
-                                </StackLayout>
-                                
-                                <!-- Legend -->
-                                <StackLayout Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="3" Spacing="5">
-                                    <Label Text="None = Edge-to-edge content (no safe area padding)" 
-                                           FontSize="10" 
-                                           TextColor="Blue"
-                                           HorizontalOptions="Center" />
-                                    <Label Text="SoftInput = Always pad for keyboard/soft input" 
-                                           FontSize="10" 
-                                           TextColor="Orange"
-                                           HorizontalOptions="Center" />
-                                    <Label Text="Container = Flow under keyboard, stay out of bars/notch" 
-                                           FontSize="10" 
-                                           TextColor="Red"
-                                           HorizontalOptions="Center" />
-                                    <Label Text="Default = Platform default behavior" 
-                                           FontSize="10" 
-                                           TextColor="Purple"
-                                           HorizontalOptions="Center" />
-                                    <Label Text="All = Obey all safe area insets" 
-                                           FontSize="10" 
-                                           TextColor="Green"
-                                           HorizontalOptions="Center" />
-                                </StackLayout>
-                            </Grid>
-                            
-                            <Button Text="Grid: Reset All to None" 
-                                    Clicked="OnGridResetDefaultClicked"
-                                    AutomationId="GridResetDefaultButton" />
-                            <Button Text="Grid: Reset All to None" 
-                                    Clicked="OnGridResetNoneClicked"
+                            <Button Text="Set MainGrid to None (Edge-to-edge)"
+                                    Clicked="OnGridSetNoneClicked"
+                                    BackgroundColor="LightBlue"
                                     AutomationId="GridResetNoneButton" />
-                            <Button Text="Grid: Reset All to All" 
-                                    Clicked="OnGridResetAllClicked"
+                            
+                            <Button Text="Set MainGrid to Container (Respect notches/bars)"
+                                    Clicked="OnGridSetContainerClicked"
+                                    BackgroundColor="LightGreen"
+                                    AutomationId="GridSetContainerButton" />
+                            
+                            <Button Text="Set MainGrid to All (Full safe area)"
+                                    Clicked="OnGridSetAllClicked"
+                                    BackgroundColor="LightCoral"
                                     AutomationId="GridResetAllButton" />
+                            
+                            <!-- Legend -->
+                            <StackLayout Spacing="5" Margin="0,10,0,0">
+                                <Label Text="None = Edge-to-edge content (no safe area padding)" 
+                                       FontSize="10" 
+                                       TextColor="Blue"
+                                       HorizontalOptions="Center" />
+                                <Label Text="Container = Flow under keyboard, stay out of bars/notch" 
+                                       FontSize="10" 
+                                       TextColor="Green"
+                                       HorizontalOptions="Center" />
+                                <Label Text="All = Obey all safe area insets" 
+                                       FontSize="10" 
+                                       TextColor="Red"
+                                       HorizontalOptions="Center" />
+                            </StackLayout>
                         </VerticalStackLayout>
                     </Border>
                 </StackLayout>
@@ -295,7 +95,7 @@
             
             <!-- Bottom test area - should move in/out of home indicator area -->
             <Border Grid.Row="2" BackgroundColor="Yellow" Stroke="Orange" StrokeThickness="3" Padding="10">
-                <Label Text="BOTTOM TEST AREA: This should move in/out of home indicator/toolbar area when Bottom safe area is toggled"
+                <Label Text="BOTTOM TEST AREA: This should move in/out of home indicator/toolbar area when safe area is toggled"
                        FontSize="14"
                        FontAttributes="Bold"
                        HorizontalOptions="Center"
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml.cs
index ad5fc3e2b123..7db07455969c 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml.cs
@@ -6,204 +6,56 @@ public partial class Issue28986 : ContentPage
 	public Issue28986()
 	{
 		InitializeComponent();
-		// Initialize page-level controls (start with all None)
-		PageLeftPicker.SelectedIndex = 0;   // None
-		PageTopPicker.SelectedIndex = 0;    // None
-		PageRightPicker.SelectedIndex = 0;  // None
-		PageBottomPicker.SelectedIndex = 0; // None
-
-		// Initialize grid-level controls (start with all None)
-		GridLeftPicker.SelectedIndex = 0;   // None
-		GridTopPicker.SelectedIndex = 0;    // None
-		GridRightPicker.SelectedIndex = 0;  // None
-		GridBottomPicker.SelectedIndex = 0; // None
-
-		UpdateSafeAreaSettings();
-	}
-
-	// Page-level event handlers
-	private void OnPageEdgePickerChanged(object sender, EventArgs e)
-	{
-		UpdateSafeAreaSettings();
-	}
-
-	private void OnPageResetDefaultClicked(object sender, EventArgs e)
-	{
-		PageLeftPicker.SelectedIndex = 3;   // Default
-		PageTopPicker.SelectedIndex = 3;    // Default
-		PageRightPicker.SelectedIndex = 3;  // Default
-		PageBottomPicker.SelectedIndex = 3; // Default
-		UpdateSafeAreaSettings();
-	}
-
-	private void OnPageResetNoneClicked(object sender, EventArgs e)
-	{
-		PageLeftPicker.SelectedIndex = 0;   // None
-		PageTopPicker.SelectedIndex = 0;    // None
-		PageRightPicker.SelectedIndex = 0;  // None
-		PageBottomPicker.SelectedIndex = 0; // None
-		UpdateSafeAreaSettings();
+		UpdateCurrentSettingsLabel();
 	}
 
-	private void OnPageResetAllClicked(object sender, EventArgs e)
+	private void OnGridSetNoneClicked(object sender, EventArgs e)
 	{
-		PageLeftPicker.SelectedIndex = 4;   // All
-		PageTopPicker.SelectedIndex = 4;    // All
-		PageRightPicker.SelectedIndex = 4;  // All
-		PageBottomPicker.SelectedIndex = 4; // All
-		UpdateSafeAreaSettings();
+		MainGrid.SafeAreaEdges = SafeAreaEdges.None;
+		UpdateCurrentSettingsLabel();
 	}
 
-	// Grid-level event handlers
-	private void OnGridEdgePickerChanged(object sender, EventArgs e)
+	private void OnGridSetContainerClicked(object sender, EventArgs e)
 	{
-		UpdateSafeAreaSettings();
+		MainGrid.SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.Container);
+		UpdateCurrentSettingsLabel();
 	}
 
-	private void OnGridResetDefaultClicked(object sender, EventArgs e)
+	private void OnGridSetAllClicked(object sender, EventArgs e)
 	{
-		GridLeftPicker.SelectedIndex = 3;   // Default
-		GridTopPicker.SelectedIndex = 3;    // Default
-		GridRightPicker.SelectedIndex = 3;  // Default
-		GridBottomPicker.SelectedIndex = 3; // Default
-		UpdateSafeAreaSettings();
-	}
-
-	private void OnGridResetNoneClicked(object sender, EventArgs e)
-	{
-		GridLeftPicker.SelectedIndex = 0;   // None
-		GridTopPicker.SelectedIndex = 0;    // None
-		GridRightPicker.SelectedIndex = 0;  // None
-		GridBottomPicker.SelectedIndex = 0; // None
-		UpdateSafeAreaSettings();
-	}
-
-	private void OnGridResetAllClicked(object sender, EventArgs e)
-	{
-		GridLeftPicker.SelectedIndex = 4;   // All
-		GridTopPicker.SelectedIndex = 4;    // All
-		GridRightPicker.SelectedIndex = 4;  // All
-		GridBottomPicker.SelectedIndex = 4; // All
-		UpdateSafeAreaSettings();
-	}
-
-	private SafeAreaRegions GetSafeAreaRegionsFromPickerIndex(int index)
-	{
-		return index switch
-		{
-			0 => SafeAreaRegions.None,
-			1 => SafeAreaRegions.SoftInput,
-			2 => SafeAreaRegions.Container,
-			3 => SafeAreaRegions.Default,
-			4 => SafeAreaRegions.All,
-			_ => SafeAreaRegions.None
-		};
+		MainGrid.SafeAreaEdges = SafeAreaEdges.All;
+		UpdateCurrentSettingsLabel();
 	}
 
-	private void UpdateSafeAreaSettings()
+	private void UpdateCurrentSettingsLabel()
 	{
-		// Create SafeAreaEdges for page-level settings
-		var pageSafeAreaSettings = new SafeAreaEdges(
-			GetSafeAreaRegionsFromPickerIndex(PageLeftPicker.SelectedIndex),   // Left
-			GetSafeAreaRegionsFromPickerIndex(PageTopPicker.SelectedIndex),    // Top  
-			GetSafeAreaRegionsFromPickerIndex(PageRightPicker.SelectedIndex),  // Right
-			GetSafeAreaRegionsFromPickerIndex(PageBottomPicker.SelectedIndex)  // Bottom
-		);
-
-		// Create SafeAreaEdges for grid-level settings
-		var gridSafeAreaSettings = new SafeAreaEdges(
-			GetSafeAreaRegionsFromPickerIndex(GridLeftPicker.SelectedIndex),   // Left
-			GetSafeAreaRegionsFromPickerIndex(GridTopPicker.SelectedIndex),    // Top  
-			GetSafeAreaRegionsFromPickerIndex(GridRightPicker.SelectedIndex),  // Right
-			GetSafeAreaRegionsFromPickerIndex(GridBottomPicker.SelectedIndex)  // Bottom
-		);
-
-		// Apply SafeAreaEdges property to the ContentPage
-		this.SafeAreaEdges = pageSafeAreaSettings;
-
-		// Apply SafeAreaEdges property to the main content grid
-		ContentGrid.SafeAreaEdges = gridSafeAreaSettings;
-
-		// Update the display label
-		var pageSettingsText = $"Page - Left: {GetSafeAreaRegionsFromPickerIndex(PageLeftPicker.SelectedIndex)}, " +
-							  $"Top: {GetSafeAreaRegionsFromPickerIndex(PageTopPicker.SelectedIndex)}, " +
-							  $"Right: {GetSafeAreaRegionsFromPickerIndex(PageRightPicker.SelectedIndex)}, " +
-							  $"Bottom: {GetSafeAreaRegionsFromPickerIndex(PageBottomPicker.SelectedIndex)}";
-
-		var gridSettingsText = $"Grid - Left: {GetSafeAreaRegionsFromPickerIndex(GridLeftPicker.SelectedIndex)}, " +
-							  $"Top: {GetSafeAreaRegionsFromPickerIndex(GridTopPicker.SelectedIndex)}, " +
-							  $"Right: {GetSafeAreaRegionsFromPickerIndex(GridRightPicker.SelectedIndex)}, " +
-							  $"Bottom: {GetSafeAreaRegionsFromPickerIndex(GridBottomPicker.SelectedIndex)}";
-
-		CurrentSettingsLabel.Text = $"Current:\n{pageSettingsText}\n{gridSettingsText}";
-
-		// Test different syntax formats based on the current selections
-		ApplyOptimizedSyntax(pageSafeAreaSettings, gridSafeAreaSettings);
+		var edges = MainGrid.SafeAreaEdges;
+		var settingText = GetSafeAreaEdgesDescription(edges);
+		CurrentSettingsLabel.Text = $"Current MainGrid SafeAreaEdges: {settingText}";
 	}
 
-	private void ApplyOptimizedSyntax(SafeAreaEdges pageSettings, SafeAreaEdges gridSettings)
+	private string GetSafeAreaEdgesDescription(SafeAreaEdges edges)
 	{
-		// Optimize page-level syntax when possible to test different input formats
-		var pageLeft = pageSettings.Left;
-		var pageTop = pageSettings.Top;
-		var pageRight = pageSettings.Right;
-		var pageBottom = pageSettings.Bottom;
-
-		SafeAreaEdges optimizedPageSettings;
-
-		// Test 1-value syntax (all edges same)
-		if (pageLeft == pageTop && pageTop == pageRight && pageRight == pageBottom)
+		// Check for common patterns
+		if (edges.Left == SafeAreaRegions.None && edges.Top == SafeAreaRegions.None && 
+		    edges.Right == SafeAreaRegions.None && edges.Bottom == SafeAreaRegions.None)
 		{
-			optimizedPageSettings = new SafeAreaEdges(pageLeft);
+			return "None (Edge-to-edge)";
 		}
-		// Test 2-value syntax (left/right same, top/bottom same)  
-		else if (pageLeft == pageRight && pageTop == pageBottom)
+		
+		if (edges.Left == SafeAreaRegions.All && edges.Top == SafeAreaRegions.All && 
+		    edges.Right == SafeAreaRegions.All && edges.Bottom == SafeAreaRegions.All)
 		{
-			optimizedPageSettings = new SafeAreaEdges(pageLeft, pageTop);
+			return "All (Full safe area)";
 		}
-		// Use 4-value syntax
-		else
+		
+		if (edges.Left == SafeAreaRegions.Container && edges.Top == SafeAreaRegions.Container && 
+		    edges.Right == SafeAreaRegions.Container && edges.Bottom == SafeAreaRegions.Container)
 		{
-			optimizedPageSettings = pageSettings;
+			return "Container (Respect notches/bars)";
 		}
 
-		// Optimize grid-level syntax when possible
-		var gridLeft = gridSettings.Left;
-		var gridTop = gridSettings.Top;
-		var gridRight = gridSettings.Right;
-		var gridBottom = gridSettings.Bottom;
-
-		SafeAreaEdges optimizedGridSettings;
-
-		// Test 1-value syntax (all edges same)
-		if (gridLeft == gridTop && gridTop == gridRight && gridRight == gridBottom)
-		{
-			optimizedGridSettings = new SafeAreaEdges(gridLeft);
-		}
-		// Test 2-value syntax (left/right same, top/bottom same)  
-		else if (gridLeft == gridRight && gridTop == gridBottom)
-		{
-			optimizedGridSettings = new SafeAreaEdges(gridLeft, gridTop);
-		}
-		// Use 4-value syntax
-		else
-		{
-			optimizedGridSettings = gridSettings;
-		}
-
-		// Apply the optimized settings to test different syntax formats
-		this.SafeAreaEdges = optimizedPageSettings;
-		ContentGrid.SafeAreaEdges = optimizedGridSettings;
-
-		// Update the label to show which syntax is being used
-		var pageSyntaxInfo = (pageLeft == pageTop && pageTop == pageRight && pageRight == pageBottom) ? " (1-value)" :
-							(pageLeft == pageRight && pageTop == pageBottom) ? " (2-value)" :
-							" (4-value)";
-
-		var gridSyntaxInfo = (gridLeft == gridTop && gridTop == gridRight && gridRight == gridBottom) ? " (1-value)" :
-							(gridLeft == gridRight && gridTop == gridBottom) ? " (2-value)" :
-							" (4-value)";
-
-		CurrentSettingsLabel.Text += $"\nPage{pageSyntaxInfo}, Grid{gridSyntaxInfo}";
+		// For mixed values, show individual edges
+		return $"Left:{edges.Left}, Top:{edges.Top}, Right:{edges.Right}, Bottom:{edges.Bottom}";
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28986.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28986.cs
index 25e42f3b3130..24d3ddf05524 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28986.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28986.cs
@@ -14,147 +14,70 @@ public Issue28986(TestDevice device) : base(device)
 
 		[Test]
 		[Category(UITestCategories.Layout)]
-		public void SafeAreaInitialStateIsCorrect()
+		public void SafeAreaMainGridBasicFunctionality()
 		{
-			// Verify initial state - all checkboxes should be unchecked
-			App.WaitForElement("TopCheckBox");
-			App.WaitForElement("LeftCheckBox");
-			App.WaitForElement("RightCheckBox");
-			App.WaitForElement("BottomCheckBox");
-
-			// Verify all checkboxes start unchecked (default behavior)
-			Assert.That(App.FindElement("TopCheckBox").GetAttribute<string>("checked"), Is.EqualTo("false"));
-			Assert.That(App.FindElement("LeftCheckBox").GetAttribute<string>("checked"), Is.EqualTo("false"));
-			Assert.That(App.FindElement("RightCheckBox").GetAttribute<string>("checked"), Is.EqualTo("false"));
-			Assert.That(App.FindElement("BottomCheckBox").GetAttribute<string>("checked"), Is.EqualTo("false"));
-
-			// Verify initial settings label contains all "Respect"
+			// 1. Test loads - verify essential elements are present
 			App.WaitForElement("CurrentSettings");
+			App.WaitForElement("GridResetNoneButton");
+			App.WaitForElement("GridSetContainerButton");
+			App.WaitForElement("GridResetAllButton");
+
+			// 2. Verify initial state - MainGrid should start with All (offset by safe area)
 			var initialSettings = App.FindElement("CurrentSettings").GetText();
-			Assert.That(initialSettings, Does.Contain("Left: Respect"));
-			Assert.That(initialSettings, Does.Contain("Top: Respect"));
-			Assert.That(initialSettings, Does.Contain("Right: Respect"));
-			Assert.That(initialSettings, Does.Contain("Bottom: Respect"));
-		}
+			Assert.That(initialSettings, Does.Contain("All (Full safe area)"));
 
-		[Test]
-		[Category(UITestCategories.Layout)]
-		public void SafeAreaIndividualCheckboxFunctionality()
-		{
-			App.WaitForElement("TopCheckBox");
-			App.WaitForElement("CurrentSettings");
+			// 3. Click button to set SafeAreaEdge to "None" on the MainGrid
+			App.Tap("GridResetNoneButton");
 
-			// Test Top checkbox
-			App.Tap("TopCheckBox");
-			var settingsAfterTop = App.FindElement("CurrentSettings").GetText();
-			Assert.That(settingsAfterTop, Does.Contain("Top: Ignore"));
-			Assert.That(settingsAfterTop, Does.Contain("Left: Respect"));
-			Assert.That(settingsAfterTop, Does.Contain("Right: Respect"));
-			Assert.That(settingsAfterTop, Does.Contain("Bottom: Respect"));
-
-			// Test Left checkbox
-			App.Tap("LeftCheckBox");
-			var settingsAfterLeft = App.FindElement("CurrentSettings").GetText();
-			Assert.That(settingsAfterLeft, Does.Contain("Top: Ignore"));
-			Assert.That(settingsAfterLeft, Does.Contain("Left: Ignore"));
-			Assert.That(settingsAfterLeft, Does.Contain("Right: Respect"));
-			Assert.That(settingsAfterLeft, Does.Contain("Bottom: Respect"));
-
-			// Test Right checkbox
-			App.Tap("RightCheckBox");
-			var settingsAfterRight = App.FindElement("CurrentSettings").GetText();
-			Assert.That(settingsAfterRight, Does.Contain("Top: Ignore"));
-			Assert.That(settingsAfterRight, Does.Contain("Left: Ignore"));
-			Assert.That(settingsAfterRight, Does.Contain("Right: Ignore"));
-			Assert.That(settingsAfterRight, Does.Contain("Bottom: Respect"));
-
-			// Test Bottom checkbox
-			App.Tap("BottomCheckBox");
-			var settingsAfterBottom = App.FindElement("CurrentSettings").GetText();
-			Assert.That(settingsAfterBottom, Does.Contain("Top: Ignore"));
-			Assert.That(settingsAfterBottom, Does.Contain("Left: Ignore"));
-			Assert.That(settingsAfterBottom, Does.Contain("Right: Ignore"));
-			Assert.That(settingsAfterBottom, Does.Contain("Bottom: Ignore"));
-		}
+			// 4. Verify it's flush with the screen and has zero offset
+			var noneSettings = App.FindElement("CurrentSettings").GetText();
+			Assert.That(noneSettings, Does.Contain("None (Edge-to-edge)"));
 
-		[Test]
-		[Category(UITestCategories.Layout)]
-		public void SafeAreaResetAllButtonFunctionality()
-		{
-			App.WaitForElement("ResetAllButton");
-			App.WaitForElement("CurrentSettings");
+			// 5. Click a button to set it to Container
+			App.Tap("GridSetContainerButton");
 
-			// Tap Reset All button
-			App.Tap("ResetAllButton");
-
-			// Verify all checkboxes are checked
-			Assert.That(App.FindElement("TopCheckBox").GetAttribute<string>("checked"), Is.EqualTo("true"));
-			Assert.That(App.FindElement("LeftCheckBox").GetAttribute<string>("checked"), Is.EqualTo("true"));
-			Assert.That(App.FindElement("RightCheckBox").GetAttribute<string>("checked"), Is.EqualTo("true"));
-			Assert.That(App.FindElement("BottomCheckBox").GetAttribute<string>("checked"), Is.EqualTo("true"));
-
-			// Verify settings label shows all "Ignore"
-			var settingsAfterReset = App.FindElement("CurrentSettings").GetText();
-			Assert.That(settingsAfterReset, Does.Contain("Left: Ignore"));
-			Assert.That(settingsAfterReset, Does.Contain("Top: Ignore"));
-			Assert.That(settingsAfterReset, Does.Contain("Right: Ignore"));
-			Assert.That(settingsAfterReset, Does.Contain("Bottom: Ignore"));
+			// 6. Verify that it is now offset again by the safe area
+			var containerSettings = App.FindElement("CurrentSettings").GetText();
+			Assert.That(containerSettings, Does.Contain("Container (Respect notches/bars)"));
 		}
 
 		[Test]
 		[Category(UITestCategories.Layout)]
-		public void SafeAreaResetNoneButtonFunctionality()
+		public void SafeAreaMainGridAllButtonFunctionality()
 		{
-			App.WaitForElement("ResetNoneButton");
+			App.WaitForElement("GridResetAllButton");
 			App.WaitForElement("CurrentSettings");
 
-			// First set some checkboxes to checked state
-			App.Tap("TopCheckBox");
-			App.Tap("LeftCheckBox");
-
-			// Tap Reset None button
-			App.Tap("ResetNoneButton");
-
-			// Verify all checkboxes are unchecked
-			Assert.That(App.FindElement("TopCheckBox").GetAttribute<string>("checked"), Is.EqualTo("false"));
-			Assert.That(App.FindElement("LeftCheckBox").GetAttribute<string>("checked"), Is.EqualTo("false"));
-			Assert.That(App.FindElement("RightCheckBox").GetAttribute<string>("checked"), Is.EqualTo("false"));
-			Assert.That(App.FindElement("BottomCheckBox").GetAttribute<string>("checked"), Is.EqualTo("false"));
-
-			// Verify settings label shows all "Respect"
-			var settingsAfterReset = App.FindElement("CurrentSettings").GetText();
-			Assert.That(settingsAfterReset, Does.Contain("Left: Respect"));
-			Assert.That(settingsAfterReset, Does.Contain("Top: Respect"));
-			Assert.That(settingsAfterReset, Does.Contain("Right: Respect"));
-			Assert.That(settingsAfterReset, Does.Contain("Bottom: Respect"));
+			// Test "All" button functionality
+			App.Tap("GridResetAllButton");
+
+			// Verify MainGrid is set to All
+			var allSettings = App.FindElement("CurrentSettings").GetText();
+			Assert.That(allSettings, Does.Contain("All (Full safe area)"));
 		}
 
 		[Test]
 		[Category(UITestCategories.Layout)]
-		public void SafeAreaSyntaxOptimizationTest()
+		public void SafeAreaMainGridSequentialButtonTesting()
 		{
 			App.WaitForElement("CurrentSettings");
 
-			// Test 1-value syntax (all edges same) - all ignore
-			App.Tap("ResetAllButton");
-			var allIgnoreSettings = App.FindElement("CurrentSettings").GetText();
-			Assert.That(allIgnoreSettings, Does.Contain("1-value syntax"));
-
-			// Test 1-value syntax (all edges same) - all respect
-			App.Tap("ResetNoneButton");
-			var allRespectSettings = App.FindElement("CurrentSettings").GetText();
-			Assert.That(allRespectSettings, Does.Contain("1-value syntax"));
-
-			// Test 2-value syntax (left/right same, top/bottom same)
-			App.Tap("LeftCheckBox");
-			App.Tap("RightCheckBox");
-			var twoValueSettings = App.FindElement("CurrentSettings").GetText();
-			Assert.That(twoValueSettings, Does.Contain("2-value syntax"));
-
-			// Test 4-value syntax (all different)
-			App.Tap("TopCheckBox");
-			var fourValueSettings = App.FindElement("CurrentSettings").GetText();
-			Assert.That(fourValueSettings, Does.Contain("4-value syntax"));
+			// Test sequence: All -> None -> Container -> All
+			App.Tap("GridResetAllButton");
+			var allSettings = App.FindElement("CurrentSettings").GetText();
+			Assert.That(allSettings, Does.Contain("All (Full safe area)"));
+
+			App.Tap("GridResetNoneButton");
+			var noneSettings = App.FindElement("CurrentSettings").GetText();
+			Assert.That(noneSettings, Does.Contain("None (Edge-to-edge)"));
+
+			App.Tap("GridSetContainerButton");
+			var containerSettings = App.FindElement("CurrentSettings").GetText();
+			Assert.That(containerSettings, Does.Contain("Container (Respect notches/bars)"));
+
+			App.Tap("GridResetAllButton");
+			var finalAllSettings = App.FindElement("CurrentSettings").GetText();
+			Assert.That(finalAllSettings, Does.Contain("All (Full safe area)"));
 		}
 	}
 }
\ No newline at end of file

From f5058c8fb5fe7e05f5b08842b9f9d23163b33343 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 25 Jul 2025 19:41:18 +0000
Subject: [PATCH 19/34] Make SafeAreaEdges a readonly struct

Co-authored-by: StephaneDelcroix <313003+StephaneDelcroix@users.noreply.github.com>
---
 src/Core/src/Primitives/SafeAreaEdges.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Core/src/Primitives/SafeAreaEdges.cs b/src/Core/src/Primitives/SafeAreaEdges.cs
index 751ac892d077..b3ceb6605105 100644
--- a/src/Core/src/Primitives/SafeAreaEdges.cs
+++ b/src/Core/src/Primitives/SafeAreaEdges.cs
@@ -7,7 +7,7 @@ namespace Microsoft.Maui
 	/// Represents safe area settings for each edge of a layout or visual element.
 	/// </summary>
 	[TypeConverter(typeof(Converters.SafeAreaEdgesTypeConverter))]
-	public struct SafeAreaEdges : IEquatable<SafeAreaEdges>
+	public readonly struct SafeAreaEdges : IEquatable<SafeAreaEdges>
 	{
 		/// <summary>
 		/// Gets the safe area behavior for the left edge.

From 97dbe7884a4881b266e6fb9637bc33c57a9bf727 Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Fri, 25 Jul 2025 14:53:11 -0500
Subject: [PATCH 20/34] - fix test

---
 .../TestCases.HostApp/Issues/Issue28986.xaml  |  6 +++---
 .../Tests/Issues/Issue28986.cs                | 19 ++++++-------------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml
index ac5bded3505c..4e8413baef7d 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml
@@ -5,9 +5,9 @@
              x:Name="TestPage"
              Title="SafeArea Test">
     
-    <Grid x:Name="MainGrid" BackgroundColor="Red" SafeAreaEdges="All">
+    <Grid x:Name="MainGrid" BackgroundColor="Red" SafeAreaEdges="All" AutomationId="MainGrid">
         <!-- Single content grid that spans the entire screen -->
-        <Grid x:Name="ContentGrid">
+        <Grid x:Name="ContentGrid" SafeAreaEdges="None" AutomationId="ContentGrid">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="*" />
@@ -15,7 +15,7 @@
             </Grid.RowDefinitions>
             
             <!-- Top test area - should move in/out of notch area -->
-            <Border Grid.Row="0" BackgroundColor="Yellow" Stroke="Orange" StrokeThickness="3" Padding="10">
+            <Border Grid.Row="0" BackgroundColor="Yellow" Stroke="Orange" StrokeThickness="3" Padding="10" SafeAreaEdges="None">
                 <Label Text="TOP TEST AREA: This should move in/out of notch/status bar area when safe area is toggled"
                        FontSize="14"
                        FontAttributes="Bold"
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28986.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28986.cs
index 24d3ddf05524..888bff504ad2 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28986.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28986.cs
@@ -17,28 +17,21 @@ public Issue28986(TestDevice device) : base(device)
 		public void SafeAreaMainGridBasicFunctionality()
 		{
 			// 1. Test loads - verify essential elements are present
-			App.WaitForElement("CurrentSettings");
-			App.WaitForElement("GridResetNoneButton");
-			App.WaitForElement("GridSetContainerButton");
-			App.WaitForElement("GridResetAllButton");
+			App.WaitForElement("ContentGrid");
 
 			// 2. Verify initial state - MainGrid should start with All (offset by safe area)
 			var initialSettings = App.FindElement("CurrentSettings").GetText();
 			Assert.That(initialSettings, Does.Contain("All (Full safe area)"));
 
+
+			var safePosition = App.WaitForElement("ContentGrid").GetRect();
 			// 3. Click button to set SafeAreaEdge to "None" on the MainGrid
 			App.Tap("GridResetNoneButton");
 
-			// 4. Verify it's flush with the screen and has zero offset
-			var noneSettings = App.FindElement("CurrentSettings").GetText();
-			Assert.That(noneSettings, Does.Contain("None (Edge-to-edge)"));
+			var unSafePosition = App.WaitForElement("ContentGrid").GetRect();
 
-			// 5. Click a button to set it to Container
-			App.Tap("GridSetContainerButton");
-
-			// 6. Verify that it is now offset again by the safe area
-			var containerSettings = App.FindElement("CurrentSettings").GetText();
-			Assert.That(containerSettings, Does.Contain("Container (Respect notches/bars)"));
+			Assert.That(unSafePosition.Y, Is.EqualTo(0), "ContentGrid Y position should be 0 when SafeAreaEdges is set to None");
+			Assert.That(safePosition.Y, Is.Not.EqualTo(0), "ContentGrid Y position should not be 0 when SafeAreaEdges is set to All");
 		}
 
 		[Test]

From 5fae9009a2622c97f203ec5685773a6d9f796f45 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 25 Jul 2025 20:09:43 +0000
Subject: [PATCH 21/34] Fix SafeArea UI tests to validate actual screen
 positioning instead of just text content

Co-authored-by: PureWeen <5375137+PureWeen@users.noreply.github.com>
---
 .../Tests/Issues/Issue28986.cs                | 27 +++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28986.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28986.cs
index 888bff504ad2..d26d64fb4a0a 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28986.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28986.cs
@@ -39,38 +39,61 @@ public void SafeAreaMainGridBasicFunctionality()
 		public void SafeAreaMainGridAllButtonFunctionality()
 		{
 			App.WaitForElement("GridResetAllButton");
-			App.WaitForElement("CurrentSettings");
+			App.WaitForElement("ContentGrid");
+
+			// First set to None to establish baseline position
+			App.Tap("GridResetNoneButton");
+			var nonePosition = App.WaitForElement("ContentGrid").GetRect();
 
 			// Test "All" button functionality
 			App.Tap("GridResetAllButton");
+			var allPosition = App.WaitForElement("ContentGrid").GetRect();
 
 			// Verify MainGrid is set to All
 			var allSettings = App.FindElement("CurrentSettings").GetText();
 			Assert.That(allSettings, Does.Contain("All (Full safe area)"));
+
+			// Verify position changes - All should offset content away from screen edges
+			Assert.That(allPosition.Y, Is.Not.EqualTo(0), "ContentGrid Y position should not be 0 when SafeAreaEdges is set to All");
+			Assert.That(allPosition.Y, Is.GreaterThan(nonePosition.Y), "ContentGrid should be positioned lower when SafeAreaEdges is All vs None");
 		}
 
 		[Test]
 		[Category(UITestCategories.Layout)]
 		public void SafeAreaMainGridSequentialButtonTesting()
 		{
+			App.WaitForElement("ContentGrid");
 			App.WaitForElement("CurrentSettings");
 
-			// Test sequence: All -> None -> Container -> All
+			// Test sequence: All -> None -> Container -> All with position validation
+			
+			// 1. Set to All and capture position
 			App.Tap("GridResetAllButton");
+			var allPosition = App.WaitForElement("ContentGrid").GetRect();
 			var allSettings = App.FindElement("CurrentSettings").GetText();
 			Assert.That(allSettings, Does.Contain("All (Full safe area)"));
 
+			// 2. Set to None and verify position changes
 			App.Tap("GridResetNoneButton");
+			var nonePosition = App.WaitForElement("ContentGrid").GetRect();
 			var noneSettings = App.FindElement("CurrentSettings").GetText();
 			Assert.That(noneSettings, Does.Contain("None (Edge-to-edge)"));
+			Assert.That(nonePosition.Y, Is.EqualTo(0), "ContentGrid Y position should be 0 when SafeAreaEdges is None (edge-to-edge)");
+			Assert.That(allPosition.Y, Is.GreaterThan(nonePosition.Y), "All position should be lower than None position");
 
+			// 3. Set to Container and verify position changes
 			App.Tap("GridSetContainerButton");
+			var containerPosition = App.WaitForElement("ContentGrid").GetRect();
 			var containerSettings = App.FindElement("CurrentSettings").GetText();
 			Assert.That(containerSettings, Does.Contain("Container (Respect notches/bars)"));
+			Assert.That(containerPosition.Y, Is.GreaterThan(nonePosition.Y), "Container position should be lower than None position");
 
+			// 4. Return to All and verify position matches original
 			App.Tap("GridResetAllButton");
+			var finalAllPosition = App.WaitForElement("ContentGrid").GetRect();
 			var finalAllSettings = App.FindElement("CurrentSettings").GetText();
 			Assert.That(finalAllSettings, Does.Contain("All (Full safe area)"));
+			Assert.That(finalAllPosition.Y, Is.EqualTo(allPosition.Y), "Final All position should match initial All position");
 		}
 	}
 }
\ No newline at end of file

From 5c72da1bae926b3c608a6028eca1f5030ae220b1 Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Fri, 25 Jul 2025 18:17:49 -0500
Subject: [PATCH 22/34] - fix up defaults

---
 src/Controls/src/Core/Border/Border.cs                |  2 +-
 src/Controls/src/Core/ContentPage/ContentPage.cs      |  2 +-
 src/Controls/src/Core/ContentView/ContentView.cs      |  2 +-
 src/Controls/src/Core/Layout/Layout.cs                |  2 +-
 .../TestCases.Shared.Tests/Tests/Issues/Issue28986.cs |  4 +++-
 .../SwipeItemView/SwipeItemViewHandler.iOS.cs         |  1 +
 .../src/Handlers/SwipeView/SwipeViewHandler.iOS.cs    |  1 +
 src/Core/src/Platform/iOS/MauiView.cs                 |  2 +-
 src/Core/src/Primitives/SafeAreaEdges.cs              | 11 ++++++++---
 9 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/Controls/src/Core/Border/Border.cs b/src/Controls/src/Core/Border/Border.cs
index 6263b2fbb342..b7f6b5804cfa 100644
--- a/src/Controls/src/Core/Border/Border.cs
+++ b/src/Controls/src/Core/Border/Border.cs
@@ -366,7 +366,7 @@ SafeAreaRegions ISafeAreaView2.GetSafeAreaRegionsForEdge(int edge)
 
 		SafeAreaEdges ISafeAreaElement.SafeAreaEdgesDefaultValueCreator()
 		{
-			return SafeAreaEdges.Default;
+			return SafeAreaEdges.None;
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/src/Core/ContentPage/ContentPage.cs b/src/Controls/src/Core/ContentPage/ContentPage.cs
index 73e5e59fcdcb..8968f1a09c4d 100644
--- a/src/Controls/src/Core/ContentPage/ContentPage.cs
+++ b/src/Controls/src/Core/ContentPage/ContentPage.cs
@@ -193,7 +193,7 @@ SafeAreaRegions ISafeAreaView2.GetSafeAreaRegionsForEdge(int edge)
 
 		SafeAreaEdges ISafeAreaElement.SafeAreaEdgesDefaultValueCreator()
 		{
-			return SafeAreaEdges.Default;
+			return SafeAreaEdges.None;
 		}
 
 		private protected override string GetDebuggerDisplay()
diff --git a/src/Controls/src/Core/ContentView/ContentView.cs b/src/Controls/src/Core/ContentView/ContentView.cs
index 7728e3f10413..7438c52d60cb 100644
--- a/src/Controls/src/Core/ContentView/ContentView.cs
+++ b/src/Controls/src/Core/ContentView/ContentView.cs
@@ -70,7 +70,7 @@ internal override void SetChildInheritedBindingContext(Element child, object con
 
 		SafeAreaEdges ISafeAreaElement.SafeAreaEdgesDefaultValueCreator()
 		{
-			return SafeAreaEdges.Default;
+			return SafeAreaEdges.None;
 		}
 
 		private protected override string GetDebuggerDisplay()
diff --git a/src/Controls/src/Core/Layout/Layout.cs b/src/Controls/src/Core/Layout/Layout.cs
index 56eebb580111..cc2816f3bac2 100644
--- a/src/Controls/src/Core/Layout/Layout.cs
+++ b/src/Controls/src/Core/Layout/Layout.cs
@@ -371,7 +371,7 @@ Thickness IPaddingElement.PaddingDefaultValueCreator()
 
 		SafeAreaEdges ISafeAreaElement.SafeAreaEdgesDefaultValueCreator()
 		{
-			return SafeAreaEdges.Default;
+			return SafeAreaEdges.Container;
 		}
 
 		public Graphics.Size CrossPlatformMeasure(double widthConstraint, double heightConstraint)
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28986.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28986.cs
index d26d64fb4a0a..ecadba015535 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28986.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28986.cs
@@ -1,3 +1,4 @@
+#if IOS
 using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
@@ -96,4 +97,5 @@ public void SafeAreaMainGridSequentialButtonTesting()
 			Assert.That(finalAllPosition.Y, Is.EqualTo(allPosition.Y), "Final All position should match initial All position");
 		}
 	}
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file
diff --git a/src/Core/src/Handlers/SwipeItemView/SwipeItemViewHandler.iOS.cs b/src/Core/src/Handlers/SwipeItemView/SwipeItemViewHandler.iOS.cs
index 747a390f1f69..4d0dc435bfca 100644
--- a/src/Core/src/Handlers/SwipeItemView/SwipeItemViewHandler.iOS.cs
+++ b/src/Core/src/Handlers/SwipeItemView/SwipeItemViewHandler.iOS.cs
@@ -20,6 +20,7 @@ public override void SetVirtualView(IView view)
 			_ = PlatformView ?? throw new InvalidOperationException($"{nameof(PlatformView)} should have been set by base class.");
 
 			PlatformView.CrossPlatformLayout = VirtualView;
+			PlatformView.View = VirtualView;
 		}
 
 		void UpdateContent()
diff --git a/src/Core/src/Handlers/SwipeView/SwipeViewHandler.iOS.cs b/src/Core/src/Handlers/SwipeView/SwipeViewHandler.iOS.cs
index b76ec173d5b3..3dd5b216a5a3 100644
--- a/src/Core/src/Handlers/SwipeView/SwipeViewHandler.iOS.cs
+++ b/src/Core/src/Handlers/SwipeView/SwipeViewHandler.iOS.cs
@@ -12,6 +12,7 @@ public override void SetVirtualView(IView view)
 			_ = PlatformView ?? throw new InvalidOperationException($"{nameof(PlatformView)} should have been set by base class.");
 
 			PlatformView.CrossPlatformLayout = VirtualView;
+			PlatformView.View = VirtualView;
 		}
 
 		public static void MapContent(ISwipeViewHandler handler, ISwipeView view)
diff --git a/src/Core/src/Platform/iOS/MauiView.cs b/src/Core/src/Platform/iOS/MauiView.cs
index 5b174a9c5813..ef82a2e052d6 100644
--- a/src/Core/src/Platform/iOS/MauiView.cs
+++ b/src/Core/src/Platform/iOS/MauiView.cs
@@ -133,7 +133,7 @@ SafeAreaRegions GetSafeAreaRegionForEdge(int edge)
 				return sav.IgnoreSafeArea ? SafeAreaRegions.None : SafeAreaRegions.Container;
 			}
 			
-			return SafeAreaRegions.Container; // Default: respect safe area
+			return SafeAreaRegions.None;
 		}
 
 		static double GetSafeAreaForEdge(SafeAreaRegions safeAreaRegion, double originalSafeArea)
diff --git a/src/Core/src/Primitives/SafeAreaEdges.cs b/src/Core/src/Primitives/SafeAreaEdges.cs
index b3ceb6605105..709e86fe73ed 100644
--- a/src/Core/src/Primitives/SafeAreaEdges.cs
+++ b/src/Core/src/Primitives/SafeAreaEdges.cs
@@ -89,17 +89,22 @@ public SafeAreaRegions GetEdge(int edge)
 		/// <summary>
 		/// A <see cref="SafeAreaEdges"/> with all edges set to <see cref="SafeAreaRegions.None"/>.
 		/// </summary>
-		public static SafeAreaEdges Default => new(SafeAreaRegions.Default);
+		public static SafeAreaEdges Default { get; } = new(SafeAreaRegions.Default);
 
 		/// <summary>
 		/// A <see cref="SafeAreaEdges"/> with all edges set to <see cref="SafeAreaRegions.None"/>.
 		/// </summary>
-		public static SafeAreaEdges None => new(SafeAreaRegions.None);
+		public static SafeAreaEdges None { get; } = new(SafeAreaRegions.None);
 
 		/// <summary>
 		/// A <see cref="SafeAreaEdges"/> with all edges set to <see cref="SafeAreaRegions.All"/>.
 		/// </summary>
-		public static SafeAreaEdges All => new(SafeAreaRegions.All);
+		public static SafeAreaEdges All { get; } = new(SafeAreaRegions.All);
+
+		/// <summary>
+		/// A <see cref="SafeAreaEdges"/> with all edges set to <see cref="SafeAreaRegions.All"/>.
+		/// </summary>
+		internal static SafeAreaEdges Container { get; } = new(SafeAreaRegions.Container);
 
 		public static bool operator ==(SafeAreaEdges left, SafeAreaEdges right)
 		{

From f77577e14473d31a5bf869f7b2f82beaff50869e Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Fri, 25 Jul 2025 19:48:48 -0500
Subject: [PATCH 23/34] - fix edge case

---
 src/Core/src/Platform/iOS/MauiScrollView.cs | 35 +++++++++++++++++++++
 src/Core/src/Platform/iOS/MauiView.cs       |  6 ++--
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/src/Core/src/Platform/iOS/MauiScrollView.cs b/src/Core/src/Platform/iOS/MauiScrollView.cs
index f479c6bcda64..241a10c84175 100644
--- a/src/Core/src/Platform/iOS/MauiScrollView.cs
+++ b/src/Core/src/Platform/iOS/MauiScrollView.cs
@@ -399,6 +399,41 @@ Size CrossPlatformArrange(CGRect bounds)
 			else
 			{
 				contentSize = CrossPlatformLayout?.CrossPlatformArrange(new Rect(new Point(), bounds.Size.ToSize())) ?? Size.Zero;
+
+				var width = contentSize.Width;
+				var height = contentSize.Height;
+
+				// When using ContentInsetAdjustmentBehavior.Automatic, UIKit dynamically decides whether to apply 
+				// safe area insets to the scroll view (via AdjustedContentInset) or to push them into the child view's SafeAreaInsets.
+				// This decision depends on whether the scroll view is considered "scrollable"—i.e., whether the contentSize 
+				// is larger than the visible bounds (after accounting for safe areas).
+				//
+				// If the content size is *just* smaller than or equal to the scroll view’s bounds, UIKit may decide that
+				// scrolling isn’t needed and push the safe area insets into the child instead. This can cause:
+				//   - content centering to behave incorrectly (e.g., not respecting safe areas),
+				//   - layout loops where the child resizes in response to changing safe area insets,
+				//   - instability when transitioning between scrollable and non-scrollable states.
+				//
+				// This logic adds safe area padding to the contentSize *only if* the content is nearly large enough to require scrolling,
+				// ensuring the scroll view remains in "scrollable mode" and keeps safe area insets at the scroll view level.
+				// This avoids inset flip-flopping and keeps layout behavior stable and predictable.
+				if (ContentInsetAdjustmentBehavior == UIScrollViewContentInsetAdjustmentBehavior.Automatic)
+				{
+					// If the content size is smaller than the bounds, we need to adjust it to fit within the safe area
+					if (width <= Bounds.Width &&
+						(_safeArea.HorizontalThickness + width) > Bounds.Width)
+					{
+						width += _safeArea.HorizontalThickness;
+					}
+
+					if (height <= Bounds.Height &&
+						(_safeArea.VerticalThickness + height) > Bounds.Height)
+					{
+						height += _safeArea.VerticalThickness;
+					}
+
+					contentSize = new Size(width, height);
+				}
 			}
 
 			// For Right-To-Left (RTL) layouts, we need to adjust the content arrangement and offset
diff --git a/src/Core/src/Platform/iOS/MauiView.cs b/src/Core/src/Platform/iOS/MauiView.cs
index ef82a2e052d6..869459cdb732 100644
--- a/src/Core/src/Platform/iOS/MauiView.cs
+++ b/src/Core/src/Platform/iOS/MauiView.cs
@@ -103,7 +103,7 @@ public IView? View
 		bool RespondsToSafeArea()
 		{
 			if (_scrollViewDescendant.HasValue)
-				return _scrollViewDescendant.Value;
+				return !_scrollViewDescendant.Value;
 
 			// iOS sets AdjustedContentInset on UIScrollView only when the ContentSize exceeds the ScrollView's Bounds.
 			// If ContentSize is smaller, AdjustedContentInset is zero, and SafeAreaInsets are applied to child views instead.
@@ -116,8 +116,8 @@ bool RespondsToSafeArea()
 			//
 			// For more details and implementation specifics, see MauiScrollView.cs, which contains the logic for safe area management
 			// within scroll views and explains how this interacts with the overall layout system.
-			_scrollViewDescendant = Superview.GetParentOfType<UIScrollView>() is null;
-			return _scrollViewDescendant.Value;
+			_scrollViewDescendant = this.GetParentOfType<UIScrollView>() is not null;
+			return !_scrollViewDescendant.Value;
 		}
 
 		SafeAreaRegions GetSafeAreaRegionForEdge(int edge)

From da577bd610e6e3d114dae75d5f4257a1aaa099b4 Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Sat, 26 Jul 2025 07:00:17 -0500
Subject: [PATCH 24/34] - fix tests and defaults

---
 src/Controls/src/Core/Layout/Layout.cs        |  9 +++
 .../tests/Core.UnitTests/SafeAreaTests.cs     | 67 ++++++++-----------
 .../Elements/Shell/ShellTests.iOS.cs          |  4 +-
 src/Core/src/Primitives/SafeAreaRegions.cs    |  8 +--
 .../net-android/PublicAPI.Unshipped.txt       |  4 +-
 .../PublicAPI/net-ios/PublicAPI.Unshipped.txt |  4 +-
 .../net-maccatalyst/PublicAPI.Unshipped.txt   |  4 +-
 .../net-windows/PublicAPI.Unshipped.txt       |  4 +-
 .../src/PublicAPI/net/PublicAPI.Unshipped.txt |  4 +-
 .../netstandard/PublicAPI.Unshipped.txt       |  4 +-
 .../netstandard2.0/PublicAPI.Unshipped.txt    |  4 +-
 11 files changed, 57 insertions(+), 59 deletions(-)

diff --git a/src/Controls/src/Core/Layout/Layout.cs b/src/Controls/src/Core/Layout/Layout.cs
index cc2816f3bac2..14e83aa3e1b9 100644
--- a/src/Controls/src/Core/Layout/Layout.cs
+++ b/src/Controls/src/Core/Layout/Layout.cs
@@ -429,6 +429,15 @@ SafeAreaRegions ISafeAreaView2.GetSafeAreaRegionsForEdge(int edge)
 				return SafeAreaRegions.Container;
 			}
 
+#pragma warning disable CS0618 // Type or member is obsolete
+			// By default this is false so if someone sets this to true, we return None for all edges
+			if (IgnoreSafeArea)
+			{
+				// If IgnoreSafeArea is set, we return None for all edges
+				return SafeAreaRegions.None;
+			}
+#pragma warning restore CS0618 // Type or member is obsolete
+
 			// For Layout views, never return the old Default - return None instead
 			// (since Default no longer exists in the new enum)
 			return regionForEdge;
diff --git a/src/Controls/tests/Core.UnitTests/SafeAreaTests.cs b/src/Controls/tests/Core.UnitTests/SafeAreaTests.cs
index b385b5d6371b..d68cd4138ef7 100644
--- a/src/Controls/tests/Core.UnitTests/SafeAreaTests.cs
+++ b/src/Controls/tests/Core.UnitTests/SafeAreaTests.cs
@@ -15,7 +15,7 @@ public void GetEdges_DefaultValue_ReturnsDefault()
 
 			var result = layout.SafeAreaEdges;
 
-			Assert.Equal(SafeAreaEdges.Default, result);
+			Assert.Equal(SafeAreaEdges.Container, result);
 		}
 
 		[Fact]
@@ -148,17 +148,6 @@ public void SafeAreaEdges_GetEdge_ReturnsCorrectValues()
 			Assert.Equal(SafeAreaRegions.None, edges.GetEdge(4));  // Invalid
 		}
 
-		[Fact]
-		public void SafeAreaEdges_GetEdge_ReturnsCorrectValues()
-		{
-			var edges = new SafeAreaEdges(SafeAreaRegions.All, SafeAreaRegions.None, SafeAreaRegions.All, SafeAreaRegions.None);
-
-			Assert.Equal(SafeAreaRegions.All, edges.GetEdge(0)); // Left
-			Assert.Equal(SafeAreaRegions.None, edges.GetEdge(1)); // Top
-			Assert.Equal(SafeAreaRegions.All, edges.GetEdge(2)); // Right
-			Assert.Equal(SafeAreaRegions.None, edges.GetEdge(3)); // Bottom
-		}
-
 		[Fact]
 		public void SafeAreaEdges_StaticProperties_ReturnCorrectValues()
 		{
@@ -188,9 +177,9 @@ public void SafeAreaEdges_ToString_FormatsCorrectly()
 			var fourValue = new SafeAreaEdges(SafeAreaRegions.All, SafeAreaRegions.None, SafeAreaRegions.All, SafeAreaRegions.None);
 			var asymmetric = new SafeAreaEdges(SafeAreaRegions.All, SafeAreaRegions.None, SafeAreaRegions.None, SafeAreaRegions.All);
 
-			Assert.Equal("All", uniform.ToString());
-			Assert.Equal("All, None", twoValue.ToString());
-			Assert.Equal("All, None", fourValue.ToString()); // Optimized: Left==Right, Top==Bottom
+			Assert.Equal("All, All, All, All", uniform.ToString());
+			Assert.Equal("All, None, All, None", twoValue.ToString());
+			Assert.Equal("All, None, All, None", fourValue.ToString()); // Optimized: Left==Right, Top==Bottom
 			Assert.Equal("All, None, None, All", asymmetric.ToString()); // No optimization possible
 		}
 
@@ -228,10 +217,10 @@ public void Layout_GetSafeAreaRegionsForEdge_FallsBackToLegacyProperty()
 			// IgnoreSafeArea = true should result in SafeAreaRegions.None (edge-to-edge)
 			var safeAreaView2 = (ISafeAreaView2)layout;
 
-			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(0));
-			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(1));
-			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(2));
-			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(3));
+			Assert.Equal(SafeAreaRegions.Container, safeAreaView2.GetSafeAreaRegionsForEdge(0));
+			Assert.Equal(SafeAreaRegions.Container, safeAreaView2.GetSafeAreaRegionsForEdge(1));
+			Assert.Equal(SafeAreaRegions.Container, safeAreaView2.GetSafeAreaRegionsForEdge(2));
+			Assert.Equal(SafeAreaRegions.Container, safeAreaView2.GetSafeAreaRegionsForEdge(3));
 		}
 
 		[Fact]
@@ -415,7 +404,7 @@ public void SafeAreaEdgesTypeConverter_ConvertToString()
 
 			var result = converter.ConvertTo(null, null, edges, typeof(string));
 
-			Assert.Equal("None, Container", result);
+			Assert.Equal("None, Container, None, Container", result);
 		}
 
 		[Fact]
@@ -474,8 +463,8 @@ public void SafeAreaEdges_EnumBitValues_AreUnique()
 			Assert.Equal(0, (int)SafeAreaRegions.None);
 			Assert.Equal(1, (int)SafeAreaRegions.SoftInput);
 			Assert.Equal(2, (int)SafeAreaRegions.Container);
-			Assert.Equal(4, (int)SafeAreaRegions.Default);
-			Assert.Equal(int.MaxValue, (int)SafeAreaRegions.All);
+			Assert.Equal(-1, (int)SafeAreaRegions.Default);
+			Assert.Equal(32768, (int)SafeAreaRegions.All);
 		}
 
 		[Fact]
@@ -501,7 +490,7 @@ public void SafeAreaEdges_TypeConverterWithBinding_SimulatedConversion()
 
 			// Test that conversion back to string works (for two-way binding)
 			var backToString = converter.ConvertTo(null, null, SafeAreaEdges.All, typeof(string));
-			Assert.Equal("All", backToString);
+			Assert.Equal("All, All, All, All", backToString);
 		}
 
 		[Fact]
@@ -531,10 +520,10 @@ public void HorizontalStackLayout_BehavesLikeRegularLayout()
 			// Should behave like regular layout with default SafeAreaEdges.None (edge-to-edge)
 			var safeAreaView2 = (ISafeAreaView2)stackLayout;
 
-			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(0)); // Left
-			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(1)); // Top
-			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(2)); // Right
-			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(3)); // Bottom
+			Assert.Equal(SafeAreaRegions.Container, safeAreaView2.GetSafeAreaRegionsForEdge(0)); // Left
+			Assert.Equal(SafeAreaRegions.Container, safeAreaView2.GetSafeAreaRegionsForEdge(1)); // Top
+			Assert.Equal(SafeAreaRegions.Container, safeAreaView2.GetSafeAreaRegionsForEdge(2)); // Right
+			Assert.Equal(SafeAreaRegions.Container, safeAreaView2.GetSafeAreaRegionsForEdge(3)); // Bottom
 		}
 
 		[Fact]
@@ -561,10 +550,10 @@ public void VerticalStackLayout_BehavesLikeRegularLayout()
 			// Should behave like regular layout with default SafeAreaEdges.None (edge-to-edge)
 			var safeAreaView2 = (ISafeAreaView2)stackLayout;
 
-			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(0)); // Left
-			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(1)); // Top
-			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(2)); // Right
-			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(3)); // Bottom
+			Assert.Equal(SafeAreaRegions.Container, safeAreaView2.GetSafeAreaRegionsForEdge(0)); // Left
+			Assert.Equal(SafeAreaRegions.Container, safeAreaView2.GetSafeAreaRegionsForEdge(1)); // Top
+			Assert.Equal(SafeAreaRegions.Container, safeAreaView2.GetSafeAreaRegionsForEdge(2)); // Right
+			Assert.Equal(SafeAreaRegions.Container, safeAreaView2.GetSafeAreaRegionsForEdge(3)); // Bottom
 		}
 
 		[Fact]
@@ -575,10 +564,10 @@ public void StackLayout_HorizontalOrientation_BehavesLikeRegularLayout_LTR()
 			// Should behave like regular layout with default SafeAreaEdges.None (edge-to-edge)
 			var safeAreaView2 = (ISafeAreaView2)stackLayout;
 
-			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(0)); // Left
-			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(1)); // Top
-			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(2)); // Right
-			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(3)); // Bottom
+			Assert.Equal(SafeAreaRegions.Container, safeAreaView2.GetSafeAreaRegionsForEdge(0)); // Left
+			Assert.Equal(SafeAreaRegions.Container, safeAreaView2.GetSafeAreaRegionsForEdge(1)); // Top
+			Assert.Equal(SafeAreaRegions.Container, safeAreaView2.GetSafeAreaRegionsForEdge(2)); // Right
+			Assert.Equal(SafeAreaRegions.Container, safeAreaView2.GetSafeAreaRegionsForEdge(3)); // Bottom
 		}
 
 		[Fact]
@@ -605,10 +594,10 @@ public void StackLayout_VerticalOrientation_BehavesLikeRegularLayout()
 			// Should behave like regular layout with default SafeAreaEdges.None (edge-to-edge)
 			var safeAreaView2 = (ISafeAreaView2)stackLayout;
 
-			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(0)); // Left
-			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(1)); // Top
-			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(2)); // Right
-			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(3)); // Bottom
+			Assert.Equal(SafeAreaRegions.Container, safeAreaView2.GetSafeAreaRegionsForEdge(0)); // Left
+			Assert.Equal(SafeAreaRegions.Container, safeAreaView2.GetSafeAreaRegionsForEdge(1)); // Top
+			Assert.Equal(SafeAreaRegions.Container, safeAreaView2.GetSafeAreaRegionsForEdge(2)); // Right
+			Assert.Equal(SafeAreaRegions.Container, safeAreaView2.GetSafeAreaRegionsForEdge(3)); // Bottom
 		}
 
 		[Fact]
diff --git a/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.iOS.cs b/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.iOS.cs
index bb8376d2c1da..7c06a5a0350f 100644
--- a/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.iOS.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.iOS.cs
@@ -90,8 +90,8 @@ public async Task SafeAreaBehaviorConsistency(bool useNewApi)
 
 			if (useNewApi)
 			{
-				SafeArea.SetIgnore(pageWithTopTabs, SafeAreaEdges.None);
-				SafeArea.SetIgnore(pageWithoutTopTabs, SafeAreaEdges.None);
+				pageWithTopTabs.SafeAreaEdges = SafeAreaEdges.Container;
+				pageWithoutTopTabs.SafeAreaEdges = SafeAreaEdges.Container;
 			}
 			else
 			{
diff --git a/src/Core/src/Primitives/SafeAreaRegions.cs b/src/Core/src/Primitives/SafeAreaRegions.cs
index 7d1b5942b1b9..68ad41fb8428 100644
--- a/src/Core/src/Primitives/SafeAreaRegions.cs
+++ b/src/Core/src/Primitives/SafeAreaRegions.cs
@@ -16,22 +16,22 @@ public enum SafeAreaRegions
 		/// <summary>
 		/// Always pad so content doesn't go under the soft input/keyboard.
 		/// </summary>
-		SoftInput = 1,
+		SoftInput = 1 << 0,
 
 		/// <summary>
 		/// Content flows under keyboard but stays out of top and bottom bars and notch.
 		/// </summary>
-		Container = 2,
+		Container = 1 << 1,
 
 		/// <summary>
 		/// Default behavior - apply platform safe area insets.
 		/// </summary>
-		Default = 4,
+		Default = -1,
 
 		/// <summary>
 		/// Obey all safe area insets - content will be positioned only in the safe area.
 		/// This includes top and bottom bars, notch, and keyboard.
 		/// </summary>
-		All = Container | SoftInput
+		All = 1 << 15
 	}
 }
\ 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 1f1f0fc8d2e7..be62de76bfe1 100644
--- a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -64,9 +64,9 @@ Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions left,
 Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions uniformValue) -> void
 Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.All = Microsoft.Maui.SafeAreaRegions.SoftInput | Microsoft.Maui.SafeAreaRegions.Container -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.All = 32768 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.Default = 4 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Default = -1 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.None = 0 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.SoftInput = 1 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.ScrollToRequest.Deconstruct(out double HorizontalOffset, out double VerticalOffset, out bool Instant) -> void
diff --git a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index aeb3115edcc9..92937a903e1d 100644
--- a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -68,9 +68,9 @@ Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions left,
 Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions uniformValue) -> void
 Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.All = Microsoft.Maui.SafeAreaRegions.SoftInput | Microsoft.Maui.SafeAreaRegions.Container -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.All = 32768 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.Default = 4 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Default = -1 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.None = 0 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.SoftInput = 1 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.ScrollToRequest.Deconstruct(out double HorizontalOffset, out double VerticalOffset, out bool Instant) -> void
diff --git a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index 165055fa4309..225c1f50268f 100644
--- a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -70,9 +70,9 @@ Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions left,
 Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions uniformValue) -> void
 Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.All = Microsoft.Maui.SafeAreaRegions.SoftInput | Microsoft.Maui.SafeAreaRegions.Container -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.All = 32768 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.Default = 4 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Default = -1 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.None = 0 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.SoftInput = 1 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.ScrollToRequest.Deconstruct(out double HorizontalOffset, out double VerticalOffset, out bool Instant) -> void
diff --git a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index 585b1f998bb4..e53631e5ecdc 100644
--- a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -61,9 +61,9 @@ Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions left,
 Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions uniformValue) -> void
 Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.All = Microsoft.Maui.SafeAreaRegions.SoftInput | Microsoft.Maui.SafeAreaRegions.Container -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.All = 32768 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.Default = 4 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Default = -1 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.None = 0 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.SoftInput = 1 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.ScrollToRequest.Deconstruct(out double HorizontalOffset, out double VerticalOffset, out bool Instant) -> void
diff --git a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
index cd4975fc3d7a..021f0f469af6 100644
--- a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -58,9 +58,9 @@ Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions left,
 Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions uniformValue) -> void
 Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.All = Microsoft.Maui.SafeAreaRegions.SoftInput | Microsoft.Maui.SafeAreaRegions.Container -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.All = 32768 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.Default = 4 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Default = -1 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.None = 0 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.SoftInput = 1 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.ScrollToRequest.Deconstruct(out double HorizontalOffset, out double VerticalOffset, out bool Instant) -> void
diff --git a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
index cd4975fc3d7a..021f0f469af6 100644
--- a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -58,9 +58,9 @@ Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions left,
 Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions uniformValue) -> void
 Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.All = Microsoft.Maui.SafeAreaRegions.SoftInput | Microsoft.Maui.SafeAreaRegions.Container -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.All = 32768 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.Default = 4 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Default = -1 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.None = 0 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.SoftInput = 1 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.ScrollToRequest.Deconstruct(out double HorizontalOffset, out double VerticalOffset, out bool Instant) -> void
diff --git a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
index cd4975fc3d7a..021f0f469af6 100644
--- a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
@@ -58,9 +58,9 @@ Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions left,
 Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions uniformValue) -> void
 Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.All = Microsoft.Maui.SafeAreaRegions.SoftInput | Microsoft.Maui.SafeAreaRegions.Container -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.All = 32768 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
-Microsoft.Maui.SafeAreaRegions.Default = 4 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Default = -1 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.None = 0 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaRegions.SoftInput = 1 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.ScrollToRequest.Deconstruct(out double HorizontalOffset, out double VerticalOffset, out bool Instant) -> void

From ce8d2e01ca8156a112ff47d9ea68504d10d36870 Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Sat, 26 Jul 2025 11:16:32 -0500
Subject: [PATCH 25/34] - fix tests

---
 src/Controls/tests/Core.UnitTests/SafeAreaTests.cs     |  8 ++++----
 .../tests/Xaml.UnitTests/SafeAreaEdgesTests.xaml.cs    | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Controls/tests/Core.UnitTests/SafeAreaTests.cs b/src/Controls/tests/Core.UnitTests/SafeAreaTests.cs
index d68cd4138ef7..50f13d9f91b3 100644
--- a/src/Controls/tests/Core.UnitTests/SafeAreaTests.cs
+++ b/src/Controls/tests/Core.UnitTests/SafeAreaTests.cs
@@ -217,10 +217,10 @@ public void Layout_GetSafeAreaRegionsForEdge_FallsBackToLegacyProperty()
 			// IgnoreSafeArea = true should result in SafeAreaRegions.None (edge-to-edge)
 			var safeAreaView2 = (ISafeAreaView2)layout;
 
-			Assert.Equal(SafeAreaRegions.Container, safeAreaView2.GetSafeAreaRegionsForEdge(0));
-			Assert.Equal(SafeAreaRegions.Container, safeAreaView2.GetSafeAreaRegionsForEdge(1));
-			Assert.Equal(SafeAreaRegions.Container, safeAreaView2.GetSafeAreaRegionsForEdge(2));
-			Assert.Equal(SafeAreaRegions.Container, safeAreaView2.GetSafeAreaRegionsForEdge(3));
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(0));
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(1));
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(2));
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(3));
 		}
 
 		[Fact]
diff --git a/src/Controls/tests/Xaml.UnitTests/SafeAreaEdgesTests.xaml.cs b/src/Controls/tests/Xaml.UnitTests/SafeAreaEdgesTests.xaml.cs
index 3453df101340..93ae0ddf5f3f 100644
--- a/src/Controls/tests/Xaml.UnitTests/SafeAreaEdgesTests.xaml.cs
+++ b/src/Controls/tests/Xaml.UnitTests/SafeAreaEdgesTests.xaml.cs
@@ -20,7 +20,7 @@ public SafeAreaEdgesTests(bool useCompiledXaml)
 		public class Tests
 		{
 			[TestCase(false)]
-			[TestCase(true)]
+			//[TestCase(true)]
 			public void SingleValueConversions(bool useCompiledXaml)
 			{
 				var layout = new SafeAreaEdgesTests(useCompiledXaml);
@@ -33,7 +33,7 @@ public void SingleValueConversions(bool useCompiledXaml)
 			}
 
 			[TestCase(false)]
-			[TestCase(true)]
+			//[TestCase(true)]
 			public void TwoValueConversions(bool useCompiledXaml)
 			{
 				var layout = new SafeAreaEdgesTests(useCompiledXaml);
@@ -43,7 +43,7 @@ public void TwoValueConversions(bool useCompiledXaml)
 			}
 
 			[TestCase(false)]
-			[TestCase(true)]
+			//[TestCase(true)]
 			public void FourValueConversions(bool useCompiledXaml)
 			{
 				var layout = new SafeAreaEdgesTests(useCompiledXaml);
@@ -53,7 +53,7 @@ public void FourValueConversions(bool useCompiledXaml)
 			}
 
 			[TestCase(false)]
-			[TestCase(true)]
+			//[TestCase(true)]
 			public void ControlSpecificProperties(bool useCompiledXaml)
 			{
 				var layout = new SafeAreaEdgesTests(useCompiledXaml);
@@ -65,7 +65,7 @@ public void ControlSpecificProperties(bool useCompiledXaml)
 			}
 
 			[TestCase(false)]
-			[TestCase(true)]
+			//[TestCase(true)]
 			public void PropertyInflation_WorksWithAllEnumValues(bool useCompiledXaml)
 			{
 				var layout = new SafeAreaEdgesTests(useCompiledXaml);

From 1d913bb74e0c2e41deb1fc0fdf1bb158a2b755dd Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Sat, 26 Jul 2025 11:44:28 -0500
Subject: [PATCH 26/34] - fix test

---
 .../PlatformConfiguration/iOSSpecific/Page.cs | 20 +++++++++----------
 .../TestCases.HostApp/Issues/Issue21325.xaml  |  3 +--
 .../Issues/Issue21325.xaml.cs                 |  2 ++
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/Controls/src/Core/PlatformConfiguration/iOSSpecific/Page.cs b/src/Controls/src/Core/PlatformConfiguration/iOSSpecific/Page.cs
index 2eb7faf11a25..e0fa4a23a2eb 100644
--- a/src/Controls/src/Core/PlatformConfiguration/iOSSpecific/Page.cs
+++ b/src/Controls/src/Core/PlatformConfiguration/iOSSpecific/Page.cs
@@ -115,9 +115,9 @@ public static IPlatformElementConfiguration<iOS, FormsElement> SetPreferredStatu
 		/// This iOS platform-specific controls whether padding values are overridden with the safe area insets.
 		/// </summary>
 		/// <remarks>
-		/// This API is deprecated. Use SafeArea.IgnoreSafeArea attached property instead for per-edge safe area control.
+		/// This API is deprecated. Use SafeAreaEdges attached property instead for per-edge safe area control.
 		/// </remarks>
-		[System.Obsolete("Use SafeArea.IgnoreSafeArea attached property instead for per-edge safe area control.")]
+		[System.Obsolete("Use SafeAreaEdges attached property instead for per-edge safe area control.")]
 #if MACCATALYST
 		public static readonly BindableProperty UseSafeAreaProperty = BindableProperty.Create("UseSafeArea", typeof(bool), typeof(Page), true);
 #else
@@ -130,9 +130,9 @@ public static IPlatformElementConfiguration<iOS, FormsElement> SetPreferredStatu
 		/// <param name="element">The element to get the safe area behavior from.</param>
 		/// <returns><see langword="true"/> if the padding values are overridden; otherwise, <see langword="false"/>.</returns>
 		/// <remarks>
-		/// This API is deprecated. Use SafeArea.IgnoreSafeArea attached property instead for per-edge safe area control.
+		/// This API is deprecated. Use SafeAreaEdges attached property instead for per-edge safe area control.
 		/// </remarks>
-		[System.Obsolete("Use SafeArea.IgnoreSafeArea attached property instead for per-edge safe area control.")]
+		[System.Obsolete("Use SafeAreaEdges attached property instead for per-edge safe area control.")]
 		public static bool GetUseSafeArea(BindableObject element)
 		{
 			return (bool)element.GetValue(UseSafeAreaProperty);
@@ -144,9 +144,9 @@ public static bool GetUseSafeArea(BindableObject element)
 		/// <param name="element">The element whose safe area use behavior to set.</param>
 		/// <param name="value"><see langword="true"/> to use the safe area inset behavior; otherwise, <see langword="false"/>.</param>
 		/// <remarks>
-		/// This API is deprecated. Use SafeArea.IgnoreSafeArea attached property instead for per-edge safe area control.
+		/// This API is deprecated. Use SafeAreaEdges attached property instead for per-edge safe area control.
 		/// </remarks>
-		[System.Obsolete("Use SafeArea.IgnoreSafeArea attached property instead for per-edge safe area control.")]
+		[System.Obsolete("Use SafeAreaEdges attached property instead for per-edge safe area control.")]
 		public static void SetUseSafeArea(BindableObject element, bool value)
 		{
 			element.SetValue(UseSafeAreaProperty, value);
@@ -159,9 +159,9 @@ public static void SetUseSafeArea(BindableObject element, bool value)
 		/// <param name="value"><see langword="true"/> to use the safe area inset behavior; otherwise, <see langword="false"/>.</param>
 		/// <returns>The updated configuration object on which developers can make successive method calls.</returns>
 		/// <remarks>
-		/// This API is deprecated. Use SafeArea.IgnoreSafeArea attached property instead for per-edge safe area control.
+		/// This API is deprecated. Use SafeAreaEdges attached property instead for per-edge safe area control.
 		/// </remarks>
-		[System.Obsolete("Use SafeArea.IgnoreSafeArea attached property instead for per-edge safe area control.")]
+		[System.Obsolete("Use SafeAreaEdges attached property instead for per-edge safe area control.")]
 		public static IPlatformElementConfiguration<iOS, FormsElement> SetUseSafeArea(this IPlatformElementConfiguration<iOS, FormsElement> config, bool value)
 		{
 			SetUseSafeArea(config.Element, value);
@@ -174,9 +174,9 @@ public static IPlatformElementConfiguration<iOS, FormsElement> SetUseSafeArea(th
 		/// <param name="config">The element whose safe area behavior to get.</param>
 		/// <returns><see langword="true"/> if the padding is overridden with the safe area; otherwise, <see langword="false"/>.</returns>
 		/// <remarks>
-		/// This API is deprecated. Use SafeArea.IgnoreSafeArea attached property instead for per-edge safe area control.
+		/// This API is deprecated. Use SafeAreaEdges attached property instead for per-edge safe area control.
 		/// </remarks>
-		[System.Obsolete("Use SafeArea.IgnoreSafeArea attached property instead for per-edge safe area control.")]
+		[System.Obsolete("Use SafeAreaEdges attached property instead for per-edge safe area control.")]
 		public static bool UsingSafeArea(this IPlatformElementConfiguration<iOS, FormsElement> config)
 		{
 			return GetUseSafeArea(config.Element);
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue21325.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue21325.xaml
index 0871671f6969..52c3cc44ea25 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue21325.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue21325.xaml
@@ -1,8 +1,7 @@
 <?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.Issues.Issue21325"
-             SafeAreaEdges="None">
+             x:Class="Maui.Controls.Sample.Issues.Issue21325">
 
     <Label Background="SlateGrey" AutomationId="greyShades" Text="Microsoft Label"/>
 
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue21325.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue21325.xaml.cs
index 32d32544b8fe..80b6f57b210c 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue21325.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue21325.xaml.cs
@@ -7,6 +7,8 @@ public partial class Issue21325 : ContentPage
 		public Issue21325()
 		{
 			InitializeComponent();
+
+			Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific.Page.SetUseSafeArea(this, true);
 		}
 	}
 }

From 76817daaf2d974e1f8e280770ad7e02bae409cba Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Sat, 26 Jul 2025 16:56:18 -0500
Subject: [PATCH 27/34] - slight adjustment to contentsize

---
 .../mac/AddItemsToCarouselViewWorks.png       | Bin 0 -> 15067 bytes
 .../Xaml.UnitTests/SafeAreaEdgesTests.xaml    |   3 -
 .../Xaml.UnitTests/SafeAreaEdgesTests.xaml.cs |  52 +++++++-----------
 src/Core/src/Platform/iOS/MauiScrollView.cs   |  42 +++++++++++++-
 4 files changed, 59 insertions(+), 38 deletions(-)
 create mode 100644 src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/AddItemsToCarouselViewWorks.png

diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/AddItemsToCarouselViewWorks.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/AddItemsToCarouselViewWorks.png
new file mode 100644
index 0000000000000000000000000000000000000000..43bb7c65e32fe05f718df755615b872d096b0115
GIT binary patch
literal 15067
zcmeHu_dlEM+kfurr0Csc6}_t{YHy0RN{xz5t!QgUjY?1nszaC6nypbYcBm056549b
zS|QwxqOB34c49>Fy&}=i^L$_5=MVV4UXLGK*LCI`$9Wv@V_e5^UeC<HS2@}F*+C!>
zr=h_W3lNCy1PHW8@!)=-B`8xV3AmhgF|aTJfe>OKP{bn;hz>MGOo2dwav%`p1_-3_
z3IyWuPsf^H0Djni%lPUQ;0pY$>(<``E(hR-CVB^^5Agr3B!%!YSOkI8>kY45vbsx}
z9Y(%LB4*5QciVS2(C`A-v`H>P#M45@{pP)e>SE2GawjRTU$>`Qy?(vEsgQ6Tb}ige
z(NftG3<X;xv|Wog0w4X{=5{N3i^`iT&#SCI;eI-6&z>`<IZYnI`+5e$LI&uYi*VK9
z2ym#-(vT8)v$ztvI^tdKF-vq>D#bU9(v(M#vJ6t6wyjX9Q&YXUlwZHBY;99CG&KXM
zQ|6q951*x|9oC&#UVoXX>O;!Icn>yHI*{eZ#KDDCRWR3dJRaZJhdglLfHGn@v73D2
z@ejM#7v?v;HZ!HyLm}MSYgq^c0*pjAHaasN=yZA)iIxsS{D|bKzS*=tWZwGxNo&cZ
zE;@M+2=spav$}Xa&>Ti9aVCy#&5jnMP<qZ=ODVLZ@=!g^pkD_4>#>5G)F$CA|8X*H
zX3%?+POG4|lb7iqc^b01LnjsK&8iLA^>bL`%#Ckk`1kksgF~GwuJ;EwZa4)72F6?n
zp2x33$z2&9ZhH>w-%rh$554;E;X@Bpqh-t1LKAo6Y|hUgPlUBgqMrYVd;|kG^KSm~
z(CM4(OzYky(Y~Y~Il2LHy0=L~Y|;jaeSNu&TQiL|PEHx@kq?CKe*X)D!FYXqbcp_M
zi*`PVWbZ?&HuUlFkxVio)%s<gJbyilJAC1xi-z{yg{+3nSwHWw<`|=bJ}hm(A*s!^
z`rdZ<=D4_yITBgF^__d`qLgh};@Lnrd}^^p*w)XlJXzX7W$Cw^OSGhvRN%&J?M$k7
znR$^F!Fg-Kney7>O>gG!w#=#CtHQ(_y(lG*u2UImcP{H}eC>vh#i&AQ6rw!_n#3ij
zk!Ko4u|xoE)lj0O&$oBx!6P9BC#CK4hU<f8cpBFtOELCXcv0EApX`Q&&DGKJ=4O4L
z(FP}FWo7L8WE%0?w+jmSb9257Vtaudu>t&@?#tY&&NoTRR~@;lYpT7TcQ$6)uR8Z?
z9OdOzq26c5#Fe}U&JPC-`LI8@=;Y*tSZWg|_V#A)<2c!BFXi&375V1w&qIMhL6n>*
z8UAIGr}tnPu{lNnKnQ%fQ?&$xv7VisCB41*kiN0O7^oL@avD2RW+|4S?i1_n?Ttau
zpkZXq(cV161UQ2?`Dwlu0MBg7A?TVKmCj5Z=RxOt_{y)PLdak8kv9u<pKulB<Xj$f
zgvAV$+U2^m#7-BNlo2Z3I@&jbxd1&MRrHR2X2VmI7%dOT2p~J|!qU@$GN%#_S)7?{
z<L}Cb<&1fQ_?5Zgl6#wj_lR$_kV<at$A^PQ!w|n0TUy}uPEKfb*rX>R&k(!tkt3;N
zVjMq6r_B&YM`gXy4J(*(uhE7u281^nw~@f!cQC(AAH>`lYnI;(nRi1I-@lK*VzJb3
zu<mJe?FeCMqC?bB7Eg`W(9k%mH~Ld&eLR7^$xPAx3ooCpj}JQk+UuOjN%zh)RnwT5
z7|PUCPe$-a(QTCyELJ0Iy~B9`kkDB}?h6YM;q<;tD5bxMp^wy0$4sO7EM-#qzPwf>
z{`+rXBnMA17Hj{6OOW8aNpx=GRV0kQzT7ZZM-~F$=sEYT4zcjz0BtHa&M4jnZI9v<
zQ1JwqXpcu=R(^dIF$4flAE<3W*+N3}6agH5{h+4&i=lfA0E(HU=D{`4n)5iz&CN~9
z>@4xB_R`;h!NDapH8ueAYPp29LrJInhOyQgtMh}@=|1H^idE-p#j8~w-8R~pgK_tM
zyWjzarpmiK4*xwSJOe=gB@Aq;MN1SyO#OqYuJ-IqRi;NZu5p}*(%W|_%P(xkLF4Yi
zjk@jTzd)b`WO6`Po4u5wOT&8j=*CFF2`QUGU}-HaE&E#EjJ&By7_bTYZ?cZ8OSHo4
z=mE4t0e9GxuE;#Pq@?d-BnJjY20MkXPl(Ld|9C7wEiw%=il_cw?w(or(WC*NdV#I4
zr!B_ab0iXp2pZ9r_N%HpcKz`XZ?2Ujsyv)llBy9{4D<oisFY4e7@D6NT;Qyc*Kg)^
ztFm(n`sxPt^6Is=bwVX4pJeO>uqXBvw<7bw8O6ezQ&;Wl0#IAOy0@-bRG$t3rpLgi
zEhYlg!+svi>`@+c%r#69o33aPveeGBRY^-aE-eXIjr{z4F(>3KrntO(@R;d^9pzEX
zT>oNlFHO~NAjuY@?oQZVi`%}N7iW^D;<d3di(P7$VyKkX!h1I8?c4p|>R^Bekg@Y-
z{Kv2Tj6zIhKLPwj0YK#DP~+y1S0jKO4~pN`q@R_wH40EU#!$-4Ou{NenBMaQ-Xa(b
zD9ik4dDzB^7pdAyq!BicPlrjKjIw`w<G%ZsSJ^1z6zGQs`zUjB11XKa-O%<JBiQ5@
zb3MJtxyJ2qv}2vc=Ue8PzsJP`8RqQgr)TtO(|g4_^jsYa$s_`&>bI=2G8vN$4a~QD
zWWcknX)TUODdV!#h=2qGw>MWytR!O|;SPKI`U=(Y0cM$~*nJ`Q!-q=~0d?{jnRF9G
zU?8n^46t>8b!d9RU4llNI0M=Um>`B_9=<ykQxH>Nc5bRmbH1Nw>#P<3>364JxTW*&
zpFCGj9xdR9+*Tulk&t*2iPYcUue9_VzzU7pX9}z<k=7Y|-ku>sz<+xB`}@0^%VRTx
zDf57&`T!l5l$6w;oIs^O2oJfn3ju2hZF<a!*xnc|zkmNPfSlA+enSgm<0yW9epfUR
z_&w1Gr4LEd4x_*7LEQxGDg6icy+XizOC8olJJs8uEDT4G43&vb1Q#d+T$B$H^Po5J
zYWa;I@r%s@^p)C1Gy^GXi(?|0ib+N>(V{6GMfv&q({TIGx9+$;VT46wKmjarGkL?<
z*6{OTrmDm61mF5u6|JqcF~rJOkE<i_wS}8WMxrPSiP;gnLuY5F%gN(Sv-+8pa7xVf
zg2_yxgk?X8RD5sk$vv|pdjY{}&+7Lhfms1uSUWgK8K$b;`Dt+1Oe}%n^Uf9lfyMZh
z{2wzX*dyh`I5VM2$dz9&wbNmwhOl~j2Ztmh6xiYE-b?<?hKHN{^R~ZMdCUNU5bPUW
zP~B(>njb+6|Nee}PQJJ0(V4Dp=}af2xT3Ay+)w~}`vGSS*ujSfxQpxS9lF$sgM%Hs
zxo_SG0a`lUsXBUU`SoL;ua$bk!^1m)1mGT~0eu#MsUv<j{o_}#)u6u}8!ayayAj=s
z99b3$+gi>X#Dy&DUoHl`aSK&GeO&9pYLS%@z&Eu<buw5+61VCCK9;KB_WaGgtq?%B
zwWvM1E)8Dy0Dl&^IvmXKX*%@YIQXDbaK^xTsa;jI->A0M+V_XpiDU;W$)x5}@|tpT
zSpY(%of{khdyd_htH%UP7=;1A7!=o8H#EuA4!d>_&<buX>I;S=!XsBHUp+Df4=JW9
zdc-ztZ_XP(Uy=f}PA5Qdq^BoqK76$v@S62XF3pEAH8m8StuY-XzmW@0uuf&{_SObX
zc6&({>gn0j#H~|W9y%cvpV!dPAV1olIh}_BG{eq25Qw5E3=O~xLQ1X*g<N59xgRiP
zPlUs-Z&OXTl_s?~IXM}Y#wAXRVR$x|QX2aiECY<$6r1o`g!XD(_jIy@Z*Td%P4C%n
zb(S}IiveB?LXc=}AXuRQo|`}+mIRKszU({c3`}O<7>;M~kP%Kb(uw8zClBPdIG;NX
z)|3gN%2zh?GOQ+cbp%Ny5OO|8@yu{<FL2W^<zXhmTMJKU{g$R)fXkvU>ukeltE+KT
z<<L)a3u9efU417#cEokv+btb7!kY`kG(JN$CLJlVwi+2W03=oXMoPD~!U0wl1B$=Y
zAv?&>Pr%(x)eQMsUcLH+5%B>2BYknt%mCUlIJmY9w`7E=tp#-6t2ak4K1am80O;b?
zmp|S5QiOyHsfrcW(I$*e`4O7r`hnn*`1Na%++hIO{eXDfI+ELXb4NxXKL5VGbTv+h
z2!O)s-0|wr^#A}rvm}ghdE*v#vOBYUV8BN3!d<g86(7Ry^<`y1gtMcK&JH!VU&`wP
z>fQ^O9#KQ@fzn>!SB6Iib~gKOg|2b(d3EVuo<lW0Bs{X#ru2F?U<8WLXrJ+O1HGFu
zD<to7FThP3p)8<KsD)TU@6XRs#NlDIv_s7lK!2)ca2W!L#JIK{wYIh{Dk(7r{D%$j
z*1#ZXtR>F-Yo(h@(53zR_g9B3yE7;PA`>$pLM5P#le)<m<f^Z<UFDTaM?70%1=}YA
zQkA_2TDyQ?TQhjh3b6C;ovEmX25qg?Z!iW30moDX*gr;udVpKV3I?l6mUS+pP@rh%
zMu=qrm<YrMj974GB}f{AyMB`w3iy5dcmCP@0s<YIwL3wa$g-~#R0nWHBy3<w!`f%r
zWaKYE=Af>><~63m+Tul1wU9w|Eu28p_fy}~k*k`(OCSg&7p=DsxI}!qy(GhU{+-#5
zl<jz#$+-Wi(0pWTFK}~OdtU2@=}wbkb8DqJ5L|#x%Yg3zFEpSRyv&J?{!_qsym<R2
z?@{I;zK=Vze450kC^sh}Pcg<fOU!FA`~R#OsI=Ufh%ZQz@zdFlFDn_>TO#HHz~$nZ
zvrsnRYVhca52N|nOJ?uCcV|scSS)1@ytsA@=n!$`x)r0N!6yxJyB6c!7BrT)`X-%W
z;6ZJyji~Gr9mpJdD@J}oh_Ot>ooHsy3UxATp2w_(-!d0gnb$gjVG#VuBl@4;hk%=l
zp(98ZH6GE~Yl4hv*3w~*bQrx19%t;V{OkpDc#YiQLrjJpX0r0u@<<22OS={zJtn2h
z{)=|rUyB$`FAlR9`@_JF@m%q;kRiO&e;?hU;_T%d72q-AQ!BIgLDsCWuC}{2JEA>$
znn~rE^Q^sQz;^fAjx+`Dh~4$z4oyb{3YbJkYcPjaG`|XnV{GHSnm)7Vzv(d6Ji5$<
zul&2S@R79DH_u5xPtZ@r{})`$els?BF|<pa$*QwW%=xY`=|1AX`*@dO3*wAvDuDL^
zhExs!_Yrs6k=@MxYo(Z9O!@9I)<5q&qszYr{S0BhIQVRbilhH9;d5)8+4~V|R&}!L
zg_0eK9AaVN?~|;(cGd0fbpkKWM6m*srl&D|I~YEz&l2W!muqz`z-piyr$ktI?^0*Z
z6VF=s43o^Kok&x?9po<Zxv;pLx%!4l4bXHhoUy^v+T>GA!NuQX&Uc1M_fzS^x-5q2
zGU5F%Zncsj6$V=0t4-iNnEgWs>{<G=%UCswlR%e?xBoBwdBKE_d;k*-mszu>!xY|F
z?_gmslgbwdqnN<GPIhGNHGOF$fu*Y~yf;tpn1iFaEMb<)=YMknRt3q$vh-Aie2O_w
z8*AaenPdXypnwUWwP<-3m%EXsOlp9p<Bg0B9?68oGFjEeQop~MbbmVe_#YO-SW0+%
z1Zl^R3InY-07|QvlxllRGxg^WV^2wN09{V2{CEAi!h#R4Iui}Mvv#TTbr<hgv^^|*
zK4MzRE2Xe9)?UFO^KC3$Woh3SbqB-G%vr)5;I*8S2UZ2~wy^M?28(6R<GPDmCYgXa
zuw)`Pw3(O1WinozWoVjtpN}#&__SNSp#Oety3r3aNMwqVBZnV#%o1-|UyGb|^jr1S
z9{cJWT-Lb{)|{SUJo`#<GFn|zbx7Xh3m+`Vw??Wd-Q;z;4Q1|XY)Q$Wv6u$CBsE^%
z;znMNp{V#i75Z0B+D(&wux=baZmUWRdPJjbeM+l|M{v07)szm|bcGzMRF*fJmt7GH
z71!x+(ZmR(ru_)Y)fqFW|IxkXOWKTusn8YQ6bS;$@2vUfk`V<{acjSVqQK&5`qS?V
zYd(6u{Z4dV2!Ir$<*?98Hhw~fFq;?6=RX||Gn17_Q%NNrZ#5>}d8?$r%itb4g=AHj
zSYeaWbr{}O8V!|-VHcgIt>g^Mohw8QQ1VeHNNb2oL)^ztU=yVHbgC^X^^4p1oRmb+
zs&R?^;a`f%2$Y8%lCCk;cjgaSqdHqR7_+A9JUDFz4an%79kePs;{yMVHtQ2W%VcDj
zH%wtl@Oic)=b_y%;}s-wlMyAMy)&(M3MlNkk0nbQaDxvdB*K2DN}@+!4=R=)mUKfU
zKfY*V0Yek>QVWM)9*d1+sFXis(a7ZWi{3}j60Il3h+nE~?QVIZJg(!S)*jLBO8Ybr
zXZjx*<;I~)tz_J&51nb#l&DIqzrDR_<AuVs<O!>n^4OmrOH*e`!`EiQ)nz9t^|x0y
ziiwWGQ~tq)!i_!U51q32a8)wa>f-1^es#g?(a89G@Im<U61$UzR4)E%j^Ok5=-xc+
z#bYJt*p(2$(2~5@of2WcijC0k<VudQfsx!PRQiYbvqgBt{+dluw>=^u5^gbAdOCdx
zvRr_|+=A$@|M;@wrO1CtZA_XMTpgf!+ak@6L8FtqJEjIYq-bxVDn<Avnt3OpAl<ms
z!QNxpGU>_5@&pctWm2$G|K#9ud>;OZF?~YnVK4a6%l#bSRqdg2X}{y+>HXKetpg^u
zdKd!fI_WJs<mi#ao>$=9HIrsag${d%Si8rZ>~3q#u;BH}nmX~g*JU0>==o~h<aM;@
zeJiIle{`P3IYEuTi%V1!mm$qpG<N{g#XVvi1bs*pFDoNFNuGdDmsV4Xa~?er83qre
ze<|+DLkY;V6%}ds)NJaZ*mAvjCi<_tB+BY}M}}BhV0~`}jXOHXN(fvL*9j4J>Ww#L
z=w7-iZn?6aD`eB%_L529{j&PA1?mZXh}nzgjo%asZ%qZ3b{7Tr6cv%6AE?!&`pa6C
zWzG&O$Cc{-K@B8Vldu^ozrJ+Xdwu>LjW~dhT~!a{%2-L1H5v{Bi_<gIb`)JLj#qYB
zXKrRGJ0;bd&DxfCf&=20;ZLCiw&%y#Q%Vubkg$gkOR?)TGD@UHmuO{gQm8<gTcymw
zii_SB7s)9=pz~Zr3t<BYbcWqJO)=HXg{V43{Mu2$h^^kQ-&z_!q!7G`Owk!2w<I1K
zTyQb$ijmx>ohbYFzZIzZ&O(ck+@Ux2=i>I<-RX~VBkV;*S5%6f3JI{{kBnBz&;K;l
zGGLJF@*2Du0(Wr9i}=il5dF90<7wLVW@@sLV3C$qE*)F;(c$|hqQL>RV>)9`%H(k!
zcVzgr#69@O{4XP>a_ThFjDGw(%5Z`Hb9X8g?nl2AvvKIW&83u089%9Oi6)9FTDI@?
z8~xmq4UW$dd=}YfQH-wMo<8$Iiq!ea(NEd!a+YIrI*fyZjN(XTGkJaFoLdZ~<kzbO
z>3I~^sN~uWC7)Ya#_svuBuvapnT(`?JOpw{2@Sg)4y*}kYtLt!rtGr|8-LCoc2^Ij
zjc|*U$xJhsd?AybPB7_^v`(lJ8ErKd_w&~kcj`$e{QT;5;&S<Weqex6=WTYY!<(8T
zdrgb0=nE4`^o0{i^w#I>!-$YbcNHLCvFca#@P}#Lhn3t+O;pCnBsrLZq%N<U(PdLy
zF}Hm6Ed@$}1yQNcUj{?Bo2P0zr20umJ-_br8ph#no!xtz`mRfDKfcKuVpMPq{$>74
zG$8jVj{;>sBj~lo_q7|}3c|Tgo&~nC7Pbhkv=rF0Id~#zDIPLnX{I4Ze_v@tbVZY}
zmwgbqSvkwlva0s{=*!|nD_)brn&MVowBrk+i7~7g9sPXD1o|{cGhb;hv=~!4kRH@@
zYA@lcjTN*ly_%${i|;ij-~c-p>J|x=%Bf$%N|tyX%h7&(tVv2i|Co0vzc<>R@~ah=
zFvDh2T-BZz{mpD??NjQMhoR9vbLIITc}vZt!uiKg&B^BavUVt-j*p;Hd__~ZR45zK
zR&NmNsc#?kI7nnEd+>9gg*_qFTs|>KP||C&>v!v|5=n2Rx(~&5UG1bPEU;MRwC6Qt
z^<1nGG9Xkr=o)9-t+pA|u->eeg@xO|6q~UmoTg_-9KV)m<(He0*G9WvT-iJSnKZ>u
zv$nAm$hlKssh=RQ2h;C>GPn(B^LsmYHVNxASaBEMtfv%ob1nxGQdQVNb~}zJ$Fi5G
zOH0gNxZdAVUfjR3si(ERl%<W(LxHK9_z<Ojy}rKUcD}G1cOu^mX`J)Un^;z~SCP$q
zZy@X2J+m&jk8{{qib~iQBhi_eJdis>r+ulx?GeEQKgO=arw2?=iLE{UtUf`o88K`O
z2{Y@yE#=u8U0v3Aw%|jKZFj`rHe|FsEqPL@NL!SQUkOUAMs#G2qlU`M2<6UvJyJfR
zPCdL+lK|vCl+%?8L{UjRZlZePR_LwSh?-xrl%LaH`1#88;sBe-oWZD}12n34<V(Nx
z;Kmb_n1_1OzMWIkw#xw{o}Y20u|nLmp-sK81wyI2Y5}#s<6$b`T68-k`>i}CMDf_#
ztiXD9tdAZlXij$O^B@QPJAvKJLZ7>AcJQ0w{jvtNg6*}yOvL`2qZ1EBr*pg{0%?!1
zh;aP`@%_+33^wSdO=GB=*`Ul9uinz?J>JxTMYFh4VKXt&&0b||$;S}o6E<ui1vOn}
zFndCKK8mKfjG!l75cdb<^SyMjt0U-CiU#(w(><?9?Qplqlg=-CS88$qw?s>_=@Ve%
zoWyelKd}!nx5<20d6@@n>_z?%zj8{ZC|A>JG^;Nezwg9z^Mi@O1gv04h~Xe4-7;`)
z+*fZ3C*#Rw#f}fJsy(Mj{XI~VGq>SZjzwhHQ`k69=A}ToOJwKaouAc}t@PD7`}o-e
z)%Yp3e#ha%pVghzq;sW_><B!*Q0k;BCKPNxU;t2}Y^A44v$o4Ein&j?PrZ*iQQXdp
z4v{VgylaB^UiLk?4k@;U8XlNQ49*qj3xQ;l9IKcAIW~I=hbzx&J7xhbs!bjCR7Okm
zJa*a_!b4ntr7R)Jm%Hi|Z#^?!tuiY^F|#ccIB8p0)GR3nIOPKC1ORcWxltbZ$`$RN
zKfXj4!}P<}6B<vs<h?eLFeyDmwMQD_H^Eoyb$y1N`}ZYSAV%HPF~O1a&Y6(TwA6u^
z6!#O?bEjj>_k2ke3^B=gMOdoiLw}VooP!hy$aMU@9|$QTs=l-eY5$<&J?PZ-hQi{N
z4VjMVV^Sqb741g4*;let-jEauM=q7GI@x5$_#MYgbmnjcMQR{E7MW4$og)vPXIlk8
zWap(lX&oWxA#*bm)U%T(bW`BE>w89w+4OYcA0E*tQk_46n7(LRnA?)UUtFr-mD^rw
z?dw@GcDKB*TZMCKB5a@ZtCu!IKXQadFBBHkj1!4t@Jq%<MW?Y6Iw5ScZYJ<f7koCs
zEB9-{9*iI-293@GY?SM-+oVG5$8#A9sb+$n0b!>ljO-2Urd5&8`FY{?+NvdymX_^#
zXvl~IFD%qouh|m;GfMheSnk+dSVMp=eY&{8m89f$E2}P{&**@8E200;eS7hO{-Aex
z4LAXzvXADf+YVfbiL!SE)#s|i{meVau2wIV1Hi>!_}%st1qMLRQfCGomg&>^muM@R
z3;>bSmJxx@my+zH0JHu5_ELb6vW>urjKQ(A{S0AhXrklFN(t2bY>~{z?6y=gem_UA
ziQjgXCi+!|u)Uy~IPLIV6kCzs`!-$?&Eg2X8!@D~NWkRUr?KIGyPE?sbvA(#Z|CJR
z<lKYds7h6kM-4xDt|0#8bna9uY3qTl%+r9spJ&@jP}!ZT(_XM&Q<4$DLjro|o*j>&
zksAg3-Kq#suY>R()fWTRbCt_^T(4C}S-e!yAP5#)#qVbicO4%vXrZSEVN$9~m2+LR
zvR4FUitD#s1=b6NuHJ|-%C;4A>(5*z4MX~$g_q|>nhm;3Rs*r)M%?khoNn*wZ>3@b
zdlA(4?_1SOU2?j$aqo?}C!VXx0`_FqDVyt*w8V)kKDnQtrHm6(R*me6j&O<IK1K&(
zi-;<qaH?6a-jj)MwC`}pJ#xw==CUm3$sGNWtE!z+vR?{|WO|bEdQNqxO9qlJb{Vtn
zD{yS4#CsLVSJ0a{{+e&;|76*2gw(h!I0Iu?FeeqM+;t$za|;2h0zsgpOTUIF`aZ7D
zFNjC^`hv*jdNvn2CP-!Ef+Hb%vbroit(TzAhq-nTzTjDS*-$buug<d1UQQWp>`)~c
z*}IYK_+p>}Qb2UrpHyivGk)<vta=9Tg2o8B8iOum%gBzUY0wUHeb(mWJe{V1xPycM
zv7>!~JGK4I1NLkkJGmZ%u#obyW7&XRt0zT~!V2@sAO(OLhGl>^AA)(h+dY@x<OB(w
zXGE3Hv-`YfMNzYD;riWn&H5Zglk|%`V0P+K+P<XAMfKfY4i42WaNKA|=C>(cyR5^q
zzx6r)1^}mq#JR5GCIa(@rW+lT`<|2+_FHpQB0@|rAx9;Pjv#292<u58n(u}VH9Tn8
zb}UEG@nsILtX15q@#wsq1Yg|wg6GlZqgheD)uJbKi*)9X$Fh&t>Qngq>C=zHtzC0P
z?ELUJ3$!JHPLz76K^Vg<(s0m{Qs1qI>8U{6dLRRrvZPnO6$)Seg`<9~!Nqc`g)MMP
z!Z$_L@x2g&F_OJK1qUI$9{iP@=!?f)2COQLs(C_JB1Hw!{aGDww&2M4!PE@B6H#E(
z&7h0NpryWcLK&6g>2YPY3;gHwGsWFd_^U>w;JmztSB*)5g-Vs4{O1vz<9OUEBFG!^
za9_DV$~e5q%^ciz@x#noMBn{fQO@xU$cS@)Y-~IbkIzmYBx+89OWa3Nf+Z7i#RUDd
zmE%?pUbHRa01`lB{%{ETRVMMC6C}GX!4inc1GMR3C!%^Ua39a<z7b<}E`)aYUGO>&
zBWZwBoEL=+HU=YIaQUkHi@WS;ht+10QrI?h7oYOLUX6e={n5|v11hXR8dIuQmwZ|~
z?^*a>|Ip_F1HT4q0`-|h;3;mR;&<x|#Z)VvLbRfl#04$gy8*gc5;U7jH{j#%`nI|V
zt#?Wl`EyS_0RWSz44pY&B<5l5aI<<I?e9v?DQYfuE4=vazD$7&9(+G0K)_vPUpp!q
zc(L2#-5*q)ca7xP{HgF?NO0reR<3B|5C2>6EV@z2hn&F=Wo9jOoV)5i$w!bU^`;|K
zQ?G-rX!u*HQ$>e*ue$(CV8{m5J+Bo0F@yQQU41qx%$)Gx>?jIM$;tsAUU>F(Vb|69
zEX%940#$uuxPDT+g-4vFZF$sWo`hNU6lNZ6mIOG<V>x54aWuWgs%u9&9UMFgw;l}c
zGr7N%ZHr8?^oi`vqhItpB~#%51OpLO`6v`*a(Q%SB}40nLF7!2-e|y3_7$@KIn%81
zoI&(6(p|mLZ^rx*tt&P2wH{pc5_MDVBj?&bAAC$vf0r!~D1q>~d%Nk-mm>4^<|dby
zV2CY0r74Cz4fxNkrE?*x*F`|$JlQl>6!1=mJ>E@Dt#ZYM+`XOK;`X>jhl*Ra(0B?F
z)^hep&9o#3ypvU>z+RbW`cQu-ev_CreXR*d{B)6F0wrl_Bu*XgNi`{uCzyfX5<aw%
zA6oievuteI=yruWXclkR*0&At(K$vY#lEIigvAQ=y?&z;cwxSO`}G^mz%PEPW$%re
zQiQpR=uVU5{<;f&WKB%xtM#yYb;djXQMt;><|U#sa2xRsSIS{LA;f3~vZU8VyhmkD
z9t0jhTgPOml`dWKJHG^fxGpl|bbam);}_oA^ip|dR`6*{YdgX;$&Jyx_%%UvCw2OL
zcu_m?1S^xJpz>n(HXu7i`7tvwd`saCGb;{cFx^C1IjJ~SlJsNmPEzoe;*!-)N)|}s
zv2u_%&h4bOKtJVe{-pfc5W>m3MFAcSJ9B38>zc~j%EX496kv*ce9}!j#+&zPp?T4n
zj~1*PA8v`6BYY9Td6=2T|HShcY_s$yW!zd>$k^ABOwP03h0JWA82Jh-jU1Y|(*lyW
zYeTS-;CCOqZ|CoD-(lF@kMX<d$=f$v(G$#ko_vU`6p*Sv%$Rm8G36yq=KQJ}<00B|
zMBUDXnaMk1`l7OOr2an{T31oZP7eC1`1!|`XPBA1YnL>3`TBDSGQhjr1HQ{wJMTYy
zZLw!nD<WV=ukPgMpLS~gNh%w&((vb*0{giP-ev9e|H4{naVg22I?B^Fq?GYA1F4`p
ze1<lU-I&|GecFyE`A-poLxP!=KIFpUoA!K0>3GL(jY2+|nY!GIbLC`l-i^iAv#f0I
zVu-jMD=B&;4r4QLU4;?wfIf{)6fyJ9+Ah(hm~>`^NQehv$7jg`XF;@b<w)coAtJ@S
z4>L3RKjoX-5%Yg&d?pFCWM)?{j70unYxCYew~Tx+i+mYVCX@C?Cnd2G?qc1{)OGyR
z*u)(cyvn)aGq98U{dp&r3GPGxzGv02v|X;SGSj$}($$-Pvdmp=&zVJ!Tb1{dP}H5$
z&pV*Y;f|f$xqL_)_N~?2O~%%FYgsG*<+97P{|;CCj+~u5bLfE4fEjaV*JO?})6qYd
zM=Drgu860xidl=iE^aYyRXc+&l#TB)Hcg>&Ab`G83VVf1NdihJjJgP5976uzCP4gP
zY3XX&w=o8ha^MhIyJt)t|9QwbyOdS2u#^;Rea=k8%h&aE@awXQRBB{HmWp$hmR?!h
zfz{&m4pvp*pzgC=X6?^?m%6`pt44p|3fYCL{eOY01UbF5kO>qSKR1c6of?UZi>Opn
zC3Cv~k0MdKDt01ym$d@Biqwr1ms)52{?5&gSp#b3XQ^2mFRMDyP`CpO(5LYX*WH@W
zg-h-KF$1_&rVV@X=p`nZY2QAL<4U6?R)Hh2480eV`>$wK{~yrWZ>HzNTDv9k4_6c9
z@9#1=?T=~wxx_M-AKQ&sMG$UQRZh%)XCD_YjD)b1xm%r8#kj#{%mnCeB`<Rar%xDW
z6R3s+ROT=>;8iK+k6jJ^k6m>+`yaddEr(gcJR6<OvXvj>6OuxAG0$II*vSOyg=PZ@
zmpz8Z-?RCLA1pn7T{t6U_DO@1yncLKgD#);g70_*A91dK@K%jx6XvqtaSf3cz*<Hu
zM{}U8>JIz`@-V)U{_z8ZMm=Ty&#3IYW8IUpd~N$BtgVPrw#t`OlKSf8fXZGM{}@n+
zRnysPBgwfkb%p#FCsi;d7(9~6Hnc}yL7{zhwNUJQF*f{pbX&TB3mfSBc{zQfMQ(wJ
z#V%u`1N!0!jof{DyhhEf>AIh_nk+7bwP;$KTNhZ#lvuQGBmV-C4~R&4pD$?N!%GgO
zN*i96Y*klH)V)(CFPX%?R0dZV+yjst5zHuVcCqOPK#WjTl>=|C6>6v4Ew|DT@$Ms!
zF8~FZj(otLU1Bil8LuI#rz8jQARq~&aEbDb#3`qLNh7y7^;zXKyLxQI9#HyK$EhR@
z)uz3m@56^O65ENz4PKAwvBKsz-^#K_^2f&Te-+{l+h5wXK&tl%ZtpIrQPjV5q_EQc
zL4b11l8Q(-z<+<C#gTJ?p;>t@Y>;My0fVNxhab$;?yvSP$B!T1>{G{P2+~(!dBZ&$
zBSjg{wlW0!x;O=A-c%32s^G>X2vf!~NSr3^{`K2%nef3NpfJ>&zPYX8G0=a`+8IqT
z-?Tf{*~>?^5g+0^=CqtaiV4+^p+^_g2oPKR>*J$i$*6eE_3a^;Ti2SVOV>_?$)zj)
zi(T1wSBQ=o6=ebU#16jp*2th_knqFaWJG=NGGBL4J<LZ2=={qO$`dS;7yNEP6Tjj+
zv{@!h@Q#Mv*`4c`qjyVsOq_a}f~d$?`ZAeN5yeopW}dDDhN))MiWS~af*EZ`-<C=+
zuAe6GDWaJ>w!v`($tp2=pxu~uRDo48ek9_?P>4_ZET6esdSjK0S*6@FEQ{2sE<R>w
z&6wRFf@%Anz1=awFP;W=B_VgB0LDQEriqT<tr)VLnmkkA4L&i7`^;kqtlHu&SQpcn
zzhHT`qpX@QP{Q2RYhG5hcMZ3?Yae-aS@u<(%&O4to(%ZkBNu>-{`bfQz=Z#HLg#;v
zT>S5m3+7Rw|1XbRY{mT)4Uzq-c%_kRJL;nAdB9mRPBL|gWT$Z9L<8ZCVQFkm1l2)<
zu*iyTr0ga=aJtS(oQJ20RF5h<);o6VTn6v?Rq=hGbYmcZcpu`5e4?}|Kp53pTJhO`
zAg_B%zn!N=+b^1GpH{sbF%Aytb}}{MM#l)vPbY2-mgl|wCVUd)-(>)t7?Sqp0I3P%
zDjn!|OW<!Up_(!#<xy`&1FvB3p<Ofjznyb3=hJdNj3SmB&eR$!D_c05r#b~A8fkn*
zVp6j@GMhuPc|;_t2~QYSHEuT2`FeKttE@@p`7rovr3wquTT_HrZK8?s0WM=($e9z%
z1d<OSx{Z)onkd;f@kSnW(E@mvIe8r9A3jA%3CHTvKN2lW5~xdWrq<tFnjR1~WCKH?
z$#Zt%)@p|Oq-s+-)y2Xk!K#{|({K)D;W0NFQq*ucRb4ODPD(mc%1&yyR-e8uMZj_7
z(Khm|yY+8g->64*Yl{oY8WhKCFNjPR2@-zS5w=O^v}n*ekHa8;6<(J_qY+L});C;U
zlM_LAn6O>?(id+=Cwdc*JcgPYd0+2S2UQI@)xCmZsINUlMW&HysO^wQ>S%e?NlwjJ
zgU^K58{BxSw3lUmNkOv-z75yg?WU__jaHpRq|?qQyXSFh|FgN+eol4_ww%}9VB5|+
zEnI65>?rD_VS>QuYV<nI*|CArIlI(RH9kW@cYl10Ola5Q1x}Qq%n*o_ye0x!_ysOO
zXjptRZq?W?$e73Eg`}eS5Qmt7__b=YyH&RIo?lZTWR!6l*p!f*v#+%k<JezwoNK}w
zZnTO&v$^!vO46_v{L<o5zo{j--Cp7_O5Lt)zqxSI^b{QwvDm3z(A5P-y$PpJ(>Qo!
zaHwx=dqAIT52NZ;jN`Ucy%x_G)t)A9Ube5bh5Ec~7zQ$TDPn_0vcie^e1;Hv!Z|@T
z$%&?OcaXD}rjzRmR{g%TMMfq8WvLtH#bD!QcjJ4o7<lKNA|2UTO);V^mo)zuGeYf4
z!sPga&l?pSCqVDlfWzIu5!_#6aXMRSC`r(bP~;-#G{2M+=3=V6Io7k1I(pJrI1G|%
zCrh+4x<`9TjWab8zGu&W3Y*&)Rzbbz6Tg*tHBa_}m=;!q9j0MzYTnKrspr&lPOC>|
zbGeUj@e+M#f*>9)5jLYf-M3v%otHI;j6aT@3e5HVyTau(>Boy4y=&Q2%}_bed-YCa
zxl?^mTmQg7*RQ#`5syOnUeMS;O;Fo$RFwOh&^gcYYL`a%dT3F-GwJu^aa}Kq1gmpK
zDP4(#`_*GFs>u;n4tyCP>&ygq6aM;yg{AN!F=;0`b$j@2l8B(D44(Y+T*XE$5~X`J
zSMYh1yRiw8kd|R_ue|z(d-bd9jh6Ouy3oSJnp)!%`l(uV-xLpk3@9AVYnQ2h%~IvK
zB?|COn2gM71mG1x(XuIy0c|Q$hP9*N8-f!;jL<D&(G56Y%=lns{@_{0$3_}zVRY(r
z3UIdi=*KL^C|tsi^k2Z?@wo=zW2rE2*L^RIP?B7y)ZW(C)rB18V4NZY&5xS`hrqdq
zVclA=vz*b1eKJW#Y``Z#jy=7-cUskL=j0hNsoIlhZTXd0%{jHuZmrexiAtyST4Lf_
z$;&Okd1@8%{MOw39I^n+m@s`5jNb-6T^z;+V!uD&0KPWDKx^_`n#%D$K;bfw_B<}^
zm&@u1yw8L~7CUvu<dxhdX=&-D5pT5%(6z-WGH{Nsc`BGQn}2iUW|z91cMDZ^y4w3r
zSXno%PJ56{cg&oDF&^&e4C;igy#+qDs`eRDVH`Qu*<SCi^&Q62xC{lrv&-9T(lssq
zLUKoq0jfmdde`BuH{os?E&*=91*9OSpe!w?Dy^VmC9kTXte~N!C?zMSAtzT%zkU0^
z4e;@E^>PpSp9c&T^fM0qocpr^+{?!e2EXa!|38n3uB34TV?c&_;45X9Z#?)vOiMXU

literal 0
HcmV?d00001

diff --git a/src/Controls/tests/Xaml.UnitTests/SafeAreaEdgesTests.xaml b/src/Controls/tests/Xaml.UnitTests/SafeAreaEdgesTests.xaml
index c744776395b9..d8c51604a0a4 100644
--- a/src/Controls/tests/Xaml.UnitTests/SafeAreaEdgesTests.xaml
+++ b/src/Controls/tests/Xaml.UnitTests/SafeAreaEdgesTests.xaml
@@ -21,9 +21,6 @@
 		<!-- Test ContentView -->
 		<ContentView x:Name="contentViewTest" SafeAreaEdges="Container,SoftInput" />
 		
-		<!-- Test ContentPage -->
-		<ContentPage x:Name="contentPageTest" SafeAreaEdges="All,None" />
-		
 		<!-- Test Border -->
 		<Border x:Name="borderTest" SafeAreaEdges="SoftInput" />
 		
diff --git a/src/Controls/tests/Xaml.UnitTests/SafeAreaEdgesTests.xaml.cs b/src/Controls/tests/Xaml.UnitTests/SafeAreaEdgesTests.xaml.cs
index 93ae0ddf5f3f..efc8717b7c0d 100644
--- a/src/Controls/tests/Xaml.UnitTests/SafeAreaEdgesTests.xaml.cs
+++ b/src/Controls/tests/Xaml.UnitTests/SafeAreaEdgesTests.xaml.cs
@@ -2,28 +2,20 @@
 using Microsoft.Maui.Controls.Core.UnitTests;
 using NUnit.Framework;
 
-namespace Microsoft.Maui.Controls.Xaml.UnitTests
-{
+namespace Microsoft.Maui.Controls.Xaml.UnitTests;
+
+	[XamlProcessing(XamlInflator.Default, true)]
 	public partial class SafeAreaEdgesTests : ContentPage
 	{
-		public SafeAreaEdgesTests()
-		{
-			InitializeComponent();
-		}
-
-		public SafeAreaEdgesTests(bool useCompiledXaml)
-		{
-			//this stub will be replaced at compile time
-		}
+		public SafeAreaEdgesTests() => InitializeComponent();
 
 		[TestFixture]
 		public class Tests
 		{
-			[TestCase(false)]
-			//[TestCase(true)]
-			public void SingleValueConversions(bool useCompiledXaml)
+			[Test]
+			public void SingleValueConversions([Values] XamlInflator inflator)
 			{
-				var layout = new SafeAreaEdgesTests(useCompiledXaml);
+				var layout = new SafeAreaEdgesTests(inflator);
 
 				Assert.AreEqual(SafeAreaEdges.None, layout.singleValueNone.SafeAreaEdges);
 				Assert.AreEqual(SafeAreaEdges.All, layout.singleValueAll.SafeAreaEdges);
@@ -32,43 +24,38 @@ public void SingleValueConversions(bool useCompiledXaml)
 				Assert.AreEqual(new SafeAreaEdges(SafeAreaRegions.Default), layout.singleValueDefault.SafeAreaEdges);
 			}
 
-			[TestCase(false)]
-			//[TestCase(true)]
-			public void TwoValueConversions(bool useCompiledXaml)
+			[Test]
+			public void TwoValueConversions([Values] XamlInflator inflator)
 			{
-				var layout = new SafeAreaEdgesTests(useCompiledXaml);
+				var layout = new SafeAreaEdgesTests(inflator);
 
 				Assert.AreEqual(new SafeAreaEdges(SafeAreaRegions.SoftInput, SafeAreaRegions.Container), layout.twoValueHorVert.SafeAreaEdges);
 				Assert.AreEqual(new SafeAreaEdges(SafeAreaRegions.None, SafeAreaRegions.All), layout.twoValueMixed.SafeAreaEdges);
 			}
 
-			[TestCase(false)]
-			//[TestCase(true)]
-			public void FourValueConversions(bool useCompiledXaml)
+			[Test]
+			public void FourValueConversions([Values] XamlInflator inflator)
 			{
-				var layout = new SafeAreaEdgesTests(useCompiledXaml);
+				var layout = new SafeAreaEdgesTests(inflator);
 
 				Assert.AreEqual(new SafeAreaEdges(SafeAreaRegions.None, SafeAreaRegions.SoftInput, SafeAreaRegions.Container, SafeAreaRegions.All), layout.fourValueMixed.SafeAreaEdges);
 				Assert.AreEqual(new SafeAreaEdges(SafeAreaRegions.Default, SafeAreaRegions.None, SafeAreaRegions.Default, SafeAreaRegions.All), layout.fourValueDefault.SafeAreaEdges);
 			}
 
-			[TestCase(false)]
-			//[TestCase(true)]
-			public void ControlSpecificProperties(bool useCompiledXaml)
+			[Test]
+			public void ControlSpecificProperties([Values] XamlInflator inflator)
 			{
-				var layout = new SafeAreaEdgesTests(useCompiledXaml);
+				var layout = new SafeAreaEdgesTests(inflator);
 
 				Assert.AreEqual(new SafeAreaEdges(SafeAreaRegions.Container, SafeAreaRegions.SoftInput), layout.contentViewTest.SafeAreaEdges);
-				Assert.AreEqual(new SafeAreaEdges(SafeAreaRegions.All, SafeAreaRegions.None), layout.contentPageTest.SafeAreaEdges);
 				Assert.AreEqual(new SafeAreaEdges(SafeAreaRegions.SoftInput), layout.borderTest.SafeAreaEdges);
 				Assert.AreEqual(new SafeAreaEdges(SafeAreaRegions.Container, SafeAreaRegions.Default, SafeAreaRegions.All, SafeAreaRegions.None), layout.scrollViewTest.SafeAreaEdges);
 			}
 
-			[TestCase(false)]
-			//[TestCase(true)]
-			public void PropertyInflation_WorksWithAllEnumValues(bool useCompiledXaml)
+			[Test]
+			public void PropertyInflation_WorksWithAllEnumValues([Values] XamlInflator inflator)
 			{
-				var layout = new SafeAreaEdgesTests(useCompiledXaml);
+				var layout = new SafeAreaEdgesTests(inflator);
 
 				// Verify all enum values are properly inflated from XAML strings
 				var noneGrid = layout.singleValueNone;
@@ -85,4 +72,3 @@ public void PropertyInflation_WorksWithAllEnumValues(bool useCompiledXaml)
 			}
 		}
 	}
-}
\ No newline at end of file
diff --git a/src/Core/src/Platform/iOS/MauiScrollView.cs b/src/Core/src/Platform/iOS/MauiScrollView.cs
index 241a10c84175..e7ca76ec3f14 100644
--- a/src/Core/src/Platform/iOS/MauiScrollView.cs
+++ b/src/Core/src/Platform/iOS/MauiScrollView.cs
@@ -394,7 +394,46 @@ Size CrossPlatformArrange(CGRect bounds)
 			if (SystemAdjustedContentInset == UIEdgeInsets.Zero || ContentInsetAdjustmentBehavior == UIScrollViewContentInsetAdjustmentBehavior.Never)
 			{
 				contentSize = CrossPlatformLayout?.CrossPlatformArrange(bounds.ToRectangle()) ?? Size.Zero;
-				contentSize = new Size(contentSize.Width + _safeArea.HorizontalThickness, contentSize.Height + _safeArea.VerticalThickness);
+
+				var width = contentSize.Width;
+				var height = contentSize.Height;
+
+				// When using ContentInsetAdjustmentBehavior.Automatic, UIKit decides whether to apply safe area insets
+				// to the scroll view (via AdjustedContentInset) or push them into the child views (via SafeAreaInsets).
+				// This decision is based on whether the scrollView is considered scrollable—i.e., whether the contentSize
+				// exceeds the bounds. If it's not scrollable, UIKit pushes the insets to the child.
+				//
+				// However, when the content size is *just slightly less than or equal to* the scroll view’s bounds,
+				// UIKit may flip-flop between applying the insets to the scroll view or its child, depending on minor layout
+				// changes. This can lead to layout loops, incorrect centering, or unstable behavior.
+				//
+				// The logic below prevents that by artificially increasing contentSize only when:
+				//   - The content would not be scrollable on its own, AND
+				//   - Adding the safe area would make it scrollable.
+				//
+				// This ensures the scroll view remains in a "scrollable" state, so UIKit consistently applies
+				// the insets at the scroll view level—avoiding child view SafeAreaInsets changes and stabilizing layout.
+				if (ContentInsetAdjustmentBehavior == UIScrollViewContentInsetAdjustmentBehavior.Automatic)
+				{
+					if (width <= Bounds.Width &&
+						(width + _safeArea.HorizontalThickness) > Bounds.Width)
+					{
+						width += _safeArea.HorizontalThickness;
+					}
+
+					if (height <= Bounds.Height &&
+						(height + _safeArea.VerticalThickness) > Bounds.Height)
+					{
+						height += _safeArea.VerticalThickness;
+					}
+				}
+				else
+				{
+					width += _safeArea.HorizontalThickness;
+					height += _safeArea.VerticalThickness;
+				}
+
+				contentSize = new Size(width, height);
 			}
 			else
 			{
@@ -419,7 +458,6 @@ Size CrossPlatformArrange(CGRect bounds)
 				// This avoids inset flip-flopping and keeps layout behavior stable and predictable.
 				if (ContentInsetAdjustmentBehavior == UIScrollViewContentInsetAdjustmentBehavior.Automatic)
 				{
-					// If the content size is smaller than the bounds, we need to adjust it to fit within the safe area
 					if (width <= Bounds.Width &&
 						(_safeArea.HorizontalThickness + width) > Bounds.Width)
 					{

From a9b3b7fccb35abd0de49c8e92a067a8957438e1d Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Sat, 26 Jul 2025 17:28:52 -0500
Subject: [PATCH 28/34] - maybe?

---
 src/Core/src/Platform/iOS/MauiScrollView.cs | 26 ---------------------
 1 file changed, 26 deletions(-)

diff --git a/src/Core/src/Platform/iOS/MauiScrollView.cs b/src/Core/src/Platform/iOS/MauiScrollView.cs
index e7ca76ec3f14..2f3703dcbf42 100644
--- a/src/Core/src/Platform/iOS/MauiScrollView.cs
+++ b/src/Core/src/Platform/iOS/MauiScrollView.cs
@@ -398,34 +398,8 @@ Size CrossPlatformArrange(CGRect bounds)
 				var width = contentSize.Width;
 				var height = contentSize.Height;
 
-				// When using ContentInsetAdjustmentBehavior.Automatic, UIKit decides whether to apply safe area insets
-				// to the scroll view (via AdjustedContentInset) or push them into the child views (via SafeAreaInsets).
-				// This decision is based on whether the scrollView is considered scrollable—i.e., whether the contentSize
-				// exceeds the bounds. If it's not scrollable, UIKit pushes the insets to the child.
-				//
-				// However, when the content size is *just slightly less than or equal to* the scroll view’s bounds,
-				// UIKit may flip-flop between applying the insets to the scroll view or its child, depending on minor layout
-				// changes. This can lead to layout loops, incorrect centering, or unstable behavior.
-				//
-				// The logic below prevents that by artificially increasing contentSize only when:
-				//   - The content would not be scrollable on its own, AND
-				//   - Adding the safe area would make it scrollable.
-				//
-				// This ensures the scroll view remains in a "scrollable" state, so UIKit consistently applies
-				// the insets at the scroll view level—avoiding child view SafeAreaInsets changes and stabilizing layout.
 				if (ContentInsetAdjustmentBehavior == UIScrollViewContentInsetAdjustmentBehavior.Automatic)
 				{
-					if (width <= Bounds.Width &&
-						(width + _safeArea.HorizontalThickness) > Bounds.Width)
-					{
-						width += _safeArea.HorizontalThickness;
-					}
-
-					if (height <= Bounds.Height &&
-						(height + _safeArea.VerticalThickness) > Bounds.Height)
-					{
-						height += _safeArea.VerticalThickness;
-					}
 				}
 				else
 				{

From 8a7e37628d2c6b6aa28ff68fd28e013c6a59c78e Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Sat, 26 Jul 2025 18:44:13 -0500
Subject: [PATCH 29/34] - cleanup code

---
 src/Core/src/Platform/iOS/MauiScrollView.cs | 85 +++++++++++----------
 1 file changed, 43 insertions(+), 42 deletions(-)

diff --git a/src/Core/src/Platform/iOS/MauiScrollView.cs b/src/Core/src/Platform/iOS/MauiScrollView.cs
index 2f3703dcbf42..0b04bab65174 100644
--- a/src/Core/src/Platform/iOS/MauiScrollView.cs
+++ b/src/Core/src/Platform/iOS/MauiScrollView.cs
@@ -391,63 +391,64 @@ Size CrossPlatformArrange(CGRect bounds)
 			Size contentSize;
 
 
+			double width;
+			double height;
 			if (SystemAdjustedContentInset == UIEdgeInsets.Zero || ContentInsetAdjustmentBehavior == UIScrollViewContentInsetAdjustmentBehavior.Never)
 			{
 				contentSize = CrossPlatformLayout?.CrossPlatformArrange(bounds.ToRectangle()) ?? Size.Zero;
 
-				var width = contentSize.Width;
-				var height = contentSize.Height;
+				width = contentSize.Width;
+				height = contentSize.Height;
+			}
+			else
+			{
+				contentSize = CrossPlatformLayout?.CrossPlatformArrange(new Rect(new Point(), bounds.Size.ToSize())) ?? Size.Zero;
+
+				width = contentSize.Width;
+				height = contentSize.Height;
+			}
 
-				if (ContentInsetAdjustmentBehavior == UIScrollViewContentInsetAdjustmentBehavior.Automatic)
+
+			// When using ContentInsetAdjustmentBehavior.Automatic, UIKit dynamically decides whether to apply 
+			// safe area insets to the scroll view (via AdjustedContentInset) or to push them into the child view's SafeAreaInsets.
+			// This decision depends on whether the scroll view is considered "scrollable"—i.e., whether the contentSize 
+			// is larger than the visible bounds (after accounting for safe areas).
+			//
+			// If the content size is *just* smaller than or equal to the scroll view’s bounds, UIKit may decide that
+			// scrolling isn’t needed and push the safe area insets into the child instead. This can cause:
+			//   - content centering to behave incorrectly (e.g., not respecting safe areas),
+			//   - layout loops where the child resizes in response to changing safe area insets,
+			//   - instability when transitioning between scrollable and non-scrollable states.
+			//
+			// This logic adds safe area padding to the contentSize *only if* the content is nearly large enough to require scrolling,
+			// ensuring the scroll view remains in "scrollable mode" and keeps safe area insets at the scroll view level.
+			// This avoids inset flip-flopping and keeps layout behavior stable and predictable.
+			if (ContentInsetAdjustmentBehavior == UIScrollViewContentInsetAdjustmentBehavior.Automatic)
+			{
+				// We do this to keep the content scrollable
+				// if we don't do this the ContentAdjustedInset + contentSize will cause the content to go off the screen and not be scrollable
+				if (width <= Bounds.Width &&
+					(_safeArea.HorizontalThickness + width) > Bounds.Width)
 				{
+					width += Bounds.Width + 1;
 				}
-				else
+
+				if (height <= Bounds.Height &&
+					(_safeArea.VerticalThickness + height) > Bounds.Height)
 				{
-					width += _safeArea.HorizontalThickness;
-					height += _safeArea.VerticalThickness;
+					height = Bounds.Height + 1;
 				}
 
 				contentSize = new Size(width, height);
 			}
-			else
+			else if (ContentInsetAdjustmentBehavior != UIScrollViewContentInsetAdjustmentBehavior.Automatic)
 			{
-				contentSize = CrossPlatformLayout?.CrossPlatformArrange(new Rect(new Point(), bounds.Size.ToSize())) ?? Size.Zero;
-
-				var width = contentSize.Width;
-				var height = contentSize.Height;
-
-				// When using ContentInsetAdjustmentBehavior.Automatic, UIKit dynamically decides whether to apply 
-				// safe area insets to the scroll view (via AdjustedContentInset) or to push them into the child view's SafeAreaInsets.
-				// This decision depends on whether the scroll view is considered "scrollable"—i.e., whether the contentSize 
-				// is larger than the visible bounds (after accounting for safe areas).
-				//
-				// If the content size is *just* smaller than or equal to the scroll view’s bounds, UIKit may decide that
-				// scrolling isn’t needed and push the safe area insets into the child instead. This can cause:
-				//   - content centering to behave incorrectly (e.g., not respecting safe areas),
-				//   - layout loops where the child resizes in response to changing safe area insets,
-				//   - instability when transitioning between scrollable and non-scrollable states.
-				//
-				// This logic adds safe area padding to the contentSize *only if* the content is nearly large enough to require scrolling,
-				// ensuring the scroll view remains in "scrollable mode" and keeps safe area insets at the scroll view level.
-				// This avoids inset flip-flopping and keeps layout behavior stable and predictable.
-				if (ContentInsetAdjustmentBehavior == UIScrollViewContentInsetAdjustmentBehavior.Automatic)
-				{
-					if (width <= Bounds.Width &&
-						(_safeArea.HorizontalThickness + width) > Bounds.Width)
-					{
-						width += _safeArea.HorizontalThickness;
-					}
-
-					if (height <= Bounds.Height &&
-						(_safeArea.VerticalThickness + height) > Bounds.Height)
-					{
-						height += _safeArea.VerticalThickness;
-					}
-
-					contentSize = new Size(width, height);
-				}
+				width += _safeArea.HorizontalThickness;
+				height += _safeArea.VerticalThickness;
 			}
 
+			contentSize = new Size(width, height);
+
 			// For Right-To-Left (RTL) layouts, we need to adjust the content arrangement and offset
 			// to ensure the content is correctly aligned and scrolled. This involves a second layout
 			// arrangement with an adjusted starting point and recalculating the content offset.

From 8778141931ac623c4cec3de6919d395edadef070 Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Sat, 26 Jul 2025 18:55:42 -0500
Subject: [PATCH 30/34] - fix test and add a comment

---
 .../DeviceTests/Elements/ScrollView/ScrollViewTests.iOS.cs    | 4 +++-
 src/Core/src/Platform/iOS/MauiScrollView.cs                   | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Controls/tests/DeviceTests/Elements/ScrollView/ScrollViewTests.iOS.cs b/src/Controls/tests/DeviceTests/Elements/ScrollView/ScrollViewTests.iOS.cs
index 8495f10ccdd3..978f753c3d71 100644
--- a/src/Controls/tests/DeviceTests/Elements/ScrollView/ScrollViewTests.iOS.cs
+++ b/src/Controls/tests/DeviceTests/Elements/ScrollView/ScrollViewTests.iOS.cs
@@ -19,7 +19,9 @@ public async Task ScrollViewContentSizeSet()
 		{
 			EnsureHandlerCreated(builder => { builder.ConfigureMauiHandlers(handlers => { handlers.AddHandler<Entry, EntryHandler>(); }); });
 
-			var scrollView = new ScrollView();
+			// we set this to none because if it's set to automatic it should become scrollable
+			// so the bottom content doesn't go off the screen
+			var scrollView = new ScrollView() { SafeAreaEdges = SafeAreaEdges.None };
 			var entry = new Entry() { Text = "In a ScrollView", HeightRequest = 10000 };
 			scrollView.Content = entry;
 			await AttachAndRun<ScrollViewHandler>(scrollView, handler =>
diff --git a/src/Core/src/Platform/iOS/MauiScrollView.cs b/src/Core/src/Platform/iOS/MauiScrollView.cs
index 0b04bab65174..e59014457516 100644
--- a/src/Core/src/Platform/iOS/MauiScrollView.cs
+++ b/src/Core/src/Platform/iOS/MauiScrollView.cs
@@ -427,6 +427,7 @@ Size CrossPlatformArrange(CGRect bounds)
 			{
 				// We do this to keep the content scrollable
 				// if we don't do this the ContentAdjustedInset + contentSize will cause the content to go off the screen and not be scrollable
+				// So the bottom content will just go off the screen until the contentsize triggers the scrollable area
 				if (width <= Bounds.Width &&
 					(_safeArea.HorizontalThickness + width) > Bounds.Width)
 				{

From 26b5d87470d64022987715b8bb5cb0d7e2d08017 Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Sun, 27 Jul 2025 07:47:33 -0500
Subject: [PATCH 31/34] - fix device test and remove some apis

---
 .../ScrollView/ScrollViewTests.iOS.cs         | 22 +++++++++----------
 src/Core/src/Primitives/SafeAreaEdges.cs      |  2 +-
 .../net-android/PublicAPI.Unshipped.txt       |  1 -
 .../PublicAPI/net-ios/PublicAPI.Unshipped.txt |  1 -
 .../net-maccatalyst/PublicAPI.Unshipped.txt   |  1 -
 .../net-windows/PublicAPI.Unshipped.txt       |  1 -
 .../src/PublicAPI/net/PublicAPI.Unshipped.txt |  1 -
 .../netstandard/PublicAPI.Unshipped.txt       |  1 -
 .../netstandard2.0/PublicAPI.Unshipped.txt    |  1 -
 9 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/src/Controls/tests/DeviceTests/Elements/ScrollView/ScrollViewTests.iOS.cs b/src/Controls/tests/DeviceTests/Elements/ScrollView/ScrollViewTests.iOS.cs
index 978f753c3d71..63d45547bf8d 100644
--- a/src/Controls/tests/DeviceTests/Elements/ScrollView/ScrollViewTests.iOS.cs
+++ b/src/Controls/tests/DeviceTests/Elements/ScrollView/ScrollViewTests.iOS.cs
@@ -35,17 +35,13 @@ public async Task ContentSizeExpandsToViewport()
 		{
 			EnsureHandlerCreated(builder => { builder.ConfigureMauiHandlers(handlers => { handlers.AddHandler<Entry, EntryHandler>(); }); });
 
-			var scrollView = new ScrollView();
+			var scrollView = new ScrollView()
+			{
+				SafeAreaEdges = SafeAreaEdges.Container
+			};
 
 			var entry = new Entry() { Text = "In a ScrollView", HeightRequest = 10 };
 
-
-			static CoreGraphics.CGSize getViewportSize(UIScrollView scrollView)
-			{
-				return scrollView.AdjustedContentInset.InsetRect(scrollView.Bounds).Size;
-			}
-			;
-
 			var scrollViewHandler = await InvokeOnMainThreadAsync(() =>
 			{
 				return CreateHandlerAsync<ScrollViewHandler>(scrollView);
@@ -57,7 +53,6 @@ await scrollViewHandler.PlatformView.AttachAndRun(async () =>
 				{
 					var uiScrollView = scrollViewHandler.PlatformView;
 
-					uiScrollView.ContentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentBehavior.Always;
 					var parent = uiScrollView.Superview;
 					uiScrollView.Bounds = parent.Bounds;
 					uiScrollView.Center = parent.Center;
@@ -69,8 +64,13 @@ await scrollViewHandler.PlatformView.AttachAndRun(async () =>
 
 					await Task.Yield();
 
-					var contentSize = uiScrollView.ContentSize;
-					var viewportSize = getViewportSize(uiScrollView);
+					// When the scroll view is set to SafeAreaEdges.Container, the uiScrollView 
+					// ContentAdjustmentInsetBehavior is set to Always
+					// This means we should always inset the content by the safe area insets
+					// This way the content doesn't go under the top and bottom bars and notch
+					var contentRect = new CoreGraphics.CGRect(0, 0, uiScrollView.ContentSize.Width, uiScrollView.ContentSize.Height);
+					var contentSize = uiScrollView.SafeAreaInsets.InsetRect(contentRect).Size;
+					var viewportSize = uiScrollView.AdjustedContentInset.InsetRect(uiScrollView.Bounds).Size;
 
 					Assert.Equal(viewportSize.Height, contentSize.Height);
 					Assert.Equal(viewportSize.Width, contentSize.Width);
diff --git a/src/Core/src/Primitives/SafeAreaEdges.cs b/src/Core/src/Primitives/SafeAreaEdges.cs
index 709e86fe73ed..15e0deac00f8 100644
--- a/src/Core/src/Primitives/SafeAreaEdges.cs
+++ b/src/Core/src/Primitives/SafeAreaEdges.cs
@@ -74,7 +74,7 @@ public SafeAreaEdges(SafeAreaRegions left, SafeAreaRegions top, SafeAreaRegions
 		/// </summary>
 		/// <param name="edge">The edge index (0=Left, 1=Top, 2=Right, 3=Bottom).</param>
 		/// <returns>The <see cref="SafeAreaRegions"/> for the specified edge.</returns>
-		public SafeAreaRegions GetEdge(int edge)
+		internal SafeAreaRegions GetEdge(int edge)
 		{
 			return edge switch
 			{
diff --git a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
index be62de76bfe1..c9245fcd263b 100644
--- a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -55,7 +55,6 @@ Microsoft.Maui.Platform.MauiSwipeRefreshLayout.CrossPlatformLayout.set -> void
 Microsoft.Maui.SafeAreaEdges
 Microsoft.Maui.SafeAreaEdges.Bottom.get -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaEdges.Equals(Microsoft.Maui.SafeAreaEdges other) -> bool
-Microsoft.Maui.SafeAreaEdges.GetEdge(int edge) -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaEdges.Left.get -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaEdges.Right.get -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaEdges.SafeAreaEdges() -> void
diff --git a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index 92937a903e1d..bd3beeef912c 100644
--- a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -59,7 +59,6 @@ Microsoft.Maui.Platform.UIApplicationExtensions
 Microsoft.Maui.SafeAreaEdges
 Microsoft.Maui.SafeAreaEdges.Bottom.get -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaEdges.Equals(Microsoft.Maui.SafeAreaEdges other) -> bool
-Microsoft.Maui.SafeAreaEdges.GetEdge(int edge) -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaEdges.Left.get -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaEdges.Right.get -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaEdges.SafeAreaEdges() -> void
diff --git a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index 225c1f50268f..a45490cf902a 100644
--- a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -61,7 +61,6 @@ Microsoft.Maui.Platform.UIApplicationExtensions
 Microsoft.Maui.SafeAreaEdges
 Microsoft.Maui.SafeAreaEdges.Bottom.get -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaEdges.Equals(Microsoft.Maui.SafeAreaEdges other) -> bool
-Microsoft.Maui.SafeAreaEdges.GetEdge(int edge) -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaEdges.Left.get -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaEdges.Right.get -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaEdges.SafeAreaEdges() -> void
diff --git a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index e53631e5ecdc..7923c02cdc15 100644
--- a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -52,7 +52,6 @@ Microsoft.Maui.Platform.CalendarDatePickerExtensions
 Microsoft.Maui.SafeAreaEdges
 Microsoft.Maui.SafeAreaEdges.Bottom.get -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaEdges.Equals(Microsoft.Maui.SafeAreaEdges other) -> bool
-Microsoft.Maui.SafeAreaEdges.GetEdge(int edge) -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaEdges.Left.get -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaEdges.Right.get -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaEdges.SafeAreaEdges() -> void
diff --git a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
index 021f0f469af6..8a7da5a7b3b5 100644
--- a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -49,7 +49,6 @@ Microsoft.Maui.IWebRequestInterceptingWebView.WebResourceRequested(Microsoft.Mau
 Microsoft.Maui.SafeAreaEdges
 Microsoft.Maui.SafeAreaEdges.Bottom.get -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaEdges.Equals(Microsoft.Maui.SafeAreaEdges other) -> bool
-Microsoft.Maui.SafeAreaEdges.GetEdge(int edge) -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaEdges.Left.get -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaEdges.Right.get -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaEdges.SafeAreaEdges() -> void
diff --git a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
index 021f0f469af6..8a7da5a7b3b5 100644
--- a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -49,7 +49,6 @@ Microsoft.Maui.IWebRequestInterceptingWebView.WebResourceRequested(Microsoft.Mau
 Microsoft.Maui.SafeAreaEdges
 Microsoft.Maui.SafeAreaEdges.Bottom.get -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaEdges.Equals(Microsoft.Maui.SafeAreaEdges other) -> bool
-Microsoft.Maui.SafeAreaEdges.GetEdge(int edge) -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaEdges.Left.get -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaEdges.Right.get -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaEdges.SafeAreaEdges() -> void
diff --git a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
index 021f0f469af6..8a7da5a7b3b5 100644
--- a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
@@ -49,7 +49,6 @@ Microsoft.Maui.IWebRequestInterceptingWebView.WebResourceRequested(Microsoft.Mau
 Microsoft.Maui.SafeAreaEdges
 Microsoft.Maui.SafeAreaEdges.Bottom.get -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaEdges.Equals(Microsoft.Maui.SafeAreaEdges other) -> bool
-Microsoft.Maui.SafeAreaEdges.GetEdge(int edge) -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaEdges.Left.get -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaEdges.Right.get -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.SafeAreaEdges.SafeAreaEdges() -> void

From 765fffaee0e248f6842561d23b93eb6745dcf98d Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 27 Jul 2025 13:17:01 +0000
Subject: [PATCH 32/34] Add per-edge SafeArea validation, ScrollView test
 suite, and revert .gitignore changes

Co-authored-by: PureWeen <5375137+PureWeen@users.noreply.github.com>
---
 .gitignore                                    |   1 -
 .../TestCases.HostApp/Issues/Issue28986.xaml  |  22 ++
 .../Issues/Issue28986.xaml.cs                 |  35 +++
 .../Issues/Issue28986_ScrollView.xaml         | 206 ++++++------------
 .../Issues/Issue28986_ScrollView.xaml.cs      |  97 ++++-----
 .../Tests/Issues/Issue28986.cs                |  27 +++
 .../Tests/Issues/Issue28986_ScrollView.cs     |  92 ++++++++
 7 files changed, 289 insertions(+), 191 deletions(-)
 create mode 100644 src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28986_ScrollView.cs

diff --git a/.gitignore b/.gitignore
index f290a755fda4..5a048174d6c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,6 @@
 .nuspec/
 .buildtasks/
 templatesTest/
-*.bak
 
 # User-specific files
 *.rsuser
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml
index 4e8413baef7d..16430e1c717d 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml
@@ -73,6 +73,28 @@
                                     BackgroundColor="LightCoral"
                                     AutomationId="GridResetAllButton" />
                             
+                            <!-- Per-edge controls for specific scenarios -->
+                            <Label Text="Per-Edge Controls:" 
+                                   FontSize="16" 
+                                   FontAttributes="Bold"
+                                   HorizontalOptions="Center"
+                                   Margin="0,10,0,0" />
+                            
+                            <Button Text="Set Bottom Edge to SoftInput"
+                                    Clicked="OnGridSetBottomSoftInputClicked"
+                                    BackgroundColor="LightYellow"
+                                    AutomationId="GridSetBottomSoftInputButton" />
+                            
+                            <Button Text="Set Top Edge to Container"
+                                    Clicked="OnGridSetTopContainerClicked"
+                                    BackgroundColor="LightPink"
+                                    AutomationId="GridSetTopContainerButton" />
+                            
+                            <Button Text="Set Top Edge to None"
+                                    Clicked="OnGridSetTopNoneClicked"
+                                    BackgroundColor="LightGray"
+                                    AutomationId="GridSetTopNoneButton" />
+                            
                             <!-- Legend -->
                             <StackLayout Spacing="5" Margin="0,10,0,0">
                                 <Label Text="None = Edge-to-edge content (no safe area padding)" 
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml.cs
index 7db07455969c..26eda117da6a 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml.cs
@@ -27,6 +27,41 @@ private void OnGridSetAllClicked(object sender, EventArgs e)
 		UpdateCurrentSettingsLabel();
 	}
 
+	private void OnGridSetBottomSoftInputClicked(object sender, EventArgs e)
+	{
+		MainGrid.SafeAreaEdges = new SafeAreaEdges(
+			SafeAreaRegions.None,     // Left
+			SafeAreaRegions.None,     // Top
+			SafeAreaRegions.None,     // Right
+			SafeAreaRegions.SoftInput // Bottom
+		);
+		UpdateCurrentSettingsLabel();
+	}
+
+	private void OnGridSetTopContainerClicked(object sender, EventArgs e)
+	{
+		var current = MainGrid.SafeAreaEdges;
+		MainGrid.SafeAreaEdges = new SafeAreaEdges(
+			current.Left,              // Left (keep current)
+			SafeAreaRegions.Container, // Top
+			current.Right,             // Right (keep current)
+			current.Bottom             // Bottom (keep current)
+		);
+		UpdateCurrentSettingsLabel();
+	}
+
+	private void OnGridSetTopNoneClicked(object sender, EventArgs e)
+	{
+		var current = MainGrid.SafeAreaEdges;
+		MainGrid.SafeAreaEdges = new SafeAreaEdges(
+			current.Left,         // Left (keep current)
+			SafeAreaRegions.None, // Top
+			current.Right,        // Right (keep current)
+			current.Bottom        // Bottom (keep current)
+		);
+		UpdateCurrentSettingsLabel();
+	}
+
 	private void UpdateCurrentSettingsLabel()
 	{
 		var edges = MainGrid.SafeAreaEdges;
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ScrollView.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ScrollView.xaml
index 35debe8f9beb..87b8ad753f93 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ScrollView.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ScrollView.xaml
@@ -2,163 +2,97 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Maui.Controls.Sample.Issues.Issue28986_ScrollView"
-             Title="SafeArea ScrollView Test" SafeAreaEdges="None"
-             Background="Red">
-
-    <Grid BackgroundColor="Red" SafeAreaEdges="None">
-        <!-- ScrollView with SafeAreaEdges property -->
-        <ScrollView x:Name="TestScrollView" SafeAreaEdges="All" BackgroundColor="LightBlue">
+             x:Name="TestPage"
+             Title="SafeArea ScrollView Test">
+    
+    <Grid x:Name="MainGrid" BackgroundColor="Blue" SafeAreaEdges="All">
+        <!-- ScrollView that spans the entire screen -->
+        <ScrollView x:Name="TestScrollView" SafeAreaEdges="All" AutomationId="TestScrollView" BackgroundColor="White">
             <StackLayout Spacing="20" Padding="20">
-                <Label Text="SafeArea ScrollView Test" 
+                <Label Text="SafeArea ScrollView Test Page" 
                        FontSize="24" 
                        FontAttributes="Bold"
-                       HorizontalOptions="Center" />
+                       HorizontalOptions="Center"
+                       TextColor="DarkBlue" />
                 
-                <Label Text="This ScrollView has SafeAreaEdges='All' and should extend behind system UI areas. The red background shows areas outside safe area."
+                <Label Text="This page tests ScrollView SafeAreaEdges behavior. The blue background shows areas outside safe area."
                        FontSize="14"
-                       HorizontalOptions="Center" />
+                       HorizontalOptions="Center"
+                       TextColor="DarkBlue" />
                 
                 <Label x:Name="CurrentSettingsLabel"
                        Text="Current ScrollView SafeAreaEdges: All"
                        FontSize="16"
                        FontAttributes="Bold"
                        HorizontalOptions="Center"
+                       TextColor="DarkBlue"
                        AutomationId="CurrentSettings" />
                 
-                <!-- Control panel for ScrollView SafeAreaEdges -->
-                <Border BackgroundColor="White" Stroke="Gray" StrokeThickness="2" Padding="15">
+                <!-- ScrollView SafeArea Control -->
+                <Border BackgroundColor="LightBlue" Stroke="DarkBlue" StrokeThickness="2" Padding="20" Margin="10">
                     <VerticalStackLayout Spacing="15">
-                        <Label Text="ScrollView SafeAreaEdges Control:" 
+                        <Label Text="ScrollView Safe Area Control:" 
                                FontSize="18" 
                                FontAttributes="Bold"
                                HorizontalOptions="Center" />
                         
-                        <Grid>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                            </Grid.RowDefinitions>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="*" />
-                            </Grid.ColumnDefinitions>
-                            
-                            <!-- Top -->
-                            <StackLayout Grid.Row="0" Grid.Column="1" Orientation="Horizontal" HorizontalOptions="Center">
-                                <Label Text="Top:" VerticalOptions="Center" />
-                                <Picker x:Name="TopPicker" 
-                                        SelectedIndex="0" 
-                                        SelectedIndexChanged="OnEdgePickerChanged"
-                                        AutomationId="TopPicker">
-                                    <Picker.Items>
-                                        <x:String>None</x:String>
-                                        <x:String>SoftInput</x:String>
-                                        <x:String>Container</x:String>
-                                        <x:String>Default</x:String>
-                                        <x:String>All</x:String>
-                                    </Picker.Items>
-                                </Picker>
-                            </StackLayout>
-                            
-                            <!-- Left and Right -->
-                            <StackLayout Grid.Row="1" Grid.Column="0" Orientation="Horizontal" HorizontalOptions="Center">
-                                <Label Text="Left:" VerticalOptions="Center" />
-                                <Picker x:Name="LeftPicker" 
-                                        SelectedIndex="0" 
-                                        SelectedIndexChanged="OnEdgePickerChanged"
-                                        AutomationId="LeftPicker">
-                                    <Picker.Items>
-                                        <x:String>None</x:String>
-                                        <x:String>SoftInput</x:String>
-                                        <x:String>Container</x:String>
-                                        <x:String>Default</x:String>
-                                        <x:String>All</x:String>
-                                    </Picker.Items>
-                                </Picker>
-                            </StackLayout>
-                            
-                            <StackLayout Grid.Row="1" Grid.Column="2" Orientation="Horizontal" HorizontalOptions="Center">
-                                <Label Text="Right:" VerticalOptions="Center" />
-                                <Picker x:Name="RightPicker" 
-                                        SelectedIndex="0" 
-                                        SelectedIndexChanged="OnEdgePickerChanged"
-                                        AutomationId="RightPicker">
-                                    <Picker.Items>
-                                        <x:String>None</x:String>
-                                        <x:String>SoftInput</x:String>
-                                        <x:String>Container</x:String>
-                                        <x:String>Default</x:String>
-                                        <x:String>All</x:String>
-                                    </Picker.Items>
-                                </Picker>
-                            </StackLayout>
-                            
-                            <!-- Bottom -->
-                            <StackLayout Grid.Row="2" Grid.Column="1" Orientation="Horizontal" HorizontalOptions="Center">
-                                <Label Text="Bottom:" VerticalOptions="Center" />
-                                <Picker x:Name="BottomPicker" 
-                                        SelectedIndex="0" 
-                                        SelectedIndexChanged="OnEdgePickerChanged"
-                                        AutomationId="BottomPicker">
-                                    <Picker.Items>
-                                        <x:String>None</x:String>
-                                        <x:String>SoftInput</x:String>
-                                        <x:String>Container</x:String>
-                                        <x:String>Default</x:String>
-                                        <x:String>All</x:String>
-                                    </Picker.Items>
-                                </Picker>
-                            </StackLayout>
-                            
-                            <!-- SoftInput test area -->
-                            <StackLayout Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="3" Orientation="Horizontal" HorizontalOptions="Center">
-                                <Label Text="SoftInput Test:" VerticalOptions="Center" />
-                                <Entry x:Name="SoftInputTestEntry" 
-                                       Placeholder="Tap to show keyboard" 
-                                       WidthRequest="200"
-                                       AutomationId="SoftInputTestEntry" />
-                            </StackLayout>
-                        </Grid>
+                        <Label Text="Test different SafeAreaEdges values on the ScrollView"
+                               FontSize="12"
+                               HorizontalOptions="Center"
+                               TextColor="Gray" />
+                        
+                        <Button Text="Set ScrollView to None (Edge-to-edge)"
+                                Clicked="OnScrollViewSetNoneClicked"
+                                BackgroundColor="LightBlue"
+                                AutomationId="ScrollViewResetNoneButton" />
+                        
+                        <Button Text="Set ScrollView to Container"
+                                Clicked="OnScrollViewSetContainerClicked"
+                                BackgroundColor="LightGreen"
+                                AutomationId="ScrollViewSetContainerButton" />
+                        
+                        <Button Text="Set ScrollView to All (Full safe area)"
+                                Clicked="OnScrollViewSetAllClicked"
+                                BackgroundColor="LightCoral"
+                                AutomationId="ScrollViewResetAllButton" />
                         
-                        <Button Text="Reset All to Default" 
-                                Clicked="OnResetDefaultClicked"
-                                AutomationId="ResetDefaultButton" />
-                        <Button Text="Reset All to None" 
-                                Clicked="OnResetNoneClicked"
-                                AutomationId="ResetNoneButton" />
-                        <Button Text="Reset All to All" 
-                                Clicked="OnResetAllClicked"
-                                AutomationId="ResetAllButton" />
+                        <Button Text="Set ScrollView to SoftInput"
+                                Clicked="OnScrollViewSetSoftInputClicked"
+                                BackgroundColor="LightYellow"
+                                AutomationId="ScrollViewSetSoftInputButton" />
                     </VerticalStackLayout>
                 </Border>
-                
-                <!-- Sample content to make scrolling meaningful -->
-                <Label Text="Sample Content" FontSize="18" FontAttributes="Bold" />
-                <Label Text="This is sample content to demonstrate ScrollView behavior with SafeAreaEdges." />
-                <Label Text="Line 1" />
-                <Label Text="Line 2" />
-                <Label Text="Line 3" />
-                <Label Text="Line 4" />
-                <Label Text="Line 5" />
-                <Label Text="Line 6" />
-                <Label Text="Line 7" />
-                <Label Text="Line 8" />
-                <Label Text="Line 9" />
-                <Label Text="Line 10" />
-                <Label Text="Line 11" />
-                <Label Text="Line 12" />
-                <Label Text="Line 13" />
-                <Label Text="Line 14" />
-                <Label Text="Line 15" />
-                <Label Text="Line 16" />
-                <Label Text="Line 17" />
-                <Label Text="Line 18" />
-                <Label Text="Line 19" />
-                <Label Text="Line 20" />
-                <Label Text="End of Content" FontSize="18" FontAttributes="Bold" />
+
+                <!-- Test content to enable scrolling -->
+                <Label Text="--- SCROLLABLE CONTENT BELOW ---" 
+                       FontSize="16" 
+                       FontAttributes="Bold"
+                       HorizontalOptions="Center"
+                       TextColor="Red" />
+
+                <!-- Add enough content to make scrolling possible -->
+                <StackLayout Spacing="20">
+                    <Label Text="Test Item 1" FontSize="18" BackgroundColor="LightGray" Padding="10" />
+                    <Label Text="Test Item 2" FontSize="18" BackgroundColor="LightGray" Padding="10" />
+                    <Label Text="Test Item 3" FontSize="18" BackgroundColor="LightGray" Padding="10" />
+                    <Label Text="Test Item 4" FontSize="18" BackgroundColor="LightGray" Padding="10" />
+                    <Label Text="Test Item 5" FontSize="18" BackgroundColor="LightGray" Padding="10" />
+                    <Label Text="Test Item 6" FontSize="18" BackgroundColor="LightGray" Padding="10" />
+                    <Label Text="Test Item 7" FontSize="18" BackgroundColor="LightGray" Padding="10" />
+                    <Label Text="Test Item 8" FontSize="18" BackgroundColor="LightGray" Padding="10" />
+                    <Label Text="Test Item 9" FontSize="18" BackgroundColor="LightGray" Padding="10" />
+                    <Label Text="Test Item 10" FontSize="18" BackgroundColor="LightGray" Padding="10" />
+                    <Label Text="Test Item 11" FontSize="18" BackgroundColor="LightGray" Padding="10" />
+                    <Label Text="Test Item 12" FontSize="18" BackgroundColor="LightGray" Padding="10" />
+                    <Label Text="Test Item 13" FontSize="18" BackgroundColor="LightGray" Padding="10" />
+                    <Label Text="Test Item 14" FontSize="18" BackgroundColor="LightGray" Padding="10" />
+                    <Label Text="Test Item 15" FontSize="18" BackgroundColor="LightGray" Padding="10" />
+                    <Label Text="Test Item 16" FontSize="18" BackgroundColor="LightGray" Padding="10" />
+                    <Label Text="Test Item 17" FontSize="18" BackgroundColor="LightGray" Padding="10" />
+                    <Label Text="Test Item 18" FontSize="18" BackgroundColor="LightGray" Padding="10" />
+                    <Label Text="Test Item 19" FontSize="18" BackgroundColor="LightGray" Padding="10" />
+                    <Label Text="Test Item 20 - BOTTOM" FontSize="18" BackgroundColor="Red" Padding="10" />
+                </StackLayout>
             </StackLayout>
         </ScrollView>
     </Grid>
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ScrollView.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ScrollView.xaml.cs
index 1d3b29ef9891..96c99e87d4c2 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ScrollView.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ScrollView.xaml.cs
@@ -6,79 +6,68 @@ public partial class Issue28986_ScrollView : ContentPage
 	public Issue28986_ScrollView()
 	{
 		InitializeComponent();
-		// Initialize controls (start with all All)
-		LeftPicker.SelectedIndex = 3;   // All
-		TopPicker.SelectedIndex = 3;    // All
-		RightPicker.SelectedIndex = 3;  // All
-		BottomPicker.SelectedIndex = 3; // All
-
-		UpdateSafeAreaSettings();
+		UpdateCurrentSettingsLabel();
 	}
 
-	private void OnEdgePickerChanged(object sender, EventArgs e)
+	private void OnScrollViewSetNoneClicked(object sender, EventArgs e)
 	{
-		UpdateSafeAreaSettings();
+		TestScrollView.SafeAreaEdges = SafeAreaEdges.None;
+		UpdateCurrentSettingsLabel();
 	}
 
-	private void OnResetDefaultClicked(object sender, EventArgs e)
+	private void OnScrollViewSetContainerClicked(object sender, EventArgs e)
 	{
-		LeftPicker.SelectedIndex = 3;   // Default
-		TopPicker.SelectedIndex = 3;    // Default
-		RightPicker.SelectedIndex = 3;  // Default
-		BottomPicker.SelectedIndex = 3; // Default
-		UpdateSafeAreaSettings();
+		TestScrollView.SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.Container);
+		UpdateCurrentSettingsLabel();
 	}
 
-	private void OnResetNoneClicked(object sender, EventArgs e)
+	private void OnScrollViewSetAllClicked(object sender, EventArgs e)
 	{
-		LeftPicker.SelectedIndex = 0;   // None
-		TopPicker.SelectedIndex = 0;    // None
-		RightPicker.SelectedIndex = 0;  // None
-		BottomPicker.SelectedIndex = 0; // None
-		UpdateSafeAreaSettings();
+		TestScrollView.SafeAreaEdges = SafeAreaEdges.All;
+		UpdateCurrentSettingsLabel();
 	}
 
-	private void OnResetAllClicked(object sender, EventArgs e)
+	private void OnScrollViewSetSoftInputClicked(object sender, EventArgs e)
 	{
-		LeftPicker.SelectedIndex = 4;   // All
-		TopPicker.SelectedIndex = 4;    // All
-		RightPicker.SelectedIndex = 4;  // All
-		BottomPicker.SelectedIndex = 4; // All
-		UpdateSafeAreaSettings();
+		TestScrollView.SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.SoftInput);
+		UpdateCurrentSettingsLabel();
 	}
 
-	private SafeAreaRegions GetSafeAreaRegionsFromPickerIndex(int index)
+	private void UpdateCurrentSettingsLabel()
 	{
-		return index switch
-		{
-			0 => SafeAreaRegions.None,
-			1 => SafeAreaRegions.SoftInput,
-			2 => SafeAreaRegions.Container,
-			3 => SafeAreaRegions.Default,
-			4 => SafeAreaRegions.All,
-			_ => SafeAreaRegions.None
-		};
+		var edges = TestScrollView.SafeAreaEdges;
+		var settingText = GetSafeAreaEdgesDescription(edges);
+		CurrentSettingsLabel.Text = $"Current ScrollView SafeAreaEdges: {settingText}";
 	}
 
-	private void UpdateSafeAreaSettings()
+	private string GetSafeAreaEdgesDescription(SafeAreaEdges edges)
 	{
-		// Create SafeAreaEdges for ScrollView settings
-		var safeAreaSettings = new SafeAreaEdges(
-			GetSafeAreaRegionsFromPickerIndex(LeftPicker.SelectedIndex),   // Left
-			GetSafeAreaRegionsFromPickerIndex(TopPicker.SelectedIndex),    // Top  
-			GetSafeAreaRegionsFromPickerIndex(RightPicker.SelectedIndex),  // Right
-			GetSafeAreaRegionsFromPickerIndex(BottomPicker.SelectedIndex)  // Bottom
-		);
-
-		// Apply SafeAreaEdges to the ScrollView
-		TestScrollView.SafeAreaEdges = safeAreaSettings;
+		// Check for common patterns
+		if (edges.Left == SafeAreaRegions.None && edges.Top == SafeAreaRegions.None && 
+		    edges.Right == SafeAreaRegions.None && edges.Bottom == SafeAreaRegions.None)
+		{
+			return "None (Edge-to-edge)";
+		}
+		
+		if (edges.Left == SafeAreaRegions.All && edges.Top == SafeAreaRegions.All && 
+		    edges.Right == SafeAreaRegions.All && edges.Bottom == SafeAreaRegions.All)
+		{
+			return "All (Full safe area)";
+		}
+		
+		if (edges.Left == SafeAreaRegions.Container && edges.Top == SafeAreaRegions.Container && 
+		    edges.Right == SafeAreaRegions.Container && edges.Bottom == SafeAreaRegions.Container)
+		{
+			return "Container (Respect notches/bars)";
+		}
 
-		// Update the display label
-		var settingsText = $"Left: {GetSafeAreaRegionsFromPickerIndex(LeftPicker.SelectedIndex)}, " +
-						  $"Top: {GetSafeAreaRegionsFromPickerIndex(TopPicker.SelectedIndex)}, " +
-						  $"Right: {GetSafeAreaRegionsFromPickerIndex(RightPicker.SelectedIndex)}, " +
-						  $"Bottom: {GetSafeAreaRegionsFromPickerIndex(BottomPicker.SelectedIndex)}";
+		if (edges.Left == SafeAreaRegions.SoftInput && edges.Top == SafeAreaRegions.SoftInput && 
+		    edges.Right == SafeAreaRegions.SoftInput && edges.Bottom == SafeAreaRegions.SoftInput)
+		{
+			return "SoftInput (Avoid keyboard only)";
+		}
 
-		CurrentSettingsLabel.Text = $"Current ScrollView SafeAreaEdges: {settingsText}";
+		// For mixed values, show individual edges
+		return $"Left:{edges.Left}, Top:{edges.Top}, Right:{edges.Right}, Bottom:{edges.Bottom}";
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28986.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28986.cs
index ecadba015535..482b2872352d 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28986.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28986.cs
@@ -96,6 +96,33 @@ public void SafeAreaMainGridSequentialButtonTesting()
 			Assert.That(finalAllSettings, Does.Contain("All (Full safe area)"));
 			Assert.That(finalAllPosition.Y, Is.EqualTo(allPosition.Y), "Final All position should match initial All position");
 		}
+
+		[Test]
+		[Category(UITestCategories.Layout)]
+		public void SafeAreaPerEdgeValidation()
+		{
+			App.WaitForElement("ContentGrid");
+			App.WaitForElement("CurrentSettings");
+
+			// Test per-edge scenario: bottom edge to SoftInput, then top edge to Container, then top edge to None
+			
+			// 1. Set bottom edge to SoftInput
+			App.Tap("GridSetBottomSoftInputButton");
+			var bottomSoftInputSettings = App.FindElement("CurrentSettings").GetText();
+			Assert.That(bottomSoftInputSettings, Does.Contain("Bottom:SoftInput"), "Should show bottom edge set to SoftInput");
+
+			// 2. Set top edge to Container (while keeping bottom as SoftInput)
+			App.Tap("GridSetTopContainerButton");
+			var topContainerSettings = App.FindElement("CurrentSettings").GetText();
+			Assert.That(topContainerSettings, Does.Contain("Top:Container"), "Should show top edge set to Container");
+			Assert.That(topContainerSettings, Does.Contain("Bottom:SoftInput"), "Should maintain bottom edge as SoftInput");
+
+			// 3. Set top edge to None (while keeping bottom as SoftInput)
+			App.Tap("GridSetTopNoneButton");
+			var topNoneSettings = App.FindElement("CurrentSettings").GetText();
+			Assert.That(topNoneSettings, Does.Contain("Top:None"), "Should show top edge set to None");
+			Assert.That(topNoneSettings, Does.Contain("Bottom:SoftInput"), "Should maintain bottom edge as SoftInput");
+		}
 	}
 }
 #endif
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28986_ScrollView.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28986_ScrollView.cs
new file mode 100644
index 000000000000..4caa4a81c550
--- /dev/null
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28986_ScrollView.cs
@@ -0,0 +1,92 @@
+#if IOS
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.TestCases.Tests.Issues
+{
+	public class Issue28986_ScrollView : _IssuesUITest
+	{
+		public override string Issue => "Test SafeArea ScrollView for per-edge safe area control";
+
+		public Issue28986_ScrollView(TestDevice device) : base(device)
+		{
+		}
+
+		[Test]
+		[Category(UITestCategories.ScrollView)]
+		public void SafeAreaScrollViewBasicFunctionality()
+		{
+			// 1. Test loads - verify essential elements are present
+			App.WaitForElement("TestScrollView");
+
+			// 2. Verify initial state - ScrollView should start with All (full safe area)
+			var initialSettings = App.FindElement("CurrentSettings").GetText();
+			Assert.That(initialSettings, Does.Contain("All (Full safe area)"));
+
+			// 3. Test None button functionality
+			App.Tap("ScrollViewResetNoneButton");
+			var noneSettings = App.FindElement("CurrentSettings").GetText();
+			Assert.That(noneSettings, Does.Contain("None (Edge-to-edge)"));
+
+			// 4. Test All button functionality
+			App.Tap("ScrollViewResetAllButton");
+			var allSettings = App.FindElement("CurrentSettings").GetText();
+			Assert.That(allSettings, Does.Contain("All (Full safe area)"));
+		}
+
+		[Test]
+		[Category(UITestCategories.ScrollView)]
+		public void SafeAreaScrollViewContainerFunctionality()
+		{
+			App.WaitForElement("TestScrollView");
+			App.WaitForElement("CurrentSettings");
+
+			// Test Container button functionality
+			App.Tap("ScrollViewSetContainerButton");
+			var containerSettings = App.FindElement("CurrentSettings").GetText();
+			Assert.That(containerSettings, Does.Contain("Container (Respect notches/bars)"));
+
+			// Test SoftInput button functionality
+			App.Tap("ScrollViewSetSoftInputButton");
+			var softInputSettings = App.FindElement("CurrentSettings").GetText();
+			Assert.That(softInputSettings, Does.Contain("SoftInput (Avoid keyboard only)"));
+		}
+
+		[Test]
+		[Category(UITestCategories.ScrollView)]
+		public void SafeAreaScrollViewSequentialTesting()
+		{
+			App.WaitForElement("TestScrollView");
+			App.WaitForElement("CurrentSettings");
+
+			// Test sequence: All -> None -> Container -> SoftInput -> All
+			
+			// 1. Set to All
+			App.Tap("ScrollViewResetAllButton");
+			var allSettings = App.FindElement("CurrentSettings").GetText();
+			Assert.That(allSettings, Does.Contain("All (Full safe area)"));
+
+			// 2. Set to None
+			App.Tap("ScrollViewResetNoneButton");
+			var noneSettings = App.FindElement("CurrentSettings").GetText();
+			Assert.That(noneSettings, Does.Contain("None (Edge-to-edge)"));
+
+			// 3. Set to Container
+			App.Tap("ScrollViewSetContainerButton");
+			var containerSettings = App.FindElement("CurrentSettings").GetText();
+			Assert.That(containerSettings, Does.Contain("Container (Respect notches/bars)"));
+
+			// 4. Set to SoftInput
+			App.Tap("ScrollViewSetSoftInputButton");
+			var softInputSettings = App.FindElement("CurrentSettings").GetText();
+			Assert.That(softInputSettings, Does.Contain("SoftInput (Avoid keyboard only)"));
+
+			// 5. Return to All
+			App.Tap("ScrollViewResetAllButton");
+			var finalAllSettings = App.FindElement("CurrentSettings").GetText();
+			Assert.That(finalAllSettings, Does.Contain("All (Full safe area)"));
+		}
+	}
+}
+#endif
\ No newline at end of file

From d282b5c35daa2d779a13ac501f8f4de568a75e08 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 27 Jul 2025 14:20:25 +0000
Subject: [PATCH 33/34] Add Entry control for SoftInput testing and fix
 ScrollView SafeAreaEdges

Co-authored-by: PureWeen <5375137+PureWeen@users.noreply.github.com>
---
 .../tests/TestCases.HostApp/Issues/Issue28986.xaml    | 11 +++++++++++
 .../Issues/Issue28986_ScrollView.xaml                 |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml
index 16430e1c717d..7b9b723b4177 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml
@@ -95,6 +95,17 @@
                                     BackgroundColor="LightGray"
                                     AutomationId="GridSetTopNoneButton" />
                             
+                            <!-- Entry for testing SoftInput behavior -->
+                            <Label Text="SoftInput Test:" 
+                                   FontSize="14" 
+                                   FontAttributes="Bold"
+                                   HorizontalOptions="Center"
+                                   Margin="0,10,0,0" />
+                            
+                            <Entry Placeholder="Focus me to test SoftInput behavior"
+                                   BackgroundColor="White"
+                                   AutomationId="SoftInputTestEntry" />
+                            
                             <!-- Legend -->
                             <StackLayout Spacing="5" Margin="0,10,0,0">
                                 <Label Text="None = Edge-to-edge content (no safe area padding)" 
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ScrollView.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ScrollView.xaml
index 87b8ad753f93..9c4baa872bce 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ScrollView.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ScrollView.xaml
@@ -5,7 +5,7 @@
              x:Name="TestPage"
              Title="SafeArea ScrollView Test">
     
-    <Grid x:Name="MainGrid" BackgroundColor="Blue" SafeAreaEdges="All">
+    <Grid x:Name="MainGrid" BackgroundColor="Blue" SafeAreaEdges="None">
         <!-- ScrollView that spans the entire screen -->
         <ScrollView x:Name="TestScrollView" SafeAreaEdges="All" AutomationId="TestScrollView" BackgroundColor="White">
             <StackLayout Spacing="20" Padding="20">

From c0af54e8f35183735a536f44a92a56eba3b82c0a Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Sun, 27 Jul 2025 11:21:59 -0500
Subject: [PATCH 34/34] - fix UI Tests to validate more scenarios

---
 .../TestCases.HostApp/Issues/Issue28986.xaml  | 22 ++-----
 .../Issues/Issue28986.xaml.cs                 |  9 +--
 .../Issues/Issue28986_ScrollView.xaml         |  2 +-
 .../Tests/Issues/Issue28986.cs                | 34 +++++-----
 .../Tests/Issues/Issue28986_ScrollView.cs     | 65 +++++++------------
 src/Core/src/Platform/iOS/MauiScrollView.cs   | 25 ++++---
 src/Core/src/Platform/iOS/MauiView.cs         | 42 ++++++++----
 src/Core/src/Primitives/SafeAreaEdges.cs      | 18 +++++
 src/Core/src/Primitives/SafeAreaRegions.cs    |  2 +-
 .../PublicAPI/net-ios/PublicAPI.Unshipped.txt |  1 -
 .../net-maccatalyst/PublicAPI.Unshipped.txt   |  1 -
 11 files changed, 109 insertions(+), 112 deletions(-)

diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml
index 7b9b723b4177..37b4948e7b0b 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml
@@ -53,11 +53,6 @@
                                    FontAttributes="Bold"
                                    HorizontalOptions="Center" />
                             
-                            <Label Text="Test different SafeAreaEdges values on the MainGrid"
-                                   FontSize="12"
-                                   HorizontalOptions="Center"
-                                   TextColor="Gray" />
-                            
                             <Button Text="Set MainGrid to None (Edge-to-edge)"
                                     Clicked="OnGridSetNoneClicked"
                                     BackgroundColor="LightBlue"
@@ -73,6 +68,12 @@
                                     BackgroundColor="LightCoral"
                                     AutomationId="GridResetAllButton" />
                             
+                            <!-- Entry for testing SoftInput behavior -->
+                            
+                            <Entry Placeholder="Focus me to test SoftInput behavior"
+                                   BackgroundColor="White"
+                                   AutomationId="SoftInputTestEntry" />
+                            
                             <!-- Per-edge controls for specific scenarios -->
                             <Label Text="Per-Edge Controls:" 
                                    FontSize="16" 
@@ -95,17 +96,6 @@
                                     BackgroundColor="LightGray"
                                     AutomationId="GridSetTopNoneButton" />
                             
-                            <!-- Entry for testing SoftInput behavior -->
-                            <Label Text="SoftInput Test:" 
-                                   FontSize="14" 
-                                   FontAttributes="Bold"
-                                   HorizontalOptions="Center"
-                                   Margin="0,10,0,0" />
-                            
-                            <Entry Placeholder="Focus me to test SoftInput behavior"
-                                   BackgroundColor="White"
-                                   AutomationId="SoftInputTestEntry" />
-                            
                             <!-- Legend -->
                             <StackLayout Spacing="5" Margin="0,10,0,0">
                                 <Label Text="None = Edge-to-edge content (no safe area padding)" 
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml.cs
index 26eda117da6a..c3cdc25b113d 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml.cs
@@ -29,11 +29,12 @@ private void OnGridSetAllClicked(object sender, EventArgs e)
 
 	private void OnGridSetBottomSoftInputClicked(object sender, EventArgs e)
 	{
+		var current = MainGrid.SafeAreaEdges;
 		MainGrid.SafeAreaEdges = new SafeAreaEdges(
-			SafeAreaRegions.None,     // Left
-			SafeAreaRegions.None,     // Top
-			SafeAreaRegions.None,     // Right
-			SafeAreaRegions.SoftInput // Bottom
+			current.Left,     // Left
+			current.Top,     // Top
+			current.Right,   // Right
+			SafeAreaRegions.SoftInput       // Bottom
 		);
 		UpdateCurrentSettingsLabel();
 	}
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ScrollView.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ScrollView.xaml
index 9c4baa872bce..24bb716fb8be 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ScrollView.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ScrollView.xaml
@@ -8,7 +8,7 @@
     <Grid x:Name="MainGrid" BackgroundColor="Blue" SafeAreaEdges="None">
         <!-- ScrollView that spans the entire screen -->
         <ScrollView x:Name="TestScrollView" SafeAreaEdges="All" AutomationId="TestScrollView" BackgroundColor="White">
-            <StackLayout Spacing="20" Padding="20">
+            <StackLayout Spacing="20" Padding="20,0,20,20" AutomationId="ScrollViewContent">
                 <Label Text="SafeArea ScrollView Test Page" 
                        FontSize="24" 
                        FontAttributes="Bold"
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28986.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28986.cs
index 482b2872352d..cd2584841b83 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28986.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28986.cs
@@ -102,26 +102,24 @@ public void SafeAreaMainGridSequentialButtonTesting()
 		public void SafeAreaPerEdgeValidation()
 		{
 			App.WaitForElement("ContentGrid");
-			App.WaitForElement("CurrentSettings");
 
-			// Test per-edge scenario: bottom edge to SoftInput, then top edge to Container, then top edge to None
-			
-			// 1. Set bottom edge to SoftInput
+			// Set all 4 edges to Container
+			App.Tap("GridSetContainerButton");
 			App.Tap("GridSetBottomSoftInputButton");
-			var bottomSoftInputSettings = App.FindElement("CurrentSettings").GetText();
-			Assert.That(bottomSoftInputSettings, Does.Contain("Bottom:SoftInput"), "Should show bottom edge set to SoftInput");
-
-			// 2. Set top edge to Container (while keeping bottom as SoftInput)
-			App.Tap("GridSetTopContainerButton");
-			var topContainerSettings = App.FindElement("CurrentSettings").GetText();
-			Assert.That(topContainerSettings, Does.Contain("Top:Container"), "Should show top edge set to Container");
-			Assert.That(topContainerSettings, Does.Contain("Bottom:SoftInput"), "Should maintain bottom edge as SoftInput");
-
-			// 3. Set top edge to None (while keeping bottom as SoftInput)
-			App.Tap("GridSetTopNoneButton");
-			var topNoneSettings = App.FindElement("CurrentSettings").GetText();
-			Assert.That(topNoneSettings, Does.Contain("Top:None"), "Should show top edge set to None");
-			Assert.That(topNoneSettings, Does.Contain("Bottom:SoftInput"), "Should maintain bottom edge as SoftInput");
+			
+			var containerPosition = App.WaitForElement("ContentGrid").GetRect();
+
+			// Open Soft Input test entry
+			App.Tap("SoftInputTestEntry");
+			var containerPositionWithSoftInput = App.WaitForElement("ContentGrid").GetRect();
+
+			Assert.That(containerPositionWithSoftInput.Height, Is.LessThan(containerPosition.Height), "ContentGrid height should be less when Soft Input is shown with Container edges");
+
+			App.DismissKeyboard();
+
+			var containerPositionWithoutSoftInput = App.WaitForElement("ContentGrid").GetRect();
+
+			Assert.That(containerPositionWithoutSoftInput.Height, Is.EqualTo(containerPosition.Height), "ContentGrid height should return to original when Soft Input is dismissed with Container edges");
 		}
 	}
 }
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28986_ScrollView.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28986_ScrollView.cs
index 4caa4a81c550..f161707e080c 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28986_ScrollView.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28986_ScrollView.cs
@@ -24,68 +24,47 @@ public void SafeAreaScrollViewBasicFunctionality()
 			var initialSettings = App.FindElement("CurrentSettings").GetText();
 			Assert.That(initialSettings, Does.Contain("All (Full safe area)"));
 
-			// 3. Test None button functionality
+			// 3. Get initial ScrollView position when SafeAreaEdges is All
+			var scrollViewWithSafeArea = App.WaitForElement("ScrollViewContent").GetRect();
+
+			// 4. Set ScrollView SafeAreaEdges to None (edge-to-edge)
 			App.Tap("ScrollViewResetNoneButton");
 			var noneSettings = App.FindElement("CurrentSettings").GetText();
 			Assert.That(noneSettings, Does.Contain("None (Edge-to-edge)"));
 
-			// 4. Test All button functionality
-			App.Tap("ScrollViewResetAllButton");
-			var allSettings = App.FindElement("CurrentSettings").GetText();
-			Assert.That(allSettings, Does.Contain("All (Full safe area)"));
-		}
-
-		[Test]
-		[Category(UITestCategories.ScrollView)]
-		public void SafeAreaScrollViewContainerFunctionality()
-		{
-			App.WaitForElement("TestScrollView");
-			App.WaitForElement("CurrentSettings");
-
-			// Test Container button functionality
-			App.Tap("ScrollViewSetContainerButton");
-			var containerSettings = App.FindElement("CurrentSettings").GetText();
-			Assert.That(containerSettings, Does.Contain("Container (Respect notches/bars)"));
+			// 5. Get ScrollView position after setting to None
+			var scrollViewEdgeToEdge = App.WaitForElement("ScrollViewContent").GetRect();
 
-			// Test SoftInput button functionality
-			App.Tap("ScrollViewSetSoftInputButton");
-			var softInputSettings = App.FindElement("CurrentSettings").GetText();
-			Assert.That(softInputSettings, Does.Contain("SoftInput (Avoid keyboard only)"));
+			// 6. Verify that ScrollView position/size changes when SafeAreaEdges changes
+			// When ScrollView has SafeAreaEdges.All, it respects safe area insets
+			// When ScrollView has SafeAreaEdges.None, it goes edge-to-edge
+			Assert.That(scrollViewEdgeToEdge.Y, Is.LessThan(scrollViewWithSafeArea.Y), 
+				"ScrollView should move up (smaller Y position) when SafeAreaEdges changes from All to None");
 		}
 
 		[Test]
 		[Category(UITestCategories.ScrollView)]
-		public void SafeAreaScrollViewSequentialTesting()
+		public void SafeAreaScrollViewContainerFunctionality()
 		{
 			App.WaitForElement("TestScrollView");
-			App.WaitForElement("CurrentSettings");
 
-			// Test sequence: All -> None -> Container -> SoftInput -> All
-			
-			// 1. Set to All
-			App.Tap("ScrollViewResetAllButton");
-			var allSettings = App.FindElement("CurrentSettings").GetText();
-			Assert.That(allSettings, Does.Contain("All (Full safe area)"));
-
-			// 2. Set to None
+			// Start with None to establish baseline
 			App.Tap("ScrollViewResetNoneButton");
-			var noneSettings = App.FindElement("CurrentSettings").GetText();
-			Assert.That(noneSettings, Does.Contain("None (Edge-to-edge)"));
+			var nonePosition = App.WaitForElement("ScrollViewContent").GetRect();
 
-			// 3. Set to Container
+			// Test Container button functionality
 			App.Tap("ScrollViewSetContainerButton");
 			var containerSettings = App.FindElement("CurrentSettings").GetText();
 			Assert.That(containerSettings, Does.Contain("Container (Respect notches/bars)"));
 
-			// 4. Set to SoftInput
-			App.Tap("ScrollViewSetSoftInputButton");
-			var softInputSettings = App.FindElement("CurrentSettings").GetText();
-			Assert.That(softInputSettings, Does.Contain("SoftInput (Avoid keyboard only)"));
+			// When you change from none back to container
+			// the scrollview will just stay scrolled up at this point
+			// it doesn't reset to zero
+			App.ScrollUp("CurrentSettings");
 
-			// 5. Return to All
-			App.Tap("ScrollViewResetAllButton");
-			var finalAllSettings = App.FindElement("CurrentSettings").GetText();
-			Assert.That(finalAllSettings, Does.Contain("All (Full safe area)"));
+			var containerPosition = App.WaitForElement("ScrollViewContent").GetRect();
+			Assert.That(containerPosition.Y, Is.GreaterThan(nonePosition.Y), 
+				"ScrollView should move down when SafeAreaEdges changes from None to Container");
 		}
 	}
 }
diff --git a/src/Core/src/Platform/iOS/MauiScrollView.cs b/src/Core/src/Platform/iOS/MauiScrollView.cs
index e59014457516..83c02b0b2d37 100644
--- a/src/Core/src/Platform/iOS/MauiScrollView.cs
+++ b/src/Core/src/Platform/iOS/MauiScrollView.cs
@@ -213,13 +213,16 @@ bool UpdateContentInsetAdjustmentBehavior()
 			if (leftRegion == topRegion && topRegion == rightRegion && rightRegion == bottomRegion)
 			{
 				// All edges have the same value, use built-in iOS behavior
-				ContentInsetAdjustmentBehavior = leftRegion switch
+				// Cache the region value to avoid redundant comparisons
+				var region = leftRegion;
+				
+				ContentInsetAdjustmentBehavior = region switch
 				{
+					SafeAreaRegions.Default => UIScrollViewContentInsetAdjustmentBehavior.Automatic, // Default behavior
 					SafeAreaRegions.None => UIScrollViewContentInsetAdjustmentBehavior.Never, // Edge-to-edge content
 					SafeAreaRegions.All => UIScrollViewContentInsetAdjustmentBehavior.Never, // We calculate insets ourselves and include keyboard
-					SafeAreaRegions.Container => UIScrollViewContentInsetAdjustmentBehavior.Always, // Content flows under keyboard but stays out of bars/notch
-					SafeAreaRegions.SoftInput => UIScrollViewContentInsetAdjustmentBehavior.Never, // We calculate insets ourselves and include keyboard
-					SafeAreaRegions.Default => UIScrollViewContentInsetAdjustmentBehavior.Automatic, // Default behavior
+					_ when SafeAreaEdges.IsContainer(region) => UIScrollViewContentInsetAdjustmentBehavior.Always, // Content flows under keyboard but stays out of bars/notch
+					_ when SafeAreaEdges.IsSoftInput(region) => UIScrollViewContentInsetAdjustmentBehavior.Never, // We calculate insets ourselves and include keyboard
 					_ => UIScrollViewContentInsetAdjustmentBehavior.Never // Default: edge-to-edge
 				};
 			}
@@ -234,15 +237,11 @@ bool UpdateContentInsetAdjustmentBehavior()
 
 		static nfloat GetManualInsetForEdge(SafeAreaRegions safeAreaRegion, nfloat safeAreaInset)
 		{
-			return safeAreaRegion switch
-			{
-				SafeAreaRegions.None => 0, // Edge-to-edge content - no inset
-				SafeAreaRegions.All => (nfloat)safeAreaInset, // Obey all safe area insets
-				SafeAreaRegions.Container => safeAreaInset, // Content flows under keyboard but stays out of bars/notch
-				//SafeAreaRegions.SoftInput => (nfloat)safeAreaInset, // Always pad for keyboard - currently not implemented pending design discussions
-				SafeAreaRegions.Default => safeAreaInset, // Default behavior - obey safe area
-				_ => 0 // Default: edge-to-edge
-			};
+			// Edge-to-edge content - no safe area padding
+			if (safeAreaRegion == SafeAreaRegions.None)
+				return 0;
+
+			return safeAreaInset;
 		}
 
 		public override void LayoutSubviews()
diff --git a/src/Core/src/Platform/iOS/MauiView.cs b/src/Core/src/Platform/iOS/MauiView.cs
index 869459cdb732..aced70d496ff 100644
--- a/src/Core/src/Platform/iOS/MauiView.cs
+++ b/src/Core/src/Platform/iOS/MauiView.cs
@@ -138,15 +138,18 @@ SafeAreaRegions GetSafeAreaRegionForEdge(int edge)
 
 		static double GetSafeAreaForEdge(SafeAreaRegions safeAreaRegion, double originalSafeArea)
 		{
-			return safeAreaRegion switch
-			{
-				SafeAreaRegions.None => 0, // Edge-to-edge content (no safe area padding)
-				SafeAreaRegions.SoftInput => originalSafeArea, // Always pad for keyboard/soft input
-				SafeAreaRegions.Container => originalSafeArea, // Content flows under keyboard but stays out of bars/notch
-				SafeAreaRegions.Default => originalSafeArea, // Platform default behavior
-				SafeAreaRegions.All => originalSafeArea, // Obey all safe area insets
-				_ => originalSafeArea // Default case - respect safe area
-			};
+			// Edge-to-edge content - no safe area padding
+			if (safeAreaRegion == SafeAreaRegions.None)
+				return 0;
+			
+			// All other regions respect safe area in some form
+			// This includes:
+			// - Default: Platform default behavior
+			// - All: Obey all safe area insets  
+			// - SoftInput: Always pad for keyboard/soft input
+			// - Container: Content flows under keyboard but stays out of bars/notch
+			// - Any combination of the above flags
+			return originalSafeArea;
 		}
 
 
@@ -177,7 +180,7 @@ bool ShouldSubscribeToKeyboardNotifications()
 				for (int edge = 0; edge < 4; edge++)
 				{
 					var region = safeAreaPage.GetSafeAreaRegionsForEdge(edge);
-					if (region == SafeAreaRegions.All || region == SafeAreaRegions.SoftInput)
+					if (SafeAreaEdges.IsSoftInput(region))
 					{
 						return true;
 					}
@@ -238,6 +241,7 @@ void UpdateKeyboardSubscription()
 
 		void OnKeyboardWillShow(NSNotification notification)
 		{
+			_safeAreaInvalidated = true;
 			var keyboardFrame = GetKeyboardFrame(notification);
 			if (keyboardFrame.HasValue)
 			{
@@ -249,6 +253,7 @@ void OnKeyboardWillShow(NSNotification notification)
 
 		void OnKeyboardWillHide(NSNotification notification)
 		{
+			_safeAreaInvalidated = true;
 			_keyboardFrame = CGRect.Empty;
 			_isKeyboardShowing = false;
 			SetNeedsLayout();
@@ -274,8 +279,9 @@ SafeAreaPadding GetAdjustedSafeAreaInsets()
 				var needsKeyboardAdjustment = false;
 				for (int edge = 0; edge < 4; edge++)
 				{
+
 					var safeAreaRegion = safeAreaPage.GetSafeAreaRegionsForEdge(edge);
-					if (safeAreaRegion == SafeAreaRegions.SoftInput)
+					if (SafeAreaEdges.IsSoftInput(safeAreaRegion))
 					{
 						needsKeyboardAdjustment = true;
 						break;
@@ -302,7 +308,7 @@ SafeAreaPadding GetAdjustedSafeAreaInsets()
 							
 							// Bottom edge is most commonly affected by keyboard
 							var bottomEdgeRegion = safeAreaPage.GetSafeAreaRegionsForEdge(3); // 3 = bottom edge
-							if (bottomEdgeRegion == SafeAreaRegions.SoftInput)
+							if (SafeAreaEdges.IsSoftInput(bottomEdgeRegion))
 							{
 								// Use the larger of the current bottom safe area or the keyboard height
 								var adjustedBottom = Math.Max(baseSafeArea.Bottom, keyboardHeight);
@@ -519,7 +525,7 @@ bool ValidateSafeArea()
 			}
 
 			// Mark the safe area as validated given that we're about to check it
-			_safeAreaInvalidated = true;
+			_safeAreaInvalidated = false;
 
 			// Store the information about the safe area for developers to use
 			if (View is ISafeAreaView2 safeAreaPage)
@@ -579,6 +585,7 @@ void IPlatformMeasureInvalidationController.InvalidateAncestorsMeasuresWhenMoved
 		/// <returns>True if the invalidation should continue propagating to ancestors, false to stop propagation</returns>
 		bool IPlatformMeasureInvalidationController.InvalidateMeasure(bool isPropagating)
 		{
+			_safeAreaInvalidated = true;
 			InvalidateConstraintsCache();
 			SetNeedsLayout();
 
@@ -618,6 +625,13 @@ event EventHandler? IUIViewLifeCycleEvents.MovedToWindow
 			remove => _movedToWindow -= value;
 		}
 
+
+		public override void SafeAreaInsetsDidChange()
+		{
+			_safeAreaInvalidated = true;
+			base.SafeAreaInsetsDidChange();
+		}
+
 		/// <summary>
 		/// Called when this view is moved to a window (added to or removed from the view hierarchy).
 		/// This triggers safe area invalidation and any pending ancestor measure invalidations.
@@ -625,7 +639,7 @@ event EventHandler? IUIViewLifeCycleEvents.MovedToWindow
 		public override void MovedToWindow()
 		{
 			base.MovedToWindow();
-			
+
 			_scrollViewDescendant = null;
 
 			// Notify any subscribers that this view has been moved to a window
diff --git a/src/Core/src/Primitives/SafeAreaEdges.cs b/src/Core/src/Primitives/SafeAreaEdges.cs
index 15e0deac00f8..0f231e249ee7 100644
--- a/src/Core/src/Primitives/SafeAreaEdges.cs
+++ b/src/Core/src/Primitives/SafeAreaEdges.cs
@@ -69,6 +69,24 @@ public SafeAreaEdges(SafeAreaRegions left, SafeAreaRegions top, SafeAreaRegions
 			Bottom = bottom;
 		}
 
+		internal static bool IsSoftInput(SafeAreaRegions region)
+		{
+			if (region == SafeAreaRegions.Default)
+				return false;
+			if (region == SafeAreaRegions.All)
+				return true;
+			return (region & SafeAreaRegions.SoftInput) == SafeAreaRegions.SoftInput;
+		}
+
+		internal static bool IsContainer(SafeAreaRegions region)
+		{
+			if (region == SafeAreaRegions.Default)
+				return false;
+			if (region == SafeAreaRegions.All)
+				return true;
+			return (region & SafeAreaRegions.Container) == SafeAreaRegions.Container;	
+		}
+
 		/// <summary>
 		/// Gets the safe area behavior for the specified edge.
 		/// </summary>
diff --git a/src/Core/src/Primitives/SafeAreaRegions.cs b/src/Core/src/Primitives/SafeAreaRegions.cs
index 68ad41fb8428..a5c26222713d 100644
--- a/src/Core/src/Primitives/SafeAreaRegions.cs
+++ b/src/Core/src/Primitives/SafeAreaRegions.cs
@@ -24,7 +24,7 @@ public enum SafeAreaRegions
 		Container = 1 << 1,
 
 		/// <summary>
-		/// Default behavior - apply platform safe area insets.
+		/// Default behavior - apply platform defaults.
 		/// </summary>
 		Default = -1,
 
diff --git a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index bd3beeef912c..8595edaf47de 100644
--- a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -151,7 +151,6 @@ override Microsoft.Maui.Handlers.OpenWindowRequest.ToString() -> string!
 override Microsoft.Maui.Handlers.ScrollViewHandler.SetVirtualView(Microsoft.Maui.IView! view) -> void
 override Microsoft.Maui.Platform.MauiScrollView.AdjustedContentInsetDidChange() -> void
 override Microsoft.Maui.Platform.MauiScrollView.SafeAreaInsetsDidChange() -> void
-*REMOVED*override Microsoft.Maui.Platform.MauiView.SafeAreaInsetsDidChange() -> void
 override Microsoft.Maui.SafeAreaEdges.Equals(object? obj) -> bool
 override Microsoft.Maui.SafeAreaEdges.GetHashCode() -> int
 override Microsoft.Maui.SafeAreaEdges.ToString() -> string!
diff --git a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index a45490cf902a..951bab10faa1 100644
--- a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -153,7 +153,6 @@ override Microsoft.Maui.Handlers.OpenWindowRequest.ToString() -> string!
 override Microsoft.Maui.Handlers.ScrollViewHandler.SetVirtualView(Microsoft.Maui.IView! view) -> void
 override Microsoft.Maui.Platform.MauiScrollView.AdjustedContentInsetDidChange() -> void
 override Microsoft.Maui.Platform.MauiScrollView.SafeAreaInsetsDidChange() -> void
-*REMOVED*override Microsoft.Maui.Platform.MauiView.SafeAreaInsetsDidChange() -> void
 override Microsoft.Maui.SafeAreaEdges.Equals(object? obj) -> bool
 override Microsoft.Maui.SafeAreaEdges.GetHashCode() -> int
 override Microsoft.Maui.SafeAreaEdges.ToString() -> string!