From 09f50c6b573f56b7416072e3abc2b48ddf0c0be9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Giudici?= <agiudici@gmail.com>
Date: Thu, 20 Oct 2022 06:22:56 -0300
Subject: [PATCH 01/77] [Essentials] Fixes IPreferences DateTime handling
 (#9974)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fixes DateTime values in Preferences (android & UWP)

* Fixes DateTime handling for iOS

* Fixes tizen PreferencesImplementation to handle DateTime

* Adds test for unsupported types

* Fixes typo

* Fixes casting error

* Fixes error

* Copies the static Preferences tests to test non-static methods & Updates UWP to use long for DateTime storage

Co-authored-by: Andrés Giudici <agiudici@tpssa.com.ar>
---
 .../src/Preferences/Preferences.android.cs    |   9 +
 .../Preferences.ios.tvos.watchos.macos.cs     |  11 +
 .../src/Preferences/Preferences.shared.cs     |  25 +-
 .../src/Preferences/Preferences.tizen.cs      |  11 +
 .../src/Preferences/Preferences.uwp.cs        |  22 +-
 .../DeviceTests/Tests/Preferences_Tests.cs    | 233 ++++++++++++++++++
 6 files changed, 307 insertions(+), 4 deletions(-)

diff --git a/src/Essentials/src/Preferences/Preferences.android.cs b/src/Essentials/src/Preferences/Preferences.android.cs
index c47c1575002b..8e3339504e8a 100644
--- a/src/Essentials/src/Preferences/Preferences.android.cs
+++ b/src/Essentials/src/Preferences/Preferences.android.cs
@@ -47,6 +47,8 @@ public void Clear(string sharedName)
 
 		public void Set<T>(string key, T value, string sharedName)
 		{
+			Preferences.CheckIsSupportedType<T>();
+
 			lock (locker)
 			{
 				using (var sharedPreferences = GetSharedPreferences(sharedName))
@@ -79,6 +81,9 @@ public void Set<T>(string key, T value, string sharedName)
 							case float f:
 								editor.PutFloat(key, f);
 								break;
+							case DateTime dt:
+								editor.PutLong(key, dt.ToBinary());
+								break;
 						}
 					}
 					editor.Apply();
@@ -134,6 +139,10 @@ public T Get<T>(string key, T defaultValue, string sharedName)
 								// the case when the string is not null
 								value = sharedPreferences.GetString(key, s);
 								break;
+							case DateTime dt:
+								var encodedValue = sharedPreferences.GetLong(key, dt.ToBinary());
+								value = DateTime.FromBinary(encodedValue);
+								break;
 						}
 					}
 				}
diff --git a/src/Essentials/src/Preferences/Preferences.ios.tvos.watchos.macos.cs b/src/Essentials/src/Preferences/Preferences.ios.tvos.watchos.macos.cs
index cc97b54260b0..f932977d8a3a 100644
--- a/src/Essentials/src/Preferences/Preferences.ios.tvos.watchos.macos.cs
+++ b/src/Essentials/src/Preferences/Preferences.ios.tvos.watchos.macos.cs
@@ -47,6 +47,8 @@ public void Clear(string sharedName)
 
 		public void Set<T>(string key, T value, string sharedName)
 		{
+			Preferences.CheckIsSupportedType<T>();
+
 			lock (locker)
 			{
 				using (var userDefaults = GetUserDefaults(sharedName))
@@ -79,6 +81,10 @@ public void Set<T>(string key, T value, string sharedName)
 						case float f:
 							userDefaults.SetFloat(f, key);
 							break;
+						case DateTime dt:
+							var encodedDateTime = Convert.ToString(dt.ToBinary(), CultureInfo.InvariantCulture);
+							userDefaults.SetString(encodedDateTime, key);
+							break;
 					}
 				}
 			}
@@ -113,6 +119,11 @@ public T Get<T>(string key, T defaultValue, string sharedName)
 						case float f:
 							value = userDefaults.FloatForKey(key);
 							break;
+						case DateTime dt:
+							var savedDateTime = userDefaults.StringForKey(key);
+							var encodedDateTime = Convert.ToInt64(savedDateTime, CultureInfo.InvariantCulture);
+							value = DateTime.FromBinary(encodedDateTime);
+							break;
 						case string s:
 							// the case when the string is not null
 							value = userDefaults.StringForKey(key);
diff --git a/src/Essentials/src/Preferences/Preferences.shared.cs b/src/Essentials/src/Preferences/Preferences.shared.cs
index 2baff57c5fc1..0555a1376a49 100644
--- a/src/Essentials/src/Preferences/Preferences.shared.cs
+++ b/src/Essentials/src/Preferences/Preferences.shared.cs
@@ -1,6 +1,7 @@
 #nullable enable
 using System;
 using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 
 namespace Microsoft.Maui.Storage
 {
@@ -162,11 +163,11 @@ public static void Set(string key, DateTime value) =>
 
 		/// <include file="../../docs/Microsoft.Maui.Essentials/Preferences.xml" path="//Member[@MemberName='Get'][9]/Docs/*" />
 		public static DateTime Get(string key, DateTime defaultValue, string? sharedName) =>
-			DateTime.FromBinary(Current.Get<long>(key, defaultValue.ToBinary(), sharedName));
+			Current.Get<DateTime>(key, defaultValue, sharedName);
 
 		/// <include file="../../docs/Microsoft.Maui.Essentials/Preferences.xml" path="//Member[@MemberName='Set'][9]/Docs/*" />
 		public static void Set(string key, DateTime value, string? sharedName) =>
-			Current.Set<long>(key, value.ToBinary(), sharedName);
+			Current.Set<DateTime>(key, value, sharedName);
 
 		static IPreferences Current => Storage.Preferences.Default;
 
@@ -180,5 +181,25 @@ internal static string GetPrivatePreferencesSharedName(string feature) =>
 
 		internal static void SetDefault(IPreferences? implementation) =>
 			defaultImplementation = implementation;
+
+		internal static Type[] SupportedTypes = new Type[]
+		{
+			typeof(string),
+			typeof(int),
+			typeof(bool),
+			typeof(long),
+			typeof(double),
+			typeof(float),
+			typeof(DateTime),
+		};
+
+		internal static void CheckIsSupportedType<T>()
+		{
+			var type = typeof(T);
+			if (!SupportedTypes.Contains(type))
+			{
+				throw new NotSupportedException($"Preferences using '{type}' type is not supported");
+			}
+		}
 	}
 }
diff --git a/src/Essentials/src/Preferences/Preferences.tizen.cs b/src/Essentials/src/Preferences/Preferences.tizen.cs
index 48b522733886..24331afb8ed8 100644
--- a/src/Essentials/src/Preferences/Preferences.tizen.cs
+++ b/src/Essentials/src/Preferences/Preferences.tizen.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Linq;
 using Tizen.Applications;
 
@@ -46,11 +47,17 @@ public void Clear(string sharedName)
 
 		public void Set<T>(string key, T value, string sharedName)
 		{
+			Preferences.CheckIsSupportedType<T>();
+
 			lock (locker)
 			{
 				var fullKey = GetFullKey(key, sharedName);
 				if (value == null)
 					Preference.Remove(fullKey);
+				else if (value is DateTime dt)
+				{
+					Preference.Set(fullKey, dt.ToBinary());
+				}
 				else
 					Preference.Set(fullKey, value);
 			}
@@ -74,6 +81,10 @@ public T Get<T>(string key, T defaultValue, string sharedName)
 						case string s:
 							value = Preference.Get<T>(fullKey);
 							break;
+						case DateTime dt:
+							var encodedValue = Preference.Get<long>(fullKey);
+							value = (T)(object)DateTime.FromBinary(encodedValue);
+							break;
 						default:
 							// the case when the string is null
 							if (typeof(T) == typeof(string))
diff --git a/src/Essentials/src/Preferences/Preferences.uwp.cs b/src/Essentials/src/Preferences/Preferences.uwp.cs
index 4ee7f21b10e9..b6c6a7706beb 100644
--- a/src/Essentials/src/Preferences/Preferences.uwp.cs
+++ b/src/Essentials/src/Preferences/Preferences.uwp.cs
@@ -71,6 +71,8 @@ public void Clear(string sharedName)
 
 		public void Set<T>(string key, T value, string sharedName)
 		{
+			Preferences.CheckIsSupportedType<T>();
+
 			lock (locker)
 			{
 				var appDataContainer = GetApplicationDataContainer(sharedName);
@@ -82,7 +84,14 @@ public void Set<T>(string key, T value, string sharedName)
 					return;
 				}
 
-				appDataContainer.Values[key] = value;
+				if (value is DateTime dt)
+				{
+					appDataContainer.Values[key] = dt.ToBinary();
+				}
+				else
+				{
+					appDataContainer.Values[key] = value;
+				}
 			}
 		}
 
@@ -95,7 +104,16 @@ public T Get<T>(string key, T defaultValue, string sharedName)
 				{
 					var tempValue = appDataContainer.Values[key];
 					if (tempValue != null)
-						return (T)tempValue;
+					{
+						if (defaultValue is DateTime dt)
+						{
+							return (T)(object)DateTime.FromBinary((long)tempValue);
+						}
+						else
+						{
+							return (T)tempValue;
+						}
+					}
 				}
 			}
 
diff --git a/src/Essentials/test/DeviceTests/Tests/Preferences_Tests.cs b/src/Essentials/test/DeviceTests/Tests/Preferences_Tests.cs
index ddd07fe1fdc9..cf628cff602c 100644
--- a/src/Essentials/test/DeviceTests/Tests/Preferences_Tests.cs
+++ b/src/Essentials/test/DeviceTests/Tests/Preferences_Tests.cs
@@ -13,6 +13,7 @@ public class Preferences_Tests
 
 		static DateTime testDateTime = new DateTime(2018, 05, 07);
 
+		#region Static method tests
 		[Theory]
 		[InlineData("datetime1", null)]
 		[InlineData("datetime1", sharedNameTestData)]
@@ -235,5 +236,237 @@ public void DateTimePreservesKind(string sharedName, DateTimeKind kind)
 			Assert.Equal(date, get);
 			Assert.Equal(kind, get.Kind);
 		}
+
+		#endregion
+
+		#region Non-static method tests
+
+		[Fact]
+		public void FailsWithUnsupportedType() =>
+			Assert.Throws<NotSupportedException>(() => Preferences.Default.Set("anything", new int[] { 1 }));
+
+		[Theory]
+		[InlineData("datetime1", null)]
+		[InlineData("datetime1", sharedNameTestData)]
+		public void Set_Get_DateTime_NonStatic(string key, string sharedName)
+		{
+			Preferences.Default.Set(key, testDateTime, sharedName);
+
+			Assert.Equal(testDateTime, Preferences.Default.Get(key, DateTime.MinValue, sharedName));
+		}
+
+		[Theory]
+		[InlineData("string1", "TEST", null)]
+		[InlineData("string1", "TEST", sharedNameTestData)]
+		public void Set_Get_String_NonStatic(string key, string value, string sharedName)
+		{
+			Preferences.Default.Set(key, value, sharedName);
+
+			Assert.Equal(value, Preferences.Default.Get<string>(key, null, sharedName));
+		}
+
+		[Theory]
+		[InlineData("string1", "TEST", null)]
+		[InlineData("string1", "TEST", sharedNameTestData)]
+		public void Set_Set_Null_Get_String_NonStatic(string key, string value, string sharedName)
+		{
+			Preferences.Default.Set(key, value, sharedName);
+			Preferences.Default.Set<string>(key, null, sharedName);
+
+			Assert.Null(Preferences.Default.Get<string>(key, null, sharedName));
+		}
+
+		[Theory]
+		[InlineData("int1", int.MaxValue - 1, null)]
+		[InlineData("sint1", int.MinValue + 1, null)]
+		[InlineData("int1", int.MaxValue - 1, sharedNameTestData)]
+		[InlineData("sint1", int.MinValue + 1, sharedNameTestData)]
+		public void Set_Get_Int_NonStatic(string key, int value, string sharedName)
+		{
+			Preferences.Default.Set(key, value, sharedName);
+			Assert.Equal(value, Preferences.Default.Get(key, 0, sharedName));
+		}
+
+		[Theory]
+		[InlineData("long1", long.MaxValue - 1, null)]
+		[InlineData("slong1", long.MinValue + 1, null)]
+		[InlineData("long1", long.MaxValue - 1, sharedNameTestData)]
+		[InlineData("slong1", long.MinValue + 1, sharedNameTestData)]
+		public void Set_Get_Long_NonStatic(string key, long value, string sharedName)
+		{
+			Preferences.Default.Set(key, value, sharedName);
+			Assert.Equal(value, Preferences.Default.Get(key, 0L, sharedName));
+		}
+
+		[Theory]
+		[InlineData("float1", float.MaxValue - 1, null)]
+		[InlineData("sfloat1", float.MinValue + 1, null)]
+		[InlineData("float1", float.MaxValue - 1, sharedNameTestData)]
+		[InlineData("sfloat1", float.MinValue + 1, sharedNameTestData)]
+		public void Set_Get_Float_NonStatic(string key, float value, string sharedName)
+		{
+			Preferences.Default.Set(key, value, sharedName);
+			Assert.Equal(value, Preferences.Default.Get(key, 0f, sharedName));
+		}
+
+		[Theory]
+		[InlineData("double1", double.MaxValue - 1, null)]
+		[InlineData("sdouble1", double.MinValue + 1, null)]
+		[InlineData("double1", double.MaxValue - 1, sharedNameTestData)]
+		[InlineData("sdouble1", double.MinValue + 1, sharedNameTestData)]
+		public void Set_Get_Double_NonStatic(string key, double value, string sharedName)
+		{
+			Preferences.Default.Set(key, value, sharedName);
+			Assert.Equal(value, Preferences.Default.Get(key, 0d, sharedName));
+		}
+
+		[Theory]
+		[InlineData("bool1", true, null)]
+		[InlineData("bool1", true, sharedNameTestData)]
+		public void Set_Get_Bool_NonStatic(string key, bool value, string sharedName)
+		{
+			Preferences.Default.Set(key, value, sharedName);
+			Assert.Equal(value, Preferences.Default.Get(key, false, sharedName));
+		}
+
+		[Theory]
+		[InlineData(null)]
+		[InlineData(sharedNameTestData)]
+		public void Remove_NonStatic(string sharedName)
+		{
+			Preferences.Default.Set("RemoveKey1", "value", sharedName);
+
+			Assert.Equal("value", Preferences.Default.Get<string>("RemoveKey1", null, sharedName));
+
+			Preferences.Default.Remove("RemoveKey1", sharedName);
+
+			Assert.Null(Preferences.Default.Get<string>("RemoveKey1", null, sharedName));
+		}
+		
+		[Theory]
+		[InlineData(null, true)]
+		[InlineData(sharedNameTestData, true)]
+		[InlineData(null, false)]
+		[InlineData(sharedNameTestData, false)]
+		public void Remove_Get_Bool_NonStatic(string sharedName, bool defaultValue)
+		{
+			Preferences.Default.Remove("RemoveGetKey1", sharedName);
+
+			Assert.Equal(defaultValue, Preferences.Default.Get("RemoveGetKey1", defaultValue, sharedName));
+		}
+
+		[Theory]
+		[InlineData(null, 5)]
+		[InlineData(sharedNameTestData, 5)]
+		[InlineData(null, 0)]
+		[InlineData(sharedNameTestData, 0)]
+		public void Remove_Get_Double_NonStatic(string sharedName, double defaultValue)
+		{
+			Preferences.Default.Remove("RemoveGetKey1", sharedName);
+
+			Assert.Equal(defaultValue, Preferences.Default.Get("RemoveGetKey1", defaultValue, sharedName));
+		}
+
+		[Theory]
+		[InlineData(null, 5)]
+		[InlineData(sharedNameTestData, 5)]
+		[InlineData(null, 0)]
+		[InlineData(sharedNameTestData, 0)]
+		public void Remove_Get_Float_NonStatic(string sharedName, float defaultValue)
+		{
+			Preferences.Default.Remove("RemoveGetKey1", sharedName);
+
+			Assert.Equal(defaultValue, Preferences.Default.Get("RemoveGetKey1", defaultValue, sharedName));
+		}
+
+		[Theory]
+		[InlineData(null, 5)]
+		[InlineData(sharedNameTestData, 5)]
+		[InlineData(null, 0)]
+		[InlineData(sharedNameTestData, 0)]
+		public void Remove_Get_Int_NonStatic(string sharedName, int defaultValue)
+		{
+			Preferences.Default.Remove("RemoveGetKey1", sharedName);
+
+			Assert.Equal(defaultValue, Preferences.Default.Get("RemoveGetKey1", defaultValue, sharedName));
+		}
+
+		[Theory]
+		[InlineData(null, 5)]
+		[InlineData(sharedNameTestData, 5)]
+		[InlineData(null, 0)]
+		[InlineData(sharedNameTestData, 0)]
+		public void Remove_Get_Long_NonStatic(string sharedName, long defaultValue)
+		{
+			Preferences.Default.Remove("RemoveGetKey1", sharedName);
+
+			Assert.Equal(defaultValue, Preferences.Default.Get("RemoveGetKey1", defaultValue, sharedName));
+		}
+
+		[Theory]
+		[InlineData(null, "text")]
+		[InlineData(sharedNameTestData, "text")]
+		[InlineData(null, null)]
+		[InlineData(sharedNameTestData, null)]
+		public void Remove_Get_String_NonStatic(string sharedName, string defaultValue)
+		{
+			Preferences.Default.Remove("RemoveGetKey1", sharedName);
+
+			Assert.Equal(defaultValue, Preferences.Default.Get("RemoveGetKey1", defaultValue, sharedName));
+		}
+
+		[Theory]
+		[InlineData(null)]
+		[InlineData(sharedNameTestData)]
+		public void Clear_NonStatic(string sharedName)
+		{
+			Preferences.Default.Set("ClearKey1", "value", sharedName);
+			Preferences.Default.Set("ClearKey2", 2, sharedName);
+
+			Assert.Equal(2, Preferences.Default.Get("ClearKey2", 0, sharedName));
+
+			Preferences.Default.Clear(sharedName);
+
+			Assert.NotEqual("value", Preferences.Default.Get<string>("ClearKey1", null, sharedName));
+			Assert.NotEqual(2, Preferences.Default.Get("ClearKey2", 0, sharedName));
+		}
+
+		[Theory]
+		[InlineData(null)]
+		[InlineData(sharedNameTestData)]
+		public void Does_ContainsKey_NonStatic(string sharedName)
+		{
+			Preferences.Default.Set("DoesContainsKey1", "One", sharedName);
+
+			Assert.True(Preferences.Default.ContainsKey("DoesContainsKey1", sharedName));
+		}
+
+		[Theory]
+		[InlineData(null)]
+		[InlineData(sharedNameTestData)]
+		public void Not_ContainsKey_NonStatic(string sharedName)
+		{
+			Preferences.Default.Remove("NotContainsKey1", sharedName);
+
+			Assert.False(Preferences.Default.ContainsKey("NotContainsKey1", sharedName));
+		}
+
+		[Theory]
+		[InlineData(null, DateTimeKind.Utc)]
+		[InlineData(sharedNameTestData, DateTimeKind.Utc)]
+		[InlineData(null, DateTimeKind.Local)]
+		[InlineData(sharedNameTestData, DateTimeKind.Local)]
+		public void DateTimePreservesKind_NonStatic(string sharedName, DateTimeKind kind)
+		{
+			var date = new DateTime(2018, 05, 07, 8, 30, 0, kind);
+
+			Preferences.Default.Set("datetime_utc", date, sharedName);
+
+			var get = Preferences.Default.Get("datetime_utc", DateTime.MinValue, sharedName);
+
+			Assert.Equal(date, get);
+			Assert.Equal(kind, get.Kind);
+		}
+		#endregion
 	}
 }

From 3b576a75087e67c73b9838134fd5a0521c5ce296 Mon Sep 17 00:00:00 2001
From: Samantha Houts <samhouts@users.noreply.github.com>
Date: Thu, 20 Oct 2022 02:39:02 -0700
Subject: [PATCH 02/77] Fix more comment/docs typos (#10796)

This is definitely for ease of reviewing and not at all for artificially increasing my PR count.
---
 .../ButtonDisabledStatesGallery.xaml                        | 2 +-
 .../DatePickerDisabledStatesGallery.xaml                    | 2 +-
 .../EditorDisabledStatesGallery.xaml                        | 2 +-
 .../EntryDisabledStatesGallery.xaml                         | 2 +-
 .../PickerDisabledStatesGallery.xaml                        | 2 +-
 .../SearchBarDisabledStatesGallery.xaml                     | 2 +-
 .../TimePickerDisabledStatesGallery.xaml                    | 2 +-
 .../Core/src/Android/StepperRendererManager.cs              | 4 ++--
 src/Controls/docs/Microsoft.Maui.Controls/BaseMenuItem.xml  | 2 +-
 src/Controls/src/Core/IPinchGestureController.cs            | 2 +-
 .../Core.UnitTests/MarshalingObservableCollectionTests.cs   | 2 +-
 src/Core/src/Platform/Android/ContextExtensions.cs          | 2 +-
 .../Platform/Android/Navigation/NavigationViewFragment.cs   | 2 +-
 .../Platform/Android/Navigation/StackNavigationManager.cs   | 6 +++---
 src/Core/src/Platform/Android/StepperHandlerManager.cs      | 4 ++--
 15 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/Compatibility/ControlGallery/src/Core/GalleryPages/VisualStateManagerGalleries/ButtonDisabledStatesGallery.xaml b/src/Compatibility/ControlGallery/src/Core/GalleryPages/VisualStateManagerGalleries/ButtonDisabledStatesGallery.xaml
index 93fe6aa26a29..63dfae7f4c4d 100644
--- a/src/Compatibility/ControlGallery/src/Core/GalleryPages/VisualStateManagerGalleries/ButtonDisabledStatesGallery.xaml
+++ b/src/Compatibility/ControlGallery/src/Core/GalleryPages/VisualStateManagerGalleries/ButtonDisabledStatesGallery.xaml
@@ -76,7 +76,7 @@
 				<Button Text="Toggle IsEnabled" x:Name="Button2_Toggle" Clicked="Button2_Toggle_OnClicked" />
 
 				<!-- This section verifies that the default colors for an entry's text and placeholder are cached and can be reverted to -->
-				<Label Text="This Button uses null for the intial text/background, and colors from the VSM when disabled."/>
+				<Label Text="This Button uses null for the initial text/background, and colors from the VSM when disabled."/>
 				<Button Text="Button" x:Name="Button3" Style="{StaticResource DefaultInInitialState}" TextColor="Default" 
 					BackgroundColor="Default" />
 				<Button Text="Toggle IsEnabled" x:Name="Button3_Toggle" Clicked="Button3_Toggle_OnClicked" />
diff --git a/src/Compatibility/ControlGallery/src/Core/GalleryPages/VisualStateManagerGalleries/DatePickerDisabledStatesGallery.xaml b/src/Compatibility/ControlGallery/src/Core/GalleryPages/VisualStateManagerGalleries/DatePickerDisabledStatesGallery.xaml
index db60b8a991cd..ce51322ac9f1 100644
--- a/src/Compatibility/ControlGallery/src/Core/GalleryPages/VisualStateManagerGalleries/DatePickerDisabledStatesGallery.xaml
+++ b/src/Compatibility/ControlGallery/src/Core/GalleryPages/VisualStateManagerGalleries/DatePickerDisabledStatesGallery.xaml
@@ -73,7 +73,7 @@
 				<Button Text="Toggle IsEnabled" x:Name="Button2" Clicked="Button2_OnClicked" />
 
 				<!-- This section verifies that the default colors for a DatePicker's text is cached and can be reverted to -->
-				<Label Text="This DatePicker uses null for the intial text/background, and colors from the VSM when disabled."/>
+				<Label Text="This DatePicker uses null for the initial text/background, and colors from the VSM when disabled."/>
 				<DatePicker x:Name="Picker3" Style="{StaticResource DefaultInInitialState}" TextColor="Default" 
 							BackgroundColor="Default">
 				</DatePicker>
diff --git a/src/Compatibility/ControlGallery/src/Core/GalleryPages/VisualStateManagerGalleries/EditorDisabledStatesGallery.xaml b/src/Compatibility/ControlGallery/src/Core/GalleryPages/VisualStateManagerGalleries/EditorDisabledStatesGallery.xaml
index 1d06af12bb4d..b7d1b7772122 100644
--- a/src/Compatibility/ControlGallery/src/Core/GalleryPages/VisualStateManagerGalleries/EditorDisabledStatesGallery.xaml
+++ b/src/Compatibility/ControlGallery/src/Core/GalleryPages/VisualStateManagerGalleries/EditorDisabledStatesGallery.xaml
@@ -72,7 +72,7 @@
 				<Button Text="Toggle IsEnabled" x:Name="Button2" Clicked="Button2_OnClicked" />
 
 				<!-- This section verifies that the default colors for a searchbar's text and placeholder are cached and can be reverted to -->
-				<Label Text="This Editor uses null for the intial text/background, and colors from the VSM when disabled."/>
+				<Label Text="This Editor uses null for the initial text/background, and colors from the VSM when disabled."/>
 				<Editor x:Name="Editor3" Style="{StaticResource DefaultInInitialState}" TextColor="Default" 
 						BackgroundColor="Default" Text="Kwyjibo" />
 				<Button Text="Toggle IsEnabled" x:Name="Button3" Clicked="Button3_OnClicked" />
diff --git a/src/Compatibility/ControlGallery/src/Core/GalleryPages/VisualStateManagerGalleries/EntryDisabledStatesGallery.xaml b/src/Compatibility/ControlGallery/src/Core/GalleryPages/VisualStateManagerGalleries/EntryDisabledStatesGallery.xaml
index ebf139bbe34b..e9d16c0a3850 100644
--- a/src/Compatibility/ControlGallery/src/Core/GalleryPages/VisualStateManagerGalleries/EntryDisabledStatesGallery.xaml
+++ b/src/Compatibility/ControlGallery/src/Core/GalleryPages/VisualStateManagerGalleries/EntryDisabledStatesGallery.xaml
@@ -74,7 +74,7 @@
 			<Button Text="Toggle IsEnabled" x:Name="Button2" Clicked="Button2_OnClicked" />
 
 			<!-- This section verifies that the default colors for an entry's text and placeholder are cached and can be reverted to -->
-			<Label Text="This Entry uses null for the intial text/background, and colors from the VSM when disabled."/>
+			<Label Text="This Entry uses null for the initial text/background, and colors from the VSM when disabled."/>
 			<Entry x:Name="Entry3" Style="{StaticResource DefaultInInitialState}" TextColor="Default" 
 				   PlaceholderColor="Default" Placeholder="placeholder" BackgroundColor="Default" />
 			<Button Text="Toggle IsEnabled" x:Name="Button3" Clicked="Button3_OnClicked" />
diff --git a/src/Compatibility/ControlGallery/src/Core/GalleryPages/VisualStateManagerGalleries/PickerDisabledStatesGallery.xaml b/src/Compatibility/ControlGallery/src/Core/GalleryPages/VisualStateManagerGalleries/PickerDisabledStatesGallery.xaml
index 91fd7734261b..c2ae823cee74 100644
--- a/src/Compatibility/ControlGallery/src/Core/GalleryPages/VisualStateManagerGalleries/PickerDisabledStatesGallery.xaml
+++ b/src/Compatibility/ControlGallery/src/Core/GalleryPages/VisualStateManagerGalleries/PickerDisabledStatesGallery.xaml
@@ -88,7 +88,7 @@
 				<Button Text="Toggle IsEnabled" x:Name="Button2" Clicked="Button2_OnClicked" />
 
 				<!-- This section verifies that the default for a Picker's text is cached and can be reverted to -->
-				<Label Text="This Picker uses null for the intial text/background, and colors from the VSM when disabled."/>
+				<Label Text="This Picker uses null for the initial text/background, and colors from the VSM when disabled."/>
 				<Picker x:Name="Picker3" Style="{StaticResource DefaultInInitialState}" TextColor="Default" 
 				   BackgroundColor="Default">
 					<Picker.Items>
diff --git a/src/Compatibility/ControlGallery/src/Core/GalleryPages/VisualStateManagerGalleries/SearchBarDisabledStatesGallery.xaml b/src/Compatibility/ControlGallery/src/Core/GalleryPages/VisualStateManagerGalleries/SearchBarDisabledStatesGallery.xaml
index b5f560bda789..6ac963973514 100644
--- a/src/Compatibility/ControlGallery/src/Core/GalleryPages/VisualStateManagerGalleries/SearchBarDisabledStatesGallery.xaml
+++ b/src/Compatibility/ControlGallery/src/Core/GalleryPages/VisualStateManagerGalleries/SearchBarDisabledStatesGallery.xaml
@@ -79,7 +79,7 @@
 				<Button Text="Toggle IsEnabled" x:Name="Button2" Clicked="Button2_OnClicked" />
 
 				<!-- This section verifies that the default colors for a searchbar's text and placeholder are cached and can be reverted to -->
-				<Label Text="This SearchBar uses null for the intial text/background, and colors from the VSM when disabled."/>
+				<Label Text="This SearchBar uses null for the initial text/background, and colors from the VSM when disabled."/>
 				<SearchBar x:Name="Search3" Style="{StaticResource DefaultInInitialState}" TextColor="Default" 
 						PlaceholderColor="Default" Placeholder="placeholder" BackgroundColor="Default"
 						CancelButtonColor="Default" />
diff --git a/src/Compatibility/ControlGallery/src/Core/GalleryPages/VisualStateManagerGalleries/TimePickerDisabledStatesGallery.xaml b/src/Compatibility/ControlGallery/src/Core/GalleryPages/VisualStateManagerGalleries/TimePickerDisabledStatesGallery.xaml
index 3a7420eecee8..923863324b20 100644
--- a/src/Compatibility/ControlGallery/src/Core/GalleryPages/VisualStateManagerGalleries/TimePickerDisabledStatesGallery.xaml
+++ b/src/Compatibility/ControlGallery/src/Core/GalleryPages/VisualStateManagerGalleries/TimePickerDisabledStatesGallery.xaml
@@ -73,7 +73,7 @@
 				<Button Text="Toggle IsEnabled" x:Name="Button2" Clicked="Button2_OnClicked" />
 
 				<!-- This section verifies that the default color for a TimePicker's text is cached and can be reverted to -->
-				<Label Text="This TimePicker uses null for the intial text/background, and colors from the VSM when disabled."/>
+				<Label Text="This TimePicker uses null for the initial text/background, and colors from the VSM when disabled."/>
 				<TimePicker x:Name="Picker3" Style="{StaticResource DefaultInInitialState}" TextColor="Default" 
 				   BackgroundColor="Default">
 				</TimePicker>
diff --git a/src/Compatibility/Core/src/Android/StepperRendererManager.cs b/src/Compatibility/Core/src/Android/StepperRendererManager.cs
index 6b07613b9e0c..b999f7d31dcf 100644
--- a/src/Compatibility/Core/src/Android/StepperRendererManager.cs
+++ b/src/Compatibility/Core/src/Android/StepperRendererManager.cs
@@ -27,14 +27,14 @@ public static void CreateStepperButtons<TButton>(IStepperRenderer renderer, out
 			upButton.SetOnClickListener(StepperListener.Instance);
 
 			// IMPORTANT:
-			// Do not be decieved. These are NOT the same characters. Neither are a "minus" either.
+			// Do not be deceived. These are NOT the same characters. Neither are a "minus" either.
 			// The Text is a visually pleasing "minus", and the description is the phonetically correct "minus".
 			// The little key on your keyboard is a dash/hyphen.
 			downButton.Text = "－";
 			downButton.ContentDescription = "−";
 
 			// IMPORTANT:
-			// Do not be decieved. These are NOT the same characters.
+			// Do not be deceived. These are NOT the same characters.
 			// The Text is a visually pleasing "plus", and the description is the phonetically correct "plus"
 			// (which, unlike the minus, IS found on your keyboard).
 			upButton.Text = "＋";
diff --git a/src/Controls/docs/Microsoft.Maui.Controls/BaseMenuItem.xml b/src/Controls/docs/Microsoft.Maui.Controls/BaseMenuItem.xml
index 7f5dba54f27c..8baa2f1fcaa9 100644
--- a/src/Controls/docs/Microsoft.Maui.Controls/BaseMenuItem.xml
+++ b/src/Controls/docs/Microsoft.Maui.Controls/BaseMenuItem.xml
@@ -35,7 +35,7 @@
       </AssemblyInfo>
       <Parameters />
       <Docs>
-        <summary>Intializes a new <see cref="T:Microsoft.Maui.Controls.BaseMenuItem" /> instance.</summary>
+        <summary>Initializes a new <see cref="T:Microsoft.Maui.Controls.BaseMenuItem" /> instance.</summary>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
diff --git a/src/Controls/src/Core/IPinchGestureController.cs b/src/Controls/src/Core/IPinchGestureController.cs
index 8d8fc071fa84..b119de4853cb 100644
--- a/src/Controls/src/Core/IPinchGestureController.cs
+++ b/src/Controls/src/Core/IPinchGestureController.cs
@@ -12,6 +12,6 @@ public interface IPinchGestureController
 
 		void SendPinchEnded(Element sender);
 
-		void SendPinchStarted(Element sender, Point intialScalePoint);
+		void SendPinchStarted(Element sender, Point intialScalePoint); //TODO: intial should be initial, but this is a breaking ABI change. Consider changing for .NET 8
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/tests/Core.UnitTests/MarshalingObservableCollectionTests.cs b/src/Controls/tests/Core.UnitTests/MarshalingObservableCollectionTests.cs
index 14c48da98a29..8774a6841b36 100644
--- a/src/Controls/tests/Core.UnitTests/MarshalingObservableCollectionTests.cs
+++ b/src/Controls/tests/Core.UnitTests/MarshalingObservableCollectionTests.cs
@@ -64,7 +64,7 @@ await Task.Run(() =>
 			Assert.True(insertCount == 1, "The CollectionChanged event should have fired with an Add exactly 1 time");
 		});
 
-		[Fact("Intial item count should match wrapped collection.")]
+		[Fact("Initial item count should match wrapped collection.")]
 		public Task InitialItemCountsMatch() => DispatcherTest.Run(async () =>
 		{
 			var _dispatcher = Dispatcher.GetForCurrentThread();
diff --git a/src/Core/src/Platform/Android/ContextExtensions.cs b/src/Core/src/Platform/Android/ContextExtensions.cs
index fba770870258..5a396f287fb9 100644
--- a/src/Core/src/Platform/Android/ContextExtensions.cs
+++ b/src/Core/src/Platform/Android/ContextExtensions.cs
@@ -22,7 +22,7 @@ public static class ContextExtensions
 	{
 		// Caching this display density here means that all pixel calculations are going to be based on the density
 		// of the first Context these extensions are run against. That's probably fine, but if we run into a 
-		// situation where subsequent activities can be launched with a different display density from the intial
+		// situation where subsequent activities can be launched with a different display density from the initial
 		// activity, we'll need to remove this cached value or cache it in a Dictionary<Context, float>
 		static float s_displayDensity = float.MinValue;
 
diff --git a/src/Core/src/Platform/Android/Navigation/NavigationViewFragment.cs b/src/Core/src/Platform/Android/Navigation/NavigationViewFragment.cs
index f63a6470e1bd..8c19b23e99fc 100644
--- a/src/Core/src/Platform/Android/Navigation/NavigationViewFragment.cs
+++ b/src/Core/src/Platform/Android/Navigation/NavigationViewFragment.cs
@@ -52,7 +52,7 @@ public override AView OnCreateView(LayoutInflater inflater, ViewGroup? container
 			// This is all a bit silly because the page is just getting added and removed to the same
 			// view. Unfortunately FragmentContainerView is sealed so we can't inherit from it and influence
 			// when the views are being added and removed. If this ends up causing too much shake up
-			// Then we can try some other approachs like just modifying the navbar ourselves to include a back button
+			// Then we can try some other approaches like just modifying the navbar ourselves to include a back button
 			// Even if there's only one page on the stack
 
 			_currentView =
diff --git a/src/Core/src/Platform/Android/Navigation/StackNavigationManager.cs b/src/Core/src/Platform/Android/Navigation/StackNavigationManager.cs
index 5089c9cfbd11..96dc0228a40d 100644
--- a/src/Core/src/Platform/Android/Navigation/StackNavigationManager.cs
+++ b/src/Core/src/Platform/Android/Navigation/StackNavigationManager.cs
@@ -72,9 +72,9 @@ public StackNavigationManager(IMauiContext mauiContext)
 		 * This is also the reason why we aren't using the custom animation features on the navigation component itself.
 		 * Because we might be popping but visually pushing.
 		 * 
-		 * The Fragments that are on the stack also do not have a hard connection to the page they originally rendereded.
+		 * The Fragments that are on the stack also do not have a hard connection to the page they originally rendered.
 		 * Whenever a fragment is the "visible" fragment it just figures out what the current page is and displays that.
-		 * Fragments are recreated everytime they are pushed on the stack but the handler renderer is not.
+		 * Fragments are recreated every time they are pushed on the stack but the handler renderer is not.
 		 * It's just attached to a new fragment
 		 * */
 		void ApplyNavigationRequest(NavigationRequest args)
@@ -354,7 +354,7 @@ public virtual void RequestNavigation(NavigationRequest e)
 
 		// Fragments are always destroyed if they aren't visible
 		// The Handler/PlatformView associated with the visible IView remain intact
-		// The performance hit of destorying/recreating fragments should be negligible
+		// The performance hit of destroying/recreating fragments should be negligible
 		// Hopefully this behavior survives implementation
 		// This will need to be tested with Maps and WebViews to make sure they behave efficiently
 		// being removed and then added back to a different Fragment
diff --git a/src/Core/src/Platform/Android/StepperHandlerManager.cs b/src/Core/src/Platform/Android/StepperHandlerManager.cs
index c0c61a7405d0..b8380077e9b2 100644
--- a/src/Core/src/Platform/Android/StepperHandlerManager.cs
+++ b/src/Core/src/Platform/Android/StepperHandlerManager.cs
@@ -44,14 +44,14 @@ public static void CreateStepperButtons<TButton>(IAndroidStepperHandler handler,
 			upButton.SetOnClickListener(StepperListener.Instance);
 
 			// IMPORTANT:
-			// Do not be decieved. These are NOT the same characters. Neither are a "minus" either.
+			// Do not be deceived. These are NOT the same characters. Neither are a "minus" either.
 			// The Text is a visually pleasing "minus", and the description is the phonetically correct "minus".
 			// The little key on your keyboard is a dash/hyphen.
 			downButton.Text = "－";
 			downButton.ContentDescription = "−";
 
 			// IMPORTANT:
-			// Do not be decieved. These are NOT the same characters.
+			// Do not be deceived. These are NOT the same characters.
 			// The Text is a visually pleasing "plus", and the description is the phonetically correct "plus"
 			// (which, unlike the minus, IS found on your keyboard).
 			upButton.Text = "＋";

From 484ff918df842e43605d47b62f1eb6b86f341dda Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Oct 2022 10:42:10 +0100
Subject: [PATCH 03/77] Bump Microsoft.CodeAnalysis.NetAnalyzers (#10783)

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

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

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

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

diff --git a/eng/Versions.props b/eng/Versions.props
index 049e05d4573d..3d3ed5498e4f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -38,7 +38,7 @@
     <MicrosoftAspNetCoreMetadataPackageVersion>6.0.10</MicrosoftAspNetCoreMetadataPackageVersion>
     <MicrosoftJSInteropPackageVersion>6.0.10</MicrosoftJSInteropPackageVersion>
     <!-- Other packages -->
-    <MicrosoftCodeAnalysisNetAnalyzersVersion>7.0.0-preview1.22514.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
+    <MicrosoftCodeAnalysisNetAnalyzersVersion>7.0.0-preview1.22518.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
     <MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.3.3</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
     <MicrosoftCodeAnalysisBannedApiAnalyzersVersion>3.3.3</MicrosoftCodeAnalysisBannedApiAnalyzersVersion>
     <MicrosoftMauiGraphicsVersion>6.0.501</MicrosoftMauiGraphicsVersion>

From 4c29bf4bebd1b373f4a5a8291d62f9b083b27e8d Mon Sep 17 00:00:00 2001
From: Samantha Houts <samhouts@users.noreply.github.com>
Date: Thu, 20 Oct 2022 02:43:25 -0700
Subject: [PATCH 04/77] Update TODO comments for API changes that did not make
 it for .NET 7 (#10794)

---
 .../src/Core/HandlerImpl/CheckBox/CheckBox.cs        |  2 +-
 .../src/Core/HandlerImpl/Label/Label.Android.cs      |  2 +-
 .../Android/Extensions/FormattedStringExtensions.cs  |  2 +-
 .../Android/Extensions/RecyclerViewExtensions.cs     |  2 +-
 .../Windows/Extensions/FormattedStringExtensions.cs  |  4 ++--
 .../iOS/Extensions/FormattedStringExtensions.cs      |  4 ++--
 src/Core/src/Fonts/FontManager.Tizen.cs              |  2 +-
 src/Core/src/Graphics/MauiDrawable.Android.cs        |  2 +-
 src/Core/src/Handlers/Button/ButtonHandler.iOS.cs    |  2 +-
 .../Handlers/DatePicker/DatePickerHandler.Windows.cs |  2 +-
 .../src/Handlers/Editor/EditorHandler.Android.cs     | 12 ++++++------
 src/Core/src/Handlers/Entry/EntryHandler.Android.cs  | 10 +++++-----
 .../ImageButton/ImageButtonHandler.Android.cs        |  2 +-
 .../src/Handlers/Picker/PickerHandler.Android.cs     |  2 +-
 .../src/Handlers/Picker/PickerHandler.Standard.cs    |  2 +-
 src/Core/src/Handlers/Picker/PickerHandler.Tizen.cs  |  2 +-
 .../src/Handlers/Picker/PickerHandler.Windows.cs     |  2 +-
 src/Core/src/Handlers/Picker/PickerHandler.iOS.cs    |  2 +-
 .../src/Handlers/SearchBar/SearchBarHandler.iOS.cs   |  2 +-
 .../Handlers/TimePicker/TimePickerHandler.Windows.cs |  2 +-
 src/Core/src/Platform/Android/EditTextExtensions.cs  |  8 ++++----
 .../src/Platform/Android/ImageButtonExtensions.cs    |  2 +-
 src/Core/src/Platform/Android/ViewExtensions.cs      |  2 +-
 .../Platform/Windows/CalendarDatePickerExtensions.cs |  2 +-
 .../src/Platform/Windows/DatePickerExtensions.cs     |  2 +-
 src/Core/src/Platform/Windows/TextBoxExtensions.cs   |  2 +-
 .../src/Platform/Windows/TimePickerExtensions.cs     |  2 +-
 src/Core/src/Platform/iOS/SearchBarExtensions.cs     |  2 +-
 src/Core/src/Platform/iOS/TextInputExtensions.cs     |  2 +-
 src/Essentials/src/AppInfo/AppInfo.uwp.cs            |  2 +-
 30 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/src/Controls/src/Core/HandlerImpl/CheckBox/CheckBox.cs b/src/Controls/src/Core/HandlerImpl/CheckBox/CheckBox.cs
index 5100fd347e6d..4f7a2a956b42 100644
--- a/src/Controls/src/Core/HandlerImpl/CheckBox/CheckBox.cs
+++ b/src/Controls/src/Core/HandlerImpl/CheckBox/CheckBox.cs
@@ -8,7 +8,7 @@ namespace Microsoft.Maui.Controls
 {
 	public partial class CheckBox
 	{
-		// TODO Make public for NET7
+		// TODO Make public for NET8
 		internal static IPropertyMapper<ICheckBox, CheckBoxHandler> ControlsCheckBoxMapper = new PropertyMapper<CheckBox, CheckBoxHandler>(CheckBoxHandler.Mapper)
 		{
 			[nameof(CheckBox.Color)] = (handler, _) => handler?.UpdateValue(nameof(ICheckBox.Foreground))
diff --git a/src/Controls/src/Core/HandlerImpl/Label/Label.Android.cs b/src/Controls/src/Core/HandlerImpl/Label/Label.Android.cs
index 4f56341d7b16..40283fafb522 100644
--- a/src/Controls/src/Core/HandlerImpl/Label/Label.Android.cs
+++ b/src/Controls/src/Core/HandlerImpl/Label/Label.Android.cs
@@ -47,7 +47,7 @@ public static void MapText(ILabelHandler handler, Label label)
 			Platform.TextViewExtensions.UpdateText(handler.PlatformView, label);
 		}
 
-		// TODO: NET7 make this public
+		// TODO: NET8 make this public
 		internal static void MapTextColor(ILabelHandler handler, Label label)
 		{
 			handler.PlatformView?.UpdateTextColor(label);
diff --git a/src/Controls/src/Core/Platform/Android/Extensions/FormattedStringExtensions.cs b/src/Controls/src/Core/Platform/Android/Extensions/FormattedStringExtensions.cs
index 04484e1a4f9e..29a82daade4d 100644
--- a/src/Controls/src/Core/Platform/Android/Extensions/FormattedStringExtensions.cs
+++ b/src/Controls/src/Core/Platform/Android/Extensions/FormattedStringExtensions.cs
@@ -26,7 +26,7 @@ public static SpannableString ToSpannableString(this Label label)
 				label.TextTransform,
 				label.TextDecorations);
 
-		// TODO: NET7 this overload must be removed in net7.0 and replace with the one below
+		// TODO: NET8 this overload must be removed in net8.0 and replaced with the one below
 		public static SpannableString ToSpannableString(
 			this FormattedString formattedString,
 			IFontManager fontManager,
diff --git a/src/Controls/src/Core/Platform/Android/Extensions/RecyclerViewExtensions.cs b/src/Controls/src/Core/Platform/Android/Extensions/RecyclerViewExtensions.cs
index 1f15e7cae7af..b4c1d35d53d2 100644
--- a/src/Controls/src/Core/Platform/Android/Extensions/RecyclerViewExtensions.cs
+++ b/src/Controls/src/Core/Platform/Android/Extensions/RecyclerViewExtensions.cs
@@ -11,7 +11,7 @@ public static class RecyclerViewExtensions
 		public static void UpdateSelection(this RecyclerView recyclerView, SelectableItemsView selectableItemsView)
 		{
 			var mode = selectableItemsView.SelectionMode;
-			//TODO: on NET7 implement a ISelectableItemsViewAdapter interface on the adapter
+			//TODO: on NET8 implement a ISelectableItemsViewAdapter interface on the adapter
 			var adapter = recyclerView.GetAdapter() as ReorderableItemsViewAdapter<ReorderableItemsView, IGroupableItemsViewSource>;
 			if (adapter == null)
 				return;
diff --git a/src/Controls/src/Core/Platform/Windows/Extensions/FormattedStringExtensions.cs b/src/Controls/src/Core/Platform/Windows/Extensions/FormattedStringExtensions.cs
index a2cccd7c2524..4f98b7d47d6d 100644
--- a/src/Controls/src/Core/Platform/Windows/Extensions/FormattedStringExtensions.cs
+++ b/src/Controls/src/Core/Platform/Windows/Extensions/FormattedStringExtensions.cs
@@ -25,7 +25,7 @@ public static void UpdateInlines(
 			this TextBlock textBlock,
 			IFontManager fontManager,
 			FormattedString formattedString,
-			double defaultLineHeight = 0d, // TODO: NET7 should be -1, but too late to change for net6
+			double defaultLineHeight = 0d, // TODO: NET8 should be -1, but too late to change for net6
 			TextAlignment defaultHorizontalAlignment = TextAlignment.Start,
 			Font? defaultFont = null,
 			Color? defaultColor = null,
@@ -76,7 +76,7 @@ public static void UpdateInlines(
 		public static IEnumerable<Tuple<Run, Color, Color>> ToRunAndColorsTuples(
 			this FormattedString formattedString,
 			IFontManager fontManager,
-			double defaultLineHeight = 0d, // TODO: NET7 should be -1, but too late to change for net6
+			double defaultLineHeight = 0d, // TODO: NET8 should be -1, but too late to change for net6
 			TextAlignment defaultHorizontalAlignment = TextAlignment.Start,
 			Font? defaultFont = null,
 			Color? defaultColor = null,
diff --git a/src/Controls/src/Core/Platform/iOS/Extensions/FormattedStringExtensions.cs b/src/Controls/src/Core/Platform/iOS/Extensions/FormattedStringExtensions.cs
index 35db906cbcd2..b50780003a87 100644
--- a/src/Controls/src/Core/Platform/iOS/Extensions/FormattedStringExtensions.cs
+++ b/src/Controls/src/Core/Platform/iOS/Extensions/FormattedStringExtensions.cs
@@ -29,7 +29,7 @@ public static class FormattedStringExtensions
 		public static NSAttributedString ToNSAttributedString(
 			this FormattedString formattedString,
 			IFontManager fontManager,
-			double defaultLineHeight = 0d, // TODO: NET7 should be -1, but too late to change for net6
+			double defaultLineHeight = 0d, // TODO: NET8 should be -1, but too late to change for net6
 			TextAlignment defaultHorizontalAlignment = TextAlignment.Start,
 			Font? defaultFont = null,
 			Color? defaultColor = null,
@@ -54,7 +54,7 @@ public static NSAttributedString ToNSAttributedString(
 		public static NSAttributedString ToNSAttributedString(
 			this Span span,
 			IFontManager fontManager,
-			double defaultLineHeight = 0d, // TODO: NET7 should be -1, but too late to change for net6
+			double defaultLineHeight = 0d, // TODO: NET8 should be -1, but too late to change for NET8
 			TextAlignment defaultHorizontalAlignment = TextAlignment.Start,
 			Font? defaultFont = null,
 			Color? defaultColor = null,
diff --git a/src/Core/src/Fonts/FontManager.Tizen.cs b/src/Core/src/Fonts/FontManager.Tizen.cs
index e3a16b14db79..df6bd444b2dd 100644
--- a/src/Core/src/Fonts/FontManager.Tizen.cs
+++ b/src/Core/src/Fonts/FontManager.Tizen.cs
@@ -38,7 +38,7 @@ public string GetFont(Font font)
 		}
 
 		/// <inheritdoc/>
-		public string GetFontFamily(string? fontFamliy)
+		public string GetFontFamily(string? fontFamliy) //TODO: this is a misspelling in public ABI; consider changing in NET8
 		{
 			if (string.IsNullOrEmpty(fontFamliy))
 				return "";
diff --git a/src/Core/src/Graphics/MauiDrawable.Android.cs b/src/Core/src/Graphics/MauiDrawable.Android.cs
index 0da15b35428d..d43f67478a42 100644
--- a/src/Core/src/Graphics/MauiDrawable.Android.cs
+++ b/src/Core/src/Graphics/MauiDrawable.Android.cs
@@ -221,7 +221,7 @@ public void SetBorderBrush(RadialGradientPaint radialGradientPaint)
 			InvalidateSelf();
 		}
 
-		// TODO: NET7 make public for net7.0
+		// TODO: NET8 make public for net8.0
 		internal void SetEmptyBorderBrush()
 		{
 			_invalidatePath = true;
diff --git a/src/Core/src/Handlers/Button/ButtonHandler.iOS.cs b/src/Core/src/Handlers/Button/ButtonHandler.iOS.cs
index 52a69bcb2f3a..938796e4d339 100644
--- a/src/Core/src/Handlers/Button/ButtonHandler.iOS.cs
+++ b/src/Core/src/Handlers/Button/ButtonHandler.iOS.cs
@@ -38,7 +38,7 @@ protected override void DisconnectHandler(UIButton platformView)
 		}
 
 #if MACCATALYST
-		//TODO: make this public on NET7
+		//TODO: make this public on NET8
 		internal static void MapBackground(IButtonHandler handler, IButton button)
 		{
 			//If this is a Mac optimized interface
diff --git a/src/Core/src/Handlers/DatePicker/DatePickerHandler.Windows.cs b/src/Core/src/Handlers/DatePicker/DatePickerHandler.Windows.cs
index 3c68607d3a07..51ed98ef1f83 100644
--- a/src/Core/src/Handlers/DatePicker/DatePickerHandler.Windows.cs
+++ b/src/Core/src/Handlers/DatePicker/DatePickerHandler.Windows.cs
@@ -81,7 +81,7 @@ private void DateChanged(CalendarDatePicker sender, CalendarDatePickerDateChange
 			VirtualView.Date = args.NewDate.Value.Date;
 		}
 
-		// TODO NET7 add to public API
+		// TODO NET8 add to public API
 		internal static void MapBackground(IDatePickerHandler handler, IDatePicker datePicker)
 		{
 			handler.PlatformView?.UpdateBackground(datePicker);
diff --git a/src/Core/src/Handlers/Editor/EditorHandler.Android.cs b/src/Core/src/Handlers/Editor/EditorHandler.Android.cs
index 032895843b18..d2baf62178d1 100644
--- a/src/Core/src/Handlers/Editor/EditorHandler.Android.cs
+++ b/src/Core/src/Handlers/Editor/EditorHandler.Android.cs
@@ -6,13 +6,13 @@
 
 namespace Microsoft.Maui.Handlers
 {
-	// TODO: NET7 issoto - Change the TPlatformView generic type to MauiAppCompatEditText
+	// TODO: NET8 issoto - Change the TPlatformView generic type to MauiAppCompatEditText
 	// This type adds support to the SelectionChanged event
 	public partial class EditorHandler : ViewHandler<IEditor, AppCompatEditText>
 	{
 		bool _set;
 
-		// TODO: NET7 issoto - Change the return type to MauiAppCompatEditText
+		// TODO: NET8 issoto - Change the return type to MauiAppCompatEditText
 		protected override AppCompatEditText CreatePlatformView()
 		{
 			var editText = new MauiAppCompatEditText(Context)
@@ -32,27 +32,27 @@ public override void SetVirtualView(IView view)
 		{
 			base.SetVirtualView(view);
 
-			// TODO: NET7 issoto - Remove the casting once we can set the TPlatformView generic type as MauiAppCompatEditText
+			// TODO: NET8 issoto - Remove the casting once we can set the TPlatformView generic type as MauiAppCompatEditText
 			if (!_set && PlatformView is MauiAppCompatEditText editText)
 				editText.SelectionChanged += OnSelectionChanged;
 
 			_set = true;
 		}
 
-		// TODO: NET7 issoto - Change the platformView type to MauiAppCompatEditText
+		// TODO: NET8 issoto - Change the platformView type to MauiAppCompatEditText
 		protected override void ConnectHandler(AppCompatEditText platformView)
 		{
 			platformView.ViewAttachedToWindow += OnPlatformViewAttachedToWindow;
 			platformView.TextChanged += OnTextChanged;
 		}
 
-		// TODO: NET7 issoto - Change the platformView type to MauiAppCompatEditText
+		// TODO: NET8 issoto - Change the platformView type to MauiAppCompatEditText
 		protected override void DisconnectHandler(AppCompatEditText platformView)
 		{
 			platformView.ViewAttachedToWindow -= OnPlatformViewAttachedToWindow;
 			platformView.TextChanged -= OnTextChanged;
 
-			// TODO: NET7 issoto - Remove the casting once we can set the TPlatformView generic type as MauiAppCompatEditText
+			// TODO: NET8 issoto - Remove the casting once we can set the TPlatformView generic type as MauiAppCompatEditText
 			if (_set && platformView is MauiAppCompatEditText editText)
 				editText.SelectionChanged -= OnSelectionChanged;
 
diff --git a/src/Core/src/Handlers/Entry/EntryHandler.Android.cs b/src/Core/src/Handlers/Entry/EntryHandler.Android.cs
index 888f081d164e..32a82b6b5ec4 100644
--- a/src/Core/src/Handlers/Entry/EntryHandler.Android.cs
+++ b/src/Core/src/Handlers/Entry/EntryHandler.Android.cs
@@ -14,7 +14,7 @@
 
 namespace Microsoft.Maui.Handlers
 {
-	// TODO: NET7 issoto - Change the TPlatformView generic type to MauiAppCompatEditText
+	// TODO: NET8 issoto - Change the TPlatformView generic type to MauiAppCompatEditText
 	// This type adds support to the SelectionChanged event
 	public partial class EntryHandler : ViewHandler<IEntry, AppCompatEditText>
 	{
@@ -36,14 +36,14 @@ public override void SetVirtualView(IView view)
 		{
 			base.SetVirtualView(view);
 
-			// TODO: NET7 issoto - Remove the casting once we can set the TPlatformView generic type as MauiAppCompatEditText
+			// TODO: NET8 issoto - Remove the casting once we can set the TPlatformView generic type as MauiAppCompatEditText
 			if (!_set && PlatformView is MauiAppCompatEditText editText)
 				editText.SelectionChanged += OnSelectionChanged;
 
 			_set = true;
 		}
 
-		// TODO: NET7 issoto - Change the return type to MauiAppCompatEditText
+		// TODO: NET8 issoto - Change the return type to MauiAppCompatEditText
 		protected override void ConnectHandler(AppCompatEditText platformView)
 		{
 			platformView.TextChanged += OnTextChanged;
@@ -52,7 +52,7 @@ protected override void ConnectHandler(AppCompatEditText platformView)
 			platformView.EditorAction += OnEditorAction;
 		}
 
-		// TODO: NET7 issoto - Change the return type to MauiAppCompatEditText
+		// TODO: NET8 issoto - Change the return type to MauiAppCompatEditText
 		protected override void DisconnectHandler(AppCompatEditText platformView)
 		{
 			_clearButtonDrawable = null;
@@ -61,7 +61,7 @@ protected override void DisconnectHandler(AppCompatEditText platformView)
 			platformView.Touch -= OnTouch;
 			platformView.EditorAction -= OnEditorAction;
 
-			// TODO: NET7 issoto - Remove the casting once we can set the TPlatformView generic type as MauiAppCompatEditText
+			// TODO: NET8 issoto - Remove the casting once we can set the TPlatformView generic type as MauiAppCompatEditText
 			if (_set && platformView is MauiAppCompatEditText editText)
 				editText.SelectionChanged -= OnSelectionChanged;
 
diff --git a/src/Core/src/Handlers/ImageButton/ImageButtonHandler.Android.cs b/src/Core/src/Handlers/ImageButton/ImageButtonHandler.Android.cs
index 41b639f9db64..dcaeafe48900 100644
--- a/src/Core/src/Handlers/ImageButton/ImageButtonHandler.Android.cs
+++ b/src/Core/src/Handlers/ImageButton/ImageButtonHandler.Android.cs
@@ -43,7 +43,7 @@ protected override void ConnectHandler(ShapeableImageView platformView)
 			base.ConnectHandler(platformView);
 		}
 
-		// TODO: NET7 make this public
+		// TODO: NET8 make this public
 		internal static void MapBackground(IImageButtonHandler handler, IImageButton imageButton)
 		{
 			(handler.PlatformView as ShapeableImageView)?.UpdateBackground(imageButton);
diff --git a/src/Core/src/Handlers/Picker/PickerHandler.Android.cs b/src/Core/src/Handlers/Picker/PickerHandler.Android.cs
index 4550bf229826..57a6d3f9839d 100644
--- a/src/Core/src/Handlers/Picker/PickerHandler.Android.cs
+++ b/src/Core/src/Handlers/Picker/PickerHandler.Android.cs
@@ -38,7 +38,7 @@ public static void MapBackground(IPickerHandler handler, IPicker picker)
 			handler.PlatformView?.UpdateBackground(picker);
 		}
 
-		// Uncomment me on NET7 [Obsolete]
+		// TODO Uncomment me on NET8 [Obsolete]
 		public static void MapReload(IPickerHandler handler, IPicker picker, object? args) => Reload(handler);
 
 		internal static void MapItems(IPickerHandler handler, IPicker picker) => Reload(handler);
diff --git a/src/Core/src/Handlers/Picker/PickerHandler.Standard.cs b/src/Core/src/Handlers/Picker/PickerHandler.Standard.cs
index 5545751e0f7b..8cffe76dbffe 100644
--- a/src/Core/src/Handlers/Picker/PickerHandler.Standard.cs
+++ b/src/Core/src/Handlers/Picker/PickerHandler.Standard.cs
@@ -6,7 +6,7 @@ public partial class PickerHandler : ViewHandler<IPicker, object>
 	{
 		protected override object CreatePlatformView() => throw new NotImplementedException();
 
-		// Uncomment me on NET7 [Obsolete]
+		// TODO Uncomment me on NET8 [Obsolete]
 		public static void MapReload(IPickerHandler handler, IPicker picker, object? args) { }
 		internal static void MapItems(IPickerHandler handler, IPicker picker) { }
 
diff --git a/src/Core/src/Handlers/Picker/PickerHandler.Tizen.cs b/src/Core/src/Handlers/Picker/PickerHandler.Tizen.cs
index c75eb38e9f05..b737dfedc674 100644
--- a/src/Core/src/Handlers/Picker/PickerHandler.Tizen.cs
+++ b/src/Core/src/Handlers/Picker/PickerHandler.Tizen.cs
@@ -28,7 +28,7 @@ protected override void DisconnectHandler(NEntry platformView)
 			base.DisconnectHandler(platformView);
 		}
 
-		// Uncomment me on NET7 [Obsolete]
+		// TODO Uncomment me on NET8 [Obsolete]
 		public static void MapReload(IPickerHandler handler, IPicker picker, object? args) => Reload(handler);
 
 		internal static void MapItems(IPickerHandler handler, IPicker picker) => Reload(handler);
diff --git a/src/Core/src/Handlers/Picker/PickerHandler.Windows.cs b/src/Core/src/Handlers/Picker/PickerHandler.Windows.cs
index 2858a4a3f311..e8a535aa51a3 100644
--- a/src/Core/src/Handlers/Picker/PickerHandler.Windows.cs
+++ b/src/Core/src/Handlers/Picker/PickerHandler.Windows.cs
@@ -54,7 +54,7 @@ static void Reload(IPickerHandler handler)
 				ph2.SetUpdatingItemSource(false);
 		}
 
-		// Uncomment me on NET7 [Obsolete]
+		// TODO: Uncomment me on NET8 [Obsolete]
 		public static void MapReload(IPickerHandler handler, IPicker picker, object? args) => Reload(handler);
 
 		internal static void MapItems(IPickerHandler handler, IPicker picker) => Reload(handler);
diff --git a/src/Core/src/Handlers/Picker/PickerHandler.iOS.cs b/src/Core/src/Handlers/Picker/PickerHandler.iOS.cs
index 2b15dd64434b..4e803cb0195f 100644
--- a/src/Core/src/Handlers/Picker/PickerHandler.iOS.cs
+++ b/src/Core/src/Handlers/Picker/PickerHandler.iOS.cs
@@ -125,7 +125,7 @@ static void Reload(IPickerHandler handler)
 			handler.PlatformView.UpdatePicker(handler.VirtualView);
 		}
 
-		// Uncomment me on NET7 [Obsolete]
+		// Uncomment me on NET8 [Obsolete]
 		public static void MapReload(IPickerHandler handler, IPicker picker, object? args) => Reload(handler);
 
 		internal static void MapItems(IPickerHandler handler, IPicker picker) => Reload(handler);
diff --git a/src/Core/src/Handlers/SearchBar/SearchBarHandler.iOS.cs b/src/Core/src/Handlers/SearchBar/SearchBarHandler.iOS.cs
index 0a19889e7002..32dbd8c5f054 100644
--- a/src/Core/src/Handlers/SearchBar/SearchBarHandler.iOS.cs
+++ b/src/Core/src/Handlers/SearchBar/SearchBarHandler.iOS.cs
@@ -63,7 +63,7 @@ public override Size GetDesiredSize(double widthConstraint, double heightConstra
 			return base.GetDesiredSize(widthConstraint, heightConstraint);
 		}
 
-		// TODO: NET7 make this public
+		// TODO: NET8 make this public
 		internal static void MapBackground(ISearchBarHandler handler, ISearchBar searchBar)
 		{
 			handler.PlatformView?.UpdateBackground(searchBar);
diff --git a/src/Core/src/Handlers/TimePicker/TimePickerHandler.Windows.cs b/src/Core/src/Handlers/TimePicker/TimePickerHandler.Windows.cs
index edcacd2d8c73..7c886f58c62c 100644
--- a/src/Core/src/Handlers/TimePicker/TimePickerHandler.Windows.cs
+++ b/src/Core/src/Handlers/TimePicker/TimePickerHandler.Windows.cs
@@ -45,7 +45,7 @@ public static void MapTextColor(ITimePickerHandler handler, ITimePicker timePick
 			handler.PlatformView.UpdateTextColor(timePicker);
 		}
 
-		// TODO NET7 make public
+		// TODO NET8 make public
 		internal static void MapBackground(ITimePickerHandler handler, ITimePicker timePicker)
 		{
 			handler.PlatformView?.UpdateBackground(timePicker);
diff --git a/src/Core/src/Platform/Android/EditTextExtensions.cs b/src/Core/src/Platform/Android/EditTextExtensions.cs
index 7ac555640f74..dc026fee305d 100644
--- a/src/Core/src/Platform/Android/EditTextExtensions.cs
+++ b/src/Core/src/Platform/Android/EditTextExtensions.cs
@@ -172,11 +172,11 @@ public static void UpdateIsReadOnly(this EditText editText, IEditor editor)
 			editText.SetCursorVisible(isReadOnly);
 		}
 
-		// TODO: NET7 hartez - Remove this, nothing uses it
+		// TODO: NET8 hartez - Remove this, nothing uses it
 		public static void UpdateClearButtonVisibility(this EditText editText, IEntry entry, Drawable? clearButtonDrawable) =>
 			UpdateClearButtonVisibility(editText, entry, () => clearButtonDrawable);
 
-		// TODO: NET7 hartez - Remove the getClearButtonDrawable parameter, nothing uses it
+		// TODO: NET8 hartez - Remove the getClearButtonDrawable parameter, nothing uses it
 		public static void UpdateClearButtonVisibility(this EditText editText, IEntry entry, Func<Drawable?>? getClearButtonDrawable)
 		{
 			if (entry?.Handler is not EntryHandler entryHandler)
@@ -206,7 +206,7 @@ public static void UpdateReturnType(this EditText editText, IEntry entry)
 			editText.ImeOptions = entry.ReturnType.ToPlatform();
 		}
 
-		// TODO: NET7 issoto - Revisit this, marking this method as `internal` to avoid breaking public API changes
+		// TODO: NET8 issoto - Revisit this, marking this method as `internal` to avoid breaking public API changes
 		internal static int GetCursorPosition(this EditText editText, int cursorOffset = 0)
 		{
 			var newCursorPosition = editText.SelectionStart + cursorOffset;
@@ -269,7 +269,7 @@ static int GetSelectionEnd(EditText editText, ITextInput entry, int start)
 			return end;
 		}
 
-		// TODO: NET7 issoto - Revisit this, marking this method as `internal` to avoid breaking public API changes
+		// TODO: NET8 issoto - Revisit this, marking this method as `internal` to avoid breaking public API changes
 		internal static int GetSelectedTextLength(this EditText editText)
 		{
 			var selectedLength = editText.SelectionEnd - editText.SelectionStart;
diff --git a/src/Core/src/Platform/Android/ImageButtonExtensions.cs b/src/Core/src/Platform/Android/ImageButtonExtensions.cs
index 597b54e85d89..48e502144a42 100644
--- a/src/Core/src/Platform/Android/ImageButtonExtensions.cs
+++ b/src/Core/src/Platform/Android/ImageButtonExtensions.cs
@@ -6,7 +6,7 @@ namespace Microsoft.Maui.Platform
 {
 	public static class ImageButtonExtensions
 	{
-		// TODO: NET7 should this be public?
+		// TODO: NET8 should this be public?
 		internal static void UpdateBackground(this ShapeableImageView platformButton, IImageButton imageButton)
 		{
 			Paint? paint = imageButton.Background;
diff --git a/src/Core/src/Platform/Android/ViewExtensions.cs b/src/Core/src/Platform/Android/ViewExtensions.cs
index bf631f585d38..296faecb4d1e 100644
--- a/src/Core/src/Platform/Android/ViewExtensions.cs
+++ b/src/Core/src/Platform/Android/ViewExtensions.cs
@@ -173,7 +173,7 @@ internal static void UpdateBackground(this AView platformView, IView view, bool
 		internal static void UpdateBackground(this TextView platformView, IView view) =>
 			UpdateBackground(platformView, view, true);
 
-		// TODO: NET7 make this public for net7.0
+		// TODO: NET8 make this public for NET8.0
 		internal static void UpdateBackground(this EditText platformView, IView view)
 		{
 			var paint = view.Background;
diff --git a/src/Core/src/Platform/Windows/CalendarDatePickerExtensions.cs b/src/Core/src/Platform/Windows/CalendarDatePickerExtensions.cs
index 8bed7bbd000f..be84bef3c971 100644
--- a/src/Core/src/Platform/Windows/CalendarDatePickerExtensions.cs
+++ b/src/Core/src/Platform/Windows/CalendarDatePickerExtensions.cs
@@ -3,7 +3,7 @@
 
 namespace Microsoft.Maui.Platform
 {
-	//TODO make this public on NET7
+	//TODO make this public on NET8
 	internal static class CalendarDatePickerExtensions
 	{
 		internal static string ToDateFormat(this string dateFormat)
diff --git a/src/Core/src/Platform/Windows/DatePickerExtensions.cs b/src/Core/src/Platform/Windows/DatePickerExtensions.cs
index c315cc218858..046f940bb069 100644
--- a/src/Core/src/Platform/Windows/DatePickerExtensions.cs
+++ b/src/Core/src/Platform/Windows/DatePickerExtensions.cs
@@ -73,7 +73,7 @@ public static void UpdateTextColor(this CalendarDatePicker platformDatePicker, I
 			"CalendarDatePickerTextForegroundSelected"
 		};
 
-		// TODO NET7 add to public API
+		// TODO NET8 add to public API
 		internal static void UpdateBackground(this CalendarDatePicker platformDatePicker, IDatePicker datePicker)
 		{
 			var brush = datePicker?.Background?.ToPlatform();
diff --git a/src/Core/src/Platform/Windows/TextBoxExtensions.cs b/src/Core/src/Platform/Windows/TextBoxExtensions.cs
index f835a77cf71e..7ad9099248b5 100644
--- a/src/Core/src/Platform/Windows/TextBoxExtensions.cs
+++ b/src/Core/src/Platform/Windows/TextBoxExtensions.cs
@@ -211,7 +211,7 @@ public static void UpdateSelectionLength(this TextBox textBox, ITextInput entry)
 				textBox.SelectionLength = entry.SelectionLength;
 		}
 
-		// TODO: NET7 issoto - Revisit this, marking this method as `internal` to avoid breaking public API changes
+		// TODO: NET8 issoto - Revisit this, marking this method as `internal` to avoid breaking public API changes
 		internal static int GetCursorPosition(this TextBox textBox, int cursorOffset = 0)
 		{
 			var newCursorPosition = textBox.SelectionStart + cursorOffset;
diff --git a/src/Core/src/Platform/Windows/TimePickerExtensions.cs b/src/Core/src/Platform/Windows/TimePickerExtensions.cs
index e7f39ac7e407..910eb0d14abe 100644
--- a/src/Core/src/Platform/Windows/TimePickerExtensions.cs
+++ b/src/Core/src/Platform/Windows/TimePickerExtensions.cs
@@ -58,7 +58,7 @@ public static void UpdateTextColor(this TimePicker platformTimePicker, ITimePick
 			"TimePickerButtonForegroundDisabled"
 		};
 
-		// TODO NET7 add to public API
+		// TODO NET8 add to public API
 		internal static void UpdateBackground(this TimePicker platformTimePicker, ITimePicker timePicker)
 		{
 			var brush = timePicker?.Background?.ToPlatform();
diff --git a/src/Core/src/Platform/iOS/SearchBarExtensions.cs b/src/Core/src/Platform/iOS/SearchBarExtensions.cs
index 3d50d7e58aa9..ec804ffad999 100644
--- a/src/Core/src/Platform/iOS/SearchBarExtensions.cs
+++ b/src/Core/src/Platform/iOS/SearchBarExtensions.cs
@@ -15,7 +15,7 @@ public static class SearchBarExtensions
 				return searchBar.GetSearchTextField();
 		}
 
-		// TODO: NET7 maybe make this public?
+		// TODO: NET8 maybe make this public?
 		internal static void UpdateBackground(this UISearchBar uiSearchBar, ISearchBar searchBar)
 		{
 			var background = searchBar.Background;
diff --git a/src/Core/src/Platform/iOS/TextInputExtensions.cs b/src/Core/src/Platform/iOS/TextInputExtensions.cs
index 16e28ff78537..7468aa5807af 100644
--- a/src/Core/src/Platform/iOS/TextInputExtensions.cs
+++ b/src/Core/src/Platform/iOS/TextInputExtensions.cs
@@ -3,7 +3,7 @@
 
 namespace Microsoft.Maui.Platform
 {
-	// TODO: NET7 issoto - Revisit this, marking this class as `internal` to avoid breaking public API changes
+	// TODO: NET8 issoto - Revisit this, marking this class as `internal` to avoid breaking public API changes
 	internal static class TextInputExtensions
 	{
 		internal static int GetCursorPosition(this IUITextInput platformView, int cursorOffset = 0)
diff --git a/src/Essentials/src/AppInfo/AppInfo.uwp.cs b/src/Essentials/src/AppInfo/AppInfo.uwp.cs
index 99e01f236278..fe438daa1894 100644
--- a/src/Essentials/src/AppInfo/AppInfo.uwp.cs
+++ b/src/Essentials/src/AppInfo/AppInfo.uwp.cs
@@ -31,7 +31,7 @@ public AppInfoImplementation()
 			? Package.Current.Id.Name
 			: _launchingAssembly.GetAppInfoValue("PackageName") ?? _launchingAssembly.GetCustomAttribute<AssemblyTitleAttribute>()?.Title ?? string.Empty;
 
-		// TODO: NET7 add this as a actual data point and public property if it is valid on platforms
+		// TODO: NET8 add this as a actual data point and public property if it is valid on platforms
 		internal static string PublisherName => AppInfoUtils.IsPackagedApp
 			? Package.Current.PublisherDisplayName
 			: _launchingAssembly.GetAppInfoValue("PublisherName") ?? _launchingAssembly.GetCustomAttribute<AssemblyCompanyAttribute>()?.Company ?? string.Empty;

From b6cbc761be231524e55713b933bb8ecb8e59e5a9 Mon Sep 17 00:00:00 2001
From: Samantha Houts <samhouts@users.noreply.github.com>
Date: Thu, 20 Oct 2022 02:46:06 -0700
Subject: [PATCH 05/77] Fix typos in comments/typos (#10793)

---
 src/Core/src/Core/IFlexLayout.cs                          | 8 ++++----
 src/Core/src/Core/IMenuFlyoutSeparator.cs                 | 2 +-
 src/Core/src/Core/ISafeAreaView.cs                        | 2 +-
 src/Core/src/Dispatching/Dispatcher.Tizen.cs              | 2 +-
 src/Core/src/Fonts/IFontManager.cs                        | 4 ++--
 src/Core/src/Handlers/Application/ApplicationHandler.cs   | 2 +-
 src/Core/src/Handlers/Border/BorderHandler.Android.cs     | 2 +-
 src/Core/src/Handlers/Button/ButtonHandler.Android.cs     | 2 +-
 .../Handlers/ContentView/ContentViewHandler.Android.cs    | 2 +-
 .../src/Handlers/FlyoutView/FlyoutViewHandler.Android.cs  | 2 +-
 src/Core/src/Handlers/Layout/LayoutHandler.Android.cs     | 2 +-
 .../Handlers/RefreshView/RefreshViewHandler.Android.cs    | 2 +-
 .../src/Handlers/ScrollView/ScrollViewHandler.Android.cs  | 2 +-
 .../SwipeItemView/SwipeItemViewHandler.Android.cs         | 2 +-
 .../LifecycleEvents/AppHostBuilderExtensions.Android.cs   | 2 +-
 .../LifecycleEvents/AppHostBuilderExtensions.Tizen.cs     | 2 +-
 src/Core/src/HotReload/HotReloadHelper.cs                 | 6 +++---
 17 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/Core/src/Core/IFlexLayout.cs b/src/Core/src/Core/IFlexLayout.cs
index a35369e6dff2..1637f26beb04 100644
--- a/src/Core/src/Core/IFlexLayout.cs
+++ b/src/Core/src/Core/IFlexLayout.cs
@@ -47,18 +47,18 @@ public interface IFlexLayout : ILayout
 		int GetOrder(IView view);
 
 		/// <summary>
-		/// Returns the value that determines the proportional growth that this element will accept to acccommodate 
+		/// Returns the value that determines the proportional growth that this element will accept to accommodate 
 		/// the layout in the row or column.
 		/// </summary>
 		/// <param name="view">The view for which to retrieve the property value.</param>
-		/// <returns>The value that determines the proportional growth that this element will accept to acccommodate the layout in the row or column.</returns>
+		/// <returns>The value that determines the proportional growth that this element will accept to  the layout in the row or column.</returns>
 		float GetGrow(IView view);
 
 		/// <summary>
-		/// Returns the value that determines the proportional reduction in size that this element will accept to acccommodate the layout in the row or column.
+		/// Returns the value that determines the proportional reduction in size that this element will accept to  the layout in the row or column.
 		/// </summary>
 		/// <param name="view">The view for which to retrieve the property value.</param>
-		/// <returns>The proportional reduction in size that this element will accept to acccommodate the layout in the row or column.</returns>
+		/// <returns>The proportional reduction in size that this element will accept to  the layout in the row or column.</returns>
 		float GetShrink(IView view);
 
 		/// <summary>
diff --git a/src/Core/src/Core/IMenuFlyoutSeparator.cs b/src/Core/src/Core/IMenuFlyoutSeparator.cs
index 0518d6c48be6..0f74c5612050 100644
--- a/src/Core/src/Core/IMenuFlyoutSeparator.cs
+++ b/src/Core/src/Core/IMenuFlyoutSeparator.cs
@@ -1,7 +1,7 @@
 namespace Microsoft.Maui
 {
 	/// <summary>
-	/// Represents a horizontal line that separates items in an MenuFlyout.
+	/// Represents a horizontal line that separates items in a MenuFlyout.
 	/// </summary>
 	public interface IMenuFlyoutSeparator : IMenuFlyoutItem
 	{
diff --git a/src/Core/src/Core/ISafeAreaView.cs b/src/Core/src/Core/ISafeAreaView.cs
index f87d5754eedd..b13183972b1f 100644
--- a/src/Core/src/Core/ISafeAreaView.cs
+++ b/src/Core/src/Core/ISafeAreaView.cs
@@ -6,7 +6,7 @@
 	public interface ISafeAreaView
 	{
 		/// <summary>
-		/// Is used to ensure that content is positioned on an area of the screen that is safe for all devices.
+		/// Ensure that content is positioned on an area of the screen that is safe for all devices.
 		/// </summary>
 		bool IgnoreSafeArea { get; }
 	}
diff --git a/src/Core/src/Dispatching/Dispatcher.Tizen.cs b/src/Core/src/Dispatching/Dispatcher.Tizen.cs
index b40f056317d7..497cc79cb72c 100644
--- a/src/Core/src/Dispatching/Dispatcher.Tizen.cs
+++ b/src/Core/src/Dispatching/Dispatcher.Tizen.cs
@@ -76,7 +76,7 @@ public void Start()
 				return;
 
 			IsRunning = true;
-			// set interval separarately to prevent calling callback before `timer' is assigned
+			// set interval separately to prevent calling callback before `timer' is assigned
 			_timer.Change(Interval, Interval);
 		}
 
diff --git a/src/Core/src/Fonts/IFontManager.cs b/src/Core/src/Fonts/IFontManager.cs
index d3bc1bcea16b..c1e6101bcd50 100644
--- a/src/Core/src/Fonts/IFontManager.cs
+++ b/src/Core/src/Fonts/IFontManager.cs
@@ -1,12 +1,12 @@
 namespace Microsoft.Maui
 {
 	/// <summary>
-	/// The <see cref="FontManager"/> handles all fonts, font families and font sizes througout the application.
+	/// The <see cref="FontManager"/> handles all fonts, font families and font sizes throughout the application.
 	/// </summary>
 	public partial interface IFontManager
 	{
 		/// <summary>
-		/// The default fontsize for the operating system.
+		/// The default font size for the operating system.
 		/// </summary>
 		double DefaultFontSize { get; }
 	}
diff --git a/src/Core/src/Handlers/Application/ApplicationHandler.cs b/src/Core/src/Handlers/Application/ApplicationHandler.cs
index db1b01aacca5..e3ef151111ba 100644
--- a/src/Core/src/Handlers/Application/ApplicationHandler.cs
+++ b/src/Core/src/Handlers/Application/ApplicationHandler.cs
@@ -25,7 +25,7 @@ public partial class ApplicationHandler
 		public static CommandMapper<IApplication, ApplicationHandler> CommandMapper = new(ElementCommandMapper)
 		{
 			[TerminateCommandKey] = MapTerminate,
-#pragma warning disable CA1416 // TODO: should we propogate SupportedOSPlatform("ios13.0") here
+#pragma warning disable CA1416 // TODO: should we propagate SupportedOSPlatform("ios13.0") here
 			[nameof(IApplication.OpenWindow)] = MapOpenWindow,
 			[nameof(IApplication.CloseWindow)] = MapCloseWindow,
 #pragma warning restore CA1416
diff --git a/src/Core/src/Handlers/Border/BorderHandler.Android.cs b/src/Core/src/Handlers/Border/BorderHandler.Android.cs
index 76465dce171f..ea2d07c50529 100644
--- a/src/Core/src/Handlers/Border/BorderHandler.Android.cs
+++ b/src/Core/src/Handlers/Border/BorderHandler.Android.cs
@@ -65,7 +65,7 @@ public static void MapContent(IBorderHandler handler, IBorderView border)
 
 		protected override void DisconnectHandler(ContentViewGroup platformView)
 		{
-			// If we're being disconnected from the xplat element, then we should no longer be managing its chidren
+			// If we're being disconnected from the xplat element, then we should no longer be managing its children
 			platformView.RemoveAllViews();
 
 			base.DisconnectHandler(platformView);
diff --git a/src/Core/src/Handlers/Button/ButtonHandler.Android.cs b/src/Core/src/Handlers/Button/ButtonHandler.Android.cs
index 178021684fa0..6189c0bd618b 100644
--- a/src/Core/src/Handlers/Button/ButtonHandler.Android.cs
+++ b/src/Core/src/Handlers/Button/ButtonHandler.Android.cs
@@ -11,7 +11,7 @@ namespace Microsoft.Maui.Handlers
 	public partial class ButtonHandler : ViewHandler<IButton, MaterialButton>
 	{
 		// The padding value has to be done here because in the Material Components,
-		// there is a minumum size of the buttons: 88dp x 48dp
+		// there is a minimum size of the buttons: 88dp x 48dp
 		// So, this is calculated:
 		//   - Vertical: 6dp*2 (inset) + 8.5dp*2 (padding) + 2.5dp*2 (text magic) + 14dp (text size) = 48dp
 		//   - Horizontal: 16dp (from the styles)
diff --git a/src/Core/src/Handlers/ContentView/ContentViewHandler.Android.cs b/src/Core/src/Handlers/ContentView/ContentViewHandler.Android.cs
index 66879db5839f..61d5c550319e 100644
--- a/src/Core/src/Handlers/ContentView/ContentViewHandler.Android.cs
+++ b/src/Core/src/Handlers/ContentView/ContentViewHandler.Android.cs
@@ -51,7 +51,7 @@ public static void MapContent(IContentViewHandler handler, IContentView page)
 
 		protected override void DisconnectHandler(ContentViewGroup platformView)
 		{
-			// If we're being disconnected from the xplat element, then we should no longer be managing its chidren
+			// If we're being disconnected from the xplat element, then we should no longer be managing its children
 			platformView.RemoveAllViews();
 			base.DisconnectHandler(platformView);
 		}
diff --git a/src/Core/src/Handlers/FlyoutView/FlyoutViewHandler.Android.cs b/src/Core/src/Handlers/FlyoutView/FlyoutViewHandler.Android.cs
index cdc8f83f1944..64a933350736 100644
--- a/src/Core/src/Handlers/FlyoutView/FlyoutViewHandler.Android.cs
+++ b/src/Core/src/Handlers/FlyoutView/FlyoutViewHandler.Android.cs
@@ -164,7 +164,7 @@ void LayoutSideBySide()
 
 			if (flyoutView.Parent != _sideBySideView)
 			{
-				// When the Flyout is acting as a flyout Android will set the Visibilty to GONE when it's off screen
+				// When the Flyout is acting as a flyout Android will set the Visibility to GONE when it's off screen
 				// This makes sure it's visible
 				flyoutView.Visibility = ViewStates.Visible;
 				flyoutView.RemoveFromParent();
diff --git a/src/Core/src/Handlers/Layout/LayoutHandler.Android.cs b/src/Core/src/Handlers/Layout/LayoutHandler.Android.cs
index 6526866f64c1..0bc96cabef1a 100644
--- a/src/Core/src/Handlers/Layout/LayoutHandler.Android.cs
+++ b/src/Core/src/Handlers/Layout/LayoutHandler.Android.cs
@@ -108,7 +108,7 @@ public void UpdateZIndex(IView child)
 
 		protected override void DisconnectHandler(LayoutViewGroup platformView)
 		{
-			// If we're being disconnected from the xplat element, then we should no longer be managing its chidren
+			// If we're being disconnected from the xplat element, then we should no longer be managing its children
 			Clear(platformView);
 			base.DisconnectHandler(platformView);
 		}
diff --git a/src/Core/src/Handlers/RefreshView/RefreshViewHandler.Android.cs b/src/Core/src/Handlers/RefreshView/RefreshViewHandler.Android.cs
index 37330fa8d5bf..0f5e0f6c6262 100644
--- a/src/Core/src/Handlers/RefreshView/RefreshViewHandler.Android.cs
+++ b/src/Core/src/Handlers/RefreshView/RefreshViewHandler.Android.cs
@@ -22,7 +22,7 @@ void OnSwipeRefresh(object? sender, System.EventArgs e)
 
 		protected override void DisconnectHandler(MauiSwipeRefreshLayout platformView)
 		{
-			// If we're being disconnected from the xplat element, then we should no longer be managing its chidren
+			// If we're being disconnected from the xplat element, then we should no longer be managing its children
 			platformView.Refresh -= OnSwipeRefresh;
 			platformView.UpdateContent(null, null);
 			base.DisconnectHandler(platformView);
diff --git a/src/Core/src/Handlers/ScrollView/ScrollViewHandler.Android.cs b/src/Core/src/Handlers/ScrollView/ScrollViewHandler.Android.cs
index c6caeee4ac6f..5f378f7e4306 100644
--- a/src/Core/src/Handlers/ScrollView/ScrollViewHandler.Android.cs
+++ b/src/Core/src/Handlers/ScrollView/ScrollViewHandler.Android.cs
@@ -54,7 +54,7 @@ public override Size GetDesiredSize(double widthConstraint, double heightConstra
 			{
 				/*	With FillViewport active, the Android ScrollView will measure the content at least once; if it is 
 					smaller than the ScrollView's viewport, it measure a second time at the size of the viewport
-					so that the content can properly vill the whole viewport. But it will only do this if the measurespec
+					so that the content can properly fill the whole viewport. But it will only do this if the measurespec
 					is set to Exactly. So if we want our ScrollView to Fill the space in the scroll direction, we need to
 					adjust the MeasureSpec accordingly. If the ScrollView is not set to Fill, we can just leave the spec
 					alone and the ScrollView will size to its content as usual. */
diff --git a/src/Core/src/Handlers/SwipeItemView/SwipeItemViewHandler.Android.cs b/src/Core/src/Handlers/SwipeItemView/SwipeItemViewHandler.Android.cs
index e76daaaa09ad..d7143b88dbe6 100644
--- a/src/Core/src/Handlers/SwipeItemView/SwipeItemViewHandler.Android.cs
+++ b/src/Core/src/Handlers/SwipeItemView/SwipeItemViewHandler.Android.cs
@@ -58,7 +58,7 @@ public static void MapVisibility(ISwipeItemViewHandler handler, ISwipeItemView v
 
 		protected override void DisconnectHandler(ContentViewGroup platformView)
 		{
-			// If we're being disconnected from the xplat element, then we should no longer be managing its chidren
+			// If we're being disconnected from the xplat element, then we should no longer be managing its children
 			platformView.RemoveAllViews();
 			base.DisconnectHandler(platformView);
 		}
diff --git a/src/Core/src/Hosting/LifecycleEvents/AppHostBuilderExtensions.Android.cs b/src/Core/src/Hosting/LifecycleEvents/AppHostBuilderExtensions.Android.cs
index a00e5b64cc18..e3335b4da3ea 100644
--- a/src/Core/src/Hosting/LifecycleEvents/AppHostBuilderExtensions.Android.cs
+++ b/src/Core/src/Hosting/LifecycleEvents/AppHostBuilderExtensions.Android.cs
@@ -17,7 +17,7 @@ static void OnConfigureLifeCycle(IAndroidLifecycleBuilder android)
 			android
 				.OnPostCreate((activity, bundle) =>
 				{
-					// OnCreate is only ever called once when the activity is initally created
+					// OnCreate is only ever called once when the activity is initially created
 					activity.GetWindow()?.Created();
 				})
 				.OnRestart(activity =>
diff --git a/src/Core/src/Hosting/LifecycleEvents/AppHostBuilderExtensions.Tizen.cs b/src/Core/src/Hosting/LifecycleEvents/AppHostBuilderExtensions.Tizen.cs
index ff1a3979b58d..2891e8e8c4de 100644
--- a/src/Core/src/Hosting/LifecycleEvents/AppHostBuilderExtensions.Tizen.cs
+++ b/src/Core/src/Hosting/LifecycleEvents/AppHostBuilderExtensions.Tizen.cs
@@ -17,7 +17,7 @@ static void OnConfigureLifeCycle(ITizenLifecycleBuilder tizen)
 			tizen
 				.OnCreate((app) =>
 				{
-					// OnCreate is only ever called once when the app is initally created
+					// OnCreate is only ever called once when the app is initially created
 					app.GetWindow().Created();
 				})
 				.OnResume(app =>
diff --git a/src/Core/src/HotReload/HotReloadHelper.cs b/src/Core/src/HotReload/HotReloadHelper.cs
index d18b206ba05c..49b6c645d742 100644
--- a/src/Core/src/HotReload/HotReloadHelper.cs
+++ b/src/Core/src/HotReload/HotReloadHelper.cs
@@ -69,14 +69,14 @@ public static IView GetReplacedView(IHotReloadableView view)
 			catch (MissingMethodException)
 			{
 				Debug.WriteLine("You are using trying to HotReload a view that requires Parameters. Please call `HotReloadHelper.Register(this, params);` in the constructor;");
-				//TODO: Notifiy that we couldnt hot reload.
+				//TODO: Notify that we couldnt hot reload.
 				return view;
 			}
 			catch (Exception ex)
 			{
 				Debug.WriteLine($"Error Hotreloading type: {newViewType}");
 				Debug.WriteLine(ex);
-				//TODO: Notifiy that we couldnt hot reload.
+				//TODO: Notify that we couldnt hot reload.
 				return view;
 			}
 
@@ -107,7 +107,7 @@ public static void RegisterReplacedView(string oldViewType, Type newViewType)
 				{
 					Debug.WriteLine($"Error calling {method.Name} on type: {newViewType}");
 					Debug.WriteLine(ex);
-					//TODO: Notifiy that we couldnt execute OnHotReload for the Method;
+					//TODO: Notify that we couldnt execute OnHotReload for the Method;
 				}
 			};
 

From 295594bf967b7581f551881218d036120fd381b9 Mon Sep 17 00:00:00 2001
From: Samantha Houts <samhouts@users.noreply.github.com>
Date: Thu, 20 Oct 2022 02:46:57 -0700
Subject: [PATCH 06/77] Fix typos in code (#10795)

---
 .../src/Core/GalleryPages/MacOSTestGallery.cs        |  2 +-
 .../src/UITests.Shared/Tests/CarouselViewUITests.cs  | 12 ++++++------
 src/Core/src/Graphics/PaintExtensions.Android.cs     |  4 ++--
 src/Core/src/Graphics/PaintExtensions.Tizen.cs       |  4 ++--
 .../src/Handlers/Editor/EditorHandler.Android.cs     |  6 +++---
 .../src/Handlers/Editor/EditorHandler.Windows.cs     |  6 +++---
 src/Core/src/Handlers/Editor/EditorHandler.iOS.cs    |  6 +++---
 src/Core/src/Handlers/Entry/EntryHandler.Android.cs  |  6 +++---
 src/Core/src/Handlers/Entry/EntryHandler.Windows.cs  |  6 +++---
 src/Core/src/Handlers/Entry/EntryHandler.iOS.cs      |  6 +++---
 .../Handlers/FlyoutView/FlyoutViewHandler.Windows.cs |  6 +++---
 src/Core/src/Platform/Tizen/ViewExtensions.cs        |  4 ++--
 12 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/Compatibility/ControlGallery/src/Core/GalleryPages/MacOSTestGallery.cs b/src/Compatibility/ControlGallery/src/Core/GalleryPages/MacOSTestGallery.cs
index bac5d3324a62..e61f26c2fba3 100644
--- a/src/Compatibility/ControlGallery/src/Core/GalleryPages/MacOSTestGallery.cs
+++ b/src/Compatibility/ControlGallery/src/Core/GalleryPages/MacOSTestGallery.cs
@@ -136,7 +136,7 @@ public MacOSTestGallery()
 
 			scroller.Scrolled += (sender, e) =>
 			{
-				lbl.Text = $"Current postion {scroller.ScrollY}";
+				lbl.Text = $"Current Position {scroller.ScrollY}";
 			};
 
 			scroller.Content = mainStck;
diff --git a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/CarouselViewUITests.cs b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/CarouselViewUITests.cs
index 17dd2c3aa0c9..37ba1b0487be 100644
--- a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/CarouselViewUITests.cs
+++ b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/CarouselViewUITests.cs
@@ -331,25 +331,25 @@ public void CarouselViewObservableCollection(string subgallery)
 			{
 				App.WaitForElement("lblPosition");
 
-				string GetPostion()
+				string GetPosition()
 				{
 					return App.Query(c => c.Marked("lblPosition")).First().Text;
 				}
 
-				Assert.AreEqual("0", GetPostion());
+				Assert.AreEqual("0", GetPosition());
 				App.Tap("btnNewObservable");
-				Assert.AreEqual("0", GetPostion());
+				Assert.AreEqual("0", GetPosition());
 
 				SwipeRightToLeft();
 
 				App.Tap("btnAddObservable");
-				Assert.AreEqual("0", GetPostion());
+				Assert.AreEqual("0", GetPosition());
 
 				SwipeRightToLeft();
-				Assert.AreEqual("1", GetPostion());
+				Assert.AreEqual("1", GetPosition());
 
 				SwipeRightToLeft();
-				Assert.AreEqual("2", GetPostion());
+				Assert.AreEqual("2", GetPosition());
 			}
 			finally
 			{
diff --git a/src/Core/src/Graphics/PaintExtensions.Android.cs b/src/Core/src/Graphics/PaintExtensions.Android.cs
index 9ab448ee4d9f..6d25511aa2b2 100644
--- a/src/Core/src/Graphics/PaintExtensions.Android.cs
+++ b/src/Core/src/Graphics/PaintExtensions.Android.cs
@@ -71,8 +71,8 @@ public static partial class PaintExtensions
 			return drawable;
 		}
 
-		static bool IsValid(this GradientPaint? gradienPaint) =>
-			gradienPaint?.GradientStops?.Length > 0;
+		static bool IsValid(this GradientPaint? gradientPaint) =>
+			gradientPaint?.GradientStops?.Length > 0;
 
 		internal static GradientData GetGradientPaintData(GradientPaint gradientPaint, float alpha = 1.0f)
 		{
diff --git a/src/Core/src/Graphics/PaintExtensions.Tizen.cs b/src/Core/src/Graphics/PaintExtensions.Tizen.cs
index f683d214fe84..8acddc010b34 100644
--- a/src/Core/src/Graphics/PaintExtensions.Tizen.cs
+++ b/src/Core/src/Graphics/PaintExtensions.Tizen.cs
@@ -76,7 +76,7 @@ public static TColor ToPlatform(this Paint paint)
 			};
 		}
 
-		static bool IsValid(this GradientPaint? gradienPaint) =>
-			gradienPaint?.GradientStops?.Length > 0;
+		static bool IsValid(this GradientPaint? gradientPaint) =>
+			gradientPaint?.GradientStops?.Length > 0;
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Handlers/Editor/EditorHandler.Android.cs b/src/Core/src/Handlers/Editor/EditorHandler.Android.cs
index d2baf62178d1..f33450c4389a 100644
--- a/src/Core/src/Handlers/Editor/EditorHandler.Android.cs
+++ b/src/Core/src/Handlers/Editor/EditorHandler.Android.cs
@@ -122,11 +122,11 @@ void OnTextChanged(object? sender, Android.Text.TextChangedEventArgs e) =>
 
 		private void OnSelectionChanged(object? sender, EventArgs e)
 		{
-			var cursorPostion = PlatformView.GetCursorPosition();
+			var cursorPosition = PlatformView.GetCursorPosition();
 			var selectedTextLength = PlatformView.GetSelectedTextLength();
 
-			if (VirtualView.CursorPosition != cursorPostion)
-				VirtualView.CursorPosition = cursorPostion;
+			if (VirtualView.CursorPosition != cursorPosition)
+				VirtualView.CursorPosition = cursorPosition;
 
 			if (VirtualView.SelectionLength != selectedTextLength)
 				VirtualView.SelectionLength = selectedTextLength;
diff --git a/src/Core/src/Handlers/Editor/EditorHandler.Windows.cs b/src/Core/src/Handlers/Editor/EditorHandler.Windows.cs
index 59eac5bd253e..38019a654b84 100644
--- a/src/Core/src/Handlers/Editor/EditorHandler.Windows.cs
+++ b/src/Core/src/Handlers/Editor/EditorHandler.Windows.cs
@@ -101,11 +101,11 @@ void OnPlatformLoaded(object sender, RoutedEventArgs e) =>
 
 		private void OnSelectionChanged(object sender, RoutedEventArgs e)
 		{
-			var cursorPostion = PlatformView.GetCursorPosition();
+			var cursorPosition = PlatformView.GetCursorPosition();
 			var selectedTextLength = PlatformView.SelectionLength;
 
-			if (VirtualView.CursorPosition != cursorPostion)
-				VirtualView.CursorPosition = cursorPostion;
+			if (VirtualView.CursorPosition != cursorPosition)
+				VirtualView.CursorPosition = cursorPosition;
 
 			if (VirtualView.SelectionLength != selectedTextLength)
 				VirtualView.SelectionLength = selectedTextLength;
diff --git a/src/Core/src/Handlers/Editor/EditorHandler.iOS.cs b/src/Core/src/Handlers/Editor/EditorHandler.iOS.cs
index fc8450aecfa9..ade8b6ce3084 100644
--- a/src/Core/src/Handlers/Editor/EditorHandler.iOS.cs
+++ b/src/Core/src/Handlers/Editor/EditorHandler.iOS.cs
@@ -173,11 +173,11 @@ void OnTextPropertySet(object? sender, EventArgs e) =>
 
 		private void OnSelectionChanged(object? sender, EventArgs e)
 		{
-			var cursorPostion = PlatformView.GetCursorPosition();
+			var cursorPosition = PlatformView.GetCursorPosition();
 			var selectedTextLength = PlatformView.GetSelectedTextLength();
 
-			if (VirtualView.CursorPosition != cursorPostion)
-				VirtualView.CursorPosition = cursorPostion;
+			if (VirtualView.CursorPosition != cursorPosition)
+				VirtualView.CursorPosition = cursorPosition;
 
 			if (VirtualView.SelectionLength != selectedTextLength)
 				VirtualView.SelectionLength = selectedTextLength;
diff --git a/src/Core/src/Handlers/Entry/EntryHandler.Android.cs b/src/Core/src/Handlers/Entry/EntryHandler.Android.cs
index 32a82b6b5ec4..e0a1261cf187 100644
--- a/src/Core/src/Handlers/Entry/EntryHandler.Android.cs
+++ b/src/Core/src/Handlers/Entry/EntryHandler.Android.cs
@@ -174,11 +174,11 @@ void OnEditorAction(object? sender, EditorActionEventArgs e)
 
 		private void OnSelectionChanged(object? sender, EventArgs e)
 		{
-			var cursorPostion = PlatformView.GetCursorPosition();
+			var cursorPosition = PlatformView.GetCursorPosition();
 			var selectedTextLength = PlatformView.GetSelectedTextLength();
 
-			if (VirtualView.CursorPosition != cursorPostion)
-				VirtualView.CursorPosition = cursorPostion;
+			if (VirtualView.CursorPosition != cursorPosition)
+				VirtualView.CursorPosition = cursorPosition;
 
 			if (VirtualView.SelectionLength != selectedTextLength)
 				VirtualView.SelectionLength = selectedTextLength;
diff --git a/src/Core/src/Handlers/Entry/EntryHandler.Windows.cs b/src/Core/src/Handlers/Entry/EntryHandler.Windows.cs
index 7d8998da19b5..2b2dfdafe54f 100644
--- a/src/Core/src/Handlers/Entry/EntryHandler.Windows.cs
+++ b/src/Core/src/Handlers/Entry/EntryHandler.Windows.cs
@@ -130,11 +130,11 @@ void OnPlatformKeyUp(object? sender, KeyRoutedEventArgs args)
 
 		void OnPlatformSelectionChanged(object sender, RoutedEventArgs e)
 		{
-			var cursorPostion = PlatformView.GetCursorPosition();
+			var cursorPosition = PlatformView.GetCursorPosition();
 			var selectedTextLength = PlatformView.SelectionLength;
 
-			if (VirtualView.CursorPosition != cursorPostion)
-				VirtualView.CursorPosition = cursorPostion;
+			if (VirtualView.CursorPosition != cursorPosition)
+				VirtualView.CursorPosition = cursorPosition;
 
 			if (VirtualView.SelectionLength != selectedTextLength)
 				VirtualView.SelectionLength = selectedTextLength;
diff --git a/src/Core/src/Handlers/Entry/EntryHandler.iOS.cs b/src/Core/src/Handlers/Entry/EntryHandler.iOS.cs
index 6d531b9f60ab..5380d17d193f 100644
--- a/src/Core/src/Handlers/Entry/EntryHandler.iOS.cs
+++ b/src/Core/src/Handlers/Entry/EntryHandler.iOS.cs
@@ -161,11 +161,11 @@ bool OnShouldChangeCharacters(UITextField textField, NSRange range, string repla
 
 		private void OnSelectionChanged(object? sender, EventArgs e)
 		{
-			var cursorPostion = PlatformView.GetCursorPosition();
+			var cursorPosition = PlatformView.GetCursorPosition();
 			var selectedTextLength = PlatformView.GetSelectedTextLength();
 
-			if (VirtualView.CursorPosition != cursorPostion)
-				VirtualView.CursorPosition = cursorPostion;
+			if (VirtualView.CursorPosition != cursorPosition)
+				VirtualView.CursorPosition = cursorPosition;
 
 			if (VirtualView.SelectionLength != selectedTextLength)
 				VirtualView.SelectionLength = selectedTextLength;
diff --git a/src/Core/src/Handlers/FlyoutView/FlyoutViewHandler.Windows.cs b/src/Core/src/Handlers/FlyoutView/FlyoutViewHandler.Windows.cs
index e272cd184bfd..bd5f2499cb5d 100644
--- a/src/Core/src/Handlers/FlyoutView/FlyoutViewHandler.Windows.cs
+++ b/src/Core/src/Handlers/FlyoutView/FlyoutViewHandler.Windows.cs
@@ -19,15 +19,15 @@ protected override RootNavigationView CreatePlatformView()
 		protected override void ConnectHandler(RootNavigationView platformView)
 		{
 			_navigationRootManager = MauiContext?.GetNavigationRootManager();
-			platformView.PaneOpened += OnPaneOepened;
+			platformView.PaneOpened += OnPaneOpened;
 		}
 
 		protected override void DisconnectHandler(RootNavigationView platformView)
 		{
-			platformView.PaneOpened -= OnPaneOepened;
+			platformView.PaneOpened -= OnPaneOpened;
 		}
 
-		void OnPaneOepened(NavigationView sender, object args)
+		void OnPaneOpened(NavigationView sender, object args)
 		{
 			VirtualView.IsPresented = sender.IsPaneOpen;
 		}
diff --git a/src/Core/src/Platform/Tizen/ViewExtensions.cs b/src/Core/src/Platform/Tizen/ViewExtensions.cs
index 157bd9bf7c97..3035eb0f81ff 100644
--- a/src/Core/src/Platform/Tizen/ViewExtensions.cs
+++ b/src/Core/src/Platform/Tizen/ViewExtensions.cs
@@ -251,8 +251,8 @@ internal static Rect GetPlatformViewBounds(this NView platformView)
 		{
 			if (platformView == null)
 				return new Rect();
-			var screenPostion = platformView.ScreenPosition;
-			return new TRect(screenPostion.X, screenPostion.Y, platformView.SizeWidth, platformView.SizeHeight).ToDP();
+			var screenPosition = platformView.ScreenPosition;
+			return new TRect(screenPosition.X, screenPosition.Y, platformView.SizeWidth, platformView.SizeHeight).ToDP();
 		}
 
 		internal static Matrix4x4 GetViewTransform(this IView view)

From 7eb3b318ccc12c7cdb22e3b506c3e0a1ae67ce6c Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 20 Oct 2022 12:26:08 +0100
Subject: [PATCH 07/77] [net6.0] Update dependencies from
 xamarin/xamarin-android (#10592)

* Update dependencies from https://github.com/xamarin/xamarin-android build 6.0.4xx-be0570be9b5cfc5cc4258aaff89b61ad26b478d9-1

Microsoft.Android.Sdk.Windows
 From Version 32.0.476 -> To Version 32.0.477

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.402-servicing.22465.1 -> To Version 6.0.403-servicing.22505.14 (parent: Microsoft.Android.Sdk.Windows

* Update dependencies from https://github.com/xamarin/xamarin-android build 6.0.4xx-28f788ced6282094aaf18fab26b47f7d1e6e88cd-1

Microsoft.Android.Sdk.Windows
 From Version 32.0.476 -> To Version 32.0.478

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.402-servicing.22465.1 -> To Version 6.0.403-servicing.22517.2 (parent: Microsoft.Android.Sdk.Windows

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Rui Marinho <me@ruimarinho.net>
---
 NuGet.config            | 7 -------
 eng/Version.Details.xml | 8 ++++----
 eng/Versions.props      | 4 ++--
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 10e3c8fc914a..43b6c8313d71 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -6,17 +6,10 @@
     <!--  Begin: Package sources from dotnet-aspnetcore -->
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
-    <add key="darc-pub-dotnet-runtime-cdf48ab" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-cdf48abd/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--  Begin: Package sources from dotnet-emsdk -->
-    <add key="darc-pub-dotnet-emsdk-c3fc739" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c3fc739c/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-emsdk-c3fc739-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c3fc739c-5/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-emsdk-c3fc739-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c3fc739c-4/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-emsdk-c3fc739-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c3fc739c-3/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-emsdk-c3fc739-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c3fc739c-2/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-emsdk-c3fc739-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c3fc739c-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-emsdk -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <!-- <add key="local" value="artifacts" /> -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 8279120b3832..b70b7009f9ee 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,16 +1,16 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.402-servicing.22465.1" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
+    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.403-servicing.22517.2" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
       <Uri>https://github.com/dotnet/installer</Uri>
-      <Sha>1c38151cabb5771a1503aff6e5cecb435be4c69c</Sha>
+      <Sha>5f500d02d2d9533cf2b56364024cd9956c2af0b8</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.10" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>cdf48abd370f148a537960141f73769e678660e7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Android.Sdk.Windows" Version="32.0.476">
+    <Dependency Name="Microsoft.Android.Sdk.Windows" Version="32.0.478">
       <Uri>https://github.com/xamarin/xamarin-android</Uri>
-      <Sha>af4a25d50f5a602c77d05c2ec8c8644c00cffbbd</Sha>
+      <Sha>28f788ced6282094aaf18fab26b47f7d1e6e88cd</Sha>
     </Dependency>
     <Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.4.467">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index ab61731e37af..1213d6cbfcad 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <!-- dotnet/installer -->
-    <MicrosoftDotnetSdkInternalPackageVersion>6.0.402-servicing.22465.1</MicrosoftDotnetSdkInternalPackageVersion>
+    <MicrosoftDotnetSdkInternalPackageVersion>6.0.403-servicing.22517.2</MicrosoftDotnetSdkInternalPackageVersion>
     <!-- dotnet/runtime -->
     <MicrosoftNETCoreAppRefPackageVersion>6.0.10</MicrosoftNETCoreAppRefPackageVersion>
     <!-- NOTE: should eventually revert back to $(MicrosoftNETCoreAppRefPackageVersion) in .NET 7 -->
@@ -9,7 +9,7 @@
     <MicrosoftExtensionsServicingPackageVersion>6.0.1</MicrosoftExtensionsServicingPackageVersion>
     <SystemCodeDomPackageVersion>6.0.0</SystemCodeDomPackageVersion>
     <!-- xamarin/xamarin-android -->
-    <MicrosoftAndroidSdkWindowsPackageVersion>32.0.476</MicrosoftAndroidSdkWindowsPackageVersion>
+    <MicrosoftAndroidSdkWindowsPackageVersion>32.0.478</MicrosoftAndroidSdkWindowsPackageVersion>
     <!-- xamarin/xamarin-macios -->
     <MicrosoftiOSSdkPackageVersion>16.0.523</MicrosoftiOSSdkPackageVersion>
     <MicrosoftMacCatalystSdkPackageVersion>15.4.467</MicrosoftMacCatalystSdkPackageVersion>

From 520dcac1bdb8fe418b61907649acad22ec0f464e Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 20 Oct 2022 13:49:11 +0100
Subject: [PATCH 08/77] [net7.0] Update dependencies from
 xamarin/xamarin-macios (#10034)

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20220909.15

Microsoft.iOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.macOS.Sdk , Microsoft.tvOS.Sdk
 From Version 15.4.1029-rc.1 -> To Version 15.4.1126-rc.2

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20220912.11

Microsoft.iOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.macOS.Sdk , Microsoft.tvOS.Sdk
 From Version 15.4.1029-rc.1 -> To Version 15.4.1153-rc.2

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20220915.2

Microsoft.iOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.macOS.Sdk , Microsoft.tvOS.Sdk
 From Version 15.4.1029-rc.1 -> To Version 15.4.1163-rc.2

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20220916.33

Microsoft.iOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.macOS.Sdk , Microsoft.tvOS.Sdk
 From Version 15.4.1029-rc.1 -> To Version 15.4.1170-rc.2

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20220919.13

Microsoft.iOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.macOS.Sdk , Microsoft.tvOS.Sdk
 From Version 15.4.1029-rc.1 -> To Version 15.4.1172-rtm

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20220920.28

Microsoft.iOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.macOS.Sdk , Microsoft.tvOS.Sdk
 From Version 15.4.1029-rc.1 -> To Version 15.4.1198-rtm

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20220921.23

Microsoft.iOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.macOS.Sdk , Microsoft.tvOS.Sdk
 From Version 15.4.1029-rc.1 -> To Version 15.4.1199-rtm

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20220923.9

Microsoft.iOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.macOS.Sdk , Microsoft.tvOS.Sdk
 From Version 15.4.1029-rc.1 -> To Version 15.4.1225-rtm

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20220926.13

Microsoft.iOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.macOS.Sdk , Microsoft.tvOS.Sdk
 From Version 15.4.1029-rc.1 -> To Version 15.4.1229-rtm

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20220928.4

Microsoft.iOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.macOS.Sdk , Microsoft.tvOS.Sdk
 From Version 15.4.1029-rc.1 -> To Version 15.4.1247-rtm

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20220930.15

Microsoft.iOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.macOS.Sdk , Microsoft.tvOS.Sdk
 From Version 15.4.1180-rc.2 -> To Version 15.4.1268-rtm

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221004.1

Microsoft.iOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.macOS.Sdk , Microsoft.tvOS.Sdk
 From Version 16.0.1263-rc.2-xcode14 -> To Version 15.4.1270-rtm

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221005.5

Microsoft.iOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.macOS.Sdk , Microsoft.tvOS.Sdk
 From Version 16.0.1263-rc.2-xcode14 -> To Version 15.4.1278-rtm

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221007.2

Microsoft.iOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.macOS.Sdk , Microsoft.tvOS.Sdk
 From Version 16.0.1263-rc.2-xcode14 -> To Version 15.4.1291-rtm

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221014.4

Microsoft.MacCatalyst.Sdk
 From Version 15.4.1186-rc.2 -> To Version 15.4.1320-rtm

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221017.34

Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk
 From Version 16.0.1271-rc.2-xcode14 -> To Version 16.0.1411

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221019.8

Microsoft.MacCatalyst.Sdk
 From Version 15.4.1186-rc.2 -> To Version 15.4.2360

* Try update manifest

* Update manifest again

* Update DotNetMaciOSManifest

* Update iOS, tvOS and macOS as well.

* Update Versions.props

* Bump again.

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221019.37

Microsoft.iOS.Sdk
 From Version 16.0.1271-rc.2-xcode14 -> To Version 16.0.1467

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221019.37

Microsoft.tvOS.Sdk
 From Version 16.0.1271-rc.2-xcode14 -> To Version 16.0.1467

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221019.41

Microsoft.macOS.Sdk
 From Version 12.3.1186-rc.2 -> To Version 12.3.2364

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221019.41

Microsoft.MacCatalyst.Sdk
 From Version 15.4.1186-rc.2 -> To Version 15.4.2364

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221019.40

Microsoft.iOS.Sdk
 From Version 16.0.1271-rc.2-xcode14 -> To Version 16.0.1468

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221019.40

Microsoft.tvOS.Sdk
 From Version 16.0.1271-rc.2-xcode14 -> To Version 16.0.1468

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221020.11

Microsoft.iOS.Sdk
 From Version 16.0.1271-rc.2-xcode14 -> To Version 16.0.1469

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221020.11

Microsoft.tvOS.Sdk
 From Version 16.0.1271-rc.2-xcode14 -> To Version 16.0.1469

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221020.12

Microsoft.macOS.Sdk
 From Version 12.3.1186-rc.2 -> To Version 12.3.2365

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221020.12

Microsoft.MacCatalyst.Sdk
 From Version 15.4.1186-rc.2 -> To Version 15.4.2365

* Supress some platform validation issues

* Ignore more warnings

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Rui Marinho <me@ruimarinho.net>
Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
---
 eng/Version.Details.xml                          | 16 ++++++++--------
 eng/Versions.props                               | 10 +++++-----
 .../ControlGallery/src/iOS/AppDelegate.cs        |  6 ++++++
 .../ControlGallery/src/iOS/CustomRenderers.cs    |  2 ++
 .../src/iOS/SampleNativeControl.cs               |  2 ++
 5 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 9c38a1bab151..d4b4ecc45e7b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -12,21 +12,21 @@
       <Uri>https://github.com/xamarin/xamarin-android</Uri>
       <Sha>d8b5a177afa0061ed34390373f1b7918f308f016</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.4.1186-rc.2">
+    <Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.4.2365">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>903a8512b8edf8a6d85db1a82719ae4ba3a355dd</Sha>
+      <Sha>c53d89a6dad1e11ef4ff63759395b89272318f4d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.macOS.Sdk" Version="12.3.1186-rc.2">
+    <Dependency Name="Microsoft.macOS.Sdk" Version="12.3.2365">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>903a8512b8edf8a6d85db1a82719ae4ba3a355dd</Sha>
+      <Sha>c53d89a6dad1e11ef4ff63759395b89272318f4d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.iOS.Sdk" Version="16.0.1271-rc.2-xcode14">
+    <Dependency Name="Microsoft.iOS.Sdk" Version="16.0.1469">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>64139f79ddb9ae7cf000d1be8f69154ee7eb4da8</Sha>
+      <Sha>d02f860266d5d3e39c3baf4d962bbd4a48d09af4</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.tvOS.Sdk" Version="16.0.1271-rc.2-xcode14">
+    <Dependency Name="Microsoft.tvOS.Sdk" Version="16.0.1469">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>64139f79ddb9ae7cf000d1be8f69154ee7eb4da8</Sha>
+      <Sha>d02f860266d5d3e39c3baf4d962bbd4a48d09af4</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.0-rtm.22504.3" CoherentParentDependency="Microsoft.NETCore.App.Ref">
       <Uri>https://github.com/dotnet/emsdk</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 98c19a8a54ba..cd256543f03f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -13,10 +13,10 @@
     <!-- xamarin/xamarin-android -->
     <MicrosoftAndroidSdkWindowsPackageVersion>33.0.3</MicrosoftAndroidSdkWindowsPackageVersion>
     <!-- xamarin/xamarin-macios -->
-    <MicrosoftiOSSdkPackageVersion>16.0.1271-rc.2-xcode14</MicrosoftiOSSdkPackageVersion>
-    <MicrosoftMacCatalystSdkPackageVersion>15.4.1186-rc.2</MicrosoftMacCatalystSdkPackageVersion>
-    <MicrosoftmacOSSdkPackageVersion>12.3.1186-rc.2</MicrosoftmacOSSdkPackageVersion>
-    <MicrosofttvOSSdkPackageVersion>16.0.1271-rc.2-xcode14</MicrosofttvOSSdkPackageVersion>
+    <MicrosoftMacCatalystSdkPackageVersion>15.4.2365</MicrosoftMacCatalystSdkPackageVersion>
+    <MicrosoftmacOSSdkPackageVersion>12.3.2365</MicrosoftmacOSSdkPackageVersion>
+    <MicrosoftiOSSdkPackageVersion>16.0.1469</MicrosoftiOSSdkPackageVersion>
+    <MicrosofttvOSSdkPackageVersion>16.0.1469</MicrosofttvOSSdkPackageVersion>
     <!-- Samsung/Tizen.NET -->
     <SamsungTizenSdkPackageVersion>7.0.100-rc.2.24</SamsungTizenSdkPackageVersion>
     <!-- emsdk -->
@@ -75,7 +75,7 @@
     <DotNetMonoManifestVersionBand>$(DotNetVersionBand)</DotNetMonoManifestVersionBand>
     <DotNetEmscriptenManifestVersionBand>$(DotNetVersionBand)</DotNetEmscriptenManifestVersionBand>
     <DotNetAndroidManifestVersionBand>$(DotNetSdkManifestsFolder)</DotNetAndroidManifestVersionBand>
-    <DotNetMaciOSManifestVersionBand>7.0.100-rc.2</DotNetMaciOSManifestVersionBand>
+    <DotNetMaciOSManifestVersionBand>$(DotNetSdkManifestsFolder)</DotNetMaciOSManifestVersionBand>
     <DotNetTizenManifestVersionBand>7.0.100-rc.2</DotNetTizenManifestVersionBand>
   </PropertyGroup>
 </Project>
diff --git a/src/Compatibility/ControlGallery/src/iOS/AppDelegate.cs b/src/Compatibility/ControlGallery/src/iOS/AppDelegate.cs
index 0a8cf212abd1..d9f22f06d663 100644
--- a/src/Compatibility/ControlGallery/src/iOS/AppDelegate.cs
+++ b/src/Compatibility/ControlGallery/src/iOS/AppDelegate.cs
@@ -174,6 +174,7 @@ void AddNativeControls(NestedNativeControlGalleryPage page)
 				"I am a native UILabel with considerably more text. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.";
 
 #pragma warning disable CA1416 // TODO: UILabel.MinimumFontSize has [UnsupportedOSPlatform("ios6.0")]
+#pragma warning disable CA1422 // Validate platform compatibility
 			var uilabel = new UILabel
 			{
 				MinimumFontSize = 14f,
@@ -235,6 +236,7 @@ void AddNativeControls(NestedNativeControlGalleryPage page)
 				LineBreakMode = UILineBreakMode.WordWrap,
 				Font = UIFont.FromName("Helvetica", 24f)
 			};
+#pragma warning restore CA1422 // Validate platform compatibility
 #pragma warning restore CA1416
 
 			// Add a misbehaving control
@@ -277,6 +279,7 @@ void AddNativeBindings(NativeBindingGalleryPage page)
 			int width = (int)sl.Width;
 			int heightCustomLabelView = 100;
 
+#pragma warning disable CA1422 // Validate platform compatibility
 			var uilabel = new UILabel(new CGRect(0, 0, width, heightCustomLabelView))
 			{
 #pragma warning disable CA1416 // TODO: UILabel.MinimumFontSize has [UnsupportedOSPlatform("ios6.0")]
@@ -287,6 +290,7 @@ void AddNativeBindings(NativeBindingGalleryPage page)
 				Font = UIFont.FromName("Helvetica", 24f),
 				Text = "DefaultText"
 			};
+#pragma warning restore CA1422 // Validate platform compatibility
 
 			var uibuttonColor = new UIButton(UIButtonType.System);
 			uibuttonColor.SetTitle("Toggle Text Color Binding", UIControlState.Normal);
@@ -344,7 +348,9 @@ public void StartPressed40911()
 			};
 
 #pragma warning disable CA1416 // TODO: 'UIApplication.KeyWindow' is unsupported on: 'ios' 13.0 and later
+#pragma warning disable CA1422 // Validate platform compatibility
 			var window = UIApplication.SharedApplication.KeyWindow;
+#pragma warning restore CA1422 // Validate platform compatibility
 #pragma warning restore CA1416
 			var vc = window.RootViewController;
 			while (vc.PresentedViewController != null)
diff --git a/src/Compatibility/ControlGallery/src/iOS/CustomRenderers.cs b/src/Compatibility/ControlGallery/src/iOS/CustomRenderers.cs
index 28f18f9381b5..1b45d7286449 100644
--- a/src/Compatibility/ControlGallery/src/iOS/CustomRenderers.cs
+++ b/src/Compatibility/ControlGallery/src/iOS/CustomRenderers.cs
@@ -471,7 +471,9 @@ public override UITableViewCell GetCell(UITableView tableView, NSIndexPath index
 
 #pragma warning disable CA1416 // TODO: 'UITableViewCell.TextLabel' is unsupported on: 'ios' 14.0 and later
 			// set the item text
+#pragma warning disable CA1422 // Validate platform compatibility
 			cell.TextLabel.Text = _tableItems[indexPath.Row]; //.Items[indexPath.Row].Heading;
+#pragma warning restore CA1422 // Validate platform compatibility
 #pragma warning restore CA1416
 
 			// if it's a cell style that supports a subheading, set it
diff --git a/src/Compatibility/ControlGallery/src/iOS/SampleNativeControl.cs b/src/Compatibility/ControlGallery/src/iOS/SampleNativeControl.cs
index 32d564dbcd6d..906569ac355e 100644
--- a/src/Compatibility/ControlGallery/src/iOS/SampleNativeControl.cs
+++ b/src/Compatibility/ControlGallery/src/iOS/SampleNativeControl.cs
@@ -17,6 +17,7 @@ public View View
 		{
 			get
 			{
+#pragma warning disable CA1422 // Validate platform compatibility
 				var uiLabel = new UILabel
 				{
 #pragma warning disable CA1416 // TODO: UILabel.MinimumFontSize has [UnsupportedOSPlatform("ios6.0")]
@@ -26,6 +27,7 @@ public View View
 					LineBreakMode = UILineBreakMode.WordWrap,
 					Text = "Sample Native Control",
 				};
+#pragma warning restore CA1422 // Validate platform compatibility
 				return uiLabel.ToView();
 			}
 		}

From 487845d8536615b8c7151b50bc045fc577b5957b Mon Sep 17 00:00:00 2001
From: Gerald Versluis <gerald.versluis@microsoft.com>
Date: Thu, 20 Oct 2022 19:03:02 +0200
Subject: [PATCH 09/77] Add Obsolete attribute to MessagingCenter (#8765)

* Add Obsolete attribute to MessagingCenter

* Fix rebase error in AlertManager

* Remove unnecessary pragma

Co-authored-by: E.Z. Hart <hartez@gmail.com>
---
 .../ControlGallery/src/WinUI/WinUIStartup.cs       |  2 ++
 .../ControlGallery/src/WinUI/_57114Renderer.cs     |  2 ++
 .../ControlGallery/src/iOS/AppDelegate.cs          |  8 ++++++++
 .../src/iOS/PerformanceTrackerRenderer.cs          |  8 ++++++++
 .../ControlGallery/src/iOS/_57114Renderer.cs       |  2 ++
 src/Compatibility/Maps/src/Android/MapRenderer.cs  |  6 ++++++
 src/Compatibility/Maps/src/iOS/MapRenderer.cs      |  6 ++++++
 .../CarouselXamlGallery.xaml.cs                    |  2 ++
 .../ExampleTemplateCarousel.xaml.cs                |  2 ++
 .../ItemsSourceGenerator.cs                        |  2 ++
 .../CustomSwipeItemViewGallery.xaml.cs             |  4 ++++
 .../ResourceSwipeItemsGallery.xaml.cs              |  4 ++++
 .../SwipeBindableLayoutGallery.xaml.cs             | 10 ++++++++++
 .../SwipeCarouselViewGallery.xaml.cs               |  4 ++++
 .../SwipeHorizontalCollectionViewGallery.xaml.cs   |  4 ++++
 .../SwipeListViewGallery.xaml.cs                   |  4 ++++
 .../SwipeVerticalCollectionViewGallery.xaml.cs     |  4 ++++
 .../SwipeViewGestureRecognizerGallery.xaml.cs      |  6 ++++++
 .../SwipeViewVisualStatesCollectionGallery.xaml.cs |  4 ++++
 src/Controls/src/Core/MessagingCenter.cs           |  1 +
 src/Controls/src/Core/Page.cs                      | 14 ++++++++++++--
 .../Platform/AlertManager/AlertManager.Android.cs  |  4 ++++
 .../Platform/AlertManager/AlertManager.Tizen.cs    |  4 ++++
 .../Platform/AlertManager/AlertManager.Windows.cs  |  4 ++++
 .../Core/Platform/AlertManager/AlertManager.iOS.cs |  4 ++++
 .../ModalNavigationManager.Android.cs              |  3 +++
 src/Controls/src/Core/RadioButton.cs               |  5 ++++-
 src/Controls/src/Core/RadioButtonGroup.cs          |  2 ++
 .../src/Core/RadioButtonGroupController.cs         |  4 ++++
 .../samples/Samples/Model/PermissionItem.cs        |  6 ++++++
 .../samples/Samples/View/PermissionsPage.xaml.cs   |  4 ++++
 31 files changed, 136 insertions(+), 3 deletions(-)

diff --git a/src/Compatibility/ControlGallery/src/WinUI/WinUIStartup.cs b/src/Compatibility/ControlGallery/src/WinUI/WinUIStartup.cs
index 4d497e3c906e..4d96e3ff80b5 100644
--- a/src/Compatibility/ControlGallery/src/WinUI/WinUIStartup.cs
+++ b/src/Compatibility/ControlGallery/src/WinUI/WinUIStartup.cs
@@ -42,11 +42,13 @@ static class WinUIPageStartup
 	{
 		public static void OnActivated(UI.Xaml.Window window, UI.Xaml.WindowActivatedEventArgs e)
 		{
+#pragma warning disable CS0618 // Type or member is obsolete
 			// When the native control gallery loads up, it'll let us know so we can add the nested native controls
 			MessagingCenter.Subscribe<NestedNativeControlGalleryPage>(window, NestedNativeControlGalleryPage.ReadyForNativeControlsMessage, AddNativeControls);
 
 			// When the native binding gallery loads up, it'll let us know so we can set up the native bindings
 			MessagingCenter.Subscribe<NativeBindingGalleryPage>(window, NativeBindingGalleryPage.ReadyForNativeBindingsMessage, AddNativeBindings);
+#pragma warning restore CS0618 // Type or member is obsolete
 
 			Application.Current.PropertyChanged += OnAppPropertyChanged;
 
diff --git a/src/Compatibility/ControlGallery/src/WinUI/_57114Renderer.cs b/src/Compatibility/ControlGallery/src/WinUI/_57114Renderer.cs
index 8bf6934d3484..d0965c7bab21 100644
--- a/src/Compatibility/ControlGallery/src/WinUI/_57114Renderer.cs
+++ b/src/Compatibility/ControlGallery/src/WinUI/_57114Renderer.cs
@@ -45,7 +45,9 @@ public _57114NativeView()
 
 		void OnTapped(object sender, TappedRoutedEventArgs tappedRoutedEventArgs)
 		{
+#pragma warning disable CS0618 // Type or member is obsolete
 			MessagingCenter.Send(this as object, Bugzilla57114._57114NativeGestureFiredMessage);
+#pragma warning restore CS0618 // Type or member is obsolete
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/src/iOS/AppDelegate.cs b/src/Compatibility/ControlGallery/src/iOS/AppDelegate.cs
index 0a8cf212abd1..1231a3417da7 100644
--- a/src/Compatibility/ControlGallery/src/iOS/AppDelegate.cs
+++ b/src/Compatibility/ControlGallery/src/iOS/AppDelegate.cs
@@ -146,15 +146,23 @@ public override bool FinishedLaunching(UIApplication uiApplication, NSDictionary
 			}
 
 			// When the native control gallery loads up, it'll let us know so we can add the nested native controls
+#pragma warning disable CS0618 // Type or member is obsolete
 			MessagingCenter.Subscribe<NestedNativeControlGalleryPage>(this, NestedNativeControlGalleryPage.ReadyForNativeControlsMessage, AddNativeControls);
+#pragma warning restore CS0618 // Type or member is obsolete
+#pragma warning disable CS0618 // Type or member is obsolete
 			MessagingCenter.Subscribe<Bugzilla40911>(this, Bugzilla40911.ReadyToSetUp40911Test, SetUp40911Test);
+#pragma warning restore CS0618 // Type or member is obsolete
+#pragma warning disable CS0618 // Type or member is obsolete
 			MessagingCenter.Subscribe<Issue5503>(this, Issue5503.ChangeUITableViewAppearanceBgColor, (s) =>
 			{
 				UITableView.Appearance.BackgroundColor = UITableView.Appearance.BackgroundColor == null ? UIColor.Red : null;
 			});
+#pragma warning restore CS0618 // Type or member is obsolete
 
 			// When the native binding gallery loads up, it'll let us know so we can set up the native bindings
+#pragma warning disable CS0618 // Type or member is obsolete
 			MessagingCenter.Subscribe<NativeBindingGalleryPage>(this, NativeBindingGalleryPage.ReadyForNativeBindingsMessage, AddNativeBindings);
+#pragma warning restore CS0618 // Type or member is obsolete
 
 			return base.FinishedLaunching(uiApplication, launchOptions);
 		}
diff --git a/src/Compatibility/ControlGallery/src/iOS/PerformanceTrackerRenderer.cs b/src/Compatibility/ControlGallery/src/iOS/PerformanceTrackerRenderer.cs
index dfb181655b17..dc65f8e29b5d 100644
--- a/src/Compatibility/ControlGallery/src/iOS/PerformanceTrackerRenderer.cs
+++ b/src/Compatibility/ControlGallery/src/iOS/PerformanceTrackerRenderer.cs
@@ -278,7 +278,9 @@ public override void LayoutSubviews()
 			base.LayoutSubviews();
 
 #pragma warning disable CS0612 // Type or member is obsolete
+#pragma warning disable CS0618 // Type or member is obsolete
 			MessagingCenter.Instance.Send((IDrawnObservable)this, PerformanceTrackerRenderer.SubviewAddedMessage);
+#pragma warning restore CS0618 // Type or member is obsolete
 #pragma warning restore CS0612 // Type or member is obsolete
 			_watcher.SubscribeToDrawn(this);
 		}
@@ -731,7 +733,9 @@ public override void LayoutSubviews()
 			base.LayoutSubviews();
 
 #pragma warning disable CS0612 // Type or member is obsolete
+#pragma warning disable CS0618 // Type or member is obsolete
 			MessagingCenter.Instance.Send((IDrawnObservable)this, PerformanceTrackerRenderer.SubviewAddedMessage);
+#pragma warning restore CS0618 // Type or member is obsolete
 #pragma warning restore CS0612 // Type or member is obsolete
 			_watcher.SubscribeToDrawn(this);
 		}
@@ -783,7 +787,9 @@ public override void LayoutSubviews()
 			base.LayoutSubviews();
 
 #pragma warning disable CS0612 // Type or member is obsolete
+#pragma warning disable CS0618 // Type or member is obsolete
 			MessagingCenter.Instance.Send((IDrawnObservable)this, PerformanceTrackerRenderer.SubviewAddedMessage);
+#pragma warning restore CS0618 // Type or member is obsolete
 #pragma warning restore CS0612 // Type or member is obsolete
 			_watcher.SubscribeToDrawn(this);
 		}
@@ -1134,7 +1140,9 @@ public override void LayoutSubviews()
 			base.LayoutSubviews();
 
 #pragma warning disable CS0612 // Type or member is obsolete
+#pragma warning disable CS0618 // Type or member is obsolete
 			MessagingCenter.Instance.Send((IDrawnObservable)this, PerformanceTrackerRenderer.SubviewAddedMessage);
+#pragma warning restore CS0618 // Type or member is obsolete
 #pragma warning restore CS0612 // Type or member is obsolete
 			_watcher.SubscribeToDrawn(this);
 		}
diff --git a/src/Compatibility/ControlGallery/src/iOS/_57114Renderer.cs b/src/Compatibility/ControlGallery/src/iOS/_57114Renderer.cs
index 86d15b3dddaa..1cc280e001ef 100644
--- a/src/Compatibility/ControlGallery/src/iOS/_57114Renderer.cs
+++ b/src/Compatibility/ControlGallery/src/iOS/_57114Renderer.cs
@@ -40,7 +40,9 @@ public class CustomGestureRecognizer : UIGestureRecognizer
 		public override void TouchesBegan(NSSet touches, UIEvent evt)
 		{
 			base.TouchesBegan(touches, evt);
+#pragma warning disable CS0618 // Type or member is obsolete
 			MessagingCenter.Instance.Send(this as object, Bugzilla57114._57114NativeGestureFiredMessage);
+#pragma warning restore CS0618 // Type or member is obsolete
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Compatibility/Maps/src/Android/MapRenderer.cs b/src/Compatibility/Maps/src/Android/MapRenderer.cs
index 80f027a02379..c13a8d26905f 100644
--- a/src/Compatibility/Maps/src/Android/MapRenderer.cs
+++ b/src/Compatibility/Maps/src/Android/MapRenderer.cs
@@ -89,7 +89,9 @@ protected override void Dispose(bool disposing)
 			{
 				if (Element != null)
 				{
+#pragma warning disable CS0618 // Type or member is obsolete
 					MessagingCenter.Unsubscribe<Map, MapSpan>(this, MoveMessageName);
+#pragma warning restore CS0618 // Type or member is obsolete
 
 					((ObservableCollection<Pin>)Element.Pins).CollectionChanged -= OnPinCollectionChanged;
 					foreach (Pin pin in Element.Pins)
@@ -149,7 +151,9 @@ protected override void OnElementChanged(ElementChangedEventArgs<Map> e)
 					child.PropertyChanged -= MapElementPropertyChanged;
 				}
 
+#pragma warning disable CS0618 // Type or member is obsolete
 				MessagingCenter.Unsubscribe<Map, MapSpan>(this, MoveMessageName);
+#pragma warning restore CS0618 // Type or member is obsolete
 
 				if (NativeMap != null)
 				{
@@ -165,7 +169,9 @@ protected override void OnElementChanged(ElementChangedEventArgs<Map> e)
 
 			Control.GetMapAsync(this);
 
+#pragma warning disable CS0618 // Type or member is obsolete
 			MessagingCenter.Subscribe<Map, MapSpan>(this, MoveMessageName, OnMoveToRegionMessage, Map);
+#pragma warning restore CS0618 // Type or member is obsolete
 
 			((INotifyCollectionChanged)Map.Pins).CollectionChanged += OnPinCollectionChanged;
 			((INotifyCollectionChanged)Map.MapElements).CollectionChanged += OnMapElementCollectionChanged;
diff --git a/src/Compatibility/Maps/src/iOS/MapRenderer.cs b/src/Compatibility/Maps/src/iOS/MapRenderer.cs
index ca83fa3676c3..7b4c8f042cf4 100644
--- a/src/Compatibility/Maps/src/iOS/MapRenderer.cs
+++ b/src/Compatibility/Maps/src/iOS/MapRenderer.cs
@@ -66,7 +66,9 @@ protected override void Dispose(bool disposing)
 				if (Element != null)
 				{
 					var mapModel = (Map)Element;
+#pragma warning disable CS0618 // Type or member is obsolete
 					MessagingCenter.Unsubscribe<Map, MapSpan>(this, MoveMessageName);
+#pragma warning restore CS0618 // Type or member is obsolete
 					((ObservableCollection<Pin>)mapModel.Pins).CollectionChanged -= OnPinCollectionChanged;
 					((ObservableCollection<MapElement>)mapModel.MapElements).CollectionChanged -= OnMapElementCollectionChanged;
 					foreach (Pin pin in mapModel.Pins)
@@ -117,7 +119,9 @@ protected override void OnElementChanged(ElementChangedEventArgs<View> e)
 			{
 				var mapModel = (Map)e.OldElement;
 
+#pragma warning disable CS0618 // Type or member is obsolete
 				MessagingCenter.Unsubscribe<Map, MapSpan>(this, MoveMessageName);
+#pragma warning restore CS0618 // Type or member is obsolete
 
 				((ObservableCollection<Pin>)mapModel.Pins).CollectionChanged -= OnPinCollectionChanged;
 				foreach (Pin pin in mapModel.Pins)
@@ -161,7 +165,9 @@ protected override void OnElementChanged(ElementChangedEventArgs<View> e)
 #endif
 				}
 
+#pragma warning disable CS0618 // Type or member is obsolete
 				MessagingCenter.Subscribe<Map, MapSpan>(this, MoveMessageName, (s, a) => MoveToRegion(a), mapModel);
+#pragma warning restore CS0618 // Type or member is obsolete
 				//if (mapModel.LastMoveToRegion != null)
 				//	MoveToRegion(mapModel.LastMoveToRegion, false);
 
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/CarouselViewGalleries/CarouselXamlGallery.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/Controls/CarouselViewGalleries/CarouselXamlGallery.xaml.cs
index c4e515c83bfe..db0604a45968 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/CarouselViewGalleries/CarouselXamlGallery.xaml.cs
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/CarouselViewGalleries/CarouselXamlGallery.xaml.cs
@@ -52,7 +52,9 @@ public CarouselViewModel(CarouselXamlSampleType type, bool loop, int initialItem
 				}
 			}
 
+#pragma warning disable CS0618 // Type or member is obsolete
 			MessagingCenter.Subscribe<ExampleTemplateCarousel>(this, "remove", (obj) => Items.Remove(obj.BindingContext as CarouselItem));
+#pragma warning restore CS0618 // Type or member is obsolete
 
 			Items = new ObservableCollection<CarouselItem>(items);
 			Count = Items.Count - 1;
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/CarouselViewGalleries/ExampleTemplateCarousel.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/Controls/CarouselViewGalleries/ExampleTemplateCarousel.xaml.cs
index bfcbe9c98aa1..55fa125f6745 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/CarouselViewGalleries/ExampleTemplateCarousel.xaml.cs
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/CarouselViewGalleries/ExampleTemplateCarousel.xaml.cs
@@ -48,7 +48,9 @@ public ExampleTemplateCarousel()
 					{
 						this.FadeTo(0.1);
 						this.TranslateTo(X, Y - 1000);
+#pragma warning disable CS0618 // Type or member is obsolete
 						MessagingCenter.Send(this, "remove");
+#pragma warning restore CS0618 // Type or member is obsolete
 					}
 					else
 					{
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/CollectionViewGalleries/ItemsSourceGenerator.cs b/src/Controls/samples/Controls.Sample/Pages/Controls/CollectionViewGalleries/ItemsSourceGenerator.cs
index f176cfb33d83..e08adb7bc673 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/CollectionViewGalleries/ItemsSourceGenerator.cs
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/CollectionViewGalleries/ItemsSourceGenerator.cs
@@ -54,10 +54,12 @@ public ItemsSourceGenerator(ItemsView cv, int initialItems = 1000,
 			layout.Children.Add(button);
 
 			button.Clicked += GenerateItems;
+#pragma warning disable CS0618 // Type or member is obsolete
 			MessagingCenter.Subscribe<ExampleTemplateCarousel>(this, "remove", (obj) =>
 			{
 				(cv.ItemsSource as ObservableCollection<CollectionViewGalleryTestItem>).Remove(obj.BindingContext as CollectionViewGalleryTestItem);
 			});
+#pragma warning restore CS0618 // Type or member is obsolete
 
 			Content = layout;
 		}
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/SwipeViewGalleries/CustomSwipeItemViewGallery.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/Controls/SwipeViewGalleries/CustomSwipeItemViewGallery.xaml.cs
index a070a6ce1f8e..4c74ddfc8dd4 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/SwipeViewGalleries/CustomSwipeItemViewGallery.xaml.cs
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/SwipeViewGalleries/CustomSwipeItemViewGallery.xaml.cs
@@ -9,8 +9,12 @@ public CustomSwipeItemViewGallery()
 			InitializeComponent();
 			BindingContext = new SwipeViewGalleryViewModel();
 
+#pragma warning disable CS0618 // Type or member is obsolete
 			MessagingCenter.Subscribe<SwipeViewGalleryViewModel>(this, "favourite", sender => { DisplayAlert("SwipeView", "Favourite", "Ok"); });
+#pragma warning restore CS0618 // Type or member is obsolete
+#pragma warning disable CS0618 // Type or member is obsolete
 			MessagingCenter.Subscribe<SwipeViewGalleryViewModel>(this, "delete", sender => { DisplayAlert("SwipeView", "Delete", "Ok"); });
+#pragma warning restore CS0618 // Type or member is obsolete
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/SwipeViewGalleries/ResourceSwipeItemsGallery.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/Controls/SwipeViewGalleries/ResourceSwipeItemsGallery.xaml.cs
index 490b2070c228..29f42f97def4 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/SwipeViewGalleries/ResourceSwipeItemsGallery.xaml.cs
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/SwipeViewGalleries/ResourceSwipeItemsGallery.xaml.cs
@@ -13,8 +13,12 @@ public ResourceSwipeItemsGallery()
 			InitializeComponent();
 			BindingContext = new SwipeViewGalleryViewModel();
 
+#pragma warning disable CS0618 // Type or member is obsolete
 			MessagingCenter.Subscribe<SwipeViewGalleryViewModel>(this, "favourite", sender => { DisplayAlert("SwipeView", "Favourite", "Ok"); });
+#pragma warning restore CS0618 // Type or member is obsolete
+#pragma warning disable CS0618 // Type or member is obsolete
 			MessagingCenter.Subscribe<SwipeViewGalleryViewModel>(this, "delete", sender => { DisplayAlert("SwipeView", "Delete", "Ok"); });
+#pragma warning restore CS0618 // Type or member is obsolete
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/SwipeViewGalleries/SwipeBindableLayoutGallery.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/Controls/SwipeViewGalleries/SwipeBindableLayoutGallery.xaml.cs
index 4bb56a9e2b49..6662f7c71ff9 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/SwipeViewGalleries/SwipeBindableLayoutGallery.xaml.cs
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/SwipeViewGalleries/SwipeBindableLayoutGallery.xaml.cs
@@ -15,8 +15,12 @@ public SwipeBindableLayoutGallery()
 			InitializeComponent();
 			BindingContext = new SwipeViewGalleryViewModel();
 
+#pragma warning disable CS0618 // Type or member is obsolete
 			MessagingCenter.Subscribe<SwipeViewGalleryViewModel>(this, "favourite", sender => { DisplayAlert("SwipeView", "Favourite", "Ok"); });
+#pragma warning restore CS0618 // Type or member is obsolete
+#pragma warning disable CS0618 // Type or member is obsolete
 			MessagingCenter.Subscribe<SwipeViewGalleryViewModel>(this, "delete", sender => { DisplayAlert("SwipeView", "Delete", "Ok"); });
+#pragma warning restore CS0618 // Type or member is obsolete
 		}
 	}
 
@@ -64,17 +68,23 @@ void LoadMessages()
 
 		void OnFavourite()
 		{
+#pragma warning disable CS0618 // Type or member is obsolete
 			MessagingCenter.Send(this, "favourite");
+#pragma warning restore CS0618 // Type or member is obsolete
 		}
 
 		void OnDelete()
 		{
+#pragma warning disable CS0618 // Type or member is obsolete
 			MessagingCenter.Send(this, "delete");
+#pragma warning restore CS0618 // Type or member is obsolete
 		}
 
 		void OnTap()
 		{
+#pragma warning disable CS0618 // Type or member is obsolete
 			MessagingCenter.Send(this, "tap");
+#pragma warning restore CS0618 // Type or member is obsolete
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/SwipeViewGalleries/SwipeCarouselViewGallery.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/Controls/SwipeViewGalleries/SwipeCarouselViewGallery.xaml.cs
index 87d391fe1875..40802506d5a8 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/SwipeViewGalleries/SwipeCarouselViewGallery.xaml.cs
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/SwipeViewGalleries/SwipeCarouselViewGallery.xaml.cs
@@ -13,8 +13,12 @@ public SwipeCarouselViewGallery()
 			InitializeComponent();
 			BindingContext = new SwipeViewGalleryViewModel();
 
+#pragma warning disable CS0618 // Type or member is obsolete
 			MessagingCenter.Subscribe<SwipeViewGalleryViewModel>(this, "favourite", sender => { DisplayAlert("SwipeView", "Favourite", "Ok"); });
+#pragma warning restore CS0618 // Type or member is obsolete
+#pragma warning disable CS0618 // Type or member is obsolete
 			MessagingCenter.Subscribe<SwipeViewGalleryViewModel>(this, "delete", sender => { DisplayAlert("SwipeView", "Delete", "Ok"); });
+#pragma warning restore CS0618 // Type or member is obsolete
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/SwipeViewGalleries/SwipeHorizontalCollectionViewGallery.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/Controls/SwipeViewGalleries/SwipeHorizontalCollectionViewGallery.xaml.cs
index 8bdde442eef8..e2b826831f74 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/SwipeViewGalleries/SwipeHorizontalCollectionViewGallery.xaml.cs
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/SwipeViewGalleries/SwipeHorizontalCollectionViewGallery.xaml.cs
@@ -13,8 +13,12 @@ public SwipeHorizontalCollectionViewGallery()
 			InitializeComponent();
 			BindingContext = new SwipeViewGalleryViewModel();
 
+#pragma warning disable CS0618 // Type or member is obsolete
 			MessagingCenter.Subscribe<SwipeViewGalleryViewModel>(this, "favourite", sender => { DisplayAlert("SwipeView", "Favourite", "Ok"); });
+#pragma warning restore CS0618 // Type or member is obsolete
+#pragma warning disable CS0618 // Type or member is obsolete
 			MessagingCenter.Subscribe<SwipeViewGalleryViewModel>(this, "delete", sender => { DisplayAlert("SwipeView", "Delete", "Ok"); });
+#pragma warning restore CS0618 // Type or member is obsolete
 		}
 
 		async void OnSwipeCollectionViewSelectionChanged(object sender, SelectionChangedEventArgs args)
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/SwipeViewGalleries/SwipeListViewGallery.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/Controls/SwipeViewGalleries/SwipeListViewGallery.xaml.cs
index e9d7b4e8119f..50931d332472 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/SwipeViewGalleries/SwipeListViewGallery.xaml.cs
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/SwipeViewGalleries/SwipeListViewGallery.xaml.cs
@@ -13,8 +13,12 @@ public SwipeListViewGallery()
 			InitializeComponent();
 			BindingContext = new SwipeViewGalleryViewModel();
 
+#pragma warning disable CS0618 // Type or member is obsolete
 			MessagingCenter.Subscribe<SwipeViewGalleryViewModel>(this, "favourite", sender => { DisplayAlert("SwipeView", "Favourite", "Ok"); });
+#pragma warning restore CS0618 // Type or member is obsolete
+#pragma warning disable CS0618 // Type or member is obsolete
 			MessagingCenter.Subscribe<SwipeViewGalleryViewModel>(this, "delete", sender => { DisplayAlert("SwipeView", "Delete", "Ok"); });
+#pragma warning restore CS0618 // Type or member is obsolete
 		}
 
 		async void OnSwipeListViewItemTapped(object sender, ItemTappedEventArgs args)
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/SwipeViewGalleries/SwipeVerticalCollectionViewGallery.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/Controls/SwipeViewGalleries/SwipeVerticalCollectionViewGallery.xaml.cs
index 50f932ab6148..03d89c0d20f8 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/SwipeViewGalleries/SwipeVerticalCollectionViewGallery.xaml.cs
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/SwipeViewGalleries/SwipeVerticalCollectionViewGallery.xaml.cs
@@ -13,8 +13,12 @@ public SwipeVerticalCollectionViewGallery()
 			InitializeComponent();
 			BindingContext = new SwipeViewGalleryViewModel();
 
+#pragma warning disable CS0618 // Type or member is obsolete
 			MessagingCenter.Subscribe<SwipeViewGalleryViewModel>(this, "favourite", sender => { DisplayAlert("SwipeView", "Favourite", "Ok"); });
+#pragma warning restore CS0618 // Type or member is obsolete
+#pragma warning disable CS0618 // Type or member is obsolete
 			MessagingCenter.Subscribe<SwipeViewGalleryViewModel>(this, "delete", sender => { DisplayAlert("SwipeView", "Delete", "Ok"); });
+#pragma warning restore CS0618 // Type or member is obsolete
 		}
 
 		async void OnSwipeCollectionViewSelectionChanged(object sender, SelectionChangedEventArgs args)
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/SwipeViewGalleries/SwipeViewGestureRecognizerGallery.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/Controls/SwipeViewGalleries/SwipeViewGestureRecognizerGallery.xaml.cs
index b8d7212c8ff8..7dd531918a48 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/SwipeViewGalleries/SwipeViewGestureRecognizerGallery.xaml.cs
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/SwipeViewGalleries/SwipeViewGestureRecognizerGallery.xaml.cs
@@ -11,9 +11,15 @@ public SwipeViewGestureRecognizerGallery()
 			InitializeComponent();
 			BindingContext = new SwipeViewGalleryViewModel();
 
+#pragma warning disable CS0618 // Type or member is obsolete
 			MessagingCenter.Subscribe<SwipeViewGalleryViewModel>(this, "favourite", sender => { DisplayAlert("SwipeView", "Favourite", "Ok"); });
+#pragma warning restore CS0618 // Type or member is obsolete
+#pragma warning disable CS0618 // Type or member is obsolete
 			MessagingCenter.Subscribe<SwipeViewGalleryViewModel>(this, "delete", sender => { DisplayAlert("SwipeView", "Delete", "Ok"); });
+#pragma warning restore CS0618 // Type or member is obsolete
+#pragma warning disable CS0618 // Type or member is obsolete
 			MessagingCenter.Subscribe<SwipeViewGalleryViewModel>(this, "tap", sender => { DisplayAlert("SwipeView", "TapGestureRecognizer", "Ok"); });
+#pragma warning restore CS0618 // Type or member is obsolete
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/SwipeViewGalleries/SwipeViewVisualStatesCollectionGallery.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/Controls/SwipeViewGalleries/SwipeViewVisualStatesCollectionGallery.xaml.cs
index 383c2c38fdd4..1ce220e05917 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/SwipeViewGalleries/SwipeViewVisualStatesCollectionGallery.xaml.cs
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/SwipeViewGalleries/SwipeViewVisualStatesCollectionGallery.xaml.cs
@@ -11,8 +11,12 @@ public SwipeViewVisualStatesCollectionGallery()
 			InitializeComponent();
 			BindingContext = new SwipeViewGalleryViewModel();
 
+#pragma warning disable CS0618 // Type or member is obsolete
 			MessagingCenter.Subscribe<SwipeViewGalleryViewModel>(this, "favourite", sender => { DisplayAlert("SwipeView", "Favourite", "Ok"); });
+#pragma warning restore CS0618 // Type or member is obsolete
+#pragma warning disable CS0618 // Type or member is obsolete
 			MessagingCenter.Subscribe<SwipeViewGalleryViewModel>(this, "delete", sender => { DisplayAlert("SwipeView", "Delete", "Ok"); });
+#pragma warning restore CS0618 // Type or member is obsolete
 		}
 
 		async void OnSwipeCollectionViewSelectionChanged(object sender, SelectionChangedEventArgs args)
diff --git a/src/Controls/src/Core/MessagingCenter.cs b/src/Controls/src/Core/MessagingCenter.cs
index 58b2f431db38..e57822c1e23b 100644
--- a/src/Controls/src/Core/MessagingCenter.cs
+++ b/src/Controls/src/Core/MessagingCenter.cs
@@ -21,6 +21,7 @@ public interface IMessagingCenter
 	}
 
 	/// <include file="../../docs/Microsoft.Maui.Controls/MessagingCenter.xml" path="Type[@FullName='Microsoft.Maui.Controls.MessagingCenter']/Docs/*" />
+	[Obsolete("We recommend migrating to `CommunityToolkit.MVVM.WeakReferenceMessenger`: https://www.nuget.org/packages/CommunityToolkit.Mvvm")]
 	public class MessagingCenter : IMessagingCenter
 	{
 		/// <include file="../../docs/Microsoft.Maui.Controls/MessagingCenter.xml" path="//Member[@MemberName='Instance']/Docs/*" />
diff --git a/src/Controls/src/Core/Page.cs b/src/Controls/src/Core/Page.cs
index 94ef0af96d33..e472d90341df 100644
--- a/src/Controls/src/Core/Page.cs
+++ b/src/Controls/src/Core/Page.cs
@@ -195,11 +195,12 @@ public Task<string> DisplayActionSheet(string title, string cancel, string destr
 			var args = new ActionSheetArguments(title, cancel, destruction, buttons);
 
 			args.FlowDirection = flowDirection;
-
+#pragma warning disable CS0618 // TODO: Remove when we internalize/replace MessagingCenter
 			if (IsPlatformEnabled)
 				MessagingCenter.Send(this, ActionSheetSignalName, args);
 			else
 				_pendingActions.Add(() => MessagingCenter.Send(this, ActionSheetSignalName, args));
+#pragma warning restore CS0618 // Type or member is obsolete
 
 			return args.Result.Task;
 		}
@@ -235,10 +236,12 @@ public Task<bool> DisplayAlert(string title, string message, string accept, stri
 			var args = new AlertArguments(title, message, accept, cancel);
 			args.FlowDirection = flowDirection;
 
+#pragma warning disable CS0618 // TODO: Remove when we internalize/replace MessagingCenter
 			if (IsPlatformEnabled)
 				MessagingCenter.Send(this, AlertSignalName, args);
 			else
 				_pendingActions.Add(() => MessagingCenter.Send(this, AlertSignalName, args));
+#pragma warning restore CS0618 // Type or member is obsolete
 
 			return args.Result.Task;
 		}
@@ -248,10 +251,12 @@ public Task<bool> DisplayAlert(string title, string message, string accept, stri
 		{
 			var args = new PromptArguments(title, message, accept, cancel, placeholder, maxLength, keyboard, initialValue);
 
+#pragma warning disable CS0618 // TODO: Remove when we internalize/replace MessagingCenter
 			if (IsPlatformEnabled)
 				MessagingCenter.Send(this, PromptSignalName, args);
 			else
 				_pendingActions.Add(() => MessagingCenter.Send(this, PromptSignalName, args));
+#pragma warning restore CS0618 // Type or member is obsolete
 
 			return args.Result.Task;
 		}
@@ -478,11 +483,13 @@ public void SendAppearing()
 
 			if (IsBusy)
 			{
+#pragma warning disable CS0618 // TODO: Remove when we internalize/replace MessagingCenter
 				if (IsPlatformEnabled)
 					MessagingCenter.Send(this, BusySetSignalName, true);
 				else
 					_pendingActions.Add(() => MessagingCenter.Send(this, BusySetSignalName, true));
 			}
+#pragma warning restore CS0618 // Type or member is obsolete
 
 			OnAppearing();
 			Appearing?.Invoke(this, EventArgs.Empty);
@@ -502,8 +509,10 @@ public void SendDisappearing()
 
 			_hasAppeared = false;
 
+#pragma warning disable CS0618 // TODO: Remove when we internalize/replace MessagingCenter
 			if (IsBusy)
 				MessagingCenter.Send(this, BusySetSignalName, false);
+#pragma warning restore CS0618 // Type or member is obsolete
 
 			var pageContainer = this as IPageContainer<Page>;
 			pageContainer?.CurrentPage?.SendDisappearing();
@@ -559,8 +568,9 @@ void OnPageBusyChanged()
 		{
 			if (!_hasAppeared)
 				return;
-
+#pragma warning disable CS0618 // TODO: Remove when we internalize/replace MessagingCenter
 			MessagingCenter.Send(this, BusySetSignalName, IsBusy);
+#pragma warning restore CS0618 // Type or member is obsolete
 		}
 
 		void OnToolbarItemsCollectionChanged(object sender, NotifyCollectionChangedEventArgs args)
diff --git a/src/Controls/src/Core/Platform/AlertManager/AlertManager.Android.cs b/src/Controls/src/Core/Platform/AlertManager/AlertManager.Android.cs
index 55579bbf22fd..2d1f1c6d763b 100644
--- a/src/Controls/src/Core/Platform/AlertManager/AlertManager.Android.cs
+++ b/src/Controls/src/Core/Platform/AlertManager/AlertManager.Android.cs
@@ -65,10 +65,12 @@ internal AlertRequestHelper(Activity context, IMauiContext mauiContext)
 				Activity = context;
 				MauiContext = mauiContext;
 
+#pragma warning disable CS0618 // TODO: Remove when we internalize/replace MessagingCenter
 				MessagingCenter.Subscribe<Page, bool>(Activity, Page.BusySetSignalName, OnPageBusy);
 				MessagingCenter.Subscribe<Page, AlertArguments>(Activity, Page.AlertSignalName, OnAlertRequested);
 				MessagingCenter.Subscribe<Page, PromptArguments>(Activity, Page.PromptSignalName, OnPromptRequested);
 				MessagingCenter.Subscribe<Page, ActionSheetArguments>(Activity, Page.ActionSheetSignalName, OnActionSheetRequested);
+#pragma warning restore CS0618 // Type or member is obsolete
 			}
 
 			public Activity Activity { get; }
@@ -76,10 +78,12 @@ internal AlertRequestHelper(Activity context, IMauiContext mauiContext)
 
 			public void Dispose()
 			{
+#pragma warning disable CS0618 // TODO: Remove when we internalize/replace MessagingCenter
 				MessagingCenter.Unsubscribe<Page, bool>(Activity, Page.BusySetSignalName);
 				MessagingCenter.Unsubscribe<Page, AlertArguments>(Activity, Page.AlertSignalName);
 				MessagingCenter.Unsubscribe<Page, PromptArguments>(Activity, Page.PromptSignalName);
 				MessagingCenter.Unsubscribe<Page, ActionSheetArguments>(Activity, Page.ActionSheetSignalName);
+#pragma warning restore CS0618 // Type or member is obsolete
 			}
 
 			public void ResetBusyCount()
diff --git a/src/Controls/src/Core/Platform/AlertManager/AlertManager.Tizen.cs b/src/Controls/src/Core/Platform/AlertManager/AlertManager.Tizen.cs
index f8a49bdd2fff..bf779b15d535 100644
--- a/src/Controls/src/Core/Platform/AlertManager/AlertManager.Tizen.cs
+++ b/src/Controls/src/Core/Platform/AlertManager/AlertManager.Tizen.cs
@@ -48,10 +48,12 @@ internal AlertRequestHelper(NWindow window, NavigationStack modalStack)
 		{
 			Window = window;
 
+#pragma warning disable CS0618 // TODO: Remove when we internalize/replace MessagingCenter
 			MessagingCenter.Subscribe<Page, bool>(Window, Page.BusySetSignalName, OnBusySetRequest);
 			MessagingCenter.Subscribe<Page, AlertArguments>(Window, Page.AlertSignalName, OnAlertRequest);
 			MessagingCenter.Subscribe<Page, ActionSheetArguments>(Window, Page.ActionSheetSignalName, OnActionSheetRequest);
 			MessagingCenter.Subscribe<Page, PromptArguments>(Window, Page.PromptSignalName, OnPromptRequested);
+#pragma warning restore CS0618 // Type or member is obsolete
 			_modalStack = modalStack;
 		}
 
@@ -59,10 +61,12 @@ internal AlertRequestHelper(NWindow window, NavigationStack modalStack)
 
 		public void Dispose()
 		{
+#pragma warning disable CS0618 // TODO: Remove when we internalize/replace MessagingCenter
 			MessagingCenter.Unsubscribe<Page, AlertArguments>(Window, Page.AlertSignalName);
 			MessagingCenter.Unsubscribe<Page, bool>(Window, Page.BusySetSignalName);
 			MessagingCenter.Unsubscribe<Page, ActionSheetArguments>(Window, Page.ActionSheetSignalName);
 			MessagingCenter.Unsubscribe<Page, PromptArguments>(Window, Page.PromptSignalName);
+#pragma warning restore CS0618 // Type or member is obsolete
 		}
 
 		void OnBusySetRequest(Page sender, bool enabled)
diff --git a/src/Controls/src/Core/Platform/AlertManager/AlertManager.Windows.cs b/src/Controls/src/Core/Platform/AlertManager/AlertManager.Windows.cs
index fe1a0bcdc0f4..4f444cb717cf 100644
--- a/src/Controls/src/Core/Platform/AlertManager/AlertManager.Windows.cs
+++ b/src/Controls/src/Core/Platform/AlertManager/AlertManager.Windows.cs
@@ -46,10 +46,12 @@ internal AlertRequestHelper(UI.Xaml.Window window, IMauiContext mauiContext)
 				Window = window;
 				MauiContext = mauiContext;
 
+#pragma warning disable CS0618 // TODO: Remove when we internalize/replace MessagingCenter
 				MessagingCenter.Subscribe<Page, bool>(Window, Page.BusySetSignalName, OnPageBusy);
 				MessagingCenter.Subscribe<Page, AlertArguments>(Window, Page.AlertSignalName, OnAlertRequested);
 				MessagingCenter.Subscribe<Page, PromptArguments>(Window, Page.PromptSignalName, OnPromptRequested);
 				MessagingCenter.Subscribe<Page, ActionSheetArguments>(Window, Page.ActionSheetSignalName, OnActionSheetRequested);
+#pragma warning restore CS0618 // Type or member is obsolete
 			}
 
 			public UI.Xaml.Window Window { get; }
@@ -57,10 +59,12 @@ internal AlertRequestHelper(UI.Xaml.Window window, IMauiContext mauiContext)
 
 			public void Dispose()
 			{
+#pragma warning disable CS0618 // TODO: Remove when we internalize/replace MessagingCenter
 				MessagingCenter.Unsubscribe<Page, bool>(Window, Page.BusySetSignalName);
 				MessagingCenter.Unsubscribe<Page, AlertArguments>(Window, Page.AlertSignalName);
 				MessagingCenter.Unsubscribe<Page, PromptArguments>(Window, Page.PromptSignalName);
 				MessagingCenter.Unsubscribe<Page, ActionSheetArguments>(Window, Page.ActionSheetSignalName);
+#pragma warning restore CS0618 // Type or member is obsolete
 			}
 
 			void OnPageBusy(Page sender, bool enabled)
diff --git a/src/Controls/src/Core/Platform/AlertManager/AlertManager.iOS.cs b/src/Controls/src/Core/Platform/AlertManager/AlertManager.iOS.cs
index 441fc49bd0c7..9f6080985b68 100644
--- a/src/Controls/src/Core/Platform/AlertManager/AlertManager.iOS.cs
+++ b/src/Controls/src/Core/Platform/AlertManager/AlertManager.iOS.cs
@@ -50,10 +50,12 @@ internal AlertRequestHelper(Window virtualView, UIWindow platformView)
 				VirtualView = virtualView;
 				PlatformView = platformView;
 
+#pragma warning disable CS0618 // TODO: Remove when we internalize/replace MessagingCenter
 				MessagingCenter.Subscribe<Page, bool>(PlatformView, Page.BusySetSignalName, OnPageBusy);
 				MessagingCenter.Subscribe<Page, AlertArguments>(PlatformView, Page.AlertSignalName, OnAlertRequested);
 				MessagingCenter.Subscribe<Page, PromptArguments>(PlatformView, Page.PromptSignalName, OnPromptRequested);
 				MessagingCenter.Subscribe<Page, ActionSheetArguments>(PlatformView, Page.ActionSheetSignalName, OnActionSheetRequested);
+#pragma warning restore CS0618 // Type or member is obsolete
 			}
 
 			public Window VirtualView { get; }
@@ -62,10 +64,12 @@ internal AlertRequestHelper(Window virtualView, UIWindow platformView)
 
 			public void Dispose()
 			{
+#pragma warning disable CS0618 // TODO: Remove when we internalize/replace MessagingCenter
 				MessagingCenter.Unsubscribe<Page, bool>(PlatformView, Page.BusySetSignalName);
 				MessagingCenter.Unsubscribe<Page, AlertArguments>(PlatformView, Page.AlertSignalName);
 				MessagingCenter.Unsubscribe<Page, PromptArguments>(PlatformView, Page.PromptSignalName);
 				MessagingCenter.Unsubscribe<Page, ActionSheetArguments>(PlatformView, Page.ActionSheetSignalName);
+#pragma warning restore CS0618 // Type or member is obsolete
 			}
 
 			void OnPageBusy(IView sender, bool enabled)
diff --git a/src/Controls/src/Core/Platform/ModalNavigationManager/ModalNavigationManager.Android.cs b/src/Controls/src/Core/Platform/ModalNavigationManager/ModalNavigationManager.Android.cs
index a75ee22c2314..dfa0e299401c 100644
--- a/src/Controls/src/Core/Platform/ModalNavigationManager/ModalNavigationManager.Android.cs
+++ b/src/Controls/src/Core/Platform/ModalNavigationManager/ModalNavigationManager.Android.cs
@@ -42,8 +42,11 @@ internal bool NavAnimationInProgress
 				if (_navAnimationInProgress == value)
 					return;
 				_navAnimationInProgress = value;
+
+#pragma warning disable CS0618 // TODO: Remove when we internalize/replace MessagingCenter
 				if (value)
 					MessagingCenter.Send(this, CloseContextActionsSignalName);
+#pragma warning restore CS0618 // Type or member is obsolete
 			}
 		}
 
diff --git a/src/Controls/src/Core/RadioButton.cs b/src/Controls/src/Core/RadioButton.cs
index 7a9b44e8d893..3a6292f76aa0 100644
--- a/src/Controls/src/Core/RadioButton.cs
+++ b/src/Controls/src/Core/RadioButton.cs
@@ -392,13 +392,15 @@ void OnValuePropertyChanged()
 			{
 				return;
 			}
-
+#pragma warning disable CS0618 // TODO: Remove when we internalize/replace MessagingCenter
 			MessagingCenter.Send(this, ValueChangedMessage,
 						new RadioButtonValueChanged(RadioButtonGroup.GetVisualRoot(this)));
+#pragma warning restore CS0618 // Type or member is obsolete
 		}
 
 		void OnGroupNamePropertyChanged(string oldGroupName, string newGroupName)
 		{
+#pragma warning disable CS0618 // TODO: Remove when we internalize/replace MessagingCenter
 			if (!string.IsNullOrEmpty(newGroupName))
 			{
 				if (string.IsNullOrEmpty(oldGroupName))
@@ -420,6 +422,7 @@ void OnGroupNamePropertyChanged(string oldGroupName, string newGroupName)
 					MessagingCenter.Unsubscribe<Element, RadioButtonGroupValueChanged>(this, RadioButtonGroup.GroupValueChangedMessage);
 				}
 			}
+#pragma warning restore CS0618 // Type or member is obsolete
 		}
 
 		bool MatchesScope(RadioButtonScopeMessage message)
diff --git a/src/Controls/src/Core/RadioButtonGroup.cs b/src/Controls/src/Core/RadioButtonGroup.cs
index 82436a6a759d..69d5c53e7aff 100644
--- a/src/Controls/src/Core/RadioButtonGroup.cs
+++ b/src/Controls/src/Core/RadioButtonGroup.cs
@@ -61,8 +61,10 @@ internal static void UpdateRadioButtonGroup(RadioButton radioButton)
 				? GroupByParent(radioButton)
 				: GetVisualRoot(radioButton);
 
+#pragma warning disable CS0618 // TODO: Remove when we internalize/replace MessagingCenter
 			MessagingCenter.Send(radioButton, GroupSelectionChangedMessage,
 				new RadioButtonGroupSelectionChanged(scope));
+#pragma warning restore CS0618 // Type or member is obsolete
 		}
 
 		internal static Element GroupByParent(RadioButton radioButton)
diff --git a/src/Controls/src/Core/RadioButtonGroupController.cs b/src/Controls/src/Core/RadioButtonGroupController.cs
index 25724cdb2eea..71102fcde8b2 100644
--- a/src/Controls/src/Core/RadioButtonGroupController.cs
+++ b/src/Controls/src/Core/RadioButtonGroupController.cs
@@ -26,12 +26,14 @@ public RadioButtonGroupController(Maui.ILayout layout)
 				UpdateGroupNames(_layout, _groupName);
 			}
 
+#pragma warning disable CS0618 // TODO: Remove when we internalize/replace MessagingCenter
 			MessagingCenter.Subscribe<RadioButton, RadioButtonGroupSelectionChanged>(this,
 				RadioButtonGroup.GroupSelectionChangedMessage, HandleRadioButtonGroupSelectionChanged);
 			MessagingCenter.Subscribe<RadioButton, RadioButtonGroupNameChanged>(this, RadioButton.GroupNameChangedMessage,
 				HandleRadioButtonGroupNameChanged);
 			MessagingCenter.Subscribe<RadioButton, RadioButtonValueChanged>(this, RadioButton.ValueChangedMessage,
 				HandleRadioButtonValueChanged);
+#pragma warning restore CS0618 // Type or member is obsolete
 		}
 
 		bool MatchesScope(RadioButtonScopeMessage message)
@@ -136,8 +138,10 @@ void SetSelectedValue(object radioButtonValue)
 
 			if (radioButtonValue != null)
 			{
+#pragma warning disable CS0618 // TODO: Remove when we internalize/replace MessagingCenter
 				MessagingCenter.Send<Element, RadioButtonGroupValueChanged>(_layout, RadioButtonGroup.GroupValueChangedMessage,
 					new RadioButtonGroupValueChanged(_groupName, RadioButtonGroup.GetVisualRoot(_layout), radioButtonValue));
+#pragma warning restore CS0618 // Type or member is obsolete
 			}
 		}
 
diff --git a/src/Essentials/samples/Samples/Model/PermissionItem.cs b/src/Essentials/samples/Samples/Model/PermissionItem.cs
index b177b7b25ec9..9e73c31be7da 100644
--- a/src/Essentials/samples/Samples/Model/PermissionItem.cs
+++ b/src/Essentials/samples/Samples/Model/PermissionItem.cs
@@ -37,7 +37,9 @@ public PermissionItem(string title, Permissions.BasePermission permission)
 				}
 				catch (Exception ex)
 				{
+#pragma warning disable CS0618 // Type or member is obsolete
 					MessagingCenter.Send<PermissionItem, Exception>(this, nameof(PermissionException), ex);
+#pragma warning restore CS0618 // Type or member is obsolete
 				}
 			});
 
@@ -51,7 +53,9 @@ public PermissionItem(string title, Permissions.BasePermission permission)
 				}
 				catch (Exception ex)
 				{
+#pragma warning disable CS0618 // Type or member is obsolete
 					MessagingCenter.Send<PermissionItem, Exception>(this, nameof(PermissionException), ex);
+#pragma warning restore CS0618 // Type or member is obsolete
 				}
 			});
 
@@ -65,7 +69,9 @@ public PermissionItem(string title, Permissions.BasePermission permission)
 				}
 				catch (Exception ex)
 				{
+#pragma warning disable CS0618 // Type or member is obsolete
 					MessagingCenter.Send<PermissionItem, Exception>(this, nameof(PermissionException), ex);
+#pragma warning restore CS0618 // Type or member is obsolete
 				}
 			});
 	}
diff --git a/src/Essentials/samples/Samples/View/PermissionsPage.xaml.cs b/src/Essentials/samples/Samples/View/PermissionsPage.xaml.cs
index 7fbd023513d7..f1937a374910 100644
--- a/src/Essentials/samples/Samples/View/PermissionsPage.xaml.cs
+++ b/src/Essentials/samples/Samples/View/PermissionsPage.xaml.cs
@@ -22,15 +22,19 @@ protected override void OnAppearing()
 		{
 			base.OnAppearing();
 
+#pragma warning disable CS0618 // Type or member is obsolete
 			MessagingCenter.Subscribe<PermissionItem, Exception>(this, nameof(PermissionException), async (p, ex) =>
 				await DisplayAlert("Permission Error", ex.Message, "OK"));
+#pragma warning restore CS0618 // Type or member is obsolete
 		}
 
 		protected override void OnDisappearing()
 		{
 			base.OnDisappearing();
 
+#pragma warning disable CS0618 // Type or member is obsolete
 			MessagingCenter.Unsubscribe<PermissionItem, Exception>(this, nameof(PermissionException));
+#pragma warning restore CS0618 // Type or member is obsolete
 		}
 	}
 }

From a08b62e73a045974ea5d48d6798acc98151b60a0 Mon Sep 17 00:00:00 2001
From: Jonathan Dick <jondick@gmail.com>
Date: Thu, 20 Oct 2022 13:32:21 -0400
Subject: [PATCH 10/77] Stable SR7 version

---
 GitInfo.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GitInfo.txt b/GitInfo.txt
index 517b19ce7498..7d1a37e9b3ae 100644
--- a/GitInfo.txt
+++ b/GitInfo.txt
@@ -1 +1 @@
-6.0.525-ci.net6.0
+6.0.542

From b03e06d0320d7192d2b6a8171f94e0c6dbf9c53f Mon Sep 17 00:00:00 2001
From: Gerald Versluis <gerald.versluis@microsoft.com>
Date: Thu, 20 Oct 2022 21:18:29 +0200
Subject: [PATCH 11/77] Update CodeDocumentationGuidelines.md

---
 docs/CodeDocumentationGuidelines.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/CodeDocumentationGuidelines.md b/docs/CodeDocumentationGuidelines.md
index 2208bfc4d1d1..bebff90cf51a 100644
--- a/docs/CodeDocumentationGuidelines.md
+++ b/docs/CodeDocumentationGuidelines.md
@@ -11,6 +11,7 @@ If you're unsure about how to document a certain element, have a look the [.NET
 These are the tags that we would like to see when applicable: `<summary>`, `<remarks>`, `<returns>`, `<param>`, `<exception>`, `<inheritdoc>`, `<see>`, `<c>`.
 
 * All public members should have at the very least a `<summary>`
+* Add "This is a bindable property." to the end of the summary of the regular C# properties that are bindable properties.
 * Keep the descriptions short and concise
   * 1-2 lines typically, no screenshots or long code-blocks (those belong in the conceptual docs)
 * Make sure the spelling is correct

From 9df0b4d80c0d02a5eabe26c0e429e1ab24c24c31 Mon Sep 17 00:00:00 2001
From: Nathan Westfall <nathan@fistbumpstudios.com>
Date: Thu, 20 Oct 2022 16:50:10 -0400
Subject: [PATCH 12/77] iOS15 WindowStateManager Window Support (#10550)

* fix: updated iOS WindowStateManager to have support for Windows and KeyWindow in iOS15

* fix: change windows to FirstOrDefault

* chore: attempt at basic unit tests

* Use the check on iOS 13 everywhere

* fix: check just view controller

Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
---
 .../src/Platform/WindowStateManager.ios.cs    | 43 ++++++++++++++-----
 .../Tests/WindowStateManager_Tests.cs         | 33 ++++++++++++++
 2 files changed, 65 insertions(+), 11 deletions(-)
 create mode 100644 src/Essentials/test/DeviceTests/Tests/WindowStateManager_Tests.cs

diff --git a/src/Essentials/src/Platform/WindowStateManager.ios.cs b/src/Essentials/src/Platform/WindowStateManager.ios.cs
index 2cb89119dcb7..b03f794ac24c 100644
--- a/src/Essentials/src/Platform/WindowStateManager.ios.cs
+++ b/src/Essentials/src/Platform/WindowStateManager.ios.cs
@@ -59,17 +59,14 @@ public void Init(Func<UIViewController?>? getCurrentUIViewController) =>
 			if (viewController != null)
 				return viewController;
 
-#pragma warning disable CA1416 // TODO: 'UIApplication.KeyWindow' is unsupported on: 'ios' 13.0 and later.
-			var window = UIApplication.SharedApplication.KeyWindow;
+			var window = GetKeyWindow();
 
 			if (window != null && window.WindowLevel == UIWindowLevel.Normal)
 				viewController = window.RootViewController;
 
 			if (viewController == null)
 			{
-				// This call site is reachable on: 'iOS' 10.0 and later. 'UIApplication.Windows.get' is unsupported on: 'ios' 15.0 and later.
-				window = UIApplication.SharedApplication
-					.Windows
+				window = GetWindows()?
 					.OrderByDescending(w => w.WindowLevel)
 					.FirstOrDefault(w => w.RootViewController != null && w.WindowLevel == UIWindowLevel.Normal);
 
@@ -84,23 +81,47 @@ public void Init(Func<UIViewController?>? getCurrentUIViewController) =>
 
 		public UIWindow? GetCurrentUIWindow()
 		{
-			// This call site is reachable on: 'iOS' 10.0 and later.0 'UIApplication.KeyWindow.get' is unsupported on: 'ios' 13.0 and later.
-			var window = UIApplication.SharedApplication.KeyWindow;
+			var window = GetKeyWindow();
 
 			if (window != null && window.WindowLevel == UIWindowLevel.Normal)
 				return window;
 
 			if (window == null)
 			{
-				// This call site is reachable on: 'iOS' 10.0 and later. 'UIApplication.Windows.get' is unsupported on: 'ios' 15.0 and later.
-				window = UIApplication.SharedApplication
-					.Windows
+				window = GetWindows()?
 					.OrderByDescending(w => w.WindowLevel)
 					.FirstOrDefault(w => w.RootViewController != null && w.WindowLevel == UIWindowLevel.Normal);
 			}
-#pragma warning restore CA1416
 
 			return window;
 		}
+
+		static UIWindow? GetKeyWindow()
+		{
+			// if we have scene support, use that
+			if (OperatingSystem.IsIOSVersionAtLeast(13) || OperatingSystem.IsMacCatalystVersionAtLeast(13))
+			{
+				var scenes = UIApplication.SharedApplication.ConnectedScenes;
+				var windowScene = scenes.ToArray<UIWindowScene>().FirstOrDefault();
+				return windowScene?.Windows.FirstOrDefault();
+			}
+
+			// use the windows property (up to 13.0)
+			return UIApplication.SharedApplication.KeyWindow;
+		}
+
+		static UIWindow[]? GetWindows()
+		{
+			// if we have scene support, use that
+			if (OperatingSystem.IsIOSVersionAtLeast(13) || OperatingSystem.IsMacCatalystVersionAtLeast(13))
+			{
+				var scenes = UIApplication.SharedApplication.ConnectedScenes;
+				var windowScene = scenes.ToArray<UIWindowScene>().FirstOrDefault();
+				return windowScene?.Windows;
+			}
+
+			// use the windows property (up to 15.0)
+			return UIApplication.SharedApplication.Windows;
+		}
 	}
 }
diff --git a/src/Essentials/test/DeviceTests/Tests/WindowStateManager_Tests.cs b/src/Essentials/test/DeviceTests/Tests/WindowStateManager_Tests.cs
new file mode 100644
index 000000000000..9bb81545d275
--- /dev/null
+++ b/src/Essentials/test/DeviceTests/Tests/WindowStateManager_Tests.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.Maui.ApplicationModel;
+using Microsoft.Maui.Authentication;
+using Xunit;
+
+namespace Microsoft.Maui.Essentials.DeviceTests
+{
+	[Category("WindowStateManager")]
+	public class WindowStateManager_Tests
+	{
+#if __IOS__
+		[Fact]
+		[Trait(Traits.InteractionType, Traits.InteractionTypes.Machine)]
+		public void GetCurrentUIWindow()
+		{
+			var window = WindowStateManager.Default.GetCurrentUIWindow();
+			Assert.NotNull(window);
+		}
+
+		[Fact]
+		[Trait(Traits.InteractionType, Traits.InteractionTypes.Machine)]
+		public void GetCurrentUIViewController()
+		{
+			var viewController = WindowStateManager.Default.GetCurrentUIViewController();
+			Assert.NotNull(viewController);
+		}
+#endif
+	}
+}

From 3ec3803e1e037a3f20e98dd995477cc2ed9a49ee Mon Sep 17 00:00:00 2001
From: Nathan Westfall <nathan@fistbumpstudios.com>
Date: Thu, 20 Oct 2022 16:50:10 -0400
Subject: [PATCH 13/77] iOS15 WindowStateManager Window Support (#10550)

* fix: updated iOS WindowStateManager to have support for Windows and KeyWindow in iOS15

* fix: change windows to FirstOrDefault

* chore: attempt at basic unit tests

* Use the check on iOS 13 everywhere

* fix: check just view controller

Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
---
 .../src/Platform/WindowStateManager.ios.cs    | 43 ++++++++++++++-----
 .../Tests/WindowStateManager_Tests.cs         | 33 ++++++++++++++
 2 files changed, 65 insertions(+), 11 deletions(-)
 create mode 100644 src/Essentials/test/DeviceTests/Tests/WindowStateManager_Tests.cs

diff --git a/src/Essentials/src/Platform/WindowStateManager.ios.cs b/src/Essentials/src/Platform/WindowStateManager.ios.cs
index 2cb89119dcb7..b03f794ac24c 100644
--- a/src/Essentials/src/Platform/WindowStateManager.ios.cs
+++ b/src/Essentials/src/Platform/WindowStateManager.ios.cs
@@ -59,17 +59,14 @@ public void Init(Func<UIViewController?>? getCurrentUIViewController) =>
 			if (viewController != null)
 				return viewController;
 
-#pragma warning disable CA1416 // TODO: 'UIApplication.KeyWindow' is unsupported on: 'ios' 13.0 and later.
-			var window = UIApplication.SharedApplication.KeyWindow;
+			var window = GetKeyWindow();
 
 			if (window != null && window.WindowLevel == UIWindowLevel.Normal)
 				viewController = window.RootViewController;
 
 			if (viewController == null)
 			{
-				// This call site is reachable on: 'iOS' 10.0 and later. 'UIApplication.Windows.get' is unsupported on: 'ios' 15.0 and later.
-				window = UIApplication.SharedApplication
-					.Windows
+				window = GetWindows()?
 					.OrderByDescending(w => w.WindowLevel)
 					.FirstOrDefault(w => w.RootViewController != null && w.WindowLevel == UIWindowLevel.Normal);
 
@@ -84,23 +81,47 @@ public void Init(Func<UIViewController?>? getCurrentUIViewController) =>
 
 		public UIWindow? GetCurrentUIWindow()
 		{
-			// This call site is reachable on: 'iOS' 10.0 and later.0 'UIApplication.KeyWindow.get' is unsupported on: 'ios' 13.0 and later.
-			var window = UIApplication.SharedApplication.KeyWindow;
+			var window = GetKeyWindow();
 
 			if (window != null && window.WindowLevel == UIWindowLevel.Normal)
 				return window;
 
 			if (window == null)
 			{
-				// This call site is reachable on: 'iOS' 10.0 and later. 'UIApplication.Windows.get' is unsupported on: 'ios' 15.0 and later.
-				window = UIApplication.SharedApplication
-					.Windows
+				window = GetWindows()?
 					.OrderByDescending(w => w.WindowLevel)
 					.FirstOrDefault(w => w.RootViewController != null && w.WindowLevel == UIWindowLevel.Normal);
 			}
-#pragma warning restore CA1416
 
 			return window;
 		}
+
+		static UIWindow? GetKeyWindow()
+		{
+			// if we have scene support, use that
+			if (OperatingSystem.IsIOSVersionAtLeast(13) || OperatingSystem.IsMacCatalystVersionAtLeast(13))
+			{
+				var scenes = UIApplication.SharedApplication.ConnectedScenes;
+				var windowScene = scenes.ToArray<UIWindowScene>().FirstOrDefault();
+				return windowScene?.Windows.FirstOrDefault();
+			}
+
+			// use the windows property (up to 13.0)
+			return UIApplication.SharedApplication.KeyWindow;
+		}
+
+		static UIWindow[]? GetWindows()
+		{
+			// if we have scene support, use that
+			if (OperatingSystem.IsIOSVersionAtLeast(13) || OperatingSystem.IsMacCatalystVersionAtLeast(13))
+			{
+				var scenes = UIApplication.SharedApplication.ConnectedScenes;
+				var windowScene = scenes.ToArray<UIWindowScene>().FirstOrDefault();
+				return windowScene?.Windows;
+			}
+
+			// use the windows property (up to 15.0)
+			return UIApplication.SharedApplication.Windows;
+		}
 	}
 }
diff --git a/src/Essentials/test/DeviceTests/Tests/WindowStateManager_Tests.cs b/src/Essentials/test/DeviceTests/Tests/WindowStateManager_Tests.cs
new file mode 100644
index 000000000000..9bb81545d275
--- /dev/null
+++ b/src/Essentials/test/DeviceTests/Tests/WindowStateManager_Tests.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.Maui.ApplicationModel;
+using Microsoft.Maui.Authentication;
+using Xunit;
+
+namespace Microsoft.Maui.Essentials.DeviceTests
+{
+	[Category("WindowStateManager")]
+	public class WindowStateManager_Tests
+	{
+#if __IOS__
+		[Fact]
+		[Trait(Traits.InteractionType, Traits.InteractionTypes.Machine)]
+		public void GetCurrentUIWindow()
+		{
+			var window = WindowStateManager.Default.GetCurrentUIWindow();
+			Assert.NotNull(window);
+		}
+
+		[Fact]
+		[Trait(Traits.InteractionType, Traits.InteractionTypes.Machine)]
+		public void GetCurrentUIViewController()
+		{
+			var viewController = WindowStateManager.Default.GetCurrentUIViewController();
+			Assert.NotNull(viewController);
+		}
+#endif
+	}
+}

From 439853d004681b16a5ff20d0c16903606d1a77ee Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Thu, 20 Oct 2022 22:54:11 +0200
Subject: [PATCH 14/77] Back to CI version

---
 GitInfo.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GitInfo.txt b/GitInfo.txt
index 7d1a37e9b3ae..8fde075b5a37 100644
--- a/GitInfo.txt
+++ b/GitInfo.txt
@@ -1 +1 @@
-6.0.542
+6.0.542-ci.net6.0
\ No newline at end of file

From 5ef1a02a5aa5906a5df1a188fe25b4be5cb42fce Mon Sep 17 00:00:00 2001
From: scoban <sbanni@users.noreply.github.com>
Date: Fri, 21 Oct 2022 00:25:53 -0700
Subject: [PATCH 15/77] Update Package.appxmanifest to have PhonePublisherId
 (#9477)

* Update Package.appxmanifest to have PhonePublisherId

* Rename template variable to better represent what it is replacing

* Revert version back to 0.0.0.0 as that is the default placeholder value

* Update blazor template with phonepublisherid for publish scenarios
---
 .../src/templates/maui-blazor/.template.config/template.json | 5 +++++
 .../maui-blazor/Platforms/Windows/Package.appxmanifest       | 3 +++
 .../src/templates/maui-mobile/.template.config/template.json | 5 +++++
 .../maui-mobile/Platforms/Windows/Package.appxmanifest       | 3 +++
 4 files changed, 16 insertions(+)

diff --git a/src/Templates/src/templates/maui-blazor/.template.config/template.json b/src/Templates/src/templates/maui-blazor/.template.config/template.json
index 32e05c337a6d..ac5f96cf33f0 100644
--- a/src/Templates/src/templates/maui-blazor/.template.config/template.json
+++ b/src/Templates/src/templates/maui-blazor/.template.config/template.json
@@ -81,6 +81,11 @@
       "HostIdentifier": {
         "type": "bind",
         "binding": "HostIdentifier"
+      },
+      "PhoneProductId": {
+        "type": "generated",
+        "generator": "guid",
+        "replaces": "$guid9$"
       }
     },
     "defaultName": "MauiApp1"
diff --git a/src/Templates/src/templates/maui-blazor/Platforms/Windows/Package.appxmanifest b/src/Templates/src/templates/maui-blazor/Platforms/Windows/Package.appxmanifest
index 2bcb11edf7c6..ab686c3da0c7 100644
--- a/src/Templates/src/templates/maui-blazor/Platforms/Windows/Package.appxmanifest
+++ b/src/Templates/src/templates/maui-blazor/Platforms/Windows/Package.appxmanifest
@@ -2,11 +2,14 @@
 <Package
   xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
   xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+  xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
   xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
   IgnorableNamespaces="uap rescap">
 
   <Identity Name="maui-package-name-placeholder" Publisher="CN=User Name" Version="0.0.0.0" />
 
+  <mp:PhoneIdentity PhoneProductId="$guid9$" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
+
   <Properties>
     <DisplayName>$placeholder$</DisplayName>
     <PublisherDisplayName>User Name</PublisherDisplayName>
diff --git a/src/Templates/src/templates/maui-mobile/.template.config/template.json b/src/Templates/src/templates/maui-mobile/.template.config/template.json
index 6a22c7d7ff07..cc0ccc0e591e 100644
--- a/src/Templates/src/templates/maui-mobile/.template.config/template.json
+++ b/src/Templates/src/templates/maui-mobile/.template.config/template.json
@@ -85,6 +85,11 @@
       "HostIdentifier": {
         "type": "bind",
         "binding": "HostIdentifier"
+      },
+      "PhoneProductId": {
+        "type": "generated",
+        "generator": "guid",
+        "replaces": "$guid9$"
       }
     },
     "defaultName": "MauiApp1"
diff --git a/src/Templates/src/templates/maui-mobile/Platforms/Windows/Package.appxmanifest b/src/Templates/src/templates/maui-mobile/Platforms/Windows/Package.appxmanifest
index 2bcb11edf7c6..ab686c3da0c7 100644
--- a/src/Templates/src/templates/maui-mobile/Platforms/Windows/Package.appxmanifest
+++ b/src/Templates/src/templates/maui-mobile/Platforms/Windows/Package.appxmanifest
@@ -2,11 +2,14 @@
 <Package
   xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
   xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+  xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
   xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
   IgnorableNamespaces="uap rescap">
 
   <Identity Name="maui-package-name-placeholder" Publisher="CN=User Name" Version="0.0.0.0" />
 
+  <mp:PhoneIdentity PhoneProductId="$guid9$" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
+
   <Properties>
     <DisplayName>$placeholder$</DisplayName>
     <PublisherDisplayName>User Name</PublisherDisplayName>

From 758de201d4d41e5da4ed9bcb69743c598c4a8e73 Mon Sep 17 00:00:00 2001
From: Rui Marinho <me@ruimarinho.net>
Date: Fri, 21 Oct 2022 11:57:00 +0100
Subject: [PATCH 16/77] Fix net7 branch with Analyzers fixes (#10808)

* Fix windows PublicAPi

* Disable warning CA1416

* Disable more warnings

* Remove GlobalSuppressions

* Fix more android usage warnings

* More warnings ignore to CA1416, CA1422

* Revert analyzer version

Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
---
 eng/Versions.props                            |  2 +-
 .../AlertManager/AlertManager.Android.cs      |  5 ++++-
 src/Core/src/Dispatching/Dispatcher.iOS.cs    |  4 ++--
 .../UriImageSourceService.iOS.cs              |  4 ++--
 .../MauiAppCompatActivity.Lifecycle.cs        |  4 ++++
 src/Core/src/Platform/iOS/ButtonExtensions.cs |  2 ++
 src/Core/src/Platform/iOS/MauiCheckBox.cs     |  2 ++
 src/Core/src/Platform/iOS/MauiSwipeView.cs    |  3 +++
 .../Platform/iOS/UIApplicationExtensions.cs   |  4 ++++
 .../net-windows/PublicAPI.Unshipped.txt       |  2 --
 src/Essentials/src/Browser/Browser.ios.cs     |  2 ++
 .../src/Connectivity/Connectivity.android.cs  | 19 ++++++++++++++++---
 .../src/Contacts/Contacts.ios.macos.cs        |  3 +++
 .../DeviceDisplay/DeviceDisplay.android.cs    |  4 ++++
 .../src/DeviceDisplay/DeviceDisplay.ios.cs    |  3 +++
 .../src/FilePicker/FilePicker.ios.cs          |  5 +++++
 .../src/FileSystem/FileSystemUtils.android.cs |  4 ++++
 .../src/Flashlight/Flashlight.android.cs      | 12 +++++++++++-
 .../src/Flashlight/Flashlight.ios.cs          |  3 +++
 .../src/MediaPicker/MediaPicker.ios.cs        |  8 ++++++++
 .../src/Permissions/Permissions.android.cs    |  4 ++++
 .../Permissions.ios.tvos.watchos.cs           |  4 ++++
 .../Platform/IntermediateActivity.android.cs  |  4 ++++
 .../src/Platform/PlatformUtils.android.cs     |  9 +++++----
 .../src/Preferences/Preferences.android.cs    |  4 ++++
 .../src/Screenshot/Screenshot.android.cs      |  4 ++++
 .../src/Vibration/Vibration.android.cs        |  4 ++++
 ...thenticatorIntermediateActivity.android.cs |  4 ++++
 .../Platforms/Android/PlatformCanvas.cs       |  4 ++++
 .../Platforms/Android/TextLayoutUtils.cs      |  8 ++++++++
 .../Platforms/MaciOS/PlatformCanvas.cs        |  2 ++
 .../iOS/PlatformStringSizeService.cs          |  2 ++
 32 files changed, 132 insertions(+), 16 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 519d85ff8169..cd256543f03f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -39,7 +39,7 @@
     <MicrosoftAspNetCoreMetadataPackageVersion>7.0.0</MicrosoftAspNetCoreMetadataPackageVersion>
     <MicrosoftJSInteropPackageVersion>7.0.0</MicrosoftJSInteropPackageVersion>
     <!-- Other packages -->
-    <MicrosoftCodeAnalysisNetAnalyzersVersion>7.0.0-preview1.22518.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
+    <MicrosoftCodeAnalysisNetAnalyzersVersion>7.0.0-preview1.22274.2</MicrosoftCodeAnalysisNetAnalyzersVersion>
     <MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.3.3</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
     <MicrosoftCodeAnalysisBannedApiAnalyzersVersion>3.3.3</MicrosoftCodeAnalysisBannedApiAnalyzersVersion>
     <SystemNumericsVectorsVersion>4.5.0</SystemNumericsVectorsVersion>
diff --git a/src/Controls/src/Core/Platform/AlertManager/AlertManager.Android.cs b/src/Controls/src/Core/Platform/AlertManager/AlertManager.Android.cs
index 2d1f1c6d763b..6add340c3bb6 100644
--- a/src/Controls/src/Core/Platform/AlertManager/AlertManager.Android.cs
+++ b/src/Controls/src/Core/Platform/AlertManager/AlertManager.Android.cs
@@ -292,9 +292,12 @@ void UpdateProgressBarVisibility(bool isBusy)
 				if (!SupportsProgress)
 					return;
 #pragma warning disable 612, 618
-
+#pragma warning disable CA1416 // Validate platform compatibility
+#pragma warning disable CA1422 // Validate platform compatibility
 				Activity.SetProgressBarIndeterminate(true);
 				Activity.SetProgressBarIndeterminateVisibility(isBusy);
+#pragma warning restore CA1422 // Validate platform compatibility
+#pragma warning restore CA1416 // Validate platform compatibility
 #pragma warning restore 612, 618
 			}
 
diff --git a/src/Core/src/Dispatching/Dispatcher.iOS.cs b/src/Core/src/Dispatching/Dispatcher.iOS.cs
index ec316cd82f57..1ac70fdff595 100644
--- a/src/Core/src/Dispatching/Dispatcher.iOS.cs
+++ b/src/Core/src/Dispatching/Dispatcher.iOS.cs
@@ -101,9 +101,9 @@ public partial class DispatcherProvider
 	{
 		static IDispatcher? GetForCurrentThreadImplementation()
 		{
-#pragma warning disable BI1234, CA1416 // Type or member is obsolete, has [UnsupportedOSPlatform("ios6.0")], deprecated but still works
+#pragma warning disable BI1234, CA1416, CA1422 // Type or member is obsolete, has [UnsupportedOSPlatform("ios6.0")], deprecated but still works
 			var q = DispatchQueue.CurrentQueue;
-#pragma warning restore BI1234, CA1416 // Type or member is obsolete
+#pragma warning restore BI1234, CA1416, CA1422 // Type or member is obsolete
 			if (q != DispatchQueue.MainQueue)
 				return null;
 
diff --git a/src/Core/src/ImageSources/UriImageSourceService/UriImageSourceService.iOS.cs b/src/Core/src/ImageSources/UriImageSourceService/UriImageSourceService.iOS.cs
index d57868a9ff9b..f04460fa217f 100644
--- a/src/Core/src/ImageSources/UriImageSourceService/UriImageSourceService.iOS.cs
+++ b/src/Core/src/ImageSources/UriImageSourceService/UriImageSourceService.iOS.cs
@@ -78,9 +78,9 @@ public void CacheImage(NSData imageData, string path)
 
 			Directory.CreateDirectory(directory);
 
-#pragma warning disable CA1416 // https://github.com/xamarin/xamarin-macios/issues/14619
+#pragma warning disable CA1416, CA1422 // https://github.com/xamarin/xamarin-macios/issues/14619
 			var result = imageData.Save(path, true);
-#pragma warning restore CA1416
+#pragma warning restore CA1416, CA1422
 
 			if (result == false)
 				throw new InvalidOperationException($"Unable to cache image at '{path}'.");
diff --git a/src/Core/src/Platform/Android/MauiAppCompatActivity.Lifecycle.cs b/src/Core/src/Platform/Android/MauiAppCompatActivity.Lifecycle.cs
index 5c007b699b47..d37ec1e6bb8c 100644
--- a/src/Core/src/Platform/Android/MauiAppCompatActivity.Lifecycle.cs
+++ b/src/Core/src/Platform/Android/MauiAppCompatActivity.Lifecycle.cs
@@ -33,7 +33,11 @@ public override void OnBackPressed()
 			});
 
 			if (!preventBackPropagation)
+#pragma warning disable CA1416 // Validate platform compatibility
+#pragma warning disable CA1422 // Validate platform compatibility
 				base.OnBackPressed();
+#pragma warning restore CA1422 // Validate platform compatibility
+#pragma warning restore CA1416 // Validate platform compatibility
 		}
 
 		public override void OnConfigurationChanged(Configuration newConfig)
diff --git a/src/Core/src/Platform/iOS/ButtonExtensions.cs b/src/Core/src/Platform/iOS/ButtonExtensions.cs
index ce861a00881d..ed8a3468ad77 100644
--- a/src/Core/src/Platform/iOS/ButtonExtensions.cs
+++ b/src/Core/src/Platform/iOS/ButtonExtensions.cs
@@ -70,11 +70,13 @@ public static void UpdatePadding(this UIButton platformButton, Thickness padding
 				bottom = AlmostZero;
 
 #pragma warning disable CA1416 // TODO: 'UIButton.ContentEdgeInsets' is unsupported on: 'ios' 15.0 and later.
+#pragma warning disable CA1422 // Validate platform compatibility
 			platformButton.ContentEdgeInsets = new UIEdgeInsets(
 				(float)top,
 				(float)padding.Left,
 				(float)bottom,
 				(float)padding.Right);
+#pragma warning restore CA1422 // Validate platform compatibility
 #pragma warning restore CA1416
 		}
 
diff --git a/src/Core/src/Platform/iOS/MauiCheckBox.cs b/src/Core/src/Platform/iOS/MauiCheckBox.cs
index 5ae16ebf60eb..9de3eb43e66a 100644
--- a/src/Core/src/Platform/iOS/MauiCheckBox.cs
+++ b/src/Core/src/Platform/iOS/MauiCheckBox.cs
@@ -33,8 +33,10 @@ public MauiCheckBox()
 			HorizontalAlignment = UIControlContentHorizontalAlignment.Center;
 			VerticalAlignment = UIControlContentVerticalAlignment.Center;
 #pragma warning disable CA1416 // TODO: both has [UnsupportedOSPlatform("ios15.0")]
+#pragma warning disable CA1422 // Validate platform compatibility
 			AdjustsImageWhenDisabled = false;
 			AdjustsImageWhenHighlighted = false;
+#pragma warning restore CA1422 // Validate platform compatibility
 #pragma warning restore CA1416
 			TouchUpInside += OnTouchUpInside;
 		}
diff --git a/src/Core/src/Platform/iOS/MauiSwipeView.cs b/src/Core/src/Platform/iOS/MauiSwipeView.cs
index 4228188cee02..0e254fb0ce51 100644
--- a/src/Core/src/Platform/iOS/MauiSwipeView.cs
+++ b/src/Core/src/Platform/iOS/MauiSwipeView.cs
@@ -399,8 +399,10 @@ void UpdateSwipeItemInsets(UIButton button, float spacing = 0.0f)
 
 			var titleEdgeInsets = new UIEdgeInsets(spacing, -imageSize.Width, -imageSize.Height, 0.0f);
 #pragma warning disable CA1416 // TODO: 'TitleEdgeInsets', 'ImageEdgeInsets' has [UnsupportedOSPlatform("ios15.0")]
+#pragma warning disable CA1422 // Validate platform compatibility
 			button.TitleEdgeInsets = titleEdgeInsets;
 
+
 			var labelString = button.TitleLabel.Text ?? string.Empty;
 
 #pragma warning disable BI1234 // Type or member is obsolete, unsupported from version 7.0
@@ -408,6 +410,7 @@ void UpdateSwipeItemInsets(UIButton button, float spacing = 0.0f)
 #pragma warning restore BI1234 // Type or member is obsolete
 			var imageEdgeInsets = new UIEdgeInsets(-(titleSize.Height + spacing), 0.0f, 0.0f, -titleSize.Width);
 			button.ImageEdgeInsets = imageEdgeInsets;
+#pragma warning restore CA1422 // Validate platform compatibility
 #pragma warning restore CA1416
 		}
 
diff --git a/src/Core/src/Platform/iOS/UIApplicationExtensions.cs b/src/Core/src/Platform/iOS/UIApplicationExtensions.cs
index 96b4ac58ad97..6b48e5e8c454 100644
--- a/src/Core/src/Platform/iOS/UIApplicationExtensions.cs
+++ b/src/Core/src/Platform/iOS/UIApplicationExtensions.cs
@@ -12,6 +12,7 @@ internal static UIEdgeInsets GetSafeAreaInsetsForWindow(this UIApplication appli
 
 			if (!OperatingSystem.IsIOSVersionAtLeast(11))
 				safeAreaInsets = new UIEdgeInsets(UIApplication.SharedApplication.StatusBarFrame.Size.Height, 0, 0, 0);
+#pragma warning disable CA1422 // Validate platform compatibility
 			else if (application.GetKeyWindow() is UIWindow keyWindow)
 				safeAreaInsets = keyWindow.SafeAreaInsets;
 #pragma warning disable CA1416 // TODO: 'UIApplication.Windows' is unsupported on: 'ios' 15.0 and later.
@@ -20,6 +21,7 @@ internal static UIEdgeInsets GetSafeAreaInsetsForWindow(this UIApplication appli
 #pragma warning restore CA1416
 			else
 				safeAreaInsets = UIEdgeInsets.Zero;
+#pragma warning restore CA1422 // Validate platform compatibility
 
 			return safeAreaInsets;
 		}
@@ -27,7 +29,9 @@ internal static UIEdgeInsets GetSafeAreaInsetsForWindow(this UIApplication appli
 		public static UIWindow? GetKeyWindow(this UIApplication application)
 		{
 #pragma warning disable CA1416 // TODO: 'UIApplication.Windows' is unsupported on: 'ios' 15.0 and later.
+#pragma warning disable CA1422 // Validate platform compatibility
 			var windows = application.Windows;
+#pragma warning restore CA1422 // Validate platform compatibility
 #pragma warning restore CA1416
 
 			for (int i = 0; i < windows.Length; i++)
diff --git a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index 8a7a233bd2d6..abf1f58b6883 100644
--- a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -124,8 +124,6 @@ static Microsoft.Maui.Handlers.MenuFlyoutSeparatorHandler.CommandMapper -> Micro
 static Microsoft.Maui.Handlers.MenuFlyoutSeparatorHandler.Mapper -> Microsoft.Maui.IPropertyMapper<Microsoft.Maui.IMenuFlyoutSeparator!, Microsoft.Maui.Handlers.IMenuFlyoutSeparatorHandler!>!
 override Microsoft.Maui.Handlers.EditorHandler.SetVirtualView(Microsoft.Maui.IView! view) -> void
 override Microsoft.Maui.Handlers.EntryHandler.SetVirtualView(Microsoft.Maui.IView! view) -> void
-Microsoft.Maui.Platform.CalendarDatePickerExtensions
-static Microsoft.Maui.Platform.CalendarDatePickerExtensions.ToDateFormat(this string! dateFormat) -> string!
 *REMOVED*Microsoft.Maui.ScrollToRequest.HoriztonalOffset.get -> double
 *REMOVED*Microsoft.Maui.ScrollToRequest.HoriztonalOffset.init -> void
 *REMOVED*Microsoft.Maui.ScrollToRequest.ScrollToRequest(double HoriztonalOffset, double VerticalOffset, bool Instant) -> void
diff --git a/src/Essentials/src/Browser/Browser.ios.cs b/src/Essentials/src/Browser/Browser.ios.cs
index 93f3aa71c8d4..dd76660be9d8 100755
--- a/src/Essentials/src/Browser/Browser.ios.cs
+++ b/src/Essentials/src/Browser/Browser.ios.cs
@@ -29,7 +29,9 @@ private static async Task LaunchSafariViewController(Uri uri, BrowserLaunchOptio
 		{
 			var nativeUrl = new NSUrl(uri.AbsoluteUri);
 #pragma warning disable CA1416 // TODO: 'SFSafariViewController(NSUrl, bool)' is unsupported on: 'ios' 11.0 and later, there is an overload SFSafariViewController(NSUrl, SFSafariViewControllerConfiguration) supported from ios 11.0+
+#pragma warning disable CA1422 // Validate platform compatibility
 			var sfViewController = new SFSafariViewController(nativeUrl, false);
+#pragma warning restore CA1422 // Validate platform compatibility
 #pragma warning restore CA1416 // probably need to call the overloads depending on OS version
 			var vc = WindowStateManager.Default.GetCurrentUIViewController(true)!;
 
diff --git a/src/Essentials/src/Connectivity/Connectivity.android.cs b/src/Essentials/src/Connectivity/Connectivity.android.cs
index 1726762b7a2d..e3507b9e511d 100644
--- a/src/Essentials/src/Connectivity/Connectivity.android.cs
+++ b/src/Essentials/src/Connectivity/Connectivity.android.cs
@@ -137,7 +137,11 @@ public NetworkAccess NetworkAccess
 					var manager = ConnectivityManager;
 
 #pragma warning disable CS0618 // Type or member is obsolete
+#pragma warning disable CA1416 // Validate platform compatibility
+#pragma warning disable CA1422 // Validate platform compatibility
 					var networks = manager.GetAllNetworks();
+#pragma warning restore CA1422 // Validate platform compatibility
+#pragma warning restore CA1416 // Validate platform compatibility
 #pragma warning restore CS0618 // Type or member is obsolete
 
 					// some devices running 21 and 22 only use the older api.
@@ -157,13 +161,13 @@ public NetworkAccess NetworkAccess
 								continue;
 
 #pragma warning disable CS0618 // Type or member is obsolete
+#pragma warning disable CA1416 // Validate platform compatibility
+#pragma warning disable CA1422 // Validate platform compatibility
 							var info = manager.GetNetworkInfo(network);
-#pragma warning restore CS0618 // Type or member is obsolete
 
-#pragma warning disable CS0618 // Type or member is obsolete
 							if (info == null || !info.IsAvailable)
-#pragma warning restore CS0618 // Type or member is obsolete
 								continue;
+#pragma warning restore CS0618 // Type or member is obsolete
 
 							// Check to see if it has the internet capability
 							if (!capabilities.HasCapability(NetCapability.Internet))
@@ -196,10 +200,13 @@ void ProcessNetworkInfo(NetworkInfo info)
 					{
 						if (info == null || !info.IsAvailable)
 							return;
+
 						if (info.IsConnected)
 							currentAccess = IsBetterAccess(currentAccess, NetworkAccess.Internet);
 						else if (info.IsConnectedOrConnecting)
 							currentAccess = IsBetterAccess(currentAccess, NetworkAccess.ConstrainedInternet);
+#pragma warning restore CA1422 // Validate platform compatibility
+#pragma warning restore CA1416 // Validate platform compatibility
 #pragma warning restore CS0618 // Type or member is obsolete
 					}
 
@@ -221,6 +228,8 @@ public IEnumerable<ConnectionProfile> ConnectionProfiles
 
 				var manager = ConnectivityManager;
 #pragma warning disable CS0618 // Type or member is obsolete
+#pragma warning disable CA1416 // Validate platform compatibility
+#pragma warning disable CA1422 // Validate platform compatibility
 				var networks = manager.GetAllNetworks();
 #pragma warning restore CS0618 // Type or member is obsolete
 				foreach (var network in networks)
@@ -245,11 +254,15 @@ public IEnumerable<ConnectionProfile> ConnectionProfiles
 #pragma warning disable CS0618 // Type or member is obsolete
 				static ConnectionProfile? ProcessNetworkInfo(NetworkInfo info)
 				{
+
 					if (info == null || !info.IsAvailable || !info.IsConnectedOrConnecting)
 						return null;
 
+
 					return GetConnectionType(info.Type, info.TypeName);
 				}
+#pragma warning restore CA1422 // Validate platform compatibility
+#pragma warning restore CA1416 // Validate platform compatibility
 #pragma warning restore CS0618 // Type or member is obsolete
 			}
 		}
diff --git a/src/Essentials/src/Contacts/Contacts.ios.macos.cs b/src/Essentials/src/Contacts/Contacts.ios.macos.cs
index 6857beec4dbf..7684d8c14255 100644
--- a/src/Essentials/src/Contacts/Contacts.ios.macos.cs
+++ b/src/Essentials/src/Contacts/Contacts.ios.macos.cs
@@ -122,6 +122,7 @@ public ContactPickerDelegate(IntPtr handle)
 
 			public Action<CNContact> DidSelectContactHandler { get; }
 #pragma warning disable CA1416 // picker.DismissModalViewController(bool) has UnsupportedOSPlatform("ios6.0")]. (Deprecated but still works)
+#pragma warning disable CA1422 // Validate platform compatibility
 			public override void ContactPickerDidCancel(CNContactPickerViewController picker)
 			{
 				DidSelectContactHandler?.Invoke(default);
@@ -136,6 +137,8 @@ public override void DidSelectContact(CNContactPickerViewController picker, CNCo
 
 			public override void DidSelectContactProperty(CNContactPickerViewController picker, CNContactProperty contactProperty) =>
 				picker.DismissModalViewController(true);
+
+#pragma warning restore CA1422 // Validate platform compatibility
 #pragma warning restore CA1416
 		}
 #endif
diff --git a/src/Essentials/src/DeviceDisplay/DeviceDisplay.android.cs b/src/Essentials/src/DeviceDisplay/DeviceDisplay.android.cs
index 990f5cb3c08d..67dd25fa5a8f 100644
--- a/src/Essentials/src/DeviceDisplay/DeviceDisplay.android.cs
+++ b/src/Essentials/src/DeviceDisplay/DeviceDisplay.android.cs
@@ -37,8 +37,12 @@ protected override DisplayInfo GetMainDisplayInfo()
 			using var displayMetrics = new DisplayMetrics();
 			var display = GetDefaultDisplay();
 #pragma warning disable CS0618 // Type or member is obsolete
+#pragma warning disable CA1422 // Validate platform compatibility
+#pragma warning disable CA1416 // Validate platform compatibility
 			display?.GetRealMetrics(displayMetrics);
 #pragma warning restore CS0618 // Type or member is obsolete
+#pragma warning restore CA1422 // Validate platform compatibility
+#pragma warning restore CA1416 // Validate platform compatibility
 
 			return new DisplayInfo(
 				width: displayMetrics?.WidthPixels ?? 0,
diff --git a/src/Essentials/src/DeviceDisplay/DeviceDisplay.ios.cs b/src/Essentials/src/DeviceDisplay/DeviceDisplay.ios.cs
index 00ee927be616..12d9d66a3e87 100644
--- a/src/Essentials/src/DeviceDisplay/DeviceDisplay.ios.cs
+++ b/src/Essentials/src/DeviceDisplay/DeviceDisplay.ios.cs
@@ -49,6 +49,7 @@ void OnMainDisplayInfoChanged(NSNotification obj) =>
 			OnMainDisplayInfoChanged();
 
 #pragma warning disable CA1416 // UIApplication.StatusBarOrientation has [UnsupportedOSPlatform("ios9.0")]. (Deprecated but still works)
+#pragma warning disable CA1422 // Validate platform compatibility
 		static DisplayOrientation CalculateOrientation() =>
 			UIApplication.SharedApplication.StatusBarOrientation.IsLandscape()
 				? DisplayOrientation.Landscape
@@ -63,6 +64,8 @@ static DisplayRotation CalculateRotation() =>
 				UIInterfaceOrientation.LandscapeRight => DisplayRotation.Rotation90,
 				_ => DisplayRotation.Unknown,
 			};
+
+#pragma warning restore CA1422 // Validate platform compatibility
 #pragma warning restore CA1416
 	}
 }
diff --git a/src/Essentials/src/FilePicker/FilePicker.ios.cs b/src/Essentials/src/FilePicker/FilePicker.ios.cs
index c0aaebfd6767..13039e914d4f 100644
--- a/src/Essentials/src/FilePicker/FilePicker.ios.cs
+++ b/src/Essentials/src/FilePicker/FilePicker.ios.cs
@@ -15,6 +15,7 @@ partial class FilePickerImplementation : IFilePicker
 		async Task<IEnumerable<FileResult>> PlatformPickAsync(PickOptions options, bool allowMultiple = false)
 		{
 #pragma warning disable CA1416 // TODO: UTType has [UnsupportedOSPlatform("ios14.0")]
+#pragma warning disable CA1422 // Validate platform compatibility
 			var allowedUtis = options?.FileTypes?.Value?.ToArray() ?? new string[]
 			{
 				UTType.Content,
@@ -26,7 +27,9 @@ async Task<IEnumerable<FileResult>> PlatformPickAsync(PickOptions options, bool
 
 			// Use Open instead of Import so that we can attempt to use the original file.
 			// If the file is from an external provider, then it will be downloaded.
+
 			using var documentPicker = new UIDocumentPickerViewController(allowedUtis, UIDocumentPickerMode.Open);
+#pragma warning restore CA1422 // Validate platform compatibility
 #pragma warning restore CA1416 // Constructor UIDocumentPickerViewController  has [UnsupportedOSPlatform("ios14.0")]
 			if (OperatingSystem.IsIOSVersionAtLeast(11, 0))
 				documentPicker.AllowsMultipleSelection = allowMultiple;
@@ -80,6 +83,7 @@ public override void DidPickDocument(UIDocumentPickerViewController controller,
 	public partial class FilePickerFileType
 	{
 #pragma warning disable CA1416 // TODO: UTType has [UnsupportedOSPlatform("ios14.0")]
+#pragma warning disable CA1422 // Validate platform compatibility
 		static FilePickerFileType PlatformImageFileType() =>
 			new FilePickerFileType(new Dictionary<DevicePlatform, IEnumerable<string>>
 			{
@@ -109,6 +113,7 @@ static FilePickerFileType PlatformPdfFileType() =>
 			{
 				{ DevicePlatform.iOS, new[] { (string)UTType.PDF } }
 			});
+#pragma warning restore CA1422 // Validate platform compatibility
 #pragma warning restore CA1416
 	}
 }
diff --git a/src/Essentials/src/FileSystem/FileSystemUtils.android.cs b/src/Essentials/src/FileSystem/FileSystemUtils.android.cs
index 74cc61a8ccbc..e293e8b1383f 100644
--- a/src/Essentials/src/FileSystem/FileSystemUtils.android.cs
+++ b/src/Essentials/src/FileSystem/FileSystemUtils.android.cs
@@ -306,7 +306,11 @@ static string GetColumnValue(AndroidUri contentUri, string column, string select
 		static string GetDataFilePath(AndroidUri contentUri, string selection = null, string[] selectionArgs = null)
 		{
 #pragma warning disable CS0618 // Type or member is obsolete
+#pragma warning disable CA1422 // Validate platform compatibility
+#pragma warning disable CA1416 // Validate platform compatibility
 			const string column = MediaStore.Files.FileColumns.Data;
+#pragma warning restore CA1422 // Validate platform compatibility
+#pragma warning restore CA1416 // Validate platform compatibility
 #pragma warning restore CS0618 // Type or member is obsolete
 
 			// ask the content provider for the data column, which may contain the actual file path
diff --git a/src/Essentials/src/Flashlight/Flashlight.android.cs b/src/Essentials/src/Flashlight/Flashlight.android.cs
index 389adcf4f53c..e7e3ef975bd1 100644
--- a/src/Essentials/src/Flashlight/Flashlight.android.cs
+++ b/src/Essentials/src/Flashlight/Flashlight.android.cs
@@ -21,7 +21,11 @@ class FlashlightImplementation : IFlashlight
 		static readonly object locker = new object();
 
 #pragma warning disable CS0618
+#pragma warning disable CA1416 // Validate platform compatibility
+#pragma warning disable CA1422 // Validate platform compatibility
 		Camera camera;
+#pragma warning restore CA1416 // Validate platform compatibility
+#pragma warning restore CA1422 // Validate platform compatibility
 #pragma warning restore CS0618
 		SurfaceTexture surface;
 
@@ -85,10 +89,14 @@ Task ToggleTorchAsync(bool switchOn)
 								surface = new SurfaceTexture(0);
 
 #pragma warning disable CS0618 // Camera types are deprecated in Android 10+
+#pragma warning disable CA1416 // Validate platform compatibility
+#pragma warning disable CA1422 // Validate platform compatibility
 							camera = Camera.Open();
 
+
 							// Nexus 5 and some devices require a preview texture
 							camera.SetPreviewTexture(surface);
+
 						}
 
 						var param = camera.GetParameters();
@@ -107,10 +115,12 @@ Task ToggleTorchAsync(bool switchOn)
 							camera.StopPreview();
 							camera.Release();
 							camera.Dispose();
-#pragma warning restore CS0618 // Type or member is obsolete
 							camera = null;
 							surface.Dispose();
 							surface = null;
+#pragma warning restore CS0618 // Type or member is obsolete
+#pragma warning restore CA1416 // Validate platform compatibility
+#pragma warning restore CA1422 // Validate platform compatibility
 						}
 					}
 				}
diff --git a/src/Essentials/src/Flashlight/Flashlight.ios.cs b/src/Essentials/src/Flashlight/Flashlight.ios.cs
index e944aa3fa769..214b47281392 100644
--- a/src/Essentials/src/Flashlight/Flashlight.ios.cs
+++ b/src/Essentials/src/Flashlight/Flashlight.ios.cs
@@ -23,6 +23,7 @@ public Task TurnOffAsync()
 		void Toggle(bool on)
 		{
 #pragma warning disable CA1416 // https://github.com/xamarin/xamarin-macios/issues/14619
+#pragma warning disable CA1422 // Validate platform compatibility
 			var captureDevice = AVCaptureDevice.GetDefaultDevice(AVMediaTypes.Video);
 			if (captureDevice == null || !(captureDevice.HasFlash || captureDevice.HasTorch))
 				throw new FeatureNotSupportedException();
@@ -48,6 +49,8 @@ void Toggle(bool on)
 			}
 
 			captureDevice.UnlockForConfiguration();
+
+#pragma warning restore CA1422 // Validate platform compatibility
 #pragma warning restore CA1416
 			captureDevice.Dispose();
 			captureDevice = null;
diff --git a/src/Essentials/src/MediaPicker/MediaPicker.ios.cs b/src/Essentials/src/MediaPicker/MediaPicker.ios.cs
index ba62588677b2..b2dbd36c1e6c 100644
--- a/src/Essentials/src/MediaPicker/MediaPicker.ios.cs
+++ b/src/Essentials/src/MediaPicker/MediaPicker.ios.cs
@@ -43,8 +43,10 @@ public Task<FileResult> CaptureVideoAsync(MediaPickerOptions options)
 		public async Task<FileResult> PhotoAsync(MediaPickerOptions options, bool photo, bool pickExisting)
 		{
 #pragma warning disable CA1416 // TODO: UIImagePickerControllerSourceType.PhotoLibrary, UTType.Image, UTType.Movie is supported on ios version 14 and above
+#pragma warning disable CA1422 // Validate platform compatibility
 			var sourceType = pickExisting ? UIImagePickerControllerSourceType.PhotoLibrary : UIImagePickerControllerSourceType.Camera;
 			var mediaType = photo ? UTType.Image : UTType.Movie;
+#pragma warning restore CA1422 // Validate platform compatibility
 #pragma warning restore CA1416
 
 			if (!UIImagePickerController.IsSourceTypeAvailable(sourceType))
@@ -138,13 +140,16 @@ static FileResult DictionaryToMediaFile(NSDictionary info)
 					if (!assetUrl.Scheme.Equals("assets-library", StringComparison.OrdinalIgnoreCase))
 						return new UIDocumentFileResult(assetUrl);
 #pragma warning disable CA1416 // TODO: 'UIImagePickerController.PHAsset' is only supported on: 'ios' from version 11.0 to 14.0
+#pragma warning disable CA1422 // Validate platform compatibility
 					phAsset = info.ValueForKey(UIImagePickerController.PHAsset) as PHAsset;
+#pragma warning restore CA1422 // Validate platform compatibility
 #pragma warning restore CA1416
 				}
 			}
 
 #if !MACCATALYST
 #pragma warning disable CA1416 // TODO: 'UIImagePickerController.ReferenceUrl' is unsupported on 'ios' 11.0 and later
+#pragma warning disable CA1422 // Validate platform compatibility
 			if (phAsset == null)
 			{
 				assetUrl = info[UIImagePickerController.ReferenceUrl] as NSUrl;
@@ -152,6 +157,7 @@ static FileResult DictionaryToMediaFile(NSDictionary info)
 				if (assetUrl != null)
 					phAsset = PHAsset.FetchAssets(new NSUrl[] { assetUrl }, null)?.LastObject as PHAsset;
 			}
+#pragma warning restore CA1422 // Validate platform compatibility
 #pragma warning restore CA1416 // 'PHAsset.FetchAssets(NSUrl[], PHFetchOptions?)' is unsupported on 'ios' 11.0 and later
 #endif
 
@@ -166,7 +172,9 @@ static FileResult DictionaryToMediaFile(NSDictionary info)
 			if (phAsset == null || assetUrl == null)
 				return null;
 #pragma warning disable CA1416 // https://github.com/xamarin/xamarin-macios/issues/14619
+#pragma warning disable CA1422 // Validate platform compatibility
 			string originalFilename = PHAssetResource.GetAssetResources(phAsset).FirstOrDefault()?.OriginalFilename;
+#pragma warning restore CA1422 // Validate platform compatibility
 #pragma warning restore CA1416
 			return new PHAssetFileResult(assetUrl, phAsset, originalFilename);
 		}
diff --git a/src/Essentials/src/Permissions/Permissions.android.cs b/src/Essentials/src/Permissions/Permissions.android.cs
index 42efc44f166d..35725ba97448 100644
--- a/src/Essentials/src/Permissions/Permissions.android.cs
+++ b/src/Essentials/src/Permissions/Permissions.android.cs
@@ -373,12 +373,16 @@ public override (string androidPermission, bool isRuntime)[] RequiredPermissions
 					}
 
 #pragma warning disable CS0618 // Type or member is obsolete
+#pragma warning disable CA1416 // Validate platform compatibility
+#pragma warning disable CA1422 // Validate platform compatibility
 					if (IsDeclaredInManifest(Manifest.Permission.ProcessOutgoingCalls))
 					{
 						if (OperatingSystem.IsAndroidVersionAtLeast((int)BuildVersionCodes.Q))
 							System.Diagnostics.Debug.WriteLine($"{Manifest.Permission.ProcessOutgoingCalls} is deprecated in Android 10");
 						permissions.Add((Manifest.Permission.ProcessOutgoingCalls, true));
 					}
+#pragma warning restore CA1422 // Validate platform compatibility
+#pragma warning restore CA1416 // Validate platform compatibility
 #pragma warning restore CS0618 // Type or member is obsolete
 
 					return permissions.ToArray();
diff --git a/src/Essentials/src/Permissions/Permissions.ios.tvos.watchos.cs b/src/Essentials/src/Permissions/Permissions.ios.tvos.watchos.cs
index 3e305252a6aa..923e6e033686 100644
--- a/src/Essentials/src/Permissions/Permissions.ios.tvos.watchos.cs
+++ b/src/Essentials/src/Permissions/Permissions.ios.tvos.watchos.cs
@@ -110,7 +110,9 @@ public override async Task<PermissionStatus> RequestAsync()
 				EnsureMainThread();
 
 #pragma warning disable CA1416 // https://github.com/xamarin/xamarin-macios/issues/14619
+#pragma warning disable CA1422 // Validate platform compatibility
 				return await RequestLocationAsync(true, lm => lm.RequestWhenInUseAuthorization());
+#pragma warning restore CA1422 // Validate platform compatibility
 #pragma warning restore CA1416
 			}
 
@@ -120,7 +122,9 @@ internal static PermissionStatus GetLocationStatus(bool whenInUse)
 					return PermissionStatus.Disabled;
 
 #pragma warning disable CA1416 // TODO: CLLocationManager.Status has [UnsupportedOSPlatform("ios14.0")], [UnsupportedOSPlatform("macos11.0")], [UnsupportedOSPlatform("tvos14.0")], [UnsupportedOSPlatform("watchos7.0")]
+#pragma warning disable CA1422 // Validate platform compatibility
 				var status = CLLocationManager.Status;
+#pragma warning restore CA1422 // Validate platform compatibility
 #pragma warning restore CA1416
 
 				return status switch
diff --git a/src/Essentials/src/Platform/IntermediateActivity.android.cs b/src/Essentials/src/Platform/IntermediateActivity.android.cs
index 4aaccc13f0cc..fb605f4e93e5 100644
--- a/src/Essentials/src/Platform/IntermediateActivity.android.cs
+++ b/src/Essentials/src/Platform/IntermediateActivity.android.cs
@@ -33,7 +33,11 @@ protected override void OnCreate(Bundle? savedInstanceState)
 			// read the values
 			launched = extras?.GetBoolean(launchedExtra, false) ?? false;
 #pragma warning disable 618 // TODO: one day use the API 33+ version: https://developer.android.com/reference/android/os/Bundle#getParcelable(java.lang.String,%20java.lang.Class%3CT%3E)
+#pragma warning disable CA1422 // Validate platform compatibility
+#pragma warning disable CA1416 // Validate platform compatibility
 			actualIntent = extras?.GetParcelable(actualIntentExtra) as Intent;
+#pragma warning restore CA1422 // Validate platform compatibility
+#pragma warning restore CA1416 // Validate platform compatibility
 #pragma warning restore 618
 			guid = extras?.GetString(guidExtra);
 			requestCode = extras?.GetInt(requestCodeExtra, -1) ?? -1;
diff --git a/src/Essentials/src/Platform/PlatformUtils.android.cs b/src/Essentials/src/Platform/PlatformUtils.android.cs
index 9035fcf75cff..e5cb453c3b18 100644
--- a/src/Essentials/src/Platform/PlatformUtils.android.cs
+++ b/src/Essentials/src/Platform/PlatformUtils.android.cs
@@ -79,11 +79,12 @@ internal static void SetLocale(Java.Util.Locale locale)
 			else
 #endif
 #pragma warning disable CS0618 // Type or member is obsolete
-			config.Locale = locale;
-#pragma warning restore CS0618 // Type or member is obsolete
-
-#pragma warning disable CS0618 // Type or member is obsolete
+#pragma warning disable CA1422 // Validate platform compatibility
+#pragma warning disable CA1416 // Validate platform compatibility
+				config.Locale = locale;
 			resources.UpdateConfiguration(config, resources.DisplayMetrics);
+#pragma warning restore CA1422 // Validate platform compatibility
+#pragma warning restore CA1416 // Validate platform compatibility
 #pragma warning restore CS0618 // Type or member is obsolete
 		}
 	}
diff --git a/src/Essentials/src/Preferences/Preferences.android.cs b/src/Essentials/src/Preferences/Preferences.android.cs
index 8e3339504e8a..25f62be8be1f 100644
--- a/src/Essentials/src/Preferences/Preferences.android.cs
+++ b/src/Essentials/src/Preferences/Preferences.android.cs
@@ -155,11 +155,15 @@ internal static ISharedPreferences GetSharedPreferences(string sharedName)
 		{
 			var context = Application.Context;
 
+#pragma warning disable CA1416 // Validate platform compatibility
+#pragma warning disable CA1422 // Validate platform compatibility
 			return string.IsNullOrWhiteSpace(sharedName) ?
 #pragma warning disable CS0618 // Type or member is obsolete
 				PreferenceManager.GetDefaultSharedPreferences(context) :
 #pragma warning restore CS0618 // Type or member is obsolete
 					context.GetSharedPreferences(sharedName, FileCreationMode.Private);
+#pragma warning restore CA1422 // Validate platform compatibility
+#pragma warning restore CA1416 // Validate platform compatibility
 		}
 	}
 }
diff --git a/src/Essentials/src/Screenshot/Screenshot.android.cs b/src/Essentials/src/Screenshot/Screenshot.android.cs
index 7eb7ca83dbce..ccb139f90fa2 100644
--- a/src/Essentials/src/Screenshot/Screenshot.android.cs
+++ b/src/Essentials/src/Screenshot/Screenshot.android.cs
@@ -86,6 +86,8 @@ static Bitmap RenderUsingCanvasDrawing(View view)
 		static Bitmap RenderUsingDrawingCache(View view)
 		{
 #pragma warning disable CS0618 // Type or member is obsolete
+#pragma warning disable CA1416 // Validate platform compatibility
+#pragma warning disable CA1422 // Validate platform compatibility
 			try
 			{
 				var enabled = view.DrawingCacheEnabled;
@@ -102,6 +104,8 @@ static Bitmap RenderUsingDrawingCache(View view)
 			{
 				return null;
 			}
+#pragma warning restore CA1422 // Validate platform compatibility
+#pragma warning restore CA1416 // Validate platform compatibility
 #pragma warning restore CS0618 // Type or member is obsolete
 		}
 	}
diff --git a/src/Essentials/src/Vibration/Vibration.android.cs b/src/Essentials/src/Vibration/Vibration.android.cs
index f96501872d30..51a5fad77fe4 100644
--- a/src/Essentials/src/Vibration/Vibration.android.cs
+++ b/src/Essentials/src/Vibration/Vibration.android.cs
@@ -23,7 +23,11 @@ partial class VibrationImplementation : IVibration
 
 		static Vibrator? VibratorServiceVibrator =>
 #pragma warning disable CS0618 // Type or member is obsolete
+#pragma warning disable CA1422 // Validate platform compatibility
+#pragma warning disable CA1416 // Validate platform compatibility
 			Application.Context.GetSystemService(Context.VibratorService) as Vibrator;
+#pragma warning restore CA1422 // Validate platform compatibility
+#pragma warning restore CA1416 // Validate platform compatibility
 #pragma warning restore CS0618 // Type or member is obsolete
 
 		static Vibrator? vibrator;
diff --git a/src/Essentials/src/WebAuthenticator/WebAuthenticatorIntermediateActivity.android.cs b/src/Essentials/src/WebAuthenticator/WebAuthenticatorIntermediateActivity.android.cs
index 8995c7d8730f..ab90862c4325 100644
--- a/src/Essentials/src/WebAuthenticator/WebAuthenticatorIntermediateActivity.android.cs
+++ b/src/Essentials/src/WebAuthenticator/WebAuthenticatorIntermediateActivity.android.cs
@@ -23,7 +23,11 @@ protected override void OnCreate(Bundle savedInstanceState)
 			// read the values
 			launched = extras.GetBoolean(launchedExtra, false);
 #pragma warning disable 618 // TODO: one day use the API 33+ version: https://developer.android.com/reference/android/os/Bundle#getParcelable(java.lang.String,%20java.lang.Class%3CT%3E)
+#pragma warning disable CA1422 // Validate platform compatibility
+#pragma warning disable CA1416 // Validate platform compatibility
 			actualIntent = extras.GetParcelable(actualIntentExtra) as Intent;
+#pragma warning restore CA1422 // Validate platform compatibility
+#pragma warning restore CA1416 // Validate platform compatibility
 #pragma warning restore 618
 		}
 
diff --git a/src/Graphics/src/Graphics/Platforms/Android/PlatformCanvas.cs b/src/Graphics/src/Graphics/Platforms/Android/PlatformCanvas.cs
index 5d8f20936a57..e4a4c28582a7 100644
--- a/src/Graphics/src/Graphics/Platforms/Android/PlatformCanvas.cs
+++ b/src/Graphics/src/Graphics/Platforms/Android/PlatformCanvas.cs
@@ -602,6 +602,8 @@ private void DrawString(string value, float x, float y)
 
 			_canvas.Save();
 			_canvas.Translate(x, y - CurrentState.ScaledFontSize);
+#pragma warning disable CA1416 // Validate platform compatibility
+#pragma warning disable CA1422 // Validate platform compatibility
 			var layout = new StaticLayout(
 				value,
 				CurrentState.FontPaint,
@@ -610,6 +612,8 @@ private void DrawString(string value, float x, float y)
 				1f,
 				0f,
 				false);
+#pragma warning restore CA1422 // Validate platform compatibility
+#pragma warning restore CA1416 // Validate platform compatibility
 			layout.Draw(_canvas);
 			_canvas.Restore();
 		}
diff --git a/src/Graphics/src/Graphics/Platforms/Android/TextLayoutUtils.cs b/src/Graphics/src/Graphics/Platforms/Android/TextLayoutUtils.cs
index dae30d858d64..fbef6ac3aab3 100644
--- a/src/Graphics/src/Graphics/Platforms/Android/TextLayoutUtils.cs
+++ b/src/Graphics/src/Graphics/Platforms/Android/TextLayoutUtils.cs
@@ -11,6 +11,8 @@ public static StaticLayout CreateLayout(string text, TextPaint textPaint, int? b
 			if (boundedWidth > 0)
 				finalWidth = (int)boundedWidth;
 
+#pragma warning disable CA1416 // Validate platform compatibility
+#pragma warning disable CA1422 // Validate platform compatibility
 			var layout = new StaticLayout(
 				text, // Text to layout
 				textPaint, // Text paint (font, size, etc...) to use
@@ -19,6 +21,8 @@ public static StaticLayout CreateLayout(string text, TextPaint textPaint, int? b
 				1.0f, // Spacing multiplier
 				0.0f, // Additional spacing
 				false); // Include padding
+#pragma warning restore CA1422 // Validate platform compatibility
+#pragma warning restore CA1416 // Validate platform compatibility
 
 			return layout;
 		}
@@ -30,6 +34,8 @@ public static StaticLayout CreateLayoutForSpannedString(SpannableString spannedS
 				finalWidth = (int)boundedWidth;
 
 #pragma warning disable CS0618 // Type or member is obsolete
+#pragma warning disable CA1416 // Validate platform compatibility
+#pragma warning disable CA1422 // Validate platform compatibility
 			var layout = new StaticLayout(
 				spannedString, // Text to layout
 				textPaint, // Text paint (font, size, etc...) to use
@@ -38,6 +44,8 @@ public static StaticLayout CreateLayoutForSpannedString(SpannableString spannedS
 				1.0f, // Spacing multiplier
 				0.0f, // Additional spacing
 				false); // Include padding
+#pragma warning restore CA1422 // Validate platform compatibility
+#pragma warning restore CA1416 // Validate platform compatibility
 #pragma warning restore CS0618 // Type or member is obsolete
 
 			return layout;
diff --git a/src/Graphics/src/Graphics/Platforms/MaciOS/PlatformCanvas.cs b/src/Graphics/src/Graphics/Platforms/MaciOS/PlatformCanvas.cs
index 016e395ff790..2e9a990570f1 100644
--- a/src/Graphics/src/Graphics/Platforms/MaciOS/PlatformCanvas.cs
+++ b/src/Graphics/src/Graphics/Platforms/MaciOS/PlatformCanvas.cs
@@ -1020,7 +1020,9 @@ private void DrawString(string value, float x, float y)
 			_context.SetTextDrawingMode(CGTextDrawingMode.Fill);
 			_context.TextMatrix = FlipTransform;
 #pragma warning disable BI1234 // Type or member is obsolete
+#pragma warning disable CA1422 // Validate platform compatibility
 			_context.ShowTextAtPoint(x, y, value);
+#pragma warning restore CA1422 // Validate platform compatibility
 #pragma warning restore BI1234 // Type or member is obsolete
 		}
 
diff --git a/src/Graphics/src/Graphics/Platforms/iOS/PlatformStringSizeService.cs b/src/Graphics/src/Graphics/Platforms/iOS/PlatformStringSizeService.cs
index ee12701a8d02..d409104eac29 100644
--- a/src/Graphics/src/Graphics/Platforms/iOS/PlatformStringSizeService.cs
+++ b/src/Graphics/src/Graphics/Platforms/iOS/PlatformStringSizeService.cs
@@ -30,7 +30,9 @@ public SizeF GetStringSize(string value, IFont font, float fontSize)
 			}
 			else
 			{
+#pragma warning disable CA1422 // Validate platform compatibility
 				size = nsString.StringSize(uiFont, CGSize.Empty);
+#pragma warning restore CA1422 // Validate platform compatibility
 			}
 
 			uiFont.Dispose();

From f92de3b36bab3f00058167b6f276f19470ddba50 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 21 Oct 2022 12:11:53 +0100
Subject: [PATCH 17/77] [create-pull-request] automated change (#10817)

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

diff --git a/src/Essentials/test/DeviceTests/Tests/Preferences_Tests.cs b/src/Essentials/test/DeviceTests/Tests/Preferences_Tests.cs
index cf628cff602c..8fd0c16fca9c 100644
--- a/src/Essentials/test/DeviceTests/Tests/Preferences_Tests.cs
+++ b/src/Essentials/test/DeviceTests/Tests/Preferences_Tests.cs
@@ -342,7 +342,7 @@ public void Remove_NonStatic(string sharedName)
 
 			Assert.Null(Preferences.Default.Get<string>("RemoveKey1", null, sharedName));
 		}
-		
+
 		[Theory]
 		[InlineData(null, true)]
 		[InlineData(sharedNameTestData, true)]

From 3624d889e4f4260406da45c6426890b8301d4475 Mon Sep 17 00:00:00 2001
From: "E.Z. Hart" <hartez@users.noreply.github.com>
Date: Fri, 21 Oct 2022 05:13:36 -0600
Subject: [PATCH 18/77] Add check to ensure measurement for
 AndExpandLayoutManager (#10813) Fixes #8816

Fixes #8816
---
 .../src/Core/Layout/AndExpandLayoutManager.cs     |  7 +++++++
 .../Core.UnitTests/Layouts/AndExpandTests.cs      | 15 +++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/src/Controls/src/Core/Layout/AndExpandLayoutManager.cs b/src/Controls/src/Core/Layout/AndExpandLayoutManager.cs
index 64e0d60f8cea..95dd8a28e35e 100644
--- a/src/Controls/src/Core/Layout/AndExpandLayoutManager.cs
+++ b/src/Controls/src/Core/Layout/AndExpandLayoutManager.cs
@@ -27,6 +27,13 @@ public Size Measure(double widthConstraint, double heightConstraint)
 
 		public Size ArrangeChildren(Rect bounds)
 		{
+			if (_manager == null)
+			{
+				// This shouldn't really happen, but some compatibility layouts might be 
+				// forcing a layout without a measure, so we'll have to ensure measurement happens here
+				Measure(bounds.Width, bounds.Height);
+			}
+
 			return _manager.ArrangeChildren(bounds);
 		}
 
diff --git a/src/Controls/tests/Core.UnitTests/Layouts/AndExpandTests.cs b/src/Controls/tests/Core.UnitTests/Layouts/AndExpandTests.cs
index eaff1b11e2de..16b5c9779e88 100644
--- a/src/Controls/tests/Core.UnitTests/Layouts/AndExpandTests.cs
+++ b/src/Controls/tests/Core.UnitTests/Layouts/AndExpandTests.cs
@@ -317,5 +317,20 @@ public void AndExpandDoesNotInterfereWithBindingContext()
 			Assert.Equal(testText, view0.Text);
 			Assert.Equal(vm, view0.BindingContext);
 		}
+
+		[Fact]
+		public void EnsuresMeasure()
+		{
+			var view0 = new TestView
+			{
+				Text = "Hello",
+				VerticalOptions = LayoutOptions.FillAndExpand
+			};
+
+			var layout = new StackLayout();
+			layout.Add(view0);
+
+			(layout as Maui.ILayout).CrossPlatformArrange(new Rect(0, 0, 100, 100));
+		}
 	}
 }

From df7ad3da02cfbb4d3cbf07b8babf35958c2c9abe Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 21 Oct 2022 15:41:22 +0100
Subject: [PATCH 19/77] [net7.0] Update dependencies from
 xamarin/xamarin-macios (#10810)

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221020.23

Microsoft.macOS.Sdk
 From Version 12.3.2365 -> To Version 12.3.2366

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221020.23

Microsoft.MacCatalyst.Sdk
 From Version 15.4.2365 -> To Version 15.4.2366

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221020.24

Microsoft.iOS.Sdk
 From Version 16.0.1469 -> To Version 16.0.1470

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221020.24

Microsoft.tvOS.Sdk
 From Version 16.0.1469 -> To Version 16.0.1470

* Add feed back

* Revert analyzer

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Rui Marinho <me@ruimarinho.net>
---
 eng/Version.Details.xml | 16 ++++++++--------
 eng/Versions.props      |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index d4b4ecc45e7b..e849f90fa3e3 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -12,21 +12,21 @@
       <Uri>https://github.com/xamarin/xamarin-android</Uri>
       <Sha>d8b5a177afa0061ed34390373f1b7918f308f016</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.4.2365">
+    <Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.4.2366">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>c53d89a6dad1e11ef4ff63759395b89272318f4d</Sha>
+      <Sha>bf2c75cdfd53558b2a25de623cd4e7cb1d60a496</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.macOS.Sdk" Version="12.3.2365">
+    <Dependency Name="Microsoft.macOS.Sdk" Version="12.3.2366">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>c53d89a6dad1e11ef4ff63759395b89272318f4d</Sha>
+      <Sha>bf2c75cdfd53558b2a25de623cd4e7cb1d60a496</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.iOS.Sdk" Version="16.0.1469">
+    <Dependency Name="Microsoft.iOS.Sdk" Version="16.0.1470">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>d02f860266d5d3e39c3baf4d962bbd4a48d09af4</Sha>
+      <Sha>ded7fcc2b795c76190faf07c33e1e8f83d17355c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.tvOS.Sdk" Version="16.0.1469">
+    <Dependency Name="Microsoft.tvOS.Sdk" Version="16.0.1470">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>d02f860266d5d3e39c3baf4d962bbd4a48d09af4</Sha>
+      <Sha>ded7fcc2b795c76190faf07c33e1e8f83d17355c</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.0-rtm.22504.3" CoherentParentDependency="Microsoft.NETCore.App.Ref">
       <Uri>https://github.com/dotnet/emsdk</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index cd256543f03f..d47f20ef5165 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -13,10 +13,10 @@
     <!-- xamarin/xamarin-android -->
     <MicrosoftAndroidSdkWindowsPackageVersion>33.0.3</MicrosoftAndroidSdkWindowsPackageVersion>
     <!-- xamarin/xamarin-macios -->
-    <MicrosoftMacCatalystSdkPackageVersion>15.4.2365</MicrosoftMacCatalystSdkPackageVersion>
-    <MicrosoftmacOSSdkPackageVersion>12.3.2365</MicrosoftmacOSSdkPackageVersion>
-    <MicrosoftiOSSdkPackageVersion>16.0.1469</MicrosoftiOSSdkPackageVersion>
-    <MicrosofttvOSSdkPackageVersion>16.0.1469</MicrosofttvOSSdkPackageVersion>
+    <MicrosoftMacCatalystSdkPackageVersion>15.4.2366</MicrosoftMacCatalystSdkPackageVersion>
+    <MicrosoftmacOSSdkPackageVersion>12.3.2366</MicrosoftmacOSSdkPackageVersion>
+    <MicrosoftiOSSdkPackageVersion>16.0.1470</MicrosoftiOSSdkPackageVersion>
+    <MicrosofttvOSSdkPackageVersion>16.0.1470</MicrosofttvOSSdkPackageVersion>
     <!-- Samsung/Tizen.NET -->
     <SamsungTizenSdkPackageVersion>7.0.100-rc.2.24</SamsungTizenSdkPackageVersion>
     <!-- emsdk -->

From 8195060b0274ec31dd094022d4bb5a7ef3e16202 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 21 Oct 2022 15:42:20 +0100
Subject: [PATCH 20/77] [net7.0] Update dependencies from
 xamarin/xamarin-android (#10815)

* Update dependencies from https://github.com/xamarin/xamarin-android build 7.0.1xx-8f1d9a47205ead80132661f68b0cee9ed0e0220b-1

Microsoft.Android.Sdk.Windows
 From Version 33.0.3 -> To Version 33.0.4

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal
 From Version 7.0.100-rtm.22517.4 -> To Version 7.0.100-rtm.22519.39 (parent: Microsoft.Android.Sdk.Windows

* Add feed back

* Revert Analyzer

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Rui Marinho <me@ruimarinho.net>
---
 eng/Version.Details.xml | 8 ++++----
 eng/Versions.props      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index e849f90fa3e3..ef0ae8549261 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,16 +1,16 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-rtm.22517.4" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
+    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-rtm.22519.39" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
       <Uri>https://github.com/dotnet/installer</Uri>
-      <Sha>036f883b74c6825c1d89280995d6c33e52c5f23e</Sha>
+      <Sha>e6dd91c290b808f971a1ac69c2fb29395bbf1051</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-rtm.22511.4" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>d25158d0dffd699340cedcfd43324c87a809a214</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Android.Sdk.Windows" Version="33.0.3">
+    <Dependency Name="Microsoft.Android.Sdk.Windows" Version="33.0.4">
       <Uri>https://github.com/xamarin/xamarin-android</Uri>
-      <Sha>d8b5a177afa0061ed34390373f1b7918f308f016</Sha>
+      <Sha>8f1d9a47205ead80132661f68b0cee9ed0e0220b</Sha>
     </Dependency>
     <Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.4.2366">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index d47f20ef5165..372016d72dcd 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -3,7 +3,7 @@
     <!-- Current previous .NET SDK major version's stable release of MAUI packages -->
     <MicrosoftMauiPreviousDotNetReleasedVersion>6.0.541</MicrosoftMauiPreviousDotNetReleasedVersion>
     <!-- dotnet/installer -->
-    <MicrosoftDotnetSdkInternalPackageVersion>7.0.100-rtm.22517.4</MicrosoftDotnetSdkInternalPackageVersion>
+    <MicrosoftDotnetSdkInternalPackageVersion>7.0.100-rtm.22519.39</MicrosoftDotnetSdkInternalPackageVersion>
     <!-- dotnet/runtime -->
     <MicrosoftNETCoreAppRefPackageVersion>7.0.0-rtm.22511.4</MicrosoftNETCoreAppRefPackageVersion>
     <!-- NOTE: should eventually revert back to $(MicrosoftNETCoreAppRefPackageVersion) in .NET 7 -->
@@ -11,7 +11,7 @@
     <MicrosoftExtensionsServicingPackageVersion>7.0.0</MicrosoftExtensionsServicingPackageVersion>
     <SystemCodeDomPackageVersion>7.0.0</SystemCodeDomPackageVersion>
     <!-- xamarin/xamarin-android -->
-    <MicrosoftAndroidSdkWindowsPackageVersion>33.0.3</MicrosoftAndroidSdkWindowsPackageVersion>
+    <MicrosoftAndroidSdkWindowsPackageVersion>33.0.4</MicrosoftAndroidSdkWindowsPackageVersion>
     <!-- xamarin/xamarin-macios -->
     <MicrosoftMacCatalystSdkPackageVersion>15.4.2366</MicrosoftMacCatalystSdkPackageVersion>
     <MicrosoftmacOSSdkPackageVersion>12.3.2366</MicrosoftmacOSSdkPackageVersion>

From b6e8de80fc6559c3d224dbe228b7604b416bb40f Mon Sep 17 00:00:00 2001
From: scoban <sbanni@users.noreply.github.com>
Date: Fri, 21 Oct 2022 00:25:53 -0700
Subject: [PATCH 21/77] Update Package.appxmanifest to have PhonePublisherId
 (#9477)

* Update Package.appxmanifest to have PhonePublisherId

* Rename template variable to better represent what it is replacing

* Revert version back to 0.0.0.0 as that is the default placeholder value

* Update blazor template with phonepublisherid for publish scenarios
---
 .../src/templates/maui-blazor/.template.config/template.json | 5 +++++
 .../maui-blazor/Platforms/Windows/Package.appxmanifest       | 3 +++
 .../src/templates/maui-mobile/.template.config/template.json | 5 +++++
 .../maui-mobile/Platforms/Windows/Package.appxmanifest       | 3 +++
 4 files changed, 16 insertions(+)

diff --git a/src/Templates/src/templates/maui-blazor/.template.config/template.json b/src/Templates/src/templates/maui-blazor/.template.config/template.json
index 473c8bd87220..6b4179f49f5a 100644
--- a/src/Templates/src/templates/maui-blazor/.template.config/template.json
+++ b/src/Templates/src/templates/maui-blazor/.template.config/template.json
@@ -75,6 +75,11 @@
       "HostIdentifier": {
         "type": "bind",
         "binding": "HostIdentifier"
+      },
+      "PhoneProductId": {
+        "type": "generated",
+        "generator": "guid",
+        "replaces": "$guid9$"
       }
     },
     "defaultName": "MauiApp1"
diff --git a/src/Templates/src/templates/maui-blazor/Platforms/Windows/Package.appxmanifest b/src/Templates/src/templates/maui-blazor/Platforms/Windows/Package.appxmanifest
index 2bcb11edf7c6..ab686c3da0c7 100644
--- a/src/Templates/src/templates/maui-blazor/Platforms/Windows/Package.appxmanifest
+++ b/src/Templates/src/templates/maui-blazor/Platforms/Windows/Package.appxmanifest
@@ -2,11 +2,14 @@
 <Package
   xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
   xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+  xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
   xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
   IgnorableNamespaces="uap rescap">
 
   <Identity Name="maui-package-name-placeholder" Publisher="CN=User Name" Version="0.0.0.0" />
 
+  <mp:PhoneIdentity PhoneProductId="$guid9$" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
+
   <Properties>
     <DisplayName>$placeholder$</DisplayName>
     <PublisherDisplayName>User Name</PublisherDisplayName>
diff --git a/src/Templates/src/templates/maui-mobile/.template.config/template.json b/src/Templates/src/templates/maui-mobile/.template.config/template.json
index 668a95b7f336..24b6bd7178e1 100644
--- a/src/Templates/src/templates/maui-mobile/.template.config/template.json
+++ b/src/Templates/src/templates/maui-mobile/.template.config/template.json
@@ -79,6 +79,11 @@
       "HostIdentifier": {
         "type": "bind",
         "binding": "HostIdentifier"
+      },
+      "PhoneProductId": {
+        "type": "generated",
+        "generator": "guid",
+        "replaces": "$guid9$"
       }
     },
     "defaultName": "MauiApp1"
diff --git a/src/Templates/src/templates/maui-mobile/Platforms/Windows/Package.appxmanifest b/src/Templates/src/templates/maui-mobile/Platforms/Windows/Package.appxmanifest
index 2bcb11edf7c6..ab686c3da0c7 100644
--- a/src/Templates/src/templates/maui-mobile/Platforms/Windows/Package.appxmanifest
+++ b/src/Templates/src/templates/maui-mobile/Platforms/Windows/Package.appxmanifest
@@ -2,11 +2,14 @@
 <Package
   xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
   xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+  xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
   xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
   IgnorableNamespaces="uap rescap">
 
   <Identity Name="maui-package-name-placeholder" Publisher="CN=User Name" Version="0.0.0.0" />
 
+  <mp:PhoneIdentity PhoneProductId="$guid9$" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
+
   <Properties>
     <DisplayName>$placeholder$</DisplayName>
     <PublisherDisplayName>User Name</PublisherDisplayName>

From ad0b8befc987ccda4fb415664742dead88655f39 Mon Sep 17 00:00:00 2001
From: Rui Marinho <me@ruimarinho.net>
Date: Fri, 21 Oct 2022 16:19:36 +0100
Subject: [PATCH 22/77] Bump GitInfo

---
 GitInfo.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GitInfo.txt b/GitInfo.txt
index 2a4cbd3ed2eb..dbca5be3d742 100644
--- a/GitInfo.txt
+++ b/GitInfo.txt
@@ -1 +1 @@
-7.0.0-rc.2
+7.0.0-ci

From a2947dfcce1e2629fe1946b120070f3c38ce0bb0 Mon Sep 17 00:00:00 2001
From: Rui Marinho <me@ruimarinho.net>
Date: Fri, 21 Oct 2022 16:59:59 +0100
Subject: [PATCH 23/77] Add code format for PR's (#10828)

---
 .../workflows/dotnet-autoformat-pr-push.yml   | 19 +++++++++++++++++++
 .github/workflows/dotnet-autoformat-pr.yml    | 13 +++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 .github/workflows/dotnet-autoformat-pr-push.yml
 create mode 100644 .github/workflows/dotnet-autoformat-pr.yml

diff --git a/.github/workflows/dotnet-autoformat-pr-push.yml b/.github/workflows/dotnet-autoformat-pr-push.yml
new file mode 100644
index 000000000000..cc303d7bc767
--- /dev/null
+++ b/.github/workflows/dotnet-autoformat-pr-push.yml
@@ -0,0 +1,19 @@
+name: PR code format check - push results
+on:
+  workflow_run:
+    workflows: ["PR code format check"]
+    types:
+      - completed
+
+jobs:
+  push-and-notify:
+    name: Push autoformatted code and notify user
+    runs-on: ubuntu-latest
+    if: >
+      github.event.workflow_run.event == 'pull_request' &&
+      github.event.workflow_run.conclusion == 'success'
+    steps:
+      - name: 'Push autoformatted patch'
+        uses: rolfbjarne/autoformat-push@v0.1
+        with:
+          githubToken: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
diff --git a/.github/workflows/dotnet-autoformat-pr.yml b/.github/workflows/dotnet-autoformat-pr.yml
new file mode 100644
index 000000000000..51b49e6b3762
--- /dev/null
+++ b/.github/workflows/dotnet-autoformat-pr.yml
@@ -0,0 +1,13 @@
+name: PR code format check
+on: pull_request
+
+jobs:
+  autoformat-code:
+    name: code format check
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: 'Autoformat'
+      uses: rolfbjarne/autoformat@v0.1
+      with:
+        projects: "Microsoft.Maui.sln"
\ No newline at end of file

From efc27a9ba26c3b63452b37c2910b876062ec01b1 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Fri, 21 Oct 2022 19:52:33 +0200
Subject: [PATCH 24/77] Update net6 workloads (#10830)

* Bump GitInfo

* Update Versions.props

* Update GitInfo.txt

Co-authored-by: Rui Marinho <me@ruimarinho.net>
---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 372016d72dcd..18e7f333ef13 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <!-- Current previous .NET SDK major version's stable release of MAUI packages -->
-    <MicrosoftMauiPreviousDotNetReleasedVersion>6.0.541</MicrosoftMauiPreviousDotNetReleasedVersion>
+    <MicrosoftMauiPreviousDotNetReleasedVersion>6.0.544</MicrosoftMauiPreviousDotNetReleasedVersion>
     <!-- dotnet/installer -->
     <MicrosoftDotnetSdkInternalPackageVersion>7.0.100-rtm.22519.39</MicrosoftDotnetSdkInternalPackageVersion>
     <!-- dotnet/runtime -->

From c93463913cdf611ef9145d473653b446d5b7af51 Mon Sep 17 00:00:00 2001
From: Rui Marinho <me@ruimarinho.net>
Date: Fri, 21 Oct 2022 19:01:28 +0100
Subject: [PATCH 25/77] Add branch info to GitInfo

---
 GitInfo.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GitInfo.txt b/GitInfo.txt
index dbca5be3d742..2f424f8bc1ca 100644
--- a/GitInfo.txt
+++ b/GitInfo.txt
@@ -1 +1 @@
-7.0.0-ci
+7.0.0-ci.net7

From c429419ab50b7d36e8be5cad8de528cbc4888cae Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 24 Oct 2022 11:55:31 +0100
Subject: [PATCH 26/77] [net6.0] Update dependencies from
 xamarin/xamarin-macios (#10826)

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221021.5

Microsoft.iOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.macOS.Sdk , Microsoft.tvOS.Sdk
 From Version 16.0.523 -> To Version 15.4.469

* Revert xcode14 versions

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Rui Marinho <me@ruimarinho.net>
---
 eng/Version.Details.xml | 8 ++++----
 eng/Versions.props      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index b70b7009f9ee..ac1b080089f7 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -12,9 +12,9 @@
       <Uri>https://github.com/xamarin/xamarin-android</Uri>
       <Sha>28f788ced6282094aaf18fab26b47f7d1e6e88cd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.4.467">
+    <Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.4.469">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>23a6d4ad7354f535140eba662a81485eb010feb0</Sha>
+      <Sha>10eff25d69496f01de7a1c213463efce4f4d6387</Sha>
     </Dependency>
     <Dependency Name="Microsoft.iOS.Sdk" Version="16.0.523">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
@@ -24,9 +24,9 @@
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
       <Sha>12aaa79efd7aefb65a3875e8c42da75e473077c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.macOS.Sdk" Version="12.3.467">
+    <Dependency Name="Microsoft.macOS.Sdk" Version="12.3.469">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>23a6d4ad7354f535140eba662a81485eb010feb0</Sha>
+      <Sha>10eff25d69496f01de7a1c213463efce4f4d6387</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.10" CoherentParentDependency="Microsoft.NETCore.App.Ref">
       <Uri>https://github.com/dotnet/emsdk</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 1213d6cbfcad..fd3a923e6594 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -12,8 +12,8 @@
     <MicrosoftAndroidSdkWindowsPackageVersion>32.0.478</MicrosoftAndroidSdkWindowsPackageVersion>
     <!-- xamarin/xamarin-macios -->
     <MicrosoftiOSSdkPackageVersion>16.0.523</MicrosoftiOSSdkPackageVersion>
-    <MicrosoftMacCatalystSdkPackageVersion>15.4.467</MicrosoftMacCatalystSdkPackageVersion>
-    <MicrosoftmacOSSdkPackageVersion>12.3.467</MicrosoftmacOSSdkPackageVersion>
+    <MicrosoftMacCatalystSdkPackageVersion>15.4.469</MicrosoftMacCatalystSdkPackageVersion>
+    <MicrosoftmacOSSdkPackageVersion>12.3.469</MicrosoftmacOSSdkPackageVersion>
     <MicrosofttvOSSdkPackageVersion>16.0.523</MicrosofttvOSSdkPackageVersion>
     <!-- Samsung/Tizen.NET -->
     <SamsungTizenSdkPackageVersion>7.0.400-preview.1.0</SamsungTizenSdkPackageVersion>

From 148d2a1fbbd1108007791390d1617afb9a25a379 Mon Sep 17 00:00:00 2001
From: Rui Marinho <me@ruimarinho.net>
Date: Mon, 24 Oct 2022 15:50:05 +0100
Subject: [PATCH 27/77] [Tizen] Update to Tizen 7.0.100 stable  (#10861)

* Update Tizen SDK

* Update the SDK prop
---
 eng/Versions.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 18e7f333ef13..97080bdd7339 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -18,7 +18,7 @@
     <MicrosoftiOSSdkPackageVersion>16.0.1470</MicrosoftiOSSdkPackageVersion>
     <MicrosofttvOSSdkPackageVersion>16.0.1470</MicrosofttvOSSdkPackageVersion>
     <!-- Samsung/Tizen.NET -->
-    <SamsungTizenSdkPackageVersion>7.0.100-rc.2.24</SamsungTizenSdkPackageVersion>
+    <SamsungTizenSdkPackageVersion>7.0.100</SamsungTizenSdkPackageVersion>
     <!-- emsdk -->
     <MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion>7.0.0-rtm.22504.3</MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion>
     <MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
@@ -76,6 +76,6 @@
     <DotNetEmscriptenManifestVersionBand>$(DotNetVersionBand)</DotNetEmscriptenManifestVersionBand>
     <DotNetAndroidManifestVersionBand>$(DotNetSdkManifestsFolder)</DotNetAndroidManifestVersionBand>
     <DotNetMaciOSManifestVersionBand>$(DotNetSdkManifestsFolder)</DotNetMaciOSManifestVersionBand>
-    <DotNetTizenManifestVersionBand>7.0.100-rc.2</DotNetTizenManifestVersionBand>
+    <DotNetTizenManifestVersionBand>7.0.100</DotNetTizenManifestVersionBand>
   </PropertyGroup>
 </Project>

From f2b54925a037cd695ad2dada7fa638369b9686cb Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Mon, 24 Oct 2022 17:12:48 +0200
Subject: [PATCH 28/77] iOS 13+ devices do not allow status bar access (#10855)

---
 .../net-android/PublicAPI.Unshipped.txt       |   4 +
 .../PublicAPI/net-ios/PublicAPI.Unshipped.txt |   6 +
 .../net-maccatalyst/PublicAPI.Unshipped.txt   |   6 +
 .../net-tizen/PublicAPI.Unshipped.txt         |   4 +
 .../net-windows/PublicAPI.Unshipped.txt       |   6 +-
 .../src/Screenshot/Screenshot.android.cs      |   2 +-
 .../src/Screenshot/Screenshot.ios.cs          | 115 +++-------------
 .../src/Screenshot/Screenshot.shared.cs       |  22 +--
 .../DeviceTests/Tests/Screenshot_Tests.cs     | 130 +++++++++++++++---
 9 files changed, 163 insertions(+), 132 deletions(-)

diff --git a/src/Essentials/src/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Essentials/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
index 1ad69bd53a12..cce8ea433f62 100644
--- a/src/Essentials/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Essentials/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -11,3 +11,7 @@ override Microsoft.Maui.Devices.Sensors.Location.GetHashCode() -> int
 ~static Microsoft.Maui.Devices.Sensors.Location.operator !=(Microsoft.Maui.Devices.Sensors.Location left, Microsoft.Maui.Devices.Sensors.Location right) -> bool
 ~static Microsoft.Maui.Devices.Sensors.Location.operator ==(Microsoft.Maui.Devices.Sensors.Location left, Microsoft.Maui.Devices.Sensors.Location right) -> bool
 *REMOVED*~override Microsoft.Maui.ApplicationModel.Permissions.LocationWhenInUse.CheckStatusAsync() -> System.Threading.Tasks.Task<Microsoft.Maui.ApplicationModel.PermissionStatus>
+*REMOVED*Microsoft.Maui.Media.IPlatformScreenshot.CaptureAsync(Android.Views.View! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult!>!
+Microsoft.Maui.Media.IPlatformScreenshot.CaptureAsync(Android.Views.View! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult?>!
+*REMOVED*static Microsoft.Maui.Media.ScreenshotExtensions.CaptureAsync(this Microsoft.Maui.Media.IScreenshot! screenshot, Android.Views.View! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult!>!
+static Microsoft.Maui.Media.ScreenshotExtensions.CaptureAsync(this Microsoft.Maui.Media.IScreenshot! screenshot, Android.Views.View! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult?>!
\ No newline at end of file
diff --git a/src/Essentials/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Essentials/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index 47042d23f092..c19aef8ce6c3 100644
--- a/src/Essentials/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Essentials/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -3,3 +3,9 @@ override Microsoft.Maui.Devices.Sensors.Location.GetHashCode() -> int
 ~override Microsoft.Maui.Devices.Sensors.Location.Equals(object obj) -> bool
 ~static Microsoft.Maui.Devices.Sensors.Location.operator !=(Microsoft.Maui.Devices.Sensors.Location left, Microsoft.Maui.Devices.Sensors.Location right) -> bool
 ~static Microsoft.Maui.Devices.Sensors.Location.operator ==(Microsoft.Maui.Devices.Sensors.Location left, Microsoft.Maui.Devices.Sensors.Location right) -> bool
+*REMOVED*Microsoft.Maui.Media.IPlatformScreenshot.CaptureAsync(UIKit.UIView! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult!>!
+Microsoft.Maui.Media.IPlatformScreenshot.CaptureAsync(UIKit.UIView! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult?>!
+*REMOVED*static Microsoft.Maui.Media.ScreenshotExtensions.CaptureAsync(this Microsoft.Maui.Media.IScreenshot! screenshot, UIKit.UIView! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult!>!
+static Microsoft.Maui.Media.ScreenshotExtensions.CaptureAsync(this Microsoft.Maui.Media.IScreenshot! screenshot, UIKit.UIView! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult?>!
+Microsoft.Maui.Media.IPlatformScreenshot.CaptureAsync(CoreAnimation.CALayer! layer, bool skipChildren) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult?>!
+static Microsoft.Maui.Media.ScreenshotExtensions.CaptureAsync(this Microsoft.Maui.Media.IScreenshot! screenshot, CoreAnimation.CALayer! layer, bool skipChildren) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult?>!
diff --git a/src/Essentials/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Essentials/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index 47042d23f092..c19aef8ce6c3 100644
--- a/src/Essentials/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Essentials/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -3,3 +3,9 @@ override Microsoft.Maui.Devices.Sensors.Location.GetHashCode() -> int
 ~override Microsoft.Maui.Devices.Sensors.Location.Equals(object obj) -> bool
 ~static Microsoft.Maui.Devices.Sensors.Location.operator !=(Microsoft.Maui.Devices.Sensors.Location left, Microsoft.Maui.Devices.Sensors.Location right) -> bool
 ~static Microsoft.Maui.Devices.Sensors.Location.operator ==(Microsoft.Maui.Devices.Sensors.Location left, Microsoft.Maui.Devices.Sensors.Location right) -> bool
+*REMOVED*Microsoft.Maui.Media.IPlatformScreenshot.CaptureAsync(UIKit.UIView! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult!>!
+Microsoft.Maui.Media.IPlatformScreenshot.CaptureAsync(UIKit.UIView! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult?>!
+*REMOVED*static Microsoft.Maui.Media.ScreenshotExtensions.CaptureAsync(this Microsoft.Maui.Media.IScreenshot! screenshot, UIKit.UIView! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult!>!
+static Microsoft.Maui.Media.ScreenshotExtensions.CaptureAsync(this Microsoft.Maui.Media.IScreenshot! screenshot, UIKit.UIView! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult?>!
+Microsoft.Maui.Media.IPlatformScreenshot.CaptureAsync(CoreAnimation.CALayer! layer, bool skipChildren) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult?>!
+static Microsoft.Maui.Media.ScreenshotExtensions.CaptureAsync(this Microsoft.Maui.Media.IScreenshot! screenshot, CoreAnimation.CALayer! layer, bool skipChildren) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult?>!
diff --git a/src/Essentials/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt b/src/Essentials/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
index 47042d23f092..87718f62039a 100644
--- a/src/Essentials/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
+++ b/src/Essentials/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
@@ -3,3 +3,7 @@ override Microsoft.Maui.Devices.Sensors.Location.GetHashCode() -> int
 ~override Microsoft.Maui.Devices.Sensors.Location.Equals(object obj) -> bool
 ~static Microsoft.Maui.Devices.Sensors.Location.operator !=(Microsoft.Maui.Devices.Sensors.Location left, Microsoft.Maui.Devices.Sensors.Location right) -> bool
 ~static Microsoft.Maui.Devices.Sensors.Location.operator ==(Microsoft.Maui.Devices.Sensors.Location left, Microsoft.Maui.Devices.Sensors.Location right) -> bool
+*REMOVED*Microsoft.Maui.Media.IPlatformScreenshot.CaptureAsync(Tizen.NUI.BaseComponents.View! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult!>!
+Microsoft.Maui.Media.IPlatformScreenshot.CaptureAsync(Tizen.NUI.BaseComponents.View! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult?>!
+*REMOVED*static Microsoft.Maui.Media.ScreenshotExtensions.CaptureAsync(this Microsoft.Maui.Media.IScreenshot! screenshot, Tizen.NUI.BaseComponents.View! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult!>!
+static Microsoft.Maui.Media.ScreenshotExtensions.CaptureAsync(this Microsoft.Maui.Media.IScreenshot! screenshot, Tizen.NUI.BaseComponents.View! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult?>!
diff --git a/src/Essentials/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Essentials/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index 488b35f1e528..a38ddf9cd8e7 100644
--- a/src/Essentials/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Essentials/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -12,4 +12,8 @@ override Microsoft.Maui.Devices.Sensors.Location.GetHashCode() -> int
 *REMOVED*~override Microsoft.Maui.ApplicationModel.Permissions.ContactsWrite.RequiredDeclarations.get -> System.Func<System.Collections.Generic.IEnumerable<string>>
 *REMOVED*~override Microsoft.Maui.ApplicationModel.Permissions.LocationAlways.RequiredDeclarations.get -> System.Func<System.Collections.Generic.IEnumerable<string>>
 *REMOVED*~override Microsoft.Maui.ApplicationModel.Permissions.LocationWhenInUse.RequiredDeclarations.get -> System.Func<System.Collections.Generic.IEnumerable<string>>
-*REMOVED*~override Microsoft.Maui.ApplicationModel.Permissions.Microphone.RequiredDeclarations.get -> System.Func<System.Collections.Generic.IEnumerable<string>>
\ No newline at end of file
+*REMOVED*~override Microsoft.Maui.ApplicationModel.Permissions.Microphone.RequiredDeclarations.get -> System.Func<System.Collections.Generic.IEnumerable<string>>
+*REMOVED*Microsoft.Maui.Media.IPlatformScreenshot.CaptureAsync(Microsoft.UI.Xaml.UIElement! element) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult!>!
+Microsoft.Maui.Media.IPlatformScreenshot.CaptureAsync(Microsoft.UI.Xaml.UIElement! element) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult?>!
+*REMOVED*static Microsoft.Maui.Media.ScreenshotExtensions.CaptureAsync(this Microsoft.Maui.Media.IScreenshot! screenshot, Microsoft.UI.Xaml.UIElement! element) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult!>!
+static Microsoft.Maui.Media.ScreenshotExtensions.CaptureAsync(this Microsoft.Maui.Media.IScreenshot! screenshot, Microsoft.UI.Xaml.UIElement! element) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult?>!
\ No newline at end of file
diff --git a/src/Essentials/src/Screenshot/Screenshot.android.cs b/src/Essentials/src/Screenshot/Screenshot.android.cs
index 7eb7ca83dbce..f07ca44834f3 100644
--- a/src/Essentials/src/Screenshot/Screenshot.android.cs
+++ b/src/Essentials/src/Screenshot/Screenshot.android.cs
@@ -44,7 +44,7 @@ public Task<IScreenshotResult> CaptureAsync(View view)
 			_ = view ?? throw new ArgumentNullException(nameof(view));
 
 			var bitmap = Render(view);
-			var result = new ScreenshotResult(bitmap);
+			var result = bitmap is null ? null :  new ScreenshotResult(bitmap);
 
 			return Task.FromResult<IScreenshotResult>(result);
 		}
diff --git a/src/Essentials/src/Screenshot/Screenshot.ios.cs b/src/Essentials/src/Screenshot/Screenshot.ios.cs
index cfbfe16218f9..f6bbaf7aebae 100644
--- a/src/Essentials/src/Screenshot/Screenshot.ios.cs
+++ b/src/Essentials/src/Screenshot/Screenshot.ios.cs
@@ -9,6 +9,7 @@
 using CoreGraphics;
 using ObjCRuntime;
 using UIKit;
+using Microsoft.Maui.ApplicationModel;
 
 namespace Microsoft.Maui.Media
 {
@@ -17,26 +18,13 @@ partial class ScreenshotImplementation : IPlatformScreenshot, IScreenshot
 		public bool IsCaptureSupported =>
 			true;
 
-		[System.Runtime.Versioning.SupportedOSPlatform("ios13.0")]
-		[System.Runtime.Versioning.SupportedOSPlatform("tvos13.0")]
 		public Task<IScreenshotResult> CaptureAsync()
 		{
-			var scenes = UIApplication.SharedApplication.ConnectedScenes;
-			//#pragma warning disable CA1416 // Known false positive with Lambda expression
-			var currentScene = scenes.ToArray().Where(n => n.ActivationState == UISceneActivationState.ForegroundActive).FirstOrDefault();
-			//#pragma warning restore CA1416
-			if (currentScene == null)
-				throw new InvalidOperationException("Unable to find current scene.");
-
-			var uiWindowScene = currentScene as UIWindowScene;
-			if (uiWindowScene == null)
-				throw new InvalidOperationException("Unable to find current window scene.");
-
-			var currentWindow = uiWindowScene.Windows.FirstOrDefault(n => n.IsKeyWindow);
+			var currentWindow = WindowStateManager.Default.GetCurrentUIWindow();
 			if (currentWindow == null)
 				throw new InvalidOperationException("Unable to find current window.");
 
-			return CaptureAsync(currentWindow.Layer, true);
+			return CaptureAsync(currentWindow);
 		}
 
 		public Task<IScreenshotResult> CaptureAsync(UIWindow window)
@@ -47,25 +35,10 @@ public Task<IScreenshotResult> CaptureAsync(UIWindow window)
 			UIGraphics.BeginImageContextWithOptions(window.Bounds.Size, false, window.Screen.Scale);
 			var ctx = UIGraphics.GetCurrentContext();
 
-			if (!TryRender(window, out var error))
-			{
-				// FIXME: test/handle this case
-			}
-
-			// Render the status bar with the correct frame size
-			try
-			{
-				TryHideStatusClockView(UIApplication.SharedApplication);
-				var statusbarWindow = GetStatusBarWindow(UIApplication.SharedApplication);
-				if (statusbarWindow != null/* && metrics.StatusBar != null*/)
-				{
-					statusbarWindow.Frame = window.Frame;
-					statusbarWindow.Layer.RenderInContext(ctx);
-				}
-			}
-			catch
+			// ctx will be null if the width/height of the view is zero
+			if (ctx is not null && !TryRender(window, out _))
 			{
-				// FIXME: test/handle this case
+				// TODO: test/handle this case
 			}
 
 			var image = UIGraphics.GetImageFromCurrentImageContext();
@@ -76,7 +49,7 @@ public Task<IScreenshotResult> CaptureAsync(UIWindow window)
 			return Task.FromResult<IScreenshotResult>(result);
 		}
 
-		public Task<IScreenshotResult> CaptureAsync(UIView view)
+		public Task<IScreenshotResult?> CaptureAsync(UIView view)
 		{
 			_ = view ?? throw new ArgumentNullException(nameof(view));
 
@@ -85,23 +58,20 @@ public Task<IScreenshotResult> CaptureAsync(UIView view)
 			var ctx = UIGraphics.GetCurrentContext();
 
 			// ctx will be null if the width/height of the view is zero
-			if (ctx != null)
+			if (ctx is not null && !TryRender(view, out _))
 			{
-				if (!TryRender(view, out var error))
-				{
-					// FIXME: test/handle this case
-				}
+				// TODO: test/handle this case
 			}
 
 			var image = UIGraphics.GetImageFromCurrentImageContext();
 			UIGraphics.EndImageContext();
 
-			var result = new ScreenshotResult(image);
+			var result = image is null ? null : new ScreenshotResult(image);
 
-			return Task.FromResult<IScreenshotResult>(result);
+			return Task.FromResult<IScreenshotResult?>(result);
 		}
 
-		public Task<IScreenshotResult> CaptureAsync(CALayer layer, bool skipChildren)
+		public Task<IScreenshotResult?> CaptureAsync(CALayer layer, bool skipChildren)
 		{
 			_ = layer ?? throw new ArgumentNullException(nameof(layer));
 
@@ -110,20 +80,17 @@ public Task<IScreenshotResult> CaptureAsync(CALayer layer, bool skipChildren)
 			var ctx = UIGraphics.GetCurrentContext();
 
 			// ctx will be null if the width/height of the view is zero
-			if (ctx != null)
+			if (ctx is not null && !TryRender(layer, ctx, skipChildren, out _))
 			{
-				if (!TryRender(layer, ctx, skipChildren, out var error))
-				{
-					// FIXME: test/handle this case
-				}
+				// TODO: test/handle this case
 			}
 
 			var image = UIGraphics.GetImageFromCurrentImageContext();
 			UIGraphics.EndImageContext();
 
-			var result = new ScreenshotResult(image);
+			var result = image is null ? null : new ScreenshotResult(image);
 
-			return Task.FromResult<IScreenshotResult>(result);
+			return Task.FromResult<IScreenshotResult?>(result);
 		}
 
 		static bool TryRender(UIView view, out Exception? error)
@@ -192,56 +159,6 @@ static void RestoreSublayers(CALayer layer, Dictionary<CALayer, bool> visibility
 				sublayer.Key.Hidden = sublayer.Value;
 			}
 		}
-
-		static void TryHideStatusClockView(UIApplication app)
-		{
-			var statusBarWindow = GetStatusBarWindow(app);
-			if (statusBarWindow == null)
-				return;
-
-			var clockView = GetClockView(statusBarWindow);
-			if (clockView != null)
-				clockView.Hidden = true;
-		}
-
-		static UIView? GetClockView(UIWindow window)
-		{
-			var classNames = new[] {
-				"UIStatusBar",
-				"UIStatusBarForegroundView",
-				"UIStatusBarTimeItemView"
-			};
-
-			return FindSubview(window, ((IEnumerable<string>)classNames).GetEnumerator());
-
-			static UIView? FindSubview(UIView view, IEnumerator<string> classNames)
-			{
-				if (!classNames.MoveNext())
-					return view;
-
-				foreach (var subview in view.Subviews)
-				{
-					if (subview.ToString().StartsWith($"<{classNames.Current}:", StringComparison.Ordinal))
-						return FindSubview(subview, classNames);
-				}
-
-				return null;
-			}
-		}
-
-		static UIWindow? GetStatusBarWindow(UIApplication app)
-		{
-			if (!app.RespondsToSelector(statusBarWindowSelector))
-				return null;
-
-			var ptr = IntPtr_objc_msgSend(app.Handle, statusBarWindowSelector.Handle);
-			return ptr != IntPtr.Zero ? Runtime.GetNSObject(ptr) as UIWindow : null;
-		}
-
-		static readonly Selector statusBarWindowSelector = new Selector("statusBarWindow");
-
-		[DllImport(Constants.ObjectiveCLibrary, EntryPoint = "objc_msgSend")]
-		static extern IntPtr IntPtr_objc_msgSend(IntPtr receiver, IntPtr selector);
 	}
 
 	partial class ScreenshotResult
diff --git a/src/Essentials/src/Screenshot/Screenshot.shared.cs b/src/Essentials/src/Screenshot/Screenshot.shared.cs
index 99ae3207029f..142198380b20 100644
--- a/src/Essentials/src/Screenshot/Screenshot.shared.cs
+++ b/src/Essentials/src/Screenshot/Screenshot.shared.cs
@@ -17,17 +17,17 @@ public interface IPlatformScreenshot : IScreenshot
 	{
 #if ANDROID
 		Task<IScreenshotResult> CaptureAsync(Android.App.Activity activity);
-		Task<IScreenshotResult> CaptureAsync(Android.Views.View view);
+		Task<IScreenshotResult?> CaptureAsync(Android.Views.View view);
 #elif IOS || MACCATALYST
 		Task<IScreenshotResult> CaptureAsync(UIKit.UIWindow window);
-		Task<IScreenshotResult> CaptureAsync(UIKit.UIView view);
-		//Task<IScreenshotResult> CaptureAsync(CoreAnimation.CALayer layer, bool skipChildren);
+		Task<IScreenshotResult?> CaptureAsync(UIKit.UIView view);
+		Task<IScreenshotResult?> CaptureAsync(CoreAnimation.CALayer layer, bool skipChildren);
 #elif WINDOWS
 		Task<IScreenshotResult> CaptureAsync(UI.Xaml.Window window);
-		Task<IScreenshotResult> CaptureAsync(UI.Xaml.UIElement element);
+		Task<IScreenshotResult?> CaptureAsync(UI.Xaml.UIElement element);
 #elif TIZEN
 		Task<IScreenshotResult> CaptureAsync(Tizen.NUI.Window window);
-		Task<IScreenshotResult> CaptureAsync(Tizen.NUI.BaseComponents.View view);
+		Task<IScreenshotResult?> CaptureAsync(Tizen.NUI.BaseComponents.View view);
 #endif
 	}
 
@@ -89,7 +89,7 @@ static IPlatformScreenshot AsPlatform(this IScreenshot screenshot)
 		public static Task<IScreenshotResult> CaptureAsync(this IScreenshot screenshot, Android.App.Activity activity) =>
 			screenshot.AsPlatform().CaptureAsync(activity);
 
-		public static Task<IScreenshotResult> CaptureAsync(this IScreenshot screenshot, Android.Views.View view) =>
+		public static Task<IScreenshotResult?> CaptureAsync(this IScreenshot screenshot, Android.Views.View view) =>
 			screenshot.AsPlatform().CaptureAsync(view);
 
 #elif IOS || MACCATALYST
@@ -97,18 +97,18 @@ public static Task<IScreenshotResult> CaptureAsync(this IScreenshot screenshot,
 		public static Task<IScreenshotResult> CaptureAsync(this IScreenshot screenshot, UIKit.UIWindow window) =>
 			screenshot.AsPlatform().CaptureAsync(window);
 
-		public static Task<IScreenshotResult> CaptureAsync(this IScreenshot screenshot, UIKit.UIView view) =>
+		public static Task<IScreenshotResult?> CaptureAsync(this IScreenshot screenshot, UIKit.UIView view) =>
 			screenshot.AsPlatform().CaptureAsync(view);
 
-		//public static Task<IScreenshotResult> CaptureAsync(this IScreenshot screenshot, CoreAnimation.CALayer layer, bool skipChildren) =>
-		//	screenshot.AsPlatform().CaptureAsync(layer, skipChildren);
+		public static Task<IScreenshotResult?> CaptureAsync(this IScreenshot screenshot, CoreAnimation.CALayer layer, bool skipChildren) =>
+			screenshot.AsPlatform().CaptureAsync(layer, skipChildren);
 
 #elif WINDOWS
 
 		public static Task<IScreenshotResult> CaptureAsync(this IScreenshot screenshot, UI.Xaml.Window window) =>
 			screenshot.AsPlatform().CaptureAsync(window);
 
-		public static Task<IScreenshotResult> CaptureAsync(this IScreenshot screenshot, UI.Xaml.UIElement element) =>
+		public static Task<IScreenshotResult?> CaptureAsync(this IScreenshot screenshot, UI.Xaml.UIElement element) =>
 			screenshot.AsPlatform().CaptureAsync(element);
 
 #elif TIZEN
@@ -116,7 +116,7 @@ public static Task<IScreenshotResult> CaptureAsync(this IScreenshot screenshot,
 		public static Task<IScreenshotResult> CaptureAsync(this IScreenshot screenshot, Tizen.NUI.Window window) =>
 			screenshot.AsPlatform().CaptureAsync(window);
 
-		public static Task<IScreenshotResult> CaptureAsync(this IScreenshot screenshot, Tizen.NUI.BaseComponents.View view) =>
+		public static Task<IScreenshotResult?> CaptureAsync(this IScreenshot screenshot, Tizen.NUI.BaseComponents.View view) =>
 			screenshot.AsPlatform().CaptureAsync(view);
 
 #endif
diff --git a/src/Essentials/test/DeviceTests/Tests/Screenshot_Tests.cs b/src/Essentials/test/DeviceTests/Tests/Screenshot_Tests.cs
index f47c8ffab732..c3b59e53e38c 100644
--- a/src/Essentials/test/DeviceTests/Tests/Screenshot_Tests.cs
+++ b/src/Essentials/test/DeviceTests/Tests/Screenshot_Tests.cs
@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using System.Threading.Tasks;
+using Microsoft.Maui.ApplicationModel;
 using Microsoft.Maui.Media;
 using Microsoft.Maui.Platform;
 using Xunit;
@@ -15,13 +16,12 @@ public Task GetPngScreenshot()
 		{
 			return Utils.OnMainThread(async () =>
 			{
-				if (CanExecuteTest())
-				{
-					await Task.Delay(100);
-					IScreenshotResult mediaFile = await Screenshot.CaptureAsync();
-					var png = await mediaFile.OpenReadAsync(ScreenshotFormat.Png);
-					Assert.True(png.Length > 0);
-				}
+				await Task.Delay(100);
+
+				IScreenshotResult mediaFile = await Screenshot.CaptureAsync();
+				var png = await mediaFile.OpenReadAsync(ScreenshotFormat.Png);
+
+				Assert.True(png.Length > 0);
 			});
 		}
 
@@ -30,23 +30,113 @@ public Task GetJpegScreenshot()
 		{
 			return Utils.OnMainThread(async () =>
 			{
-				if (CanExecuteTest())
-				{
-					await Task.Delay(100);
-					IScreenshotResult mediaFile = await Screenshot.CaptureAsync();
-					var png = await mediaFile.OpenReadAsync(ScreenshotFormat.Jpeg);
-					Assert.True(png.Length > 0);
-				}
+				await Task.Delay(100);
+
+				IScreenshotResult mediaFile = await Screenshot.CaptureAsync();
+				var png = await mediaFile.OpenReadAsync(ScreenshotFormat.Jpeg);
+
+				Assert.True(png.Length > 0);
 			});
 		}
 
-		static bool CanExecuteTest()
+		[Fact]
+		public Task CaptureStaticAsync()
 		{
-#if __IOS__
-			return OperatingSystem.IsIOSVersionAtLeast(13) || OperatingSystem.IsTvOSVersionAtLeast(13);
-#else
-			return true;
-#endif
+			return Utils.OnMainThread(async () =>
+			{
+				await Task.Delay(100);
+
+				IScreenshotResult mediaFile = await Screenshot.CaptureAsync();
+
+				Assert.True(mediaFile.Width > 0);
+				Assert.True(mediaFile.Height > 0);
+
+				using (var stream = await mediaFile.OpenReadAsync())
+					Assert.True(stream.Length > 0);
+			});
 		}
+
+		[Fact]
+		public Task CaptureAsync()
+		{
+			return Utils.OnMainThread(async () =>
+			{
+				await Task.Delay(100);
+
+				IScreenshotResult mediaFile = await Screenshot.Default.CaptureAsync();
+
+				Assert.True(mediaFile.Width > 0);
+				Assert.True(mediaFile.Height > 0);
+
+				using (var stream = await mediaFile.OpenReadAsync())
+					Assert.True(stream.Length > 0);
+			});
+		}
+
+#if IOS || MACCATALYST
+
+		[Fact]
+		public Task CaptureWindowAsync()
+		{
+			return Utils.OnMainThread(async () =>
+			{
+				await Task.Delay(100);
+
+				var window = WindowStateManager.Default.GetCurrentUIWindow();
+
+				IScreenshotResult mediaFile = await Screenshot.Default.CaptureAsync(window);
+
+				Assert.True(mediaFile.Width > 0);
+				Assert.True(mediaFile.Height > 0);
+
+				using (var stream = await mediaFile.OpenReadAsync())
+					Assert.True(stream.Length > 0);
+			});
+		}
+
+		[Fact]
+		public Task CaptureViewAsync()
+		{
+			return Utils.OnMainThread(async () =>
+			{
+				await Task.Delay(100);
+
+				var window = WindowStateManager.Default.GetCurrentUIWindow();
+				var view = window.RootViewController.View;
+
+				IScreenshotResult mediaFile = await Screenshot.Default.CaptureAsync(view);
+
+				Assert.True(mediaFile.Width > 0);
+				Assert.True(mediaFile.Height > 0);
+
+				using (var stream = await mediaFile.OpenReadAsync())
+					Assert.True(stream.Length > 0);
+			});
+		}
+
+		[Theory]
+		[InlineData(true)]
+		[InlineData(false)]
+		public Task CaptureLayerAsync(bool skipChildren)
+		{
+			return Utils.OnMainThread(async () =>
+			{
+				await Task.Delay(100);
+
+				var window = WindowStateManager.Default.GetCurrentUIWindow();
+				var view = window.RootViewController.View;
+				var layer = view.Layer;
+
+				IScreenshotResult mediaFile = await Screenshot.Default.CaptureAsync(layer, skipChildren);
+
+				Assert.True(mediaFile.Width > 0);
+				Assert.True(mediaFile.Height > 0);
+
+				using (var stream = await mediaFile.OpenReadAsync())
+					Assert.True(stream.Length > 0);
+			});
+		}
+
+#endif
 	}
 }

From 7f28df4b94a15e4c79f4ceb6c69cc237168e26f8 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Mon, 24 Oct 2022 17:12:48 +0200
Subject: [PATCH 29/77] iOS 13+ devices do not allow status bar access (#10855)

# Conflicts:
#	src/Essentials/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
#	src/Essentials/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
#	src/Essentials/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
#	src/Essentials/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
#	src/Essentials/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
---
 .../net-android/PublicAPI.Unshipped.txt       |   4 +
 .../PublicAPI/net-ios/PublicAPI.Unshipped.txt |   4 +
 .../net-maccatalyst/PublicAPI.Unshipped.txt   |   4 +
 .../net-tizen/PublicAPI.Unshipped.txt         |   4 +
 .../net-windows/PublicAPI.Unshipped.txt       |   4 +
 .../src/Screenshot/Screenshot.android.cs      |   2 +-
 .../src/Screenshot/Screenshot.ios.cs          | 115 +++-------------
 .../src/Screenshot/Screenshot.shared.cs       |  20 +--
 .../DeviceTests/Tests/Screenshot_Tests.cs     | 130 +++++++++++++++---
 9 files changed, 157 insertions(+), 130 deletions(-)

diff --git a/src/Essentials/src/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Essentials/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
index ab058de62d44..ab29c60636ab 100644
--- a/src/Essentials/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Essentials/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -1 +1,5 @@
 #nullable enable
+*REMOVED*Microsoft.Maui.Media.IPlatformScreenshot.CaptureAsync(Android.Views.View! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult!>!
+Microsoft.Maui.Media.IPlatformScreenshot.CaptureAsync(Android.Views.View! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult?>!
+*REMOVED*static Microsoft.Maui.Media.ScreenshotExtensions.CaptureAsync(this Microsoft.Maui.Media.IScreenshot! screenshot, Android.Views.View! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult!>!
+static Microsoft.Maui.Media.ScreenshotExtensions.CaptureAsync(this Microsoft.Maui.Media.IScreenshot! screenshot, Android.Views.View! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult?>!
diff --git a/src/Essentials/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Essentials/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index ab058de62d44..9ec85f8e9ada 100644
--- a/src/Essentials/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Essentials/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -1 +1,5 @@
 #nullable enable
+*REMOVED*Microsoft.Maui.Media.IPlatformScreenshot.CaptureAsync(UIKit.UIView! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult!>!
+Microsoft.Maui.Media.IPlatformScreenshot.CaptureAsync(UIKit.UIView! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult?>!
+*REMOVED*static Microsoft.Maui.Media.ScreenshotExtensions.CaptureAsync(this Microsoft.Maui.Media.IScreenshot! screenshot, UIKit.UIView! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult!>!
+static Microsoft.Maui.Media.ScreenshotExtensions.CaptureAsync(this Microsoft.Maui.Media.IScreenshot! screenshot, UIKit.UIView! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult?>!
diff --git a/src/Essentials/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Essentials/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index ab058de62d44..9ec85f8e9ada 100644
--- a/src/Essentials/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Essentials/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -1 +1,5 @@
 #nullable enable
+*REMOVED*Microsoft.Maui.Media.IPlatformScreenshot.CaptureAsync(UIKit.UIView! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult!>!
+Microsoft.Maui.Media.IPlatformScreenshot.CaptureAsync(UIKit.UIView! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult?>!
+*REMOVED*static Microsoft.Maui.Media.ScreenshotExtensions.CaptureAsync(this Microsoft.Maui.Media.IScreenshot! screenshot, UIKit.UIView! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult!>!
+static Microsoft.Maui.Media.ScreenshotExtensions.CaptureAsync(this Microsoft.Maui.Media.IScreenshot! screenshot, UIKit.UIView! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult?>!
diff --git a/src/Essentials/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt b/src/Essentials/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
index ab058de62d44..256a238b54e2 100644
--- a/src/Essentials/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
+++ b/src/Essentials/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
@@ -1 +1,5 @@
 #nullable enable
+*REMOVED*Microsoft.Maui.Media.IPlatformScreenshot.CaptureAsync(Tizen.NUI.BaseComponents.View! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult!>!
+Microsoft.Maui.Media.IPlatformScreenshot.CaptureAsync(Tizen.NUI.BaseComponents.View! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult?>!
+*REMOVED*static Microsoft.Maui.Media.ScreenshotExtensions.CaptureAsync(this Microsoft.Maui.Media.IScreenshot! screenshot, Tizen.NUI.BaseComponents.View! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult!>!
+static Microsoft.Maui.Media.ScreenshotExtensions.CaptureAsync(this Microsoft.Maui.Media.IScreenshot! screenshot, Tizen.NUI.BaseComponents.View! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult?>!
diff --git a/src/Essentials/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Essentials/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index ab058de62d44..5712295502a0 100644
--- a/src/Essentials/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Essentials/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -1 +1,5 @@
 #nullable enable
+*REMOVED*Microsoft.Maui.Media.IPlatformScreenshot.CaptureAsync(Microsoft.UI.Xaml.UIElement! element) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult!>!
+Microsoft.Maui.Media.IPlatformScreenshot.CaptureAsync(Microsoft.UI.Xaml.UIElement! element) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult?>!
+*REMOVED*static Microsoft.Maui.Media.ScreenshotExtensions.CaptureAsync(this Microsoft.Maui.Media.IScreenshot! screenshot, Microsoft.UI.Xaml.UIElement! element) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult!>!
+static Microsoft.Maui.Media.ScreenshotExtensions.CaptureAsync(this Microsoft.Maui.Media.IScreenshot! screenshot, Microsoft.UI.Xaml.UIElement! element) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult?>!
diff --git a/src/Essentials/src/Screenshot/Screenshot.android.cs b/src/Essentials/src/Screenshot/Screenshot.android.cs
index 7eb7ca83dbce..f07ca44834f3 100644
--- a/src/Essentials/src/Screenshot/Screenshot.android.cs
+++ b/src/Essentials/src/Screenshot/Screenshot.android.cs
@@ -44,7 +44,7 @@ public Task<IScreenshotResult> CaptureAsync(View view)
 			_ = view ?? throw new ArgumentNullException(nameof(view));
 
 			var bitmap = Render(view);
-			var result = new ScreenshotResult(bitmap);
+			var result = bitmap is null ? null :  new ScreenshotResult(bitmap);
 
 			return Task.FromResult<IScreenshotResult>(result);
 		}
diff --git a/src/Essentials/src/Screenshot/Screenshot.ios.cs b/src/Essentials/src/Screenshot/Screenshot.ios.cs
index cfbfe16218f9..f6bbaf7aebae 100644
--- a/src/Essentials/src/Screenshot/Screenshot.ios.cs
+++ b/src/Essentials/src/Screenshot/Screenshot.ios.cs
@@ -9,6 +9,7 @@
 using CoreGraphics;
 using ObjCRuntime;
 using UIKit;
+using Microsoft.Maui.ApplicationModel;
 
 namespace Microsoft.Maui.Media
 {
@@ -17,26 +18,13 @@ partial class ScreenshotImplementation : IPlatformScreenshot, IScreenshot
 		public bool IsCaptureSupported =>
 			true;
 
-		[System.Runtime.Versioning.SupportedOSPlatform("ios13.0")]
-		[System.Runtime.Versioning.SupportedOSPlatform("tvos13.0")]
 		public Task<IScreenshotResult> CaptureAsync()
 		{
-			var scenes = UIApplication.SharedApplication.ConnectedScenes;
-			//#pragma warning disable CA1416 // Known false positive with Lambda expression
-			var currentScene = scenes.ToArray().Where(n => n.ActivationState == UISceneActivationState.ForegroundActive).FirstOrDefault();
-			//#pragma warning restore CA1416
-			if (currentScene == null)
-				throw new InvalidOperationException("Unable to find current scene.");
-
-			var uiWindowScene = currentScene as UIWindowScene;
-			if (uiWindowScene == null)
-				throw new InvalidOperationException("Unable to find current window scene.");
-
-			var currentWindow = uiWindowScene.Windows.FirstOrDefault(n => n.IsKeyWindow);
+			var currentWindow = WindowStateManager.Default.GetCurrentUIWindow();
 			if (currentWindow == null)
 				throw new InvalidOperationException("Unable to find current window.");
 
-			return CaptureAsync(currentWindow.Layer, true);
+			return CaptureAsync(currentWindow);
 		}
 
 		public Task<IScreenshotResult> CaptureAsync(UIWindow window)
@@ -47,25 +35,10 @@ public Task<IScreenshotResult> CaptureAsync(UIWindow window)
 			UIGraphics.BeginImageContextWithOptions(window.Bounds.Size, false, window.Screen.Scale);
 			var ctx = UIGraphics.GetCurrentContext();
 
-			if (!TryRender(window, out var error))
-			{
-				// FIXME: test/handle this case
-			}
-
-			// Render the status bar with the correct frame size
-			try
-			{
-				TryHideStatusClockView(UIApplication.SharedApplication);
-				var statusbarWindow = GetStatusBarWindow(UIApplication.SharedApplication);
-				if (statusbarWindow != null/* && metrics.StatusBar != null*/)
-				{
-					statusbarWindow.Frame = window.Frame;
-					statusbarWindow.Layer.RenderInContext(ctx);
-				}
-			}
-			catch
+			// ctx will be null if the width/height of the view is zero
+			if (ctx is not null && !TryRender(window, out _))
 			{
-				// FIXME: test/handle this case
+				// TODO: test/handle this case
 			}
 
 			var image = UIGraphics.GetImageFromCurrentImageContext();
@@ -76,7 +49,7 @@ public Task<IScreenshotResult> CaptureAsync(UIWindow window)
 			return Task.FromResult<IScreenshotResult>(result);
 		}
 
-		public Task<IScreenshotResult> CaptureAsync(UIView view)
+		public Task<IScreenshotResult?> CaptureAsync(UIView view)
 		{
 			_ = view ?? throw new ArgumentNullException(nameof(view));
 
@@ -85,23 +58,20 @@ public Task<IScreenshotResult> CaptureAsync(UIView view)
 			var ctx = UIGraphics.GetCurrentContext();
 
 			// ctx will be null if the width/height of the view is zero
-			if (ctx != null)
+			if (ctx is not null && !TryRender(view, out _))
 			{
-				if (!TryRender(view, out var error))
-				{
-					// FIXME: test/handle this case
-				}
+				// TODO: test/handle this case
 			}
 
 			var image = UIGraphics.GetImageFromCurrentImageContext();
 			UIGraphics.EndImageContext();
 
-			var result = new ScreenshotResult(image);
+			var result = image is null ? null : new ScreenshotResult(image);
 
-			return Task.FromResult<IScreenshotResult>(result);
+			return Task.FromResult<IScreenshotResult?>(result);
 		}
 
-		public Task<IScreenshotResult> CaptureAsync(CALayer layer, bool skipChildren)
+		public Task<IScreenshotResult?> CaptureAsync(CALayer layer, bool skipChildren)
 		{
 			_ = layer ?? throw new ArgumentNullException(nameof(layer));
 
@@ -110,20 +80,17 @@ public Task<IScreenshotResult> CaptureAsync(CALayer layer, bool skipChildren)
 			var ctx = UIGraphics.GetCurrentContext();
 
 			// ctx will be null if the width/height of the view is zero
-			if (ctx != null)
+			if (ctx is not null && !TryRender(layer, ctx, skipChildren, out _))
 			{
-				if (!TryRender(layer, ctx, skipChildren, out var error))
-				{
-					// FIXME: test/handle this case
-				}
+				// TODO: test/handle this case
 			}
 
 			var image = UIGraphics.GetImageFromCurrentImageContext();
 			UIGraphics.EndImageContext();
 
-			var result = new ScreenshotResult(image);
+			var result = image is null ? null : new ScreenshotResult(image);
 
-			return Task.FromResult<IScreenshotResult>(result);
+			return Task.FromResult<IScreenshotResult?>(result);
 		}
 
 		static bool TryRender(UIView view, out Exception? error)
@@ -192,56 +159,6 @@ static void RestoreSublayers(CALayer layer, Dictionary<CALayer, bool> visibility
 				sublayer.Key.Hidden = sublayer.Value;
 			}
 		}
-
-		static void TryHideStatusClockView(UIApplication app)
-		{
-			var statusBarWindow = GetStatusBarWindow(app);
-			if (statusBarWindow == null)
-				return;
-
-			var clockView = GetClockView(statusBarWindow);
-			if (clockView != null)
-				clockView.Hidden = true;
-		}
-
-		static UIView? GetClockView(UIWindow window)
-		{
-			var classNames = new[] {
-				"UIStatusBar",
-				"UIStatusBarForegroundView",
-				"UIStatusBarTimeItemView"
-			};
-
-			return FindSubview(window, ((IEnumerable<string>)classNames).GetEnumerator());
-
-			static UIView? FindSubview(UIView view, IEnumerator<string> classNames)
-			{
-				if (!classNames.MoveNext())
-					return view;
-
-				foreach (var subview in view.Subviews)
-				{
-					if (subview.ToString().StartsWith($"<{classNames.Current}:", StringComparison.Ordinal))
-						return FindSubview(subview, classNames);
-				}
-
-				return null;
-			}
-		}
-
-		static UIWindow? GetStatusBarWindow(UIApplication app)
-		{
-			if (!app.RespondsToSelector(statusBarWindowSelector))
-				return null;
-
-			var ptr = IntPtr_objc_msgSend(app.Handle, statusBarWindowSelector.Handle);
-			return ptr != IntPtr.Zero ? Runtime.GetNSObject(ptr) as UIWindow : null;
-		}
-
-		static readonly Selector statusBarWindowSelector = new Selector("statusBarWindow");
-
-		[DllImport(Constants.ObjectiveCLibrary, EntryPoint = "objc_msgSend")]
-		static extern IntPtr IntPtr_objc_msgSend(IntPtr receiver, IntPtr selector);
 	}
 
 	partial class ScreenshotResult
diff --git a/src/Essentials/src/Screenshot/Screenshot.shared.cs b/src/Essentials/src/Screenshot/Screenshot.shared.cs
index 99ae3207029f..4f3e944f4db4 100644
--- a/src/Essentials/src/Screenshot/Screenshot.shared.cs
+++ b/src/Essentials/src/Screenshot/Screenshot.shared.cs
@@ -17,17 +17,17 @@ public interface IPlatformScreenshot : IScreenshot
 	{
 #if ANDROID
 		Task<IScreenshotResult> CaptureAsync(Android.App.Activity activity);
-		Task<IScreenshotResult> CaptureAsync(Android.Views.View view);
+		Task<IScreenshotResult?> CaptureAsync(Android.Views.View view);
 #elif IOS || MACCATALYST
 		Task<IScreenshotResult> CaptureAsync(UIKit.UIWindow window);
-		Task<IScreenshotResult> CaptureAsync(UIKit.UIView view);
-		//Task<IScreenshotResult> CaptureAsync(CoreAnimation.CALayer layer, bool skipChildren);
+		Task<IScreenshotResult?> CaptureAsync(UIKit.UIView view);
+		//Task<IScreenshotResult?> CaptureAsync(CoreAnimation.CALayer layer, bool skipChildren);
 #elif WINDOWS
 		Task<IScreenshotResult> CaptureAsync(UI.Xaml.Window window);
-		Task<IScreenshotResult> CaptureAsync(UI.Xaml.UIElement element);
+		Task<IScreenshotResult?> CaptureAsync(UI.Xaml.UIElement element);
 #elif TIZEN
 		Task<IScreenshotResult> CaptureAsync(Tizen.NUI.Window window);
-		Task<IScreenshotResult> CaptureAsync(Tizen.NUI.BaseComponents.View view);
+		Task<IScreenshotResult?> CaptureAsync(Tizen.NUI.BaseComponents.View view);
 #endif
 	}
 
@@ -89,7 +89,7 @@ static IPlatformScreenshot AsPlatform(this IScreenshot screenshot)
 		public static Task<IScreenshotResult> CaptureAsync(this IScreenshot screenshot, Android.App.Activity activity) =>
 			screenshot.AsPlatform().CaptureAsync(activity);
 
-		public static Task<IScreenshotResult> CaptureAsync(this IScreenshot screenshot, Android.Views.View view) =>
+		public static Task<IScreenshotResult?> CaptureAsync(this IScreenshot screenshot, Android.Views.View view) =>
 			screenshot.AsPlatform().CaptureAsync(view);
 
 #elif IOS || MACCATALYST
@@ -97,10 +97,10 @@ public static Task<IScreenshotResult> CaptureAsync(this IScreenshot screenshot,
 		public static Task<IScreenshotResult> CaptureAsync(this IScreenshot screenshot, UIKit.UIWindow window) =>
 			screenshot.AsPlatform().CaptureAsync(window);
 
-		public static Task<IScreenshotResult> CaptureAsync(this IScreenshot screenshot, UIKit.UIView view) =>
+		public static Task<IScreenshotResult?> CaptureAsync(this IScreenshot screenshot, UIKit.UIView view) =>
 			screenshot.AsPlatform().CaptureAsync(view);
 
-		//public static Task<IScreenshotResult> CaptureAsync(this IScreenshot screenshot, CoreAnimation.CALayer layer, bool skipChildren) =>
+		//public static Task<IScreenshotResult?> CaptureAsync(this IScreenshot screenshot, CoreAnimation.CALayer layer, bool skipChildren) =>
 		//	screenshot.AsPlatform().CaptureAsync(layer, skipChildren);
 
 #elif WINDOWS
@@ -108,7 +108,7 @@ public static Task<IScreenshotResult> CaptureAsync(this IScreenshot screenshot,
 		public static Task<IScreenshotResult> CaptureAsync(this IScreenshot screenshot, UI.Xaml.Window window) =>
 			screenshot.AsPlatform().CaptureAsync(window);
 
-		public static Task<IScreenshotResult> CaptureAsync(this IScreenshot screenshot, UI.Xaml.UIElement element) =>
+		public static Task<IScreenshotResult?> CaptureAsync(this IScreenshot screenshot, UI.Xaml.UIElement element) =>
 			screenshot.AsPlatform().CaptureAsync(element);
 
 #elif TIZEN
@@ -116,7 +116,7 @@ public static Task<IScreenshotResult> CaptureAsync(this IScreenshot screenshot,
 		public static Task<IScreenshotResult> CaptureAsync(this IScreenshot screenshot, Tizen.NUI.Window window) =>
 			screenshot.AsPlatform().CaptureAsync(window);
 
-		public static Task<IScreenshotResult> CaptureAsync(this IScreenshot screenshot, Tizen.NUI.BaseComponents.View view) =>
+		public static Task<IScreenshotResult?> CaptureAsync(this IScreenshot screenshot, Tizen.NUI.BaseComponents.View view) =>
 			screenshot.AsPlatform().CaptureAsync(view);
 
 #endif
diff --git a/src/Essentials/test/DeviceTests/Tests/Screenshot_Tests.cs b/src/Essentials/test/DeviceTests/Tests/Screenshot_Tests.cs
index f47c8ffab732..81ceed4dfa7c 100644
--- a/src/Essentials/test/DeviceTests/Tests/Screenshot_Tests.cs
+++ b/src/Essentials/test/DeviceTests/Tests/Screenshot_Tests.cs
@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using System.Threading.Tasks;
+using Microsoft.Maui.ApplicationModel;
 using Microsoft.Maui.Media;
 using Microsoft.Maui.Platform;
 using Xunit;
@@ -15,13 +16,12 @@ public Task GetPngScreenshot()
 		{
 			return Utils.OnMainThread(async () =>
 			{
-				if (CanExecuteTest())
-				{
-					await Task.Delay(100);
-					IScreenshotResult mediaFile = await Screenshot.CaptureAsync();
-					var png = await mediaFile.OpenReadAsync(ScreenshotFormat.Png);
-					Assert.True(png.Length > 0);
-				}
+				await Task.Delay(100);
+
+				IScreenshotResult mediaFile = await Screenshot.CaptureAsync();
+				var png = await mediaFile.OpenReadAsync(ScreenshotFormat.Png);
+
+				Assert.True(png.Length > 0);
 			});
 		}
 
@@ -30,23 +30,113 @@ public Task GetJpegScreenshot()
 		{
 			return Utils.OnMainThread(async () =>
 			{
-				if (CanExecuteTest())
-				{
-					await Task.Delay(100);
-					IScreenshotResult mediaFile = await Screenshot.CaptureAsync();
-					var png = await mediaFile.OpenReadAsync(ScreenshotFormat.Jpeg);
-					Assert.True(png.Length > 0);
-				}
+				await Task.Delay(100);
+
+				IScreenshotResult mediaFile = await Screenshot.CaptureAsync();
+				var png = await mediaFile.OpenReadAsync(ScreenshotFormat.Jpeg);
+
+				Assert.True(png.Length > 0);
 			});
 		}
 
-		static bool CanExecuteTest()
+		[Fact]
+		public Task CaptureStaticAsync()
 		{
-#if __IOS__
-			return OperatingSystem.IsIOSVersionAtLeast(13) || OperatingSystem.IsTvOSVersionAtLeast(13);
-#else
-			return true;
-#endif
+			return Utils.OnMainThread(async () =>
+			{
+				await Task.Delay(100);
+
+				IScreenshotResult mediaFile = await Screenshot.CaptureAsync();
+
+				Assert.True(mediaFile.Width > 0);
+				Assert.True(mediaFile.Height > 0);
+
+				using (var stream = await mediaFile.OpenReadAsync())
+					Assert.True(stream.Length > 0);
+			});
+		}
+
+		[Fact]
+		public Task CaptureAsync()
+		{
+			return Utils.OnMainThread(async () =>
+			{
+				await Task.Delay(100);
+
+				IScreenshotResult mediaFile = await Screenshot.Default.CaptureAsync();
+
+				Assert.True(mediaFile.Width > 0);
+				Assert.True(mediaFile.Height > 0);
+
+				using (var stream = await mediaFile.OpenReadAsync())
+					Assert.True(stream.Length > 0);
+			});
+		}
+
+#if IOS || MACCATALYST
+
+		[Fact]
+		public Task CaptureWindowAsync()
+		{
+			return Utils.OnMainThread(async () =>
+			{
+				await Task.Delay(100);
+
+				var window = WindowStateManager.Default.GetCurrentUIWindow();
+
+				IScreenshotResult mediaFile = await Screenshot.Default.CaptureAsync(window);
+
+				Assert.True(mediaFile.Width > 0);
+				Assert.True(mediaFile.Height > 0);
+
+				using (var stream = await mediaFile.OpenReadAsync())
+					Assert.True(stream.Length > 0);
+			});
+		}
+
+		[Fact]
+		public Task CaptureViewAsync()
+		{
+			return Utils.OnMainThread(async () =>
+			{
+				await Task.Delay(100);
+
+				var window = WindowStateManager.Default.GetCurrentUIWindow();
+				var view = window.RootViewController.View;
+
+				IScreenshotResult mediaFile = await Screenshot.Default.CaptureAsync(view);
+
+				Assert.True(mediaFile.Width > 0);
+				Assert.True(mediaFile.Height > 0);
+
+				using (var stream = await mediaFile.OpenReadAsync())
+					Assert.True(stream.Length > 0);
+			});
 		}
+
+		//[Theory]
+		//[InlineData(true)]
+		//[InlineData(false)]
+		//public Task CaptureLayerAsync(bool skipChildren)
+		//{
+		//	return Utils.OnMainThread(async () =>
+		//	{
+		//		await Task.Delay(100);
+
+		//		var window = WindowStateManager.Default.GetCurrentUIWindow();
+		//		var view = window.RootViewController.View;
+		//		var layer = view.Layer;
+
+		//		IScreenshotResult mediaFile = await Screenshot.Default.CaptureAsync(layer, skipChildren);
+
+		//		Assert.True(mediaFile.Width > 0);
+		//		Assert.True(mediaFile.Height > 0);
+
+		//		using (var stream = await mediaFile.OpenReadAsync())
+		//			Assert.True(stream.Length > 0);
+		//	});
+		//}
+
+#endif
 	}
 }

From 0548b7c4c1f461a58644e3d0ef8b5b9ea9155db1 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Mon, 24 Oct 2022 17:12:48 +0200
Subject: [PATCH 30/77] iOS 13+ devices do not allow status bar access (#10855)

---
 .../net-android/PublicAPI.Unshipped.txt       |   4 +
 .../PublicAPI/net-ios/PublicAPI.Unshipped.txt |   6 +
 .../net-maccatalyst/PublicAPI.Unshipped.txt   |   6 +
 .../net-tizen/PublicAPI.Unshipped.txt         |   4 +
 .../net-windows/PublicAPI.Unshipped.txt       |   6 +-
 .../src/Screenshot/Screenshot.android.cs      |   2 +-
 .../src/Screenshot/Screenshot.ios.cs          | 115 +++-------------
 .../src/Screenshot/Screenshot.shared.cs       |  22 +--
 .../DeviceTests/Tests/Screenshot_Tests.cs     | 130 +++++++++++++++---
 9 files changed, 163 insertions(+), 132 deletions(-)

diff --git a/src/Essentials/src/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Essentials/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
index 1ad69bd53a12..cce8ea433f62 100644
--- a/src/Essentials/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Essentials/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -11,3 +11,7 @@ override Microsoft.Maui.Devices.Sensors.Location.GetHashCode() -> int
 ~static Microsoft.Maui.Devices.Sensors.Location.operator !=(Microsoft.Maui.Devices.Sensors.Location left, Microsoft.Maui.Devices.Sensors.Location right) -> bool
 ~static Microsoft.Maui.Devices.Sensors.Location.operator ==(Microsoft.Maui.Devices.Sensors.Location left, Microsoft.Maui.Devices.Sensors.Location right) -> bool
 *REMOVED*~override Microsoft.Maui.ApplicationModel.Permissions.LocationWhenInUse.CheckStatusAsync() -> System.Threading.Tasks.Task<Microsoft.Maui.ApplicationModel.PermissionStatus>
+*REMOVED*Microsoft.Maui.Media.IPlatformScreenshot.CaptureAsync(Android.Views.View! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult!>!
+Microsoft.Maui.Media.IPlatformScreenshot.CaptureAsync(Android.Views.View! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult?>!
+*REMOVED*static Microsoft.Maui.Media.ScreenshotExtensions.CaptureAsync(this Microsoft.Maui.Media.IScreenshot! screenshot, Android.Views.View! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult!>!
+static Microsoft.Maui.Media.ScreenshotExtensions.CaptureAsync(this Microsoft.Maui.Media.IScreenshot! screenshot, Android.Views.View! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult?>!
\ No newline at end of file
diff --git a/src/Essentials/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Essentials/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index 47042d23f092..c19aef8ce6c3 100644
--- a/src/Essentials/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Essentials/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -3,3 +3,9 @@ override Microsoft.Maui.Devices.Sensors.Location.GetHashCode() -> int
 ~override Microsoft.Maui.Devices.Sensors.Location.Equals(object obj) -> bool
 ~static Microsoft.Maui.Devices.Sensors.Location.operator !=(Microsoft.Maui.Devices.Sensors.Location left, Microsoft.Maui.Devices.Sensors.Location right) -> bool
 ~static Microsoft.Maui.Devices.Sensors.Location.operator ==(Microsoft.Maui.Devices.Sensors.Location left, Microsoft.Maui.Devices.Sensors.Location right) -> bool
+*REMOVED*Microsoft.Maui.Media.IPlatformScreenshot.CaptureAsync(UIKit.UIView! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult!>!
+Microsoft.Maui.Media.IPlatformScreenshot.CaptureAsync(UIKit.UIView! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult?>!
+*REMOVED*static Microsoft.Maui.Media.ScreenshotExtensions.CaptureAsync(this Microsoft.Maui.Media.IScreenshot! screenshot, UIKit.UIView! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult!>!
+static Microsoft.Maui.Media.ScreenshotExtensions.CaptureAsync(this Microsoft.Maui.Media.IScreenshot! screenshot, UIKit.UIView! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult?>!
+Microsoft.Maui.Media.IPlatformScreenshot.CaptureAsync(CoreAnimation.CALayer! layer, bool skipChildren) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult?>!
+static Microsoft.Maui.Media.ScreenshotExtensions.CaptureAsync(this Microsoft.Maui.Media.IScreenshot! screenshot, CoreAnimation.CALayer! layer, bool skipChildren) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult?>!
diff --git a/src/Essentials/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Essentials/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index 47042d23f092..c19aef8ce6c3 100644
--- a/src/Essentials/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Essentials/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -3,3 +3,9 @@ override Microsoft.Maui.Devices.Sensors.Location.GetHashCode() -> int
 ~override Microsoft.Maui.Devices.Sensors.Location.Equals(object obj) -> bool
 ~static Microsoft.Maui.Devices.Sensors.Location.operator !=(Microsoft.Maui.Devices.Sensors.Location left, Microsoft.Maui.Devices.Sensors.Location right) -> bool
 ~static Microsoft.Maui.Devices.Sensors.Location.operator ==(Microsoft.Maui.Devices.Sensors.Location left, Microsoft.Maui.Devices.Sensors.Location right) -> bool
+*REMOVED*Microsoft.Maui.Media.IPlatformScreenshot.CaptureAsync(UIKit.UIView! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult!>!
+Microsoft.Maui.Media.IPlatformScreenshot.CaptureAsync(UIKit.UIView! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult?>!
+*REMOVED*static Microsoft.Maui.Media.ScreenshotExtensions.CaptureAsync(this Microsoft.Maui.Media.IScreenshot! screenshot, UIKit.UIView! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult!>!
+static Microsoft.Maui.Media.ScreenshotExtensions.CaptureAsync(this Microsoft.Maui.Media.IScreenshot! screenshot, UIKit.UIView! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult?>!
+Microsoft.Maui.Media.IPlatformScreenshot.CaptureAsync(CoreAnimation.CALayer! layer, bool skipChildren) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult?>!
+static Microsoft.Maui.Media.ScreenshotExtensions.CaptureAsync(this Microsoft.Maui.Media.IScreenshot! screenshot, CoreAnimation.CALayer! layer, bool skipChildren) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult?>!
diff --git a/src/Essentials/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt b/src/Essentials/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
index 47042d23f092..87718f62039a 100644
--- a/src/Essentials/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
+++ b/src/Essentials/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
@@ -3,3 +3,7 @@ override Microsoft.Maui.Devices.Sensors.Location.GetHashCode() -> int
 ~override Microsoft.Maui.Devices.Sensors.Location.Equals(object obj) -> bool
 ~static Microsoft.Maui.Devices.Sensors.Location.operator !=(Microsoft.Maui.Devices.Sensors.Location left, Microsoft.Maui.Devices.Sensors.Location right) -> bool
 ~static Microsoft.Maui.Devices.Sensors.Location.operator ==(Microsoft.Maui.Devices.Sensors.Location left, Microsoft.Maui.Devices.Sensors.Location right) -> bool
+*REMOVED*Microsoft.Maui.Media.IPlatformScreenshot.CaptureAsync(Tizen.NUI.BaseComponents.View! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult!>!
+Microsoft.Maui.Media.IPlatformScreenshot.CaptureAsync(Tizen.NUI.BaseComponents.View! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult?>!
+*REMOVED*static Microsoft.Maui.Media.ScreenshotExtensions.CaptureAsync(this Microsoft.Maui.Media.IScreenshot! screenshot, Tizen.NUI.BaseComponents.View! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult!>!
+static Microsoft.Maui.Media.ScreenshotExtensions.CaptureAsync(this Microsoft.Maui.Media.IScreenshot! screenshot, Tizen.NUI.BaseComponents.View! view) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult?>!
diff --git a/src/Essentials/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Essentials/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index 1f9990ea3fe2..5655cdb6578c 100644
--- a/src/Essentials/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Essentials/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -12,4 +12,8 @@ override Microsoft.Maui.Devices.Sensors.Location.GetHashCode() -> int
 *REMOVED*~override Microsoft.Maui.ApplicationModel.Permissions.ContactsWrite.RequiredDeclarations.get -> System.Func<System.Collections.Generic.IEnumerable<string>>
 *REMOVED*~override Microsoft.Maui.ApplicationModel.Permissions.LocationAlways.RequiredDeclarations.get -> System.Func<System.Collections.Generic.IEnumerable<string>>
 *REMOVED*~override Microsoft.Maui.ApplicationModel.Permissions.LocationWhenInUse.RequiredDeclarations.get -> System.Func<System.Collections.Generic.IEnumerable<string>>
-*REMOVED*~override Microsoft.Maui.ApplicationModel.Permissions.Microphone.RequiredDeclarations.get -> System.Func<System.Collections.Generic.IEnumerable<string>>
\ No newline at end of file
+*REMOVED*~override Microsoft.Maui.ApplicationModel.Permissions.Microphone.RequiredDeclarations.get -> System.Func<System.Collections.Generic.IEnumerable<string>>
+*REMOVED*Microsoft.Maui.Media.IPlatformScreenshot.CaptureAsync(Microsoft.UI.Xaml.UIElement! element) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult!>!
+Microsoft.Maui.Media.IPlatformScreenshot.CaptureAsync(Microsoft.UI.Xaml.UIElement! element) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult?>!
+*REMOVED*static Microsoft.Maui.Media.ScreenshotExtensions.CaptureAsync(this Microsoft.Maui.Media.IScreenshot! screenshot, Microsoft.UI.Xaml.UIElement! element) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult!>!
+static Microsoft.Maui.Media.ScreenshotExtensions.CaptureAsync(this Microsoft.Maui.Media.IScreenshot! screenshot, Microsoft.UI.Xaml.UIElement! element) -> System.Threading.Tasks.Task<Microsoft.Maui.Media.IScreenshotResult?>!
\ No newline at end of file
diff --git a/src/Essentials/src/Screenshot/Screenshot.android.cs b/src/Essentials/src/Screenshot/Screenshot.android.cs
index ccb139f90fa2..361e313358e6 100644
--- a/src/Essentials/src/Screenshot/Screenshot.android.cs
+++ b/src/Essentials/src/Screenshot/Screenshot.android.cs
@@ -44,7 +44,7 @@ public Task<IScreenshotResult> CaptureAsync(View view)
 			_ = view ?? throw new ArgumentNullException(nameof(view));
 
 			var bitmap = Render(view);
-			var result = new ScreenshotResult(bitmap);
+			var result = bitmap is null ? null :  new ScreenshotResult(bitmap);
 
 			return Task.FromResult<IScreenshotResult>(result);
 		}
diff --git a/src/Essentials/src/Screenshot/Screenshot.ios.cs b/src/Essentials/src/Screenshot/Screenshot.ios.cs
index cfbfe16218f9..f6bbaf7aebae 100644
--- a/src/Essentials/src/Screenshot/Screenshot.ios.cs
+++ b/src/Essentials/src/Screenshot/Screenshot.ios.cs
@@ -9,6 +9,7 @@
 using CoreGraphics;
 using ObjCRuntime;
 using UIKit;
+using Microsoft.Maui.ApplicationModel;
 
 namespace Microsoft.Maui.Media
 {
@@ -17,26 +18,13 @@ partial class ScreenshotImplementation : IPlatformScreenshot, IScreenshot
 		public bool IsCaptureSupported =>
 			true;
 
-		[System.Runtime.Versioning.SupportedOSPlatform("ios13.0")]
-		[System.Runtime.Versioning.SupportedOSPlatform("tvos13.0")]
 		public Task<IScreenshotResult> CaptureAsync()
 		{
-			var scenes = UIApplication.SharedApplication.ConnectedScenes;
-			//#pragma warning disable CA1416 // Known false positive with Lambda expression
-			var currentScene = scenes.ToArray().Where(n => n.ActivationState == UISceneActivationState.ForegroundActive).FirstOrDefault();
-			//#pragma warning restore CA1416
-			if (currentScene == null)
-				throw new InvalidOperationException("Unable to find current scene.");
-
-			var uiWindowScene = currentScene as UIWindowScene;
-			if (uiWindowScene == null)
-				throw new InvalidOperationException("Unable to find current window scene.");
-
-			var currentWindow = uiWindowScene.Windows.FirstOrDefault(n => n.IsKeyWindow);
+			var currentWindow = WindowStateManager.Default.GetCurrentUIWindow();
 			if (currentWindow == null)
 				throw new InvalidOperationException("Unable to find current window.");
 
-			return CaptureAsync(currentWindow.Layer, true);
+			return CaptureAsync(currentWindow);
 		}
 
 		public Task<IScreenshotResult> CaptureAsync(UIWindow window)
@@ -47,25 +35,10 @@ public Task<IScreenshotResult> CaptureAsync(UIWindow window)
 			UIGraphics.BeginImageContextWithOptions(window.Bounds.Size, false, window.Screen.Scale);
 			var ctx = UIGraphics.GetCurrentContext();
 
-			if (!TryRender(window, out var error))
-			{
-				// FIXME: test/handle this case
-			}
-
-			// Render the status bar with the correct frame size
-			try
-			{
-				TryHideStatusClockView(UIApplication.SharedApplication);
-				var statusbarWindow = GetStatusBarWindow(UIApplication.SharedApplication);
-				if (statusbarWindow != null/* && metrics.StatusBar != null*/)
-				{
-					statusbarWindow.Frame = window.Frame;
-					statusbarWindow.Layer.RenderInContext(ctx);
-				}
-			}
-			catch
+			// ctx will be null if the width/height of the view is zero
+			if (ctx is not null && !TryRender(window, out _))
 			{
-				// FIXME: test/handle this case
+				// TODO: test/handle this case
 			}
 
 			var image = UIGraphics.GetImageFromCurrentImageContext();
@@ -76,7 +49,7 @@ public Task<IScreenshotResult> CaptureAsync(UIWindow window)
 			return Task.FromResult<IScreenshotResult>(result);
 		}
 
-		public Task<IScreenshotResult> CaptureAsync(UIView view)
+		public Task<IScreenshotResult?> CaptureAsync(UIView view)
 		{
 			_ = view ?? throw new ArgumentNullException(nameof(view));
 
@@ -85,23 +58,20 @@ public Task<IScreenshotResult> CaptureAsync(UIView view)
 			var ctx = UIGraphics.GetCurrentContext();
 
 			// ctx will be null if the width/height of the view is zero
-			if (ctx != null)
+			if (ctx is not null && !TryRender(view, out _))
 			{
-				if (!TryRender(view, out var error))
-				{
-					// FIXME: test/handle this case
-				}
+				// TODO: test/handle this case
 			}
 
 			var image = UIGraphics.GetImageFromCurrentImageContext();
 			UIGraphics.EndImageContext();
 
-			var result = new ScreenshotResult(image);
+			var result = image is null ? null : new ScreenshotResult(image);
 
-			return Task.FromResult<IScreenshotResult>(result);
+			return Task.FromResult<IScreenshotResult?>(result);
 		}
 
-		public Task<IScreenshotResult> CaptureAsync(CALayer layer, bool skipChildren)
+		public Task<IScreenshotResult?> CaptureAsync(CALayer layer, bool skipChildren)
 		{
 			_ = layer ?? throw new ArgumentNullException(nameof(layer));
 
@@ -110,20 +80,17 @@ public Task<IScreenshotResult> CaptureAsync(CALayer layer, bool skipChildren)
 			var ctx = UIGraphics.GetCurrentContext();
 
 			// ctx will be null if the width/height of the view is zero
-			if (ctx != null)
+			if (ctx is not null && !TryRender(layer, ctx, skipChildren, out _))
 			{
-				if (!TryRender(layer, ctx, skipChildren, out var error))
-				{
-					// FIXME: test/handle this case
-				}
+				// TODO: test/handle this case
 			}
 
 			var image = UIGraphics.GetImageFromCurrentImageContext();
 			UIGraphics.EndImageContext();
 
-			var result = new ScreenshotResult(image);
+			var result = image is null ? null : new ScreenshotResult(image);
 
-			return Task.FromResult<IScreenshotResult>(result);
+			return Task.FromResult<IScreenshotResult?>(result);
 		}
 
 		static bool TryRender(UIView view, out Exception? error)
@@ -192,56 +159,6 @@ static void RestoreSublayers(CALayer layer, Dictionary<CALayer, bool> visibility
 				sublayer.Key.Hidden = sublayer.Value;
 			}
 		}
-
-		static void TryHideStatusClockView(UIApplication app)
-		{
-			var statusBarWindow = GetStatusBarWindow(app);
-			if (statusBarWindow == null)
-				return;
-
-			var clockView = GetClockView(statusBarWindow);
-			if (clockView != null)
-				clockView.Hidden = true;
-		}
-
-		static UIView? GetClockView(UIWindow window)
-		{
-			var classNames = new[] {
-				"UIStatusBar",
-				"UIStatusBarForegroundView",
-				"UIStatusBarTimeItemView"
-			};
-
-			return FindSubview(window, ((IEnumerable<string>)classNames).GetEnumerator());
-
-			static UIView? FindSubview(UIView view, IEnumerator<string> classNames)
-			{
-				if (!classNames.MoveNext())
-					return view;
-
-				foreach (var subview in view.Subviews)
-				{
-					if (subview.ToString().StartsWith($"<{classNames.Current}:", StringComparison.Ordinal))
-						return FindSubview(subview, classNames);
-				}
-
-				return null;
-			}
-		}
-
-		static UIWindow? GetStatusBarWindow(UIApplication app)
-		{
-			if (!app.RespondsToSelector(statusBarWindowSelector))
-				return null;
-
-			var ptr = IntPtr_objc_msgSend(app.Handle, statusBarWindowSelector.Handle);
-			return ptr != IntPtr.Zero ? Runtime.GetNSObject(ptr) as UIWindow : null;
-		}
-
-		static readonly Selector statusBarWindowSelector = new Selector("statusBarWindow");
-
-		[DllImport(Constants.ObjectiveCLibrary, EntryPoint = "objc_msgSend")]
-		static extern IntPtr IntPtr_objc_msgSend(IntPtr receiver, IntPtr selector);
 	}
 
 	partial class ScreenshotResult
diff --git a/src/Essentials/src/Screenshot/Screenshot.shared.cs b/src/Essentials/src/Screenshot/Screenshot.shared.cs
index 99ae3207029f..142198380b20 100644
--- a/src/Essentials/src/Screenshot/Screenshot.shared.cs
+++ b/src/Essentials/src/Screenshot/Screenshot.shared.cs
@@ -17,17 +17,17 @@ public interface IPlatformScreenshot : IScreenshot
 	{
 #if ANDROID
 		Task<IScreenshotResult> CaptureAsync(Android.App.Activity activity);
-		Task<IScreenshotResult> CaptureAsync(Android.Views.View view);
+		Task<IScreenshotResult?> CaptureAsync(Android.Views.View view);
 #elif IOS || MACCATALYST
 		Task<IScreenshotResult> CaptureAsync(UIKit.UIWindow window);
-		Task<IScreenshotResult> CaptureAsync(UIKit.UIView view);
-		//Task<IScreenshotResult> CaptureAsync(CoreAnimation.CALayer layer, bool skipChildren);
+		Task<IScreenshotResult?> CaptureAsync(UIKit.UIView view);
+		Task<IScreenshotResult?> CaptureAsync(CoreAnimation.CALayer layer, bool skipChildren);
 #elif WINDOWS
 		Task<IScreenshotResult> CaptureAsync(UI.Xaml.Window window);
-		Task<IScreenshotResult> CaptureAsync(UI.Xaml.UIElement element);
+		Task<IScreenshotResult?> CaptureAsync(UI.Xaml.UIElement element);
 #elif TIZEN
 		Task<IScreenshotResult> CaptureAsync(Tizen.NUI.Window window);
-		Task<IScreenshotResult> CaptureAsync(Tizen.NUI.BaseComponents.View view);
+		Task<IScreenshotResult?> CaptureAsync(Tizen.NUI.BaseComponents.View view);
 #endif
 	}
 
@@ -89,7 +89,7 @@ static IPlatformScreenshot AsPlatform(this IScreenshot screenshot)
 		public static Task<IScreenshotResult> CaptureAsync(this IScreenshot screenshot, Android.App.Activity activity) =>
 			screenshot.AsPlatform().CaptureAsync(activity);
 
-		public static Task<IScreenshotResult> CaptureAsync(this IScreenshot screenshot, Android.Views.View view) =>
+		public static Task<IScreenshotResult?> CaptureAsync(this IScreenshot screenshot, Android.Views.View view) =>
 			screenshot.AsPlatform().CaptureAsync(view);
 
 #elif IOS || MACCATALYST
@@ -97,18 +97,18 @@ public static Task<IScreenshotResult> CaptureAsync(this IScreenshot screenshot,
 		public static Task<IScreenshotResult> CaptureAsync(this IScreenshot screenshot, UIKit.UIWindow window) =>
 			screenshot.AsPlatform().CaptureAsync(window);
 
-		public static Task<IScreenshotResult> CaptureAsync(this IScreenshot screenshot, UIKit.UIView view) =>
+		public static Task<IScreenshotResult?> CaptureAsync(this IScreenshot screenshot, UIKit.UIView view) =>
 			screenshot.AsPlatform().CaptureAsync(view);
 
-		//public static Task<IScreenshotResult> CaptureAsync(this IScreenshot screenshot, CoreAnimation.CALayer layer, bool skipChildren) =>
-		//	screenshot.AsPlatform().CaptureAsync(layer, skipChildren);
+		public static Task<IScreenshotResult?> CaptureAsync(this IScreenshot screenshot, CoreAnimation.CALayer layer, bool skipChildren) =>
+			screenshot.AsPlatform().CaptureAsync(layer, skipChildren);
 
 #elif WINDOWS
 
 		public static Task<IScreenshotResult> CaptureAsync(this IScreenshot screenshot, UI.Xaml.Window window) =>
 			screenshot.AsPlatform().CaptureAsync(window);
 
-		public static Task<IScreenshotResult> CaptureAsync(this IScreenshot screenshot, UI.Xaml.UIElement element) =>
+		public static Task<IScreenshotResult?> CaptureAsync(this IScreenshot screenshot, UI.Xaml.UIElement element) =>
 			screenshot.AsPlatform().CaptureAsync(element);
 
 #elif TIZEN
@@ -116,7 +116,7 @@ public static Task<IScreenshotResult> CaptureAsync(this IScreenshot screenshot,
 		public static Task<IScreenshotResult> CaptureAsync(this IScreenshot screenshot, Tizen.NUI.Window window) =>
 			screenshot.AsPlatform().CaptureAsync(window);
 
-		public static Task<IScreenshotResult> CaptureAsync(this IScreenshot screenshot, Tizen.NUI.BaseComponents.View view) =>
+		public static Task<IScreenshotResult?> CaptureAsync(this IScreenshot screenshot, Tizen.NUI.BaseComponents.View view) =>
 			screenshot.AsPlatform().CaptureAsync(view);
 
 #endif
diff --git a/src/Essentials/test/DeviceTests/Tests/Screenshot_Tests.cs b/src/Essentials/test/DeviceTests/Tests/Screenshot_Tests.cs
index f47c8ffab732..c3b59e53e38c 100644
--- a/src/Essentials/test/DeviceTests/Tests/Screenshot_Tests.cs
+++ b/src/Essentials/test/DeviceTests/Tests/Screenshot_Tests.cs
@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using System.Threading.Tasks;
+using Microsoft.Maui.ApplicationModel;
 using Microsoft.Maui.Media;
 using Microsoft.Maui.Platform;
 using Xunit;
@@ -15,13 +16,12 @@ public Task GetPngScreenshot()
 		{
 			return Utils.OnMainThread(async () =>
 			{
-				if (CanExecuteTest())
-				{
-					await Task.Delay(100);
-					IScreenshotResult mediaFile = await Screenshot.CaptureAsync();
-					var png = await mediaFile.OpenReadAsync(ScreenshotFormat.Png);
-					Assert.True(png.Length > 0);
-				}
+				await Task.Delay(100);
+
+				IScreenshotResult mediaFile = await Screenshot.CaptureAsync();
+				var png = await mediaFile.OpenReadAsync(ScreenshotFormat.Png);
+
+				Assert.True(png.Length > 0);
 			});
 		}
 
@@ -30,23 +30,113 @@ public Task GetJpegScreenshot()
 		{
 			return Utils.OnMainThread(async () =>
 			{
-				if (CanExecuteTest())
-				{
-					await Task.Delay(100);
-					IScreenshotResult mediaFile = await Screenshot.CaptureAsync();
-					var png = await mediaFile.OpenReadAsync(ScreenshotFormat.Jpeg);
-					Assert.True(png.Length > 0);
-				}
+				await Task.Delay(100);
+
+				IScreenshotResult mediaFile = await Screenshot.CaptureAsync();
+				var png = await mediaFile.OpenReadAsync(ScreenshotFormat.Jpeg);
+
+				Assert.True(png.Length > 0);
 			});
 		}
 
-		static bool CanExecuteTest()
+		[Fact]
+		public Task CaptureStaticAsync()
 		{
-#if __IOS__
-			return OperatingSystem.IsIOSVersionAtLeast(13) || OperatingSystem.IsTvOSVersionAtLeast(13);
-#else
-			return true;
-#endif
+			return Utils.OnMainThread(async () =>
+			{
+				await Task.Delay(100);
+
+				IScreenshotResult mediaFile = await Screenshot.CaptureAsync();
+
+				Assert.True(mediaFile.Width > 0);
+				Assert.True(mediaFile.Height > 0);
+
+				using (var stream = await mediaFile.OpenReadAsync())
+					Assert.True(stream.Length > 0);
+			});
 		}
+
+		[Fact]
+		public Task CaptureAsync()
+		{
+			return Utils.OnMainThread(async () =>
+			{
+				await Task.Delay(100);
+
+				IScreenshotResult mediaFile = await Screenshot.Default.CaptureAsync();
+
+				Assert.True(mediaFile.Width > 0);
+				Assert.True(mediaFile.Height > 0);
+
+				using (var stream = await mediaFile.OpenReadAsync())
+					Assert.True(stream.Length > 0);
+			});
+		}
+
+#if IOS || MACCATALYST
+
+		[Fact]
+		public Task CaptureWindowAsync()
+		{
+			return Utils.OnMainThread(async () =>
+			{
+				await Task.Delay(100);
+
+				var window = WindowStateManager.Default.GetCurrentUIWindow();
+
+				IScreenshotResult mediaFile = await Screenshot.Default.CaptureAsync(window);
+
+				Assert.True(mediaFile.Width > 0);
+				Assert.True(mediaFile.Height > 0);
+
+				using (var stream = await mediaFile.OpenReadAsync())
+					Assert.True(stream.Length > 0);
+			});
+		}
+
+		[Fact]
+		public Task CaptureViewAsync()
+		{
+			return Utils.OnMainThread(async () =>
+			{
+				await Task.Delay(100);
+
+				var window = WindowStateManager.Default.GetCurrentUIWindow();
+				var view = window.RootViewController.View;
+
+				IScreenshotResult mediaFile = await Screenshot.Default.CaptureAsync(view);
+
+				Assert.True(mediaFile.Width > 0);
+				Assert.True(mediaFile.Height > 0);
+
+				using (var stream = await mediaFile.OpenReadAsync())
+					Assert.True(stream.Length > 0);
+			});
+		}
+
+		[Theory]
+		[InlineData(true)]
+		[InlineData(false)]
+		public Task CaptureLayerAsync(bool skipChildren)
+		{
+			return Utils.OnMainThread(async () =>
+			{
+				await Task.Delay(100);
+
+				var window = WindowStateManager.Default.GetCurrentUIWindow();
+				var view = window.RootViewController.View;
+				var layer = view.Layer;
+
+				IScreenshotResult mediaFile = await Screenshot.Default.CaptureAsync(layer, skipChildren);
+
+				Assert.True(mediaFile.Width > 0);
+				Assert.True(mediaFile.Height > 0);
+
+				using (var stream = await mediaFile.OpenReadAsync())
+					Assert.True(stream.Length > 0);
+			});
+		}
+
+#endif
 	}
 }

From f012146d5c5d0b4eb4a36c610156222b8ef58981 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Oct 2022 16:41:26 +0100
Subject: [PATCH 31/77] Bump Microsoft.CodeAnalysis.NetAnalyzers (#10863)

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

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

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

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

diff --git a/eng/Versions.props b/eng/Versions.props
index 53acc5d8ae93..7b0ab77884ee 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -38,7 +38,7 @@
     <MicrosoftAspNetCoreMetadataPackageVersion>6.0.10</MicrosoftAspNetCoreMetadataPackageVersion>
     <MicrosoftJSInteropPackageVersion>6.0.10</MicrosoftJSInteropPackageVersion>
     <!-- Other packages -->
-    <MicrosoftCodeAnalysisNetAnalyzersVersion>7.0.0-preview1.22518.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
+    <MicrosoftCodeAnalysisNetAnalyzersVersion>7.0.0-preview1.22521.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
     <MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.3.3</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
     <MicrosoftCodeAnalysisBannedApiAnalyzersVersion>3.3.3</MicrosoftCodeAnalysisBannedApiAnalyzersVersion>
     <MicrosoftMauiGraphicsVersion>6.0.501</MicrosoftMauiGraphicsVersion>

From e0d29d2743f76cc7bb83a11709604d284c096da7 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 24 Oct 2022 18:17:26 +0100
Subject: [PATCH 32/77] Update dependencies from
 https://github.com/xamarin/xamarin-macios build 20221021.6 (#10869)

Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk
 From Version 16.0.523 -> To Version 16.0.525

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

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index ac1b080089f7..9eb42b303d1d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -16,13 +16,13 @@
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
       <Sha>10eff25d69496f01de7a1c213463efce4f4d6387</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.iOS.Sdk" Version="16.0.523">
+    <Dependency Name="Microsoft.iOS.Sdk" Version="16.0.525">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>12aaa79efd7aefb65a3875e8c42da75e473077c6</Sha>
+      <Sha>dc7da0d737499409bed6be24c4a0f16683d7739e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.tvOS.Sdk" Version="16.0.523">
+    <Dependency Name="Microsoft.tvOS.Sdk" Version="16.0.525">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>12aaa79efd7aefb65a3875e8c42da75e473077c6</Sha>
+      <Sha>dc7da0d737499409bed6be24c4a0f16683d7739e</Sha>
     </Dependency>
     <Dependency Name="Microsoft.macOS.Sdk" Version="12.3.469">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index fd3a923e6594..7edfbee6dae3 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -11,10 +11,10 @@
     <!-- xamarin/xamarin-android -->
     <MicrosoftAndroidSdkWindowsPackageVersion>32.0.478</MicrosoftAndroidSdkWindowsPackageVersion>
     <!-- xamarin/xamarin-macios -->
-    <MicrosoftiOSSdkPackageVersion>16.0.523</MicrosoftiOSSdkPackageVersion>
+    <MicrosoftiOSSdkPackageVersion>16.0.525</MicrosoftiOSSdkPackageVersion>
     <MicrosoftMacCatalystSdkPackageVersion>15.4.469</MicrosoftMacCatalystSdkPackageVersion>
     <MicrosoftmacOSSdkPackageVersion>12.3.469</MicrosoftmacOSSdkPackageVersion>
-    <MicrosofttvOSSdkPackageVersion>16.0.523</MicrosofttvOSSdkPackageVersion>
+    <MicrosofttvOSSdkPackageVersion>16.0.525</MicrosofttvOSSdkPackageVersion>
     <!-- Samsung/Tizen.NET -->
     <SamsungTizenSdkPackageVersion>7.0.400-preview.1.0</SamsungTizenSdkPackageVersion>
     <!-- emsdk -->

From 3bc3746979d5020229a25567be63a90823509724 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 24 Oct 2022 18:23:07 +0100
Subject: [PATCH 33/77] Update dependencies from
 https://github.com/dotnet/xharness build 20221024.1 (#10862)

Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit
 From Version 1.0.0-prerelease.22514.1 -> To Version 1.0.0-prerelease.22524.1

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

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index e8d1af2bf72b..bf2394e11cfe 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -15,7 +15,7 @@
       ]
     },
     "microsoft.dotnet.xharness.cli": {
-      "version": "1.0.0-prerelease.22514.1",
+      "version": "1.0.0-prerelease.22524.1",
       "commands": [
         "xharness"
       ]
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index feb7845082bf..f78ff6b5ab8d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -75,17 +75,17 @@
       <Uri>https://github.com/dotnet/Microsoft.Maui.Graphics</Uri>
       <Sha>015c4cd2d4ce120e516d75601ef5e80004b141a7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="1.0.0-prerelease.22514.1">
+    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="1.0.0-prerelease.22524.1">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>625a866f72b15b09cab79e84ef0f1cf4729de634</Sha>
+      <Sha>49b581c1ac56352864cb692d3c523b3fc27eddf7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.22514.1">
+    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.22524.1">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>625a866f72b15b09cab79e84ef0f1cf4729de634</Sha>
+      <Sha>49b581c1ac56352864cb692d3c523b3fc27eddf7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.22514.1">
+    <Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.22524.1">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>625a866f72b15b09cab79e84ef0f1cf4729de634</Sha>
+      <Sha>49b581c1ac56352864cb692d3c523b3fc27eddf7</Sha>
     </Dependency>
   </ProductDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 7b0ab77884ee..78ff149718a6 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -61,9 +61,9 @@
     <_HarfBuzzSharpVersion>2.8.2.2</_HarfBuzzSharpVersion>
     <_SkiaSharpNativeAssetsVersion>0.0.0-commit.193b587552cb0ed39372a049d7e6c692db98c267.483</_SkiaSharpNativeAssetsVersion>
     <MicrosoftTemplateEngineTasksVersion>7.0.100-preview.5.22226.1</MicrosoftTemplateEngineTasksVersion>
-    <MicrosoftDotNetXHarnessTestRunnersCommonVersion>1.0.0-prerelease.22514.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
-    <MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.22514.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
-    <MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.22514.1</MicrosoftDotNetXHarnessCLIVersion>
+    <MicrosoftDotNetXHarnessTestRunnersCommonVersion>1.0.0-prerelease.22524.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
+    <MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.22524.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
+    <MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.22524.1</MicrosoftDotNetXHarnessCLIVersion>
     <TizenUIExtensionsVersion>0.9.0</TizenUIExtensionsVersion>
     <SvgSkiaPackageVersion>0.5.13</SvgSkiaPackageVersion>
     <FizzlerPackageVersion>1.2.0</FizzlerPackageVersion>

From 90cd35e8b2bae4c0cfe8d81ace8746c60fa9b70f Mon Sep 17 00:00:00 2001
From: Gerald Versluis <gerald.versluis@microsoft.com>
Date: Tue, 25 Oct 2022 12:11:05 +0200
Subject: [PATCH 34/77] Fix more inline API docs (#10785)

* Update Animation.cs

* Fixed Entry and related

* Fix Button and related

* Add bindable properties notes

* - add loaded/unloaded docs

* Apply suggestions from code review

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>

* Update src/Controls/src/Core/Animation.cs

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>

* Removed dead links

Co-authored-by: Shane Neuville <shneuvil@microsoft.com>
Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>
---
 src/Controls/src/Core/ActionSheetArguments.cs |   3 +-
 src/Controls/src/Core/AlertArguments.cs       |   3 +-
 src/Controls/src/Core/Animation.cs            |  71 ++++--
 src/Controls/src/Core/AnimationExtensions.cs  |   3 -
 src/Controls/src/Core/Application.cs          |   3 +-
 src/Controls/src/Core/AutomationProperties.cs |   3 -
 .../src/Core/BindableObjectExtensions.cs      |   2 -
 .../src/Core/BindablePropertyConverter.cs     |   6 +-
 src/Controls/src/Core/Binding.cs              |   1 -
 src/Controls/src/Core/BrushTypeConverter.cs   |   8 +-
 src/Controls/src/Core/Button.cs               | 202 ++++++++++++++----
 src/Controls/src/Core/ButtonElement.cs        |  36 ++++
 ...ColumnDefinitionCollectionTypeConverter.cs |   6 +-
 src/Controls/src/Core/Command.cs              |   1 -
 src/Controls/src/Core/DatePicker.cs           |   2 -
 src/Controls/src/Core/DecorableTextElement.cs |   4 -
 src/Controls/src/Core/DependencyService.cs    |   6 -
 src/Controls/src/Core/DoubleCollection.cs     |   1 -
 .../src/Core/DoubleCollectionConverter.cs     |   6 +-
 src/Controls/src/Core/Editor.cs               |  11 -
 src/Controls/src/Core/ElementTemplate.cs      |   3 +-
 src/Controls/src/Core/Entry.cs                | 152 +++++++++----
 src/Controls/src/Core/EnumerableExtensions.cs |   5 +-
 .../src/Core/FileImageSourceConverter.cs      |   6 +-
 src/Controls/src/Core/FontAttributes.cs       |   6 +-
 src/Controls/src/Core/FontElement.cs          |  12 ++
 src/Controls/src/Core/FontImageSource.cs      |   2 -
 src/Controls/src/Core/FontSizeConverter.cs    |   6 +-
 src/Controls/src/Core/GestureRecognizer.cs    |   3 +-
 .../src/Core/GridLengthTypeConverter.cs       |   7 +-
 .../Core/HandlerImpl/Button/Button.Impl.cs    |   1 -
 .../HandlerImpl/Button/Button.Standard.cs     |  12 +-
 .../src/Core/HandlerImpl/Button/Button.cs     |  11 +-
 .../HandlerImpl/CheckBox/CheckBox.Impl.cs     |   5 +-
 .../Core/HandlerImpl/Element/Element.Impl.cs  |   3 +-
 .../HandlerImpl/Element/Element.Standard.cs   |   4 +-
 .../src/Core/HandlerImpl/Element/Element.cs   |   3 +-
 .../src/Core/HandlerImpl/Ellipse.Impl.cs      |   5 +-
 .../src/Core/HandlerImpl/Entry/Entry.Impl.cs  |   1 -
 .../Core/HandlerImpl/FlyoutPage/FlyoutPage.cs |   3 +-
 .../Core/HandlerImpl/Label/Label.Standard.cs  |   4 +-
 .../src/Core/HandlerImpl/Label/Label.cs       |   3 +-
 .../src/Core/HandlerImpl/Line.Impl.cs         |   5 +-
 .../src/Core/HandlerImpl/Page.Impl.cs         |   3 +-
 .../src/Core/HandlerImpl/Path.Impl.cs         |   3 +-
 .../src/Core/HandlerImpl/Polygon.Impl.cs      |   5 +-
 .../src/Core/HandlerImpl/Polyline.Impl.cs     |   5 +-
 .../HandlerImpl/RadioButton/RadioButton.cs    |   3 +-
 .../src/Core/HandlerImpl/Rectangle.Impl.cs    |   5 +-
 .../VisualElement/VisualElement.Impl.cs       |  21 +-
 .../VisualElement/VisualElement.cs            |   2 -
 src/Controls/src/Core/ImageSourceConverter.cs |   6 +-
 .../src/Core/Interactivity/TriggerAction.cs   |   1 -
 src/Controls/src/Core/Internals/AsyncValue.cs |   3 +-
 .../src/Core/Internals/CellExtensions.cs      |   5 -
 .../src/Core/Internals/ImageParser.cs         |   4 -
 .../Core/Internals/TextTransformUtilites.cs   |  21 +-
 .../Core/Items/CarouselLayoutTypeConverter.cs |   6 +-
 .../Core/Items/ItemsLayoutTypeConverter.cs    |   6 +-
 src/Controls/src/Core/ItemsView.cs            |   3 +-
 src/Controls/src/Core/Label.cs                |   2 -
 .../src/Core/Layout/AbsoluteLayout.cs         |   2 -
 .../src/Core/Layout/BoundsTypeConverter.cs    |   6 +-
 src/Controls/src/Core/Layout/FlexLayout.cs    |  12 --
 src/Controls/src/Core/Layout/Grid.cs          |  10 -
 src/Controls/src/Core/Layout/Layout.cs        |  15 --
 .../src/Core/LayoutOptionsConverter.cs        |   9 +-
 .../src/Core/ListStringTypeConverter.cs       |   6 +-
 src/Controls/src/Core/MessagingCenter.cs      |   6 -
 src/Controls/src/Core/NameScopeExtensions.cs  |   3 +-
 src/Controls/src/Core/NavigationModel.cs      |   3 +-
 src/Controls/src/Core/Page.cs                 |   1 -
 src/Controls/src/Core/PanGestureRecognizer.cs |   3 +-
 src/Controls/src/Core/Picker.cs               |   2 -
 .../src/Core/PlatformBindingHelpers.cs        |   6 -
 .../WindowsSpecific/RefreshView.cs            |   4 -
 .../WindowsSpecific/WebView.cs                |   5 -
 src/Controls/src/Core/RadioButton.cs          |   2 -
 src/Controls/src/Core/RadioButtonGroup.cs     |   4 +-
 .../src/Core/ReferenceTypeConverter.cs        |   6 +-
 src/Controls/src/Core/Registrar.cs            |  14 --
 src/Controls/src/Core/RouteFactory.cs         |   1 -
 .../RowDefinitionCollectionTypeConverter.cs   |   6 +-
 .../src/Core/ScrollToRequestedEventArgs.cs    |   3 +-
 src/Controls/src/Core/SearchBar.cs            |   8 -
 .../src/Core/Shapes/EllipseGeometry.cs        |   3 +-
 src/Controls/src/Core/Shapes/Geometry.cs      |   3 +-
 src/Controls/src/Core/Shapes/GeometryGroup.cs |   3 +-
 src/Controls/src/Core/Shapes/Line.cs          |   1 -
 src/Controls/src/Core/Shapes/LineGeometry.cs  |   3 +-
 .../src/Core/Shapes/MatrixTypeConverter.cs    |   6 +-
 src/Controls/src/Core/Shapes/Path.cs          |   1 -
 .../Shapes/PathFigureCollectionConverter.cs   |   6 +-
 src/Controls/src/Core/Shapes/PathGeometry.cs  |   3 +-
 .../src/Core/Shapes/PathGeometryConverter.cs  |   6 +-
 .../Core/Shapes/PointCollectionConverter.cs   |   6 +-
 src/Controls/src/Core/Shapes/Polygon.cs       |   1 -
 src/Controls/src/Core/Shapes/Polyline.cs      |   1 -
 .../src/Core/Shapes/RectangleGeometry.cs      |   3 +-
 src/Controls/src/Core/Shapes/Shape.cs         |   4 +-
 .../src/Core/Shapes/TransformTypeConverter.cs |   6 +-
 .../src/Core/Shell/BackButtonBehavior.cs      |   4 +-
 src/Controls/src/Core/Shell/BaseShellItem.cs  |   1 -
 src/Controls/src/Core/Shell/SearchHandler.cs  |   6 +-
 src/Controls/src/Core/Shell/Shell.cs          |  22 --
 .../src/Core/Shell/ShellAppearance.cs         |   6 +-
 src/Controls/src/Core/Span.cs                 |   2 -
 src/Controls/src/Core/TableSection.cs         |  11 -
 src/Controls/src/Core/TextAlignment.cs        |   7 +-
 src/Controls/src/Core/TextElement.cs          |   9 +
 src/Controls/src/Core/TimePicker.cs           |   2 -
 src/Controls/src/Core/TypeTypeConverter.cs    |   6 +-
 src/Controls/src/Core/UriImageSource.cs       |   4 +-
 src/Controls/src/Core/UriTypeConverter.cs     |   4 -
 src/Controls/src/Core/VisualElement.cs        |   9 +-
 .../src/Core/Visuals/VisualTypeConverter.cs   |   9 +-
 .../src/Core/WebViewSourceTypeConverter.cs    |   6 +-
 src/Core/src/Core/IButton.cs                  |   8 +-
 src/Core/src/Core/IEntry.cs                   |   2 +-
 src/Core/src/Platform/ViewExtensions.cs       |   3 +-
 src/Core/src/Primitives/Aspect.cs             |   3 +-
 .../src/Primitives/ClearButtonVisibility.cs   |  14 +-
 src/Core/src/Primitives/Font.cs               |   8 -
 src/Core/src/Primitives/LineBreakMode.cs      |  34 ++-
 src/Core/src/Primitives/ReturnType.cs         |  36 +++-
 src/Core/src/Primitives/TextTransform.cs      |  23 +-
 src/Core/src/Primitives/Thickness.cs          |   4 +-
 .../VisualDiagnostics/VisualDiagnostics.cs    |   4 -
 .../VisualTreeChangeEventArgs.cs              |   1 -
 src/Core/src/WeakEventManager.cs              |   4 -
 .../src/AppActions/AppActions.shared.cs       |   1 -
 src/Essentials/src/Compass/Compass.shared.cs  |   1 -
 .../src/DeviceDisplay/DeviceDisplay.shared.cs |   3 +-
 .../src/Magnetometer/Magnetometer.shared.cs   |   1 -
 .../src/Permissions/Permissions.shared.cs     |   3 -
 .../src/Screenshot/Screenshot.shared.cs       |   1 -
 .../src/SecureStorage/SecureStorage.shared.cs |   1 -
 src/Essentials/src/Types/Contact.shared.cs    |   2 -
 .../WebAuthenticator.shared.cs                |   1 -
 139 files changed, 602 insertions(+), 601 deletions(-)

diff --git a/src/Controls/src/Core/ActionSheetArguments.cs b/src/Controls/src/Core/ActionSheetArguments.cs
index 230d32fe1e5a..3a558dbe98d0 100644
--- a/src/Controls/src/Core/ActionSheetArguments.cs
+++ b/src/Controls/src/Core/ActionSheetArguments.cs
@@ -44,7 +44,6 @@ public ActionSheetArguments(string title, string cancel, string destruction, IEn
 		/// </summary>
 		public string Title { get; private set; }
 
-		/// <include file="../../docs/Microsoft.Maui.Controls.Internals/ActionSheetArguments.xml" path="//Member[@MemberName='FlowDirection']/Docs/*" />
 		public FlowDirection FlowDirection { get; set; }
 
 		/// <include file="../../docs/Microsoft.Maui.Controls.Internals/ActionSheetArguments.xml" path="//Member[@MemberName='SetResult']/Docs/*" />
@@ -53,4 +52,4 @@ public void SetResult(string result)
 			Result.TrySetResult(result);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/AlertArguments.cs b/src/Controls/src/Core/AlertArguments.cs
index 7126663f6bad..d1e39db871c5 100644
--- a/src/Controls/src/Core/AlertArguments.cs
+++ b/src/Controls/src/Core/AlertArguments.cs
@@ -36,7 +36,6 @@ public AlertArguments(string title, string message, string accept, string cancel
 		/// <include file="../../docs/Microsoft.Maui.Controls.Internals/AlertArguments.xml" path="//Member[@MemberName='Result']/Docs/*" />
 		public TaskCompletionSource<bool> Result { get; }
 
-		/// <include file="../../docs/Microsoft.Maui.Controls.Internals/AlertArguments.xml" path="//Member[@MemberName='FlowDirection']/Docs/*" />
 		public FlowDirection FlowDirection { get; set; }
 
 		/// <summary>
@@ -50,4 +49,4 @@ public void SetResult(bool result)
 			Result.TrySetResult(result);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/Animation.cs b/src/Controls/src/Core/Animation.cs
index 0722205bae41..397f5f03e13f 100644
--- a/src/Controls/src/Core/Animation.cs
+++ b/src/Controls/src/Core/Animation.cs
@@ -2,20 +2,32 @@
 using System.Collections;
 using System.Collections.Generic;
 using BaseAnimation = Microsoft.Maui.Animations.Animation;
+
 namespace Microsoft.Maui.Controls
 {
-	/// <include file="../../docs/Microsoft.Maui.Controls/Animation.xml" path="Type[@FullName='Microsoft.Maui.Controls.Animation']/Docs/*" />
+	/// <summary>
+	/// Encapsulates an animation, a collection of functions that modify properties over a user-perceptible time period.
+	/// </summary>
 	public class Animation : BaseAnimation
 	{
 		bool _finishedTriggered;
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Animation.xml" path="//Member[@MemberName='.ctor'][1]/Docs/*" />
+		/// <summary>
+		/// Creates a new <see cref="Animation" /> object with default values.
+		/// </summary>
 		public Animation()
 		{
 			Easing = Easing.Linear;
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Animation.xml" path="//Member[@MemberName='.ctor']/Docs/*" />
+		/// <summary>
+		/// Creates a new <see cref = "Animation" /> object with the specified parameters.
+		/// </summary>
+		/// <param name="callback">An action that is called with successive animation values.</param>
+		/// <param name="start"> The fraction into the current animation at which to start the animation.</param>
+		/// <param name="end"> The fraction into the current animation at which to end the animation.</param>
+		/// <param name="easing"> The easing function to use to transition in, out, or in and out of the animation.</param>
+		/// <param name="finished"> An action to call when the animation is finished.</param>
 		public Animation(Action<double> callback, double start = 0.0f, double end = 1.0f, Easing easing = null, Action finished = null) : base(callback, start, end - start, easing, finished)
 		{
 
@@ -23,8 +35,12 @@ public Animation(Action<double> callback, double start = 0.0f, double end = 1.0f
 			Func<double, double> transform = AnimationExtensions.Interpolate(start, end);
 			Step = f => callback(transform(f));
 		}
-
-		/// <include file="../../docs/Microsoft.Maui.Controls/Animation.xml" path="//Member[@MemberName='Add']/Docs/*" />
+		/// <summary>
+		/// Adds an <see cref="Animation"/> object to this <see cref="Animation"/> that begins at <paramref name="beginAt"/> and finishes at <paramref name="finishAt"/>.
+		/// </summary>
+		/// <param name="beginAt">The fraction into this animation at which the added child animation will begin animating.</param>
+		/// <param name="finishAt">The fraction into this animation at which the added child animation will stop animating.</param>
+		/// <param name="animation">The animation to add.</param>
 		public void Add(double beginAt, double finishAt, Animation animation)
 		{
 			if (beginAt < 0 || beginAt > 1)
@@ -41,13 +57,25 @@ public void Add(double beginAt, double finishAt, Animation animation)
 			childrenAnimations.Add(animation);
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Animation.xml" path="//Member[@MemberName='Commit']/Docs/*" />
+		/// <summary>
+		/// Runs the <paramref name="owner" /> animation with the supplied parameters.
+		/// </summary>
+		/// <param name="owner">The owning animation that will be animated.</param>
+		/// <param name="name">The name, or handle, that is used to access and track the animation and its state.</param>
+		/// <param name="rate">The time, in milliseconds, between frames.</param>
+		/// <param name="length">The number of milliseconds over which to interpolate the animation.</param>
+		/// <param name="easing">The easing function to use to transition in, out, or in and out of the animation.</param>
+		/// <param name="finished">An action to call when the animation is finished.</param>
+		/// <param name="repeat">A function that should return true if the animation should continue.</param>
 		public void Commit(IAnimatable owner, string name, uint rate = 16, uint length = 250, Easing easing = null, Action<double, bool> finished = null, Func<bool> repeat = null)
 		{
 			owner.Animate(name, this, rate, length, easing, finished, repeat);
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Animation.xml" path="//Member[@MemberName='GetCallback']/Docs/*" />
+		/// <summary>
+		/// Returns a callback that recursively runs the eased animation step on this <see cref="Animation" /> object and those of its children that have begun and not finished.
+		/// </summary>
+		/// <returns>A callback that recursively runs the eased animation step on this <see cref="Animation" /> object and those of its children that have begun and not finished.</returns>
 		public Action<double> GetCallback()
 		{
 			Action<double> result = f =>
@@ -78,21 +106,30 @@ public Action<double> GetCallback()
 
 		internal void ResetChildren() => this.Reset();
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Animation.xml" path="//Member[@MemberName='Reset']/Docs/*" />
 		public override void Reset()
 		{
 			base.Reset();
 			_finishedTriggered = false;
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Animation.xml" path="//Member[@MemberName='Insert']/Docs/*" />
+		/// <summary>
+		/// Adds an <see cref="Animation" /> object to this <see cref="Animation" /> that begins at <paramref name="beginAt" /> and finishes at <paramref name="finishAt" />.
+		/// </summary>
+		/// <param name="beginAt">The fraction into this animation at which the added child animation will begin animating.</param>
+		/// <param name="finishAt">The fraction into this animation at which the added child animation will stop animating.</param>
+		/// <param name="animation">The animation to add.</param>
 		public Animation Insert(double beginAt, double finishAt, Animation animation)
 		{
 			Add(beginAt, finishAt, animation);
 			return this;
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Animation.xml" path="//Member[@MemberName='WithConcurrent'][1]/Docs/*" />
+		/// <summary>
+		/// Adds <paramref name="animation" /> to the children of this <see cref="Animation" /> object and sets the start and end times of <paramref name="animation" /> to <paramref name="beginAt" /> and <paramref name="finishAt" />, respectively.
+		/// </summary>
+		/// <param name="animation">The animation to add.</param>
+		/// <param name="beginAt">The fraction into this animation at which the added child animation will begin animating.</param>
+		/// <param name="finishAt">The fraction into this animation at which the added child animation will stop animating.</param>
 		public Animation WithConcurrent(Animation animation, double beginAt = 0.0f, double finishAt = 1.0f)
 		{
 			animation.StartDelay = beginAt;
@@ -101,7 +138,15 @@ public Animation WithConcurrent(Animation animation, double beginAt = 0.0f, doub
 			return this;
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Animation.xml" path="//Member[@MemberName='WithConcurrent'][2]/Docs/*" />
+		/// <summary>
+		/// Creates a new <see cref="Animation" /> object with the specified <paramref name="callback" />, and adds it to the children of this <see cref="Animation" /> object.
+		/// </summary>
+		/// <param name="callback">An action that is called with successive animation values.</param>
+		/// <param name="start">The fraction into the current animation at which to start the animation.</param>
+		/// <param name="end">The fraction into the current animation at which to end the animation.</param>
+		/// <param name="easing">The easing function to use to transition in, out, or in and out of the animation.</param>
+		/// <param name="beginAt">The fraction into this animation at which the added child animation will begin animating.</param>
+		/// <param name="finishAt">The fraction into this animation at which the added child animation will stop animating.</param>
 		public Animation WithConcurrent(Action<double> callback, double start = 0.0f, double end = 1.0f, Easing easing = null, double beginAt = 0.0f, double finishAt = 1.0f)
 		{
 			var child = new Animation(callback, start, end, easing);
@@ -111,7 +156,9 @@ public Animation WithConcurrent(Action<double> callback, double start = 0.0f, do
 			return this;
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Animation.xml" path="//Member[@MemberName='IsEnabled']/Docs/*" />
+		/// <summary>
+		/// Specifies if this animation is currently enabled.
+		/// </summary>
 		public bool IsEnabled
 		{
 			get
diff --git a/src/Controls/src/Core/AnimationExtensions.cs b/src/Controls/src/Core/AnimationExtensions.cs
index 117f97e2d6b1..32f814b21319 100644
--- a/src/Controls/src/Core/AnimationExtensions.cs
+++ b/src/Controls/src/Core/AnimationExtensions.cs
@@ -47,7 +47,6 @@ static AnimationExtensions()
 			s_tweeners = new Dictionary<int, Animation>();
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/AnimationExtensions.xml" path="//Member[@MemberName='Add']/Docs/*" />
 		public static int Add(this IAnimationManager animationManager, Action<double> step)
 		{
 			var id = s_currentTweener++;
@@ -61,7 +60,6 @@ public static int Add(this IAnimationManager animationManager, Action<double> st
 			animation.Commit(animationManager);
 			return id;
 		}
-		/// <include file="../../docs/Microsoft.Maui.Controls/AnimationExtensions.xml" path="//Member[@MemberName='Insert']/Docs/*" />
 		public static int Insert(this IAnimationManager animationManager, Func<long, bool> step)
 		{
 			var id = s_currentTweener++;
@@ -75,7 +73,6 @@ public static int Insert(this IAnimationManager animationManager, Func<long, boo
 			animation.Commit(animationManager);
 			return id;
 		}
-		/// <include file="../../docs/Microsoft.Maui.Controls/AnimationExtensions.xml" path="//Member[@MemberName='Remove']/Docs/*" />
 		public static void Remove(this IAnimationManager animationManager, int tickerId)
 		{
 			var animation = s_tweeners[tickerId];
diff --git a/src/Controls/src/Core/Application.cs b/src/Controls/src/Core/Application.cs
index 47a695f25530..8a5680e7a203 100644
--- a/src/Controls/src/Core/Application.cs
+++ b/src/Controls/src/Core/Application.cs
@@ -180,7 +180,6 @@ public AppTheme UserAppTheme
 		public AppTheme RequestedTheme => UserAppTheme != AppTheme.Unspecified ? UserAppTheme : PlatformAppTheme;
 
 		static Color? _accentColor;
-		/// <include file="../../docs/Microsoft.Maui.Controls/Application.xml" path="//Member[@MemberName='AccentColor']/Docs/*" />
 		public static Color? AccentColor
 		{
 			get => _accentColor ??= GetAccentColor();
@@ -385,4 +384,4 @@ protected internal virtual void CleanUp()
 
 		IReadOnlyList<Maui.IVisualTreeElement> IVisualTreeElement.GetVisualChildren() => this.Windows;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/AutomationProperties.cs b/src/Controls/src/Core/AutomationProperties.cs
index 251fa613f151..e5efa0b30827 100644
--- a/src/Controls/src/Core/AutomationProperties.cs
+++ b/src/Controls/src/Core/AutomationProperties.cs
@@ -9,7 +9,6 @@ public class AutomationProperties
 		/// <include file="../../docs/Microsoft.Maui.Controls/AutomationProperties.xml" path="//Member[@MemberName='IsInAccessibleTreeProperty']/Docs/*" />
 		public static readonly BindableProperty IsInAccessibleTreeProperty = BindableProperty.Create("IsInAccessibleTree", typeof(bool?), typeof(AutomationProperties), null);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/AutomationProperties.xml" path="//Member[@MemberName='ExcludedWithChildrenProperty']/Docs/*" />
 		public static readonly BindableProperty ExcludedWithChildrenProperty = BindableProperty.Create("ExcludedWithChildren", typeof(bool?), typeof(AutomationProperties), null);
 
 		/// <include file="../../docs/Microsoft.Maui.Controls/AutomationProperties.xml" path="//Member[@MemberName='LabeledByProperty']/Docs/*" />
@@ -30,7 +29,6 @@ public static string GetHelpText(BindableObject bindable)
 			return (bool?)bindable.GetValue(IsInAccessibleTreeProperty);
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/AutomationProperties.xml" path="//Member[@MemberName='GetExcludedWithChildren']/Docs/*" />
 		public static bool? GetExcludedWithChildren(BindableObject bindable)
 		{
 			return (bool?)bindable.GetValue(ExcludedWithChildrenProperty);
@@ -61,7 +59,6 @@ public static void SetIsInAccessibleTree(BindableObject bindable, bool? value)
 			bindable.SetValue(IsInAccessibleTreeProperty, value);
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/AutomationProperties.xml" path="//Member[@MemberName='SetExcludedWithChildren']/Docs/*" />
 		public static void SetExcludedWithChildren(BindableObject bindable, bool? value)
 		{
 			bindable.SetValue(ExcludedWithChildrenProperty, value);
diff --git a/src/Controls/src/Core/BindableObjectExtensions.cs b/src/Controls/src/Core/BindableObjectExtensions.cs
index 6edd507fc1c6..12c9da451776 100644
--- a/src/Controls/src/Core/BindableObjectExtensions.cs
+++ b/src/Controls/src/Core/BindableObjectExtensions.cs
@@ -42,7 +42,6 @@ public static void SetBinding(this BindableObject self, BindableProperty targetP
 			self.SetBinding(targetProperty, binding);
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/BindableObjectExtensions.xml" path="//Member[@MemberName='GetPropertyIfSet']/Docs/*" />
 		public static T GetPropertyIfSet<T>(this BindableObject bindableObject, BindableProperty bindableProperty, T returnIfNotSet)
 		{
 			if (bindableObject == null)
@@ -54,7 +53,6 @@ public static T GetPropertyIfSet<T>(this BindableObject bindableObject, Bindable
 			return returnIfNotSet;
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/BindableObjectExtensions.xml" path="//Member[@MemberName='SetAppTheme']/Docs/*" />
 		public static void SetAppTheme<T>(this BindableObject self, BindableProperty targetProperty, T light, T dark) => self.SetBinding(targetProperty, new AppThemeBinding { Light = light, Dark = dark });
 
 		/// <include file="../../docs/Microsoft.Maui.Controls/BindableObjectExtensions.xml" path="//Member[@MemberName='SetAppThemeColor']/Docs/*" />
diff --git a/src/Controls/src/Core/BindablePropertyConverter.cs b/src/Controls/src/Core/BindablePropertyConverter.cs
index 5867278ff79d..b9396053636a 100644
--- a/src/Controls/src/Core/BindablePropertyConverter.cs
+++ b/src/Controls/src/Core/BindablePropertyConverter.cs
@@ -14,11 +14,9 @@ namespace Microsoft.Maui.Controls
 	[Xaml.ProvideCompiled("Microsoft.Maui.Controls.XamlC.BindablePropertyConverter")]
 	public sealed class BindablePropertyConverter : TypeConverter, IExtendedTypeConverter
 	{
-		/// <include file="../../docs/Microsoft.Maui.Controls/BindablePropertyConverter.xml" path="//Member[@MemberName='CanConvertFrom']/Docs/*" />
 		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
 			=> sourceType == typeof(string);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/BindablePropertyConverter.xml" path="//Member[@MemberName='CanConvertTo']/Docs/*" />
 		public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
 			=> true;
 
@@ -74,7 +72,6 @@ object IExtendedTypeConverter.ConvertFromInvariantString(string value, IServiceP
 			throw new XamlParseException($"Can't resolve {value}. Syntax is [[prefix:]Type.]PropertyName.", lineinfo);
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/BindablePropertyConverter.xml" path="//Member[@MemberName='ConvertFrom']/Docs/*" />
 		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
 		{
 			var strValue = value?.ToString();
@@ -144,7 +141,6 @@ Type FindTypeForVisualState(IProvideParentValues parentValueProvider, IXmlLineIn
 
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/BindablePropertyConverter.xml" path="//Member[@MemberName='ConvertTo']/Docs/*" />
 		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
 		{
 			if (value is not BindableProperty bp)
@@ -152,4 +148,4 @@ public override object ConvertTo(ITypeDescriptorContext context, CultureInfo cul
 			return $"{bp.DeclaringType.Name}.{bp.PropertyName}";
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/Binding.cs b/src/Controls/src/Core/Binding.cs
index 224a7e3b33fb..2a869c04f55b 100644
--- a/src/Controls/src/Core/Binding.cs
+++ b/src/Controls/src/Core/Binding.cs
@@ -9,7 +9,6 @@ namespace Microsoft.Maui.Controls
 	/// <include file="../../docs/Microsoft.Maui.Controls/Binding.xml" path="Type[@FullName='Microsoft.Maui.Controls.Binding']/Docs/*" />
 	public sealed class Binding : BindingBase
 	{
-		/// <include file="../../docs/Microsoft.Maui.Controls/Binding.xml" path="//Member[@MemberName='SelfPath']/Docs/*" />
 		public const string SelfPath = ".";
 		IValueConverter _converter;
 		object _converterParameter;
diff --git a/src/Controls/src/Core/BrushTypeConverter.cs b/src/Controls/src/Core/BrushTypeConverter.cs
index d174eb68d514..01abdea217b4 100644
--- a/src/Controls/src/Core/BrushTypeConverter.cs
+++ b/src/Controls/src/Core/BrushTypeConverter.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Globalization;
@@ -26,15 +26,12 @@ public class BrushTypeConverter : TypeConverter
 
 		readonly ColorTypeConverter _colorTypeConverter = new ColorTypeConverter();
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/BrushTypeConverter.xml" path="//Member[@MemberName='CanConvertFrom']/Docs/*" />
 		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
 			=> sourceType == typeof(string);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/BrushTypeConverter.xml" path="//Member[@MemberName='CanConvertTo']/Docs/*" />
 		public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
 			=> false;
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/BrushTypeConverter.xml" path="//Member[@MemberName='ConvertFrom']/Docs/*" />
 		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
 		{
 			var strValue = value?.ToString();
@@ -71,7 +68,6 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
 		}
 
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/BrushTypeConverter.xml" path="//Member[@MemberName='ConvertTo']/Docs/*" />
 		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
 			=> throw new NotSupportedException();
 
@@ -410,4 +406,4 @@ bool TryParseOffsets(string[] parts, out float[] result)
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/Button.cs b/src/Controls/src/Core/Button.cs
index 48d02da0ef3d..dcf49ca50dc1 100644
--- a/src/Controls/src/Core/Button.cs
+++ b/src/Controls/src/Core/Button.cs
@@ -8,69 +8,85 @@
 
 namespace Microsoft.Maui.Controls
 {
-	/// <include file="../../docs/Microsoft.Maui.Controls/Button.xml" path="Type[@FullName='Microsoft.Maui.Controls.Button']/Docs/*" />
+	/// <summary>
+	/// A button <see cref="View" /> that reacts to touch events.
+	/// </summary>
 	public partial class Button : View, IFontElement, ITextElement, IBorderElement, IButtonController, IElementConfiguration<Button>, IPaddingElement, IImageController, IViewController, IButtonElement, IImageElement
 	{
 		const double DefaultSpacing = 10;
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Button.xml" path="//Member[@MemberName='CommandProperty']/Docs/*" />
+		/// <inheritdoc cref="ButtonElement.CommandProperty"/>
 		public static readonly BindableProperty CommandProperty = ButtonElement.CommandProperty;
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Button.xml" path="//Member[@MemberName='CommandParameterProperty']/Docs/*" />
+		/// <summary>
+		/// The backing store for the <see cref="CommandParameter" /> bindable property.
+		/// </summary>
 		public static readonly BindableProperty CommandParameterProperty = ButtonElement.CommandParameterProperty;
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Button.xml" path="//Member[@MemberName='ContentLayoutProperty']/Docs/*" />
+		/// <summary>
+		/// The backing store for the <see cref="ContentLayout" /> bindable property.
+		/// </summary>
 		public static readonly BindableProperty ContentLayoutProperty = BindableProperty.Create(
 			nameof(ContentLayout), typeof(ButtonContentLayout), typeof(Button), new ButtonContentLayout(ButtonContentLayout.ImagePosition.Left, DefaultSpacing),
 			propertyChanged: (bindable, oldVal, newVal) => ((Button)bindable).InvalidateMeasureInternal(InvalidationTrigger.MeasureChanged));
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Button.xml" path="//Member[@MemberName='TextProperty']/Docs/*" />
+		/// <summary>
+		/// The backing store for the <see cref="Text" /> bindable property.
+		/// </summary>
 		public static readonly BindableProperty TextProperty = BindableProperty.Create(
 			nameof(Text), typeof(string), typeof(Button), null,
 			propertyChanged: (bindable, oldVal, newVal) => ((Button)bindable).InvalidateMeasureInternal(InvalidationTrigger.MeasureChanged));
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Button.xml" path="//Member[@MemberName='TextColorProperty']/Docs/*" />
+		/// <inheritdoc cref="TextElement.TextColorProperty"/>
 		public static readonly BindableProperty TextColorProperty = TextElement.TextColorProperty;
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Button.xml" path="//Member[@MemberName='CharacterSpacingProperty']/Docs/*" />
+		/// <inheritdoc cref="TextElement.CharacterSpacingProperty"/>
 		public static readonly BindableProperty CharacterSpacingProperty = TextElement.CharacterSpacingProperty;
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Button.xml" path="//Member[@MemberName='FontFamilyProperty']/Docs/*" />
+		/// <inheritdoc cref="FontElement.FontFamilyProperty"/>
 		public static readonly BindableProperty FontFamilyProperty = FontElement.FontFamilyProperty;
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Button.xml" path="//Member[@MemberName='FontSizeProperty']/Docs/*" />
+		/// <inheritdoc cref="FontElement.FontSizeProperty"/>
 		public static readonly BindableProperty FontSizeProperty = FontElement.FontSizeProperty;
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Button.xml" path="//Member[@MemberName='TextTransformProperty']/Docs/*" />
+		/// <inheritdoc cref="TextElement.TextTransformProperty"/>
 		public static readonly BindableProperty TextTransformProperty = TextElement.TextTransformProperty;
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Button.xml" path="//Member[@MemberName='FontAttributesProperty']/Docs/*" />
+		/// <inheritdoc cref="FontElement.FontAttributesProperty"/>
 		public static readonly BindableProperty FontAttributesProperty = FontElement.FontAttributesProperty;
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Button.xml" path="//Member[@MemberName='FontAutoScalingEnabledProperty']/Docs/*" />
+		/// <inheritdoc cref="FontElement.FontAutoScalingEnabledProperty"/>
 		public static readonly BindableProperty FontAutoScalingEnabledProperty = FontElement.FontAutoScalingEnabledProperty;
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Button.xml" path="//Member[@MemberName='BorderWidthProperty']/Docs/*" />
+		/// <summary>
+		/// The backing store for the <see cref="BorderWidth"/> bindable property.
+		/// </summary>
 		public static readonly BindableProperty BorderWidthProperty = BindableProperty.Create(nameof(BorderWidth), typeof(double), typeof(Button), -1d);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Button.xml" path="//Member[@MemberName='BorderColorProperty']/Docs/*" />
+		/// <inheritdoc cref="BorderElement.BorderColorProperty"/>
 		public static readonly BindableProperty BorderColorProperty = BorderElement.BorderColorProperty;
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Button.xml" path="//Member[@MemberName='CornerRadiusProperty']/Docs/*" />
+		/// <summary>
+		/// The backing store for the <see cref="CornerRadius"/> bindable property.
+		/// </summary>
 		public static readonly BindableProperty CornerRadiusProperty = BindableProperty.Create(nameof(CornerRadius), typeof(int), typeof(Button), defaultValue: BorderElement.DefaultCornerRadius);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Button.xml" path="//Member[@MemberName='ImageSourceProperty']/Docs/*" />
+		/// <inheritdoc cref="ImageElement.ImageSourceProperty"/>
 		public static readonly BindableProperty ImageSourceProperty = ImageElement.ImageSourceProperty;
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Button.xml" path="//Member[@MemberName='PaddingProperty']/Docs/*" />
+		/// <inheritdoc cref="PaddingElement.PaddingProperty"/>
 		public static readonly BindableProperty PaddingProperty = PaddingElement.PaddingProperty;
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Button.xml" path="//Member[@MemberName='LineBreakModeProperty']/Docs/*" />
+		/// <summary>
+		/// The backing store for the <see cref="LineBreakMode"/> bindable property.
+		/// </summary>
 		public static readonly BindableProperty LineBreakModeProperty = BindableProperty.Create(
 			nameof(LineBreakMode), typeof(LineBreakMode), typeof(Button), LineBreakMode.NoWrap,
 			propertyChanged: (bindable, oldvalue, newvalue) => ((Button)bindable).InvalidateMeasureInternal(InvalidationTrigger.MeasureChanged));
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Button.xml" path="//Member[@MemberName='Padding']/Docs/*" />
+		/// <summary>
+		/// Gets or sets the padding for the button. This is a bindable property.
+		/// </summary>
 		public Thickness Padding
 		{
 			get { return (Thickness)GetValue(PaddingElement.PaddingProperty); }
@@ -79,7 +95,10 @@ public Thickness Padding
 
 		Thickness IPaddingElement.PaddingDefaultValueCreator() => new Thickness(double.NaN);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Button.xml" path="//Member[@MemberName='LineBreakMode']/Docs/*" />
+		/// <summary>
+		/// Determines how <see cref="Text"/> is shown when the length is overflowing the size of this button.
+		/// This is a bindable property.
+		/// </summary>
 		public LineBreakMode LineBreakMode
 		{
 			get { return (LineBreakMode)GetValue(LineBreakModeProperty); }
@@ -93,76 +112,108 @@ void IPaddingElement.OnPaddingPropertyChanged(Thickness oldValue, Thickness newV
 
 
 		internal static readonly BindablePropertyKey IsPressedPropertyKey = BindableProperty.CreateReadOnly(nameof(IsPressed), typeof(bool), typeof(Button), default(bool));
-		/// <include file="../../docs/Microsoft.Maui.Controls/Button.xml" path="//Member[@MemberName='IsPressedProperty']/Docs/*" />
+		
+		/// <summary>
+		/// The backing store for the <see cref="IsPressed"/> bindable property.
+		/// </summary>
 		public static readonly BindableProperty IsPressedProperty = IsPressedPropertyKey.BindableProperty;
 
 
 		readonly Lazy<PlatformConfigurationRegistry<Button>> _platformConfigurationRegistry;
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Button.xml" path="//Member[@MemberName='BorderColor']/Docs/*" />
+		/// <summary>
+		/// Gets or sets a color that describes the border stroke color of the button. This is a bindable property.
+		/// </summary>
+		/// <remarks>This property has no effect if <see cref="IBorderElement.BorderWidth" /> is set to 0. On Android this property will not have an effect unless <see cref="VisualElement.BackgroundColor" /> is set to a non-default color.</remarks>
 		public Color BorderColor
 		{
 			get { return (Color)GetValue(BorderElement.BorderColorProperty); }
 			set { SetValue(BorderElement.BorderColorProperty, value); }
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Button.xml" path="//Member[@MemberName='CornerRadius']/Docs/*" />
+		/// <summary>
+		/// Gets or sets the corner radius for the button, in device-independent units. This is a bindable property.
+		/// </summary>
 		public int CornerRadius
 		{
 			get { return (int)GetValue(CornerRadiusProperty); }
 			set { SetValue(CornerRadiusProperty, value); }
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Button.xml" path="//Member[@MemberName='BorderWidth']/Docs/*" />
+		/// <summary>
+		/// Gets or sets the width of the border, in device-independent units. This is a bindable property.
+		/// </summary>
+		/// <remarks>Set this value to a non-zero value in order to have a visible border.</remarks>
 		public double BorderWidth
 		{
 			get { return (double)GetValue(BorderWidthProperty); }
 			set { SetValue(BorderWidthProperty, value); }
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Button.xml" path="//Member[@MemberName='ContentLayout']/Docs/*" />
+		/// <summary>
+		/// Gets or sets an object that controls the position of the button image and the spacing between the button's image and the button's text.
+		/// This is a bindable property.
+		/// </summary>
 		public ButtonContentLayout ContentLayout
 		{
 			get { return (ButtonContentLayout)GetValue(ContentLayoutProperty); }
 			set { SetValue(ContentLayoutProperty, value); }
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Button.xml" path="//Member[@MemberName='Command']/Docs/*" />
+		/// <summary>
+		/// Gets or sets the command to invoke when the button is activated. This is a bindable property.
+		/// </summary>
+		/// <remarks>This property is used to associate a command with an instance of a button. This property is most often set in the MVVM pattern to bind callbacks back into the ViewModel. <see cref="VisualElement.IsEnabled" /> is controlled by the <see cref="Command.CanExecute(object)"/> if set.</remarks>
 		public ICommand Command
 		{
 			get { return (ICommand)GetValue(CommandProperty); }
 			set { SetValue(CommandProperty, value); }
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Button.xml" path="//Member[@MemberName='CommandParameter']/Docs/*" />
+		/// <summary>
+		/// Gets or sets the parameter to pass to the <see cref="Command"/> property.
+		/// The default value is <see langword="null"/>. This is a bindable property.
+		/// </summary>
 		public object CommandParameter
 		{
 			get { return GetValue(CommandParameterProperty); }
 			set { SetValue(CommandParameterProperty, value); }
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Button.xml" path="//Member[@MemberName='ImageSource']/Docs/*" />
+		/// <summary>
+		/// Allows you to display a bitmap image on the Button. This is a bindable property.
+		/// </summary>
+		/// <remarks>For more options have a look at <see cref="ImageButton"/>.</remarks>
 		public ImageSource ImageSource
 		{
 			get { return (ImageSource)GetValue(ImageSourceProperty); }
 			set { SetValue(ImageSourceProperty, value); }
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Button.xml" path="//Member[@MemberName='Text']/Docs/*" />
+		/// <summary>
+		/// Gets or sets the text displayed as the content of the button.
+		/// The default value is <see langword="null"/>. This is a bindable property.
+		/// </summary>
+		/// <remarks>Changing the text of a button will trigger a layout cycle.</remarks>
 		public string Text
 		{
 			get { return (string)GetValue(TextProperty); }
 			set { SetValue(TextProperty, value); }
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Button.xml" path="//Member[@MemberName='TextColor']/Docs/*" />
+		/// <summary>
+		/// Gets or sets the <see cref="Color" /> for the text of the button. This is a bindable property.
+		/// </summary>
 		public Color TextColor
 		{
 			get { return (Color)GetValue(TextElement.TextColorProperty); }
 			set { SetValue(TextElement.TextColorProperty, value); }
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Button.xml" path="//Member[@MemberName='CharacterSpacing']/Docs/*" />
+		/// <summary>
+		/// Gets or sets the spacing between each of the characters of <see cref="Text"/> when displayed on the button.
+		/// This is a bindable property.
+		/// </summary>
 		public double CharacterSpacing
 		{
 			get { return (double)GetValue(TextElement.CharacterSpacingProperty); }
@@ -174,21 +225,32 @@ bool IButtonElement.IsEnabledCore
 			set { SetValueCore(IsEnabledProperty, value); }
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Button.xml" path="//Member[@MemberName='SendClicked']/Docs/*" />
+		/// <summary>
+		/// Internal method to trigger the <see cref="Clicked"/> event.
+		/// Should not be called manually outside of .NET MAUI.
+		/// </summary>
 		[EditorBrowsable(EditorBrowsableState.Never)]
 		public void SendClicked() => ButtonElement.ElementClicked(this, this);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Button.xml" path="//Member[@MemberName='IsPressed']/Docs/*" />
+		/// <summary>
+		/// Gets whether or not the button is currently pressed.
+		/// </summary>
 		public bool IsPressed => (bool)GetValue(IsPressedProperty);
 
 		[EditorBrowsable(EditorBrowsableState.Never)]
 		void IButtonElement.SetIsPressed(bool isPressed) => SetValue(IsPressedPropertyKey, isPressed);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Button.xml" path="//Member[@MemberName='SendPressed']/Docs/*" />
+		/// <summary>
+		/// Internal method to trigger the <see cref="Pressed"/> event.
+		/// Should not be called manually outside of .NET MAUI.
+		/// </summary>
 		[EditorBrowsable(EditorBrowsableState.Never)]
 		public void SendPressed() => ButtonElement.ElementPressed(this, this);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Button.xml" path="//Member[@MemberName='SendReleased']/Docs/*" />
+		/// <summary>
+		/// Internal method to trigger the <see cref="Released"/> event.
+		/// Should not be called manually outside of .NET MAUI.
+		/// </summary>
 		[EditorBrowsable(EditorBrowsableState.Never)]
 		public void SendReleased() => ButtonElement.ElementReleased(this, this);
 
@@ -201,21 +263,28 @@ bool IButtonElement.IsEnabledCore
 		[EditorBrowsable(EditorBrowsableState.Never)]
 		void IButtonElement.PropagateUpReleased() => Released?.Invoke(this, EventArgs.Empty);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Button.xml" path="//Member[@MemberName='FontAttributes']/Docs/*" />
+		/// <summary>
+		/// Gets or sets a value that indicates whether the font for the text of this button is bold, italic, or neither.
+		/// This is a bindable property.
+		/// </summary>
 		public FontAttributes FontAttributes
 		{
 			get { return (FontAttributes)GetValue(FontAttributesProperty); }
 			set { SetValue(FontAttributesProperty, value); }
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Button.xml" path="//Member[@MemberName='FontFamily']/Docs/*" />
+		/// <summary>
+		/// Gets or sets the font family for the text of this entry. This is a bindable property.
+		/// </summary>
 		public string FontFamily
 		{
 			get { return (string)GetValue(FontFamilyProperty); }
 			set { SetValue(FontFamilyProperty, value); }
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Button.xml" path="//Member[@MemberName='FontSize']/Docs/*" />
+		/// <summary>
+		/// Gets or sets the size of the font for the text of this entry. This is a bindable property.
+		/// </summary>
 		[System.ComponentModel.TypeConverter(typeof(FontSizeConverter))]
 		public double FontSize
 		{
@@ -223,26 +292,45 @@ public double FontSize
 			set { SetValue(FontSizeProperty, value); }
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Button.xml" path="//Member[@MemberName='FontAutoScalingEnabled']/Docs/*" />
+		/// <summary>
+		/// Determines whether or not the font of this entry should scale automatically according to the operating system settings. Default value is <see langword="true"/>.
+		/// This is a bindable property.
+		/// </summary>
+		/// <remarks>Typically this should always be enabled for accessibility reasons.</remarks>
 		public bool FontAutoScalingEnabled
 		{
 			get => (bool)GetValue(FontAutoScalingEnabledProperty);
 			set => SetValue(FontAutoScalingEnabledProperty, value);
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Button.xml" path="//Member[@MemberName='TextTransform']/Docs/*" />
+		/// <summary>
+		/// Applies text transformation to the <see cref="Text"/> displayed on this button.
+		/// This is a bindable property.
+		/// </summary>
 		public TextTransform TextTransform
 		{
 			get => (TextTransform)GetValue(TextTransformProperty);
 			set => SetValue(TextTransformProperty, value);
 		}
 
+		/// <summary>
+		/// Occurs when the button is clicked/tapped.
+		/// </summary>
 		public event EventHandler Clicked;
+
+		/// <summary>
+		/// Occurs when the button is pressed.
+		/// </summary>
 		public event EventHandler Pressed;
 
+		/// <summary>
+		/// Occurs when the button is released.
+		/// </summary>
 		public event EventHandler Released;
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Button.xml" path="//Member[@MemberName='.ctor']/Docs/*" />
+		/// <summary>
+		/// Initializes a new instance of the <see cref="Button"/> class.
+		/// </summary>
 		public Button()
 		{
 			_platformConfigurationRegistry = new Lazy<PlatformConfigurationRegistry<Button>>(() => new PlatformConfigurationRegistry<Button>(this));
@@ -347,14 +435,26 @@ void IImageController.SetIsLoading(bool isLoading)
 		void ITextElement.OnTextTransformChanged(TextTransform oldValue, TextTransform newValue)
 			=> InvalidateMeasureInternal(InvalidationTrigger.MeasureChanged);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Button.xml" path="//Member[@MemberName='UpdateFormsText']/Docs/*" />
+		/// <summary>
+		/// Applies the <see cref="TextTransform"/> to <see cref="Text"/>.
+		/// </summary>
+		/// <remarks>For internal use by the .NET MAUI platform mostly.</remarks>
+		/// <param name="source">The text to transform.</param>
+		/// <param name="textTransform">The transform to apply to <paramref name="source"/>.</param>
+		/// <returns>The transformed text.</returns>
 		public virtual string UpdateFormsText(string source, TextTransform textTransform)
 			=> TextTransformUtilites.GetTransformedText(source, textTransform);
 
+		/// <summary>
+		/// Represents the layout of the button content whenever an image is shown.
+		/// </summary>
 		[DebuggerDisplay("Image Position = {Position}, Spacing = {Spacing}")]
 		[System.ComponentModel.TypeConverter(typeof(ButtonContentTypeConverter))]
 		public sealed class ButtonContentLayout
 		{
+			/// <summary>
+			/// Enumerates values that determine the position of the image on the button.
+			/// </summary>
 			public enum ImagePosition
 			{
 				Left,
@@ -363,19 +463,37 @@ public enum ImagePosition
 				Bottom
 			}
 
+			/// <summary>
+			/// Initializes a new instance of the this class.
+			/// </summary>
+			/// <param name="position">The position of the image.</param>
+			/// <param name="spacing">The spacing for the button content.</param>
 			public ButtonContentLayout(ImagePosition position, double spacing)
 			{
 				Position = position;
 				Spacing = spacing;
 			}
 
+			/// <summary>
+			/// Gets the position of the image on the button.
+			/// </summary>
 			public ImagePosition Position { get; }
 
+			/// <summary>
+			/// Gets the spacing for the button content.
+			/// </summary>
 			public double Spacing { get; }
 
+			/// <summary>
+			/// Gets the string representation of this object.
+			/// </summary>
+			/// <returns>Prints out the values of <see cref="Position"/> and <see cref="Spacing"/>.</returns>
 			public override string ToString() => $"Image Position = {Position}, Spacing = {Spacing}";
 		}
 
+		/// <summary>
+		/// A converter to convert a string to a <see cref="ButtonContentLayout"/> object.
+		/// </summary>
 		public sealed class ButtonContentTypeConverter : TypeConverter
 		{
 			public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
diff --git a/src/Controls/src/Core/ButtonElement.cs b/src/Controls/src/Core/ButtonElement.cs
index 978a9e245872..eeadfdc49723 100644
--- a/src/Controls/src/Core/ButtonElement.cs
+++ b/src/Controls/src/Core/ButtonElement.cs
@@ -6,8 +6,14 @@ namespace Microsoft.Maui.Controls
 {
 	static class ButtonElement
 	{
+		/// <summary>
+		/// The backing store for the <see cref="IButtonElement.Command" /> bindable property.
+		/// </summary>
 		public static readonly BindableProperty CommandProperty = BindableProperty.Create(nameof(IButtonElement.Command), typeof(ICommand), typeof(IButtonElement), null, propertyChanging: OnCommandChanging, propertyChanged: OnCommandChanged);
 
+		/// <summary>
+		/// The backing store for the <see cref="IButtonElement.CommandParameter" /> bindable property.
+		/// </summary>
 		public static readonly BindableProperty CommandParameterProperty = BindableProperty.Create(nameof(IButtonElement.CommandParameter), typeof(object), typeof(IButtonElement), null,
 			propertyChanged: (bindable, oldvalue, newvalue) => CommandCanExecuteChanged(bindable, EventArgs.Empty));
 
@@ -29,8 +35,15 @@ static void OnCommandChanging(BindableObject bo, object o, object n)
 			}
 		}
 
+		/// <summary>
+		/// The string identifier for the pressed visual state of this control.
+		/// </summary>
 		public const string PressedVisualState = "Pressed";
 
+		/// <summary>
+		/// A method to signal that the <see cref="IButtonElement.Command"/> property has been changed.
+		/// </summary>
+		/// <param name="sender">The object initiating this event.</param>
 		public static void CommandChanged(IButtonElement sender)
 		{
 			if (sender.Command != null)
@@ -43,6 +56,11 @@ public static void CommandChanged(IButtonElement sender)
 			}
 		}
 
+		/// <summary>
+		/// A method to signal that the <see cref="Command.CanExecute(object)"/> might have changed and needs to be reevaluated.
+		/// </summary>
+		/// <param name="sender">The object initiating this event.</param>
+		/// <param name="e">Arguments associated with this event.</param>
 		public static void CommandCanExecuteChanged(object sender, EventArgs e)
 		{
 			IButtonElement ButtonElementManager = (IButtonElement)sender;
@@ -53,6 +71,12 @@ public static void CommandCanExecuteChanged(object sender, EventArgs e)
 			}
 		}
 
+		/// <summary>
+		/// A method to signal that this element was clicked/tapped.
+		/// By calling this, the <see cref="IButtonElement.Command"/> and clicked events are triggered.
+		/// </summary>
+		/// <param name="visualElement">The element that was interacted with.</param>
+		/// <param name="ButtonElementManager">The button element implementation to trigger the commands and events on.</param>
 		public static void ElementClicked(VisualElement visualElement, IButtonElement ButtonElementManager)
 		{
 			if (visualElement.IsEnabled == true)
@@ -62,6 +86,12 @@ public static void ElementClicked(VisualElement visualElement, IButtonElement Bu
 			}
 		}
 
+		/// <summary>
+		/// A method to signal that this element was pressed.
+		/// By calling this, <see cref="IButtonElement.IsPressed"/> is set to <see langword="true"/>, the visual state is changed and events are triggered.
+		/// </summary>
+		/// <param name="visualElement">The element that was interacted with.</param>
+		/// <param name="ButtonElementManager">The button element implementation to trigger the commands and events on.</param>
 		public static void ElementPressed(VisualElement visualElement, IButtonElement ButtonElementManager)
 		{
 			if (visualElement.IsEnabled == true)
@@ -72,6 +102,12 @@ public static void ElementPressed(VisualElement visualElement, IButtonElement Bu
 			}
 		}
 
+		/// <summary>
+		/// A method to signal that this element was released.
+		/// By calling this, <see cref="IButtonElement.IsPressed"/> is set to <see langword="false"/>, the visual state is changed and events are triggered.
+		/// </summary>
+		/// <param name="visualElement">The element that was interacted with.</param>
+		/// <param name="ButtonElementManager">The button element implementation to trigger the commands and events on.</param>
 		public static void ElementReleased(VisualElement visualElement, IButtonElement ButtonElementManager)
 		{
 			if (visualElement.IsEnabled == true)
diff --git a/src/Controls/src/Core/ColumnDefinitionCollectionTypeConverter.cs b/src/Controls/src/Core/ColumnDefinitionCollectionTypeConverter.cs
index eb9836e96d95..5486fb358852 100644
--- a/src/Controls/src/Core/ColumnDefinitionCollectionTypeConverter.cs
+++ b/src/Controls/src/Core/ColumnDefinitionCollectionTypeConverter.cs
@@ -10,15 +10,12 @@ namespace Microsoft.Maui.Controls
 	[ProvideCompiled("Microsoft.Maui.Controls.XamlC.ColumnDefinitionCollectionTypeConverter")]
 	public class ColumnDefinitionCollectionTypeConverter : TypeConverter
 	{
-		/// <include file="../../docs/Microsoft.Maui.Controls/ColumnDefinitionCollectionTypeConverter.xml" path="//Member[@MemberName='CanConvertFrom']/Docs/*" />
 		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
 			=> sourceType == typeof(string);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/ColumnDefinitionCollectionTypeConverter.xml" path="//Member[@MemberName='CanConvertTo']/Docs/*" />
 		public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
 			=> destinationType == typeof(string);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/ColumnDefinitionCollectionTypeConverter.xml" path="//Member[@MemberName='ConvertFrom']/Docs/*" />
 		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
 		{
 			var strValue = value?.ToString();
@@ -37,7 +34,6 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
 		}
 
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/ColumnDefinitionCollectionTypeConverter.xml" path="//Member[@MemberName='ConvertTo']/Docs/*" />
 		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
 		{
 			if (value is not ColumnDefinitionCollection cdc)
@@ -46,4 +42,4 @@ public override object ConvertTo(ITypeDescriptorContext context, CultureInfo cul
 			return string.Join(", ", cdc.Select(cd => converter.ConvertToInvariantString(cd.Width)));
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/Command.cs b/src/Controls/src/Core/Command.cs
index 34f38277d6ee..7e47b9a427b0 100644
--- a/src/Controls/src/Core/Command.cs
+++ b/src/Controls/src/Core/Command.cs
@@ -4,7 +4,6 @@
 
 namespace Microsoft.Maui.Controls
 {
-	/// <include file="../../docs/Microsoft.Maui.Controls/Command.xml" path="Type[@FullName='Microsoft.Maui.Controls.Command' and position()=0]/Docs/*" />
 	public sealed class Command<T> : Command
 	{
 		/// <include file="../../docs/Microsoft.Maui.Controls/Command.xml" path="//Member[@MemberName='.ctor'][1]/Docs/*" />
diff --git a/src/Controls/src/Core/DatePicker.cs b/src/Controls/src/Core/DatePicker.cs
index 8c218692a52a..a04cb9a2b085 100644
--- a/src/Controls/src/Core/DatePicker.cs
+++ b/src/Controls/src/Core/DatePicker.cs
@@ -39,7 +39,6 @@ public partial class DatePicker : View, IFontElement, ITextElement, IElementConf
 		/// <include file="../../docs/Microsoft.Maui.Controls/DatePicker.xml" path="//Member[@MemberName='FontAttributesProperty']/Docs/*" />
 		public static readonly BindableProperty FontAttributesProperty = FontElement.FontAttributesProperty;
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/DatePicker.xml" path="//Member[@MemberName='FontAutoScalingEnabledProperty']/Docs/*" />
 		public static readonly BindableProperty FontAutoScalingEnabledProperty = FontElement.FontAutoScalingEnabledProperty;
 
 		readonly Lazy<PlatformConfigurationRegistry<DatePicker>> _platformConfigurationRegistry;
@@ -120,7 +119,6 @@ public double FontSize
 			set { SetValue(FontSizeProperty, value); }
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/DatePicker.xml" path="//Member[@MemberName='FontAutoScalingEnabled']/Docs/*" />
 		public bool FontAutoScalingEnabled
 		{
 			get => (bool)GetValue(FontAutoScalingEnabledProperty);
diff --git a/src/Controls/src/Core/DecorableTextElement.cs b/src/Controls/src/Core/DecorableTextElement.cs
index 60a0296ad1a7..64369742ff4e 100644
--- a/src/Controls/src/Core/DecorableTextElement.cs
+++ b/src/Controls/src/Core/DecorableTextElement.cs
@@ -12,15 +12,12 @@ static class DecorableTextElement
 	/// <include file="../../docs/Microsoft.Maui.Controls/TextDecorationConverter.xml" path="Type[@FullName='Microsoft.Maui.Controls.TextDecorationConverter']/Docs/*" />
 	public class TextDecorationConverter : TypeConverter
 	{
-		/// <include file="../../docs/Microsoft.Maui.Controls/TextDecorationConverter.xml" path="//Member[@MemberName='CanConvertFrom']/Docs/*" />
 		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
 			=> sourceType == typeof(string);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/TextDecorationConverter.xml" path="//Member[@MemberName='CanConvertTo']/Docs/*" />
 		public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
 			=> destinationType == typeof(string);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/TextDecorationConverter.xml" path="//Member[@MemberName='ConvertFrom']/Docs/*" />
 		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
 		{
 			var strValue = value?.ToString();
@@ -47,7 +44,6 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
 			return result;
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/TextDecorationConverter.xml" path="//Member[@MemberName='ConvertTo']/Docs/*" />
 		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
 		{
 			if (value is not TextDecorations td)
diff --git a/src/Controls/src/Core/DependencyService.cs b/src/Controls/src/Core/DependencyService.cs
index 8702c0aac87f..5b13042c41d4 100644
--- a/src/Controls/src/Core/DependencyService.cs
+++ b/src/Controls/src/Core/DependencyService.cs
@@ -18,7 +18,6 @@ public static class DependencyService
 		static readonly List<Type> DependencyTypes = new List<Type>();
 		static readonly Dictionary<Type, DependencyData> DependencyImplementations = new Dictionary<Type, DependencyData>();
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/DependencyService.xml" path="//Member[@MemberName='Resolve']/Docs/*" />
 		public static T Resolve<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] T>(DependencyFetchTarget fallbackFetchTarget = DependencyFetchTarget.GlobalInstance) where T : class
 		{
 			var result = DependencyResolver.Resolve(typeof(T)) as T;
@@ -26,7 +25,6 @@ public static class DependencyService
 			return result ?? Get<T>(fallbackFetchTarget);
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/DependencyService.xml" path="//Member[@MemberName='Get']/Docs/*" />
 		public static T Get<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] T>(DependencyFetchTarget fetchTarget = DependencyFetchTarget.GlobalInstance) where T : class
 		{
 			Initialize();
@@ -62,7 +60,6 @@ public static class DependencyService
 			return (T)Activator.CreateInstance(dependencyImplementation.ImplementorType);
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/DependencyService.xml" path="//Member[@MemberName='Register'][1]/Docs/*" />
 		public static void Register<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)] T>() where T : class
 		{
 			Type type = typeof(T);
@@ -70,7 +67,6 @@ public static class DependencyService
 				DependencyTypes.Add(type);
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/DependencyService.xml" path="//Member[@MemberName='Register'][2]/Docs/*" />
 		public static void Register<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)] T, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)] TImpl>() where T : class where TImpl : class, T
 		{
 			Type targetType = typeof(T);
@@ -82,7 +78,6 @@ public static class DependencyService
 				DependencyImplementations[targetType] = new DependencyData { ImplementorType = implementorType };
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/DependencyService.xml" path="//Member[@MemberName='RegisterSingleton']/Docs/*" />
 		public static void RegisterSingleton<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)] T>(T instance) where T : class
 		{
 			Type targetType = typeof(T);
@@ -126,7 +121,6 @@ static void Initialize()
 			}
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/DependencyService.xml" path="//Member[@MemberName='Register'][3]/Docs/*" />
 		public static void Register(Assembly[] assemblies)
 		{
 			lock (s_initializeLock)
diff --git a/src/Controls/src/Core/DoubleCollection.cs b/src/Controls/src/Core/DoubleCollection.cs
index 696f6408c0f2..52dc22574b50 100644
--- a/src/Controls/src/Core/DoubleCollection.cs
+++ b/src/Controls/src/Core/DoubleCollection.cs
@@ -11,7 +11,6 @@ public sealed class DoubleCollection : ObservableCollection<double>
 		public DoubleCollection()
 		{ }
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/DoubleCollection.xml" path="//Member[@MemberName='.ctor'][2]/Docs/*" />
 		public DoubleCollection(double[] values)
 			: base(values)
 		{
diff --git a/src/Controls/src/Core/DoubleCollectionConverter.cs b/src/Controls/src/Core/DoubleCollectionConverter.cs
index f27558cf7a9c..9580e81e8783 100644
--- a/src/Controls/src/Core/DoubleCollectionConverter.cs
+++ b/src/Controls/src/Core/DoubleCollectionConverter.cs
@@ -8,15 +8,12 @@ namespace Microsoft.Maui.Controls
 	/// <include file="../../docs/Microsoft.Maui.Controls/DoubleCollectionConverter.xml" path="Type[@FullName='Microsoft.Maui.Controls.DoubleCollectionConverter']/Docs/*" />
 	public class DoubleCollectionConverter : TypeConverter
 	{
-		/// <include file="../../docs/Microsoft.Maui.Controls/DoubleCollectionConverter.xml" path="//Member[@MemberName='CanConvertFrom']/Docs/*" />
 		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
 			=> sourceType == typeof(string);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/DoubleCollectionConverter.xml" path="//Member[@MemberName='CanConvertTo']/Docs/*" />
 		public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
 			=> destinationType == typeof(string);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/DoubleCollectionConverter.xml" path="//Member[@MemberName='ConvertFrom']/Docs/*" />
 		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
 		{
 			var strValue = value?.ToString();
@@ -35,7 +32,6 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
 			return doubleCollection;
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/DoubleCollectionConverter.xml" path="//Member[@MemberName='ConvertTo']/Docs/*" />
 		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
 		{
 			if (value is not DoubleCollection dc)
@@ -43,4 +39,4 @@ public override object ConvertTo(ITypeDescriptorContext context, CultureInfo cul
 			return string.Join(", ", dc);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/Editor.cs b/src/Controls/src/Core/Editor.cs
index a06f76ada1ce..abdd87bb67fc 100644
--- a/src/Controls/src/Core/Editor.cs
+++ b/src/Controls/src/Core/Editor.cs
@@ -19,7 +19,6 @@ public partial class Editor : InputView, IEditorController, IFontElement, ITextA
 		/// <include file="../../docs/Microsoft.Maui.Controls/Editor.xml" path="//Member[@MemberName='FontAttributesProperty']/Docs/*" />
 		public static readonly BindableProperty FontAttributesProperty = FontElement.FontAttributesProperty;
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Editor.xml" path="//Member[@MemberName='FontAutoScalingEnabledProperty']/Docs/*" />
 		public static readonly BindableProperty FontAutoScalingEnabledProperty = FontElement.FontAutoScalingEnabledProperty;
 
 		/// <include file="../../docs/Microsoft.Maui.Controls/Editor.xml" path="//Member[@MemberName='TextColorProperty']/Docs/*" />
@@ -37,20 +36,16 @@ public partial class Editor : InputView, IEditorController, IFontElement, ITextA
 		/// <include file="../../docs/Microsoft.Maui.Controls/Editor.xml" path="//Member[@MemberName='IsTextPredictionEnabledProperty']/Docs/*" />
 		public static readonly BindableProperty IsTextPredictionEnabledProperty = BindableProperty.Create(nameof(IsTextPredictionEnabled), typeof(bool), typeof(Editor), true, BindingMode.Default);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Editor.xml" path="//Member[@MemberName='CursorPositionProperty']/Docs/*" />
 		public static readonly BindableProperty CursorPositionProperty = BindableProperty.Create(nameof(CursorPosition), typeof(int), typeof(Editor), 0, validateValue: (b, v) => (int)v >= 0);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Editor.xml" path="//Member[@MemberName='SelectionLengthProperty']/Docs/*" />
 		public static readonly BindableProperty SelectionLengthProperty = BindableProperty.Create(nameof(SelectionLength), typeof(int), typeof(Editor), 0, validateValue: (b, v) => (int)v >= 0);
 
 		/// <include file="../../docs/Microsoft.Maui.Controls/Editor.xml" path="//Member[@MemberName='AutoSizeProperty']/Docs/*" />
 		public static readonly BindableProperty AutoSizeProperty = BindableProperty.Create(nameof(AutoSize), typeof(EditorAutoSizeOption), typeof(Editor), defaultValue: EditorAutoSizeOption.Disabled, propertyChanged: (bindable, oldValue, newValue)
 			=> ((Editor)bindable)?.UpdateAutoSizeOption());
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Editor.xml" path="//Member[@MemberName='HorizontalTextAlignmentProperty']/Docs/*" />
 		public static readonly BindableProperty HorizontalTextAlignmentProperty = TextAlignmentElement.HorizontalTextAlignmentProperty;
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Editor.xml" path="//Member[@MemberName='VerticalTextAlignmentProperty']/Docs/*" />
 		public static readonly BindableProperty VerticalTextAlignmentProperty = BindableProperty.Create(nameof(VerticalTextAlignment), typeof(TextAlignment), typeof(Editor), TextAlignment.Start);
 
 		readonly Lazy<PlatformConfigurationRegistry<Editor>> _platformConfigurationRegistry;
@@ -76,14 +71,12 @@ public bool IsTextPredictionEnabled
 			set { SetValue(IsTextPredictionEnabledProperty, value); }
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Editor.xml" path="//Member[@MemberName='CursorPosition']/Docs/*" />
 		public int CursorPosition
 		{
 			get { return (int)GetValue(CursorPositionProperty); }
 			set { SetValue(CursorPositionProperty, value); }
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Editor.xml" path="//Member[@MemberName='SelectionLength']/Docs/*" />
 		public int SelectionLength
 		{
 			get { return (int)GetValue(SelectionLengthProperty); }
@@ -105,21 +98,18 @@ public double FontSize
 			set { SetValue(FontSizeProperty, value); }
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Editor.xml" path="//Member[@MemberName='HorizontalTextAlignment']/Docs/*" />
 		public TextAlignment HorizontalTextAlignment
 		{
 			get { return (TextAlignment)GetValue(HorizontalTextAlignmentProperty); }
 			set { SetValue(HorizontalTextAlignmentProperty, value); }
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Editor.xml" path="//Member[@MemberName='VerticalTextAlignment']/Docs/*" />
 		public TextAlignment VerticalTextAlignment
 		{
 			get { return (TextAlignment)GetValue(VerticalTextAlignmentProperty); }
 			set { SetValue(VerticalTextAlignmentProperty, value); }
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Editor.xml" path="//Member[@MemberName='FontAutoScalingEnabled']/Docs/*" />
 		public bool FontAutoScalingEnabled
 		{
 			get => (bool)GetValue(FontAutoScalingEnabledProperty);
@@ -182,7 +172,6 @@ protected override void OnTextChanged(string oldValue, string newValue)
 			}
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Editor.xml" path="//Member[@MemberName='OnHorizontalTextAlignmentPropertyChanged']/Docs/*" />
 		public void OnHorizontalTextAlignmentPropertyChanged(TextAlignment oldValue, TextAlignment newValue)
 		{
 		}
diff --git a/src/Controls/src/Core/ElementTemplate.cs b/src/Controls/src/Core/ElementTemplate.cs
index 745371237028..4964bfd81d7a 100644
--- a/src/Controls/src/Core/ElementTemplate.cs
+++ b/src/Controls/src/Core/ElementTemplate.cs
@@ -34,7 +34,6 @@ internal ElementTemplate(
 
 		internal ElementTemplate(Func<object> loadTemplate) : this() => LoadTemplate = loadTemplate ?? throw new ArgumentNullException("loadTemplate");
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/ElementTemplate.xml" path="//Member[@MemberName='LoadTemplate']/Docs/*" />
 		public Func<object> LoadTemplate { get; set; }
 
 		void IElementDefinition.AddResourcesChangedListener(Action<object, ResourcesChangedEventArgs> onchanged)
@@ -104,4 +103,4 @@ void OnResourcesChanged(object sender, ResourcesChangedEventArgs e)
 				handler(this, e);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/Entry.cs b/src/Controls/src/Core/Entry.cs
index 6fcc7b77e457..dfec86cc7216 100644
--- a/src/Controls/src/Core/Entry.cs
+++ b/src/Controls/src/Core/Entry.cs
@@ -5,113 +5,161 @@
 
 namespace Microsoft.Maui.Controls
 {
-	/// <include file="../../docs/Microsoft.Maui.Controls/Entry.xml" path="Type[@FullName='Microsoft.Maui.Controls.Entry']/Docs/*" />
+	/// <summary>
+	/// Entry is a single line text entry. It is best used for collecting small discrete pieces of information, like usernames and passwords.
+	/// </summary>
 	public partial class Entry : InputView, IFontElement, ITextAlignmentElement, IEntryController, IElementConfiguration<Entry>
 	{
-		/// <include file="../../docs/Microsoft.Maui.Controls/Entry.xml" path="//Member[@MemberName='ReturnTypeProperty']/Docs/*" />
+		/// <summary>
+		/// Backing store for the <see cref="ReturnType"/> property.
+		/// </summary>
 		public static readonly BindableProperty ReturnTypeProperty = BindableProperty.Create(nameof(ReturnType), typeof(ReturnType), typeof(Entry), ReturnType.Default);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Entry.xml" path="//Member[@MemberName='ReturnCommandProperty']/Docs/*" />
+		/// <summary>
+		/// Backing store for the <see cref="ReturnCommand"/> property.
+		/// </summary>
 		public static readonly BindableProperty ReturnCommandProperty = BindableProperty.Create(nameof(ReturnCommand), typeof(ICommand), typeof(Entry), default(ICommand));
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Entry.xml" path="//Member[@MemberName='ReturnCommandParameterProperty']/Docs/*" />
+		/// <summary>
+		/// Backing store for the <see cref="ReturnCommandParameter"/> property.
+		/// </summary>
 		public static readonly BindableProperty ReturnCommandParameterProperty = BindableProperty.Create(nameof(ReturnCommandParameter), typeof(object), typeof(Entry), default(object));
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Entry.xml" path="//Member[@MemberName='PlaceholderProperty']/Docs/*" />
+		/// <inheritdoc cref="InputView.PlaceholderProperty"/>
 		public new static readonly BindableProperty PlaceholderProperty = InputView.PlaceholderProperty;
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Entry.xml" path="//Member[@MemberName='PlaceholderColorProperty']/Docs/*" />
+		/// <inheritdoc cref="InputView.PlaceholderColorProperty"/>
 		public new static readonly BindableProperty PlaceholderColorProperty = InputView.PlaceholderColorProperty;
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Entry.xml" path="//Member[@MemberName='IsPasswordProperty']/Docs/*" />
+		/// <summary>
+		/// Backing store for the <see cref="IsPassword"/> property.
+		/// </summary>
 		public static readonly BindableProperty IsPasswordProperty = BindableProperty.Create(nameof(IsPassword), typeof(bool), typeof(Entry), default(bool));
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Entry.xml" path="//Member[@MemberName='TextProperty']/Docs/*" />
+		/// <inheritdoc cref="InputView.TextProperty"/>
 		public new static readonly BindableProperty TextProperty = InputView.TextProperty;
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Entry.xml" path="//Member[@MemberName='TextColorProperty']/Docs/*" />
+		/// <inheritdoc cref="InputView.TextColorProperty"/>
 		public new static readonly BindableProperty TextColorProperty = InputView.TextColorProperty;
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Entry.xml" path="//Member[@MemberName='KeyboardProperty']/Docs/*" />
+		/// <inheritdoc cref="InputView.KeyboardProperty"/>
 		public new static readonly BindableProperty KeyboardProperty = InputView.KeyboardProperty;
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Entry.xml" path="//Member[@MemberName='CharacterSpacingProperty']/Docs/*" />
+		/// <inheritdoc cref="InputView.CharacterSpacingProperty"/>
 		public new static readonly BindableProperty CharacterSpacingProperty = InputView.CharacterSpacingProperty;
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Entry.xml" path="//Member[@MemberName='HorizontalTextAlignmentProperty']/Docs/*" />
+		/// <summary>
+		/// Backing store for the <see cref="TextAlignmentElement.HorizontalTextAlignmentProperty"/> property.
+		/// </summary>
 		public static readonly BindableProperty HorizontalTextAlignmentProperty = TextAlignmentElement.HorizontalTextAlignmentProperty;
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Entry.xml" path="//Member[@MemberName='VerticalTextAlignmentProperty']/Docs/*" />
+		/// <summary>
+		/// Backing store for the <see cref="ReturnType"/> property.
+		/// </summary>
 		public static readonly BindableProperty VerticalTextAlignmentProperty = TextAlignmentElement.VerticalTextAlignmentProperty;
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Entry.xml" path="//Member[@MemberName='FontFamilyProperty']/Docs/*" />
+		/// <summary>
+		/// Backing store for the <see cref="ReturnType"/> property.
+		/// </summary>
 		public static readonly BindableProperty FontFamilyProperty = FontElement.FontFamilyProperty;
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Entry.xml" path="//Member[@MemberName='FontSizeProperty']/Docs/*" />
+		/// <summary>
+		/// Backing store for the <see cref="ReturnType"/> property.
+		/// </summary>
 		public static readonly BindableProperty FontSizeProperty = FontElement.FontSizeProperty;
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Entry.xml" path="//Member[@MemberName='FontAttributesProperty']/Docs/*" />
+		/// <summary>
+		/// Backing store for the <see cref="ReturnType"/> property.
+		/// </summary>
 		public static readonly BindableProperty FontAttributesProperty = FontElement.FontAttributesProperty;
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Entry.xml" path="//Member[@MemberName='FontAutoScalingEnabledProperty']/Docs/*" />
+		/// <summary>
+		/// Backing store for the <see cref="ReturnType"/> property.
+		/// </summary>
 		public static readonly BindableProperty FontAutoScalingEnabledProperty = FontElement.FontAutoScalingEnabledProperty;
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Entry.xml" path="//Member[@MemberName='IsTextPredictionEnabledProperty']/Docs/*" />
+		/// <summary>
+		/// Backing store for the <see cref="IsTextPredictionEnabled"/> property.
+		/// </summary>
 		public static readonly BindableProperty IsTextPredictionEnabledProperty = BindableProperty.Create(nameof(IsTextPredictionEnabled), typeof(bool), typeof(Entry), true, BindingMode.OneTime);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Entry.xml" path="//Member[@MemberName='CursorPositionProperty']/Docs/*" />
+		/// <summary>
+		/// Backing store for the <see cref="CursorPosition"/> property.
+		/// </summary>
 		public static readonly BindableProperty CursorPositionProperty = BindableProperty.Create(nameof(CursorPosition), typeof(int), typeof(Entry), 0, validateValue: (b, v) => (int)v >= 0);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Entry.xml" path="//Member[@MemberName='SelectionLengthProperty']/Docs/*" />
+		/// <summary>
+		/// Backing store for the <see cref="SelectionLength"/> property.
+		/// </summary>
 		public static readonly BindableProperty SelectionLengthProperty = BindableProperty.Create(nameof(SelectionLength), typeof(int), typeof(Entry), 0, validateValue: (b, v) => (int)v >= 0);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Entry.xml" path="//Member[@MemberName='ClearButtonVisibilityProperty']/Docs/*" />
-		public static readonly BindableProperty ClearButtonVisibilityProperty = BindableProperty.Create(nameof(ClearButtonVisibility), typeof(ClearButtonVisibility), typeof(Entry), ClearButtonVisibility.Never);
+		/// <summary>
+		/// Backing store for the <see cref="SelectionLength"/> property.
+		/// </summary>
+		public static readonly BindableProperty ClearButtonVisibilityProperty = BindableProperty.Create(nameof(SelectionLength), typeof(ClearButtonVisibility), typeof(Entry), ClearButtonVisibility.Never);
 
 		readonly Lazy<PlatformConfigurationRegistry<Entry>> _platformConfigurationRegistry;
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Entry.xml" path="//Member[@MemberName='.ctor']/Docs/*" />
+		/// <summary>
+		/// Creates a new <see cref="Entry"/> object with default values.
+		/// </summary>
 		public Entry()
 		{
 			_platformConfigurationRegistry = new Lazy<PlatformConfigurationRegistry<Entry>>(() => new PlatformConfigurationRegistry<Entry>(this));
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Entry.xml" path="//Member[@MemberName='HorizontalTextAlignment']/Docs/*" />
+		/// <summary>
+		/// Gets or sets the horizontal text alignment. This is a bindable property.
+		/// </summary>
 		public TextAlignment HorizontalTextAlignment
 		{
 			get { return (TextAlignment)GetValue(TextAlignmentElement.HorizontalTextAlignmentProperty); }
 			set { SetValue(TextAlignmentElement.HorizontalTextAlignmentProperty, value); }
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Entry.xml" path="//Member[@MemberName='VerticalTextAlignment']/Docs/*" />
+		/// <summary>
+		/// Gets or sets the vertical text alignment. This is a bindable property.
+		/// </summary>
 		public TextAlignment VerticalTextAlignment
 		{
 			get { return (TextAlignment)GetValue(TextAlignmentElement.VerticalTextAlignmentProperty); }
 			set { SetValue(TextAlignmentElement.VerticalTextAlignmentProperty, value); }
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Entry.xml" path="//Member[@MemberName='IsPassword']/Docs/*" />
+		/// <summary>
+		/// Gets or sets a value that indicates if the entry should visually obscure typed text.
+		/// Value is <see langword="true" /> if the element is a password box; otherwise, <see langword="false" />. Default value is <see langword="false" />.
+		/// This is a bindable property.
+		/// </summary>
+		/// <remarks>Toggling this value does not reset the contents of the entry, therefore it is advisable to be careful about setting <see cref="IsPassword"/> to false, as it may contain sensitive information.</remarks>
 		public bool IsPassword
 		{
 			get { return (bool)GetValue(IsPasswordProperty); }
 			set { SetValue(IsPasswordProperty, value); }
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Entry.xml" path="//Member[@MemberName='FontAttributes']/Docs/*" />
+		/// <summary>
+		/// Gets or sets a value that indicates whether the font for the text of this entry is bold, italic, or neither.
+		/// This is a bindable property.
+		/// </summary>
 		public FontAttributes FontAttributes
 		{
 			get { return (FontAttributes)GetValue(FontAttributesProperty); }
 			set { SetValue(FontAttributesProperty, value); }
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Entry.xml" path="//Member[@MemberName='FontFamily']/Docs/*" />
+		/// <summary>
+		/// Gets or sets the font family for the text of this entry. This is a bindable property.
+		/// </summary>
 		public string FontFamily
 		{
 			get { return (string)GetValue(FontFamilyProperty); }
 			set { SetValue(FontFamilyProperty, value); }
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Entry.xml" path="//Member[@MemberName='FontSize']/Docs/*" />
+		/// <summary>
+		/// Gets or sets the size of the font for the text of this entry. This is a bindable property.
+		/// </summary>
 		[System.ComponentModel.TypeConverter(typeof(FontSizeConverter))]
 		public double FontSize
 		{
@@ -119,56 +167,78 @@ public double FontSize
 			set { SetValue(FontSizeProperty, value); }
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Entry.xml" path="//Member[@MemberName='FontAutoScalingEnabled']/Docs/*" />
+		/// <summary>
+		/// Determines whether or not the font of this entry should scale automatically according to the operating system settings. Default value is <see langword="true"/>.
+		/// This is a bindable property.
+		/// </summary>
+		/// <remarks>Typically this should always be enabled for accessibility reasons.</remarks>
 		public bool FontAutoScalingEnabled
 		{
 			get => (bool)GetValue(FontAutoScalingEnabledProperty);
 			set => SetValue(FontAutoScalingEnabledProperty, value);
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Entry.xml" path="//Member[@MemberName='IsTextPredictionEnabled']/Docs/*" />
+		/// <summary>
+		/// Determines whether text prediction and automatic text correction is enabled. Default value is <see langword="true"/>.
+		/// </summary>
 		public bool IsTextPredictionEnabled
 		{
 			get { return (bool)GetValue(IsTextPredictionEnabledProperty); }
 			set { SetValue(IsTextPredictionEnabledProperty, value); }
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Entry.xml" path="//Member[@MemberName='ReturnType']/Docs/*" />
+		/// <summary>
+		/// Determines what the return key on the on-screen keyboard should look like. This is a bindable property.
+		/// </summary>
 		public ReturnType ReturnType
 		{
 			get => (ReturnType)GetValue(ReturnTypeProperty);
 			set => SetValue(ReturnTypeProperty, value);
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Entry.xml" path="//Member[@MemberName='CursorPosition']/Docs/*" />
+		/// <summary>
+		/// Gets or sets the position of the cursor. The value must be more than or equal to 0 and less or equal to the length of <see cref="InputView.Text"/>.
+		/// This is a bindable property.
+		/// </summary>
 		public int CursorPosition
 		{
 			get { return (int)GetValue(CursorPositionProperty); }
 			set { SetValue(CursorPositionProperty, value); }
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Entry.xml" path="//Member[@MemberName='SelectionLength']/Docs/*" />
+		/// <summary>
+		/// Gets or sets the length of the selection. The selection will start at <see cref="CursorPosition"/>.
+		/// This is a bindable property.
+		/// </summary>
 		public int SelectionLength
 		{
 			get { return (int)GetValue(SelectionLengthProperty); }
 			set { SetValue(SelectionLengthProperty, value); }
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Entry.xml" path="//Member[@MemberName='ReturnCommand']/Docs/*" />
+		/// <summary>
+		/// Gets or sets the command to run when the user presses the return key, either physically or on the on-screen keyboard.
+		/// This is a bindable property.
+		/// </summary>
 		public ICommand ReturnCommand
 		{
 			get => (ICommand)GetValue(ReturnCommandProperty);
 			set => SetValue(ReturnCommandProperty, value);
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Entry.xml" path="//Member[@MemberName='ReturnCommandParameter']/Docs/*" />
+		/// <summary>
+		/// Gets or sets the parameter object for the <see cref="ReturnCommand" /> that can be used to provide extra information.
+		/// This is a bindable property.
+		/// </summary>
 		public object ReturnCommandParameter
 		{
 			get => GetValue(ReturnCommandParameterProperty);
 			set => SetValue(ReturnCommandParameterProperty, value);
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Entry.xml" path="//Member[@MemberName='ClearButtonVisibility']/Docs/*" />
+		/// <summary>
+		/// Determines the behavior of the clear text button on this entry. This is a bindable property.
+		/// </summary>
 		public ClearButtonVisibility ClearButtonVisibility
 		{
 			get => (ClearButtonVisibility)GetValue(ClearButtonVisibilityProperty);
@@ -196,9 +266,15 @@ void HandleFontChanged()
 			InvalidateMeasureInternal(InvalidationTrigger.MeasureChanged);
 		}
 
+		/// <summary>
+		/// Occurs when the user finalizes the text in an entry with the return key.
+		/// </summary>
 		public event EventHandler Completed;
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Entry.xml" path="//Member[@MemberName='SendCompleted']/Docs/*" />
+		/// <summary>
+		/// Internal method to trigger <see cref="Completed"/> and <see cref="ReturnCommand"/>.
+		/// Should not be called manually outside of .NET MAUI.
+		/// </summary>
 		[EditorBrowsable(EditorBrowsableState.Never)]
 		public void SendCompleted()
 		{
diff --git a/src/Controls/src/Core/EnumerableExtensions.cs b/src/Controls/src/Core/EnumerableExtensions.cs
index b7fbb51606a2..ed8ac3c84962 100644
--- a/src/Controls/src/Core/EnumerableExtensions.cs
+++ b/src/Controls/src/Core/EnumerableExtensions.cs
@@ -6,7 +6,6 @@ namespace Microsoft.Maui.Controls.Internals
 {
 	static class EnumerableExtensions
 	{
-		/// <include file="../../docs/Microsoft.Maui.Controls.Internals/EnumerableExtensions.xml" path="//Member[@MemberName='HasChildGesturesFor']/Docs/*" />
 		public static bool HasChildGesturesFor<T>(this IEnumerable<GestureElement> elements, Func<T, bool> predicate = null) where T : GestureRecognizer
 		{
 			if (elements == null)
@@ -26,7 +25,6 @@ public static bool HasChildGesturesFor<T>(this IEnumerable<GestureElement> eleme
 			return false;
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls.Internals/EnumerableExtensions.xml" path="//Member[@MemberName='GetChildGesturesFor']/Docs/*" />
 		public static IEnumerable<T> GetChildGesturesFor<T>(this IEnumerable<GestureElement> elements, Func<T, bool> predicate = null) where T : GestureRecognizer
 		{
 			if (elements == null)
@@ -44,7 +42,6 @@ public static IEnumerable<T> GetChildGesturesFor<T>(this IEnumerable<GestureElem
 				}
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls.Internals/EnumerableExtensions.xml" path="//Member[@MemberName='GetGesturesFor']/Docs/*" />
 		public static IEnumerable<T> GetGesturesFor<T>(this IEnumerable<IGestureRecognizer> gestures, Func<T, bool> predicate = null) where T : GestureRecognizer
 		{
 			if (gestures == null)
@@ -63,4 +60,4 @@ public static IEnumerable<T> GetGesturesFor<T>(this IEnumerable<IGestureRecogniz
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/FileImageSourceConverter.cs b/src/Controls/src/Core/FileImageSourceConverter.cs
index ce14b5d007a2..811741bb7401 100644
--- a/src/Controls/src/Core/FileImageSourceConverter.cs
+++ b/src/Controls/src/Core/FileImageSourceConverter.cs
@@ -7,15 +7,12 @@ namespace Microsoft.Maui.Controls
 	/// <include file="../../docs/Microsoft.Maui.Controls/FileImageSourceConverter.xml" path="Type[@FullName='Microsoft.Maui.Controls.FileImageSourceConverter']/Docs/*" />
 	public sealed class FileImageSourceConverter : TypeConverter
 	{
-		/// <include file="../../docs/Microsoft.Maui.Controls/FileImageSourceConverter.xml" path="//Member[@MemberName='CanConvertFrom']/Docs/*" />
 		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
 			=> sourceType == typeof(string);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/FileImageSourceConverter.xml" path="//Member[@MemberName='CanConvertTo']/Docs/*" />
 		public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
 			=> true;
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/FileImageSourceConverter.xml" path="//Member[@MemberName='ConvertFrom']/Docs/*" />
 		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
 		{
 			var strValue = value?.ToString();
@@ -25,7 +22,6 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
 			throw new InvalidOperationException(string.Format("Cannot convert \"{0}\" into {1}", strValue, typeof(FileImageSource)));
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/FileImageSourceConverter.xml" path="//Member[@MemberName='ConvertTo']/Docs/*" />
 		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
 		{
 			if (value is not FileImageSource fis)
@@ -33,4 +29,4 @@ public override object ConvertTo(ITypeDescriptorContext context, CultureInfo cul
 			return fis.File;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/FontAttributes.cs b/src/Controls/src/Core/FontAttributes.cs
index f6a5986e2020..7f83e97651ee 100644
--- a/src/Controls/src/Core/FontAttributes.cs
+++ b/src/Controls/src/Core/FontAttributes.cs
@@ -20,15 +20,12 @@ public enum FontAttributes
 	/// <include file="../../docs/Microsoft.Maui.Controls/FontAttributesConverter.xml" path="Type[@FullName='Microsoft.Maui.Controls.FontAttributesConverter']/Docs/*" />
 	public sealed class FontAttributesConverter : TypeConverter
 	{
-		/// <include file="../../docs/Microsoft.Maui.Controls/FontAttributesConverter.xml" path="//Member[@MemberName='CanConvertFrom']/Docs/*" />
 		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
 			=> sourceType == typeof(string);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/FontAttributesConverter.xml" path="//Member[@MemberName='CanConvertTo']/Docs/*" />
 		public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
 			=> destinationType == typeof(string);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/FontAttributesConverter.xml" path="//Member[@MemberName='ConvertFrom']/Docs/*" />
 		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
 		{
 			var strValue = value?.ToString();
@@ -65,7 +62,6 @@ static FontAttributes ParseSingleAttribute(string part, string originalvalue)
 			throw new InvalidOperationException(string.Format("Cannot convert \"{0}\" into {1}", originalvalue, typeof(FontAttributes)));
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/FontAttributesConverter.xml" path="//Member[@MemberName='ConvertTo']/Docs/*" />
 		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
 		{
 			if (value is not FontAttributes attr)
@@ -80,4 +76,4 @@ public override object ConvertTo(ITypeDescriptorContext context, CultureInfo cul
 			return string.Join("' ", parts);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/FontElement.cs b/src/Controls/src/Core/FontElement.cs
index ce969d1e4f52..291bc5d996c7 100644
--- a/src/Controls/src/Core/FontElement.cs
+++ b/src/Controls/src/Core/FontElement.cs
@@ -4,19 +4,31 @@ namespace Microsoft.Maui.Controls
 {
 	static class FontElement
 	{
+		/// <summary>
+		/// The backing store for the <see cref="IFontElement.FontFamily" /> bindable property.
+		/// </summary>
 		public static readonly BindableProperty FontFamilyProperty =
 			BindableProperty.Create("FontFamily", typeof(string), typeof(IFontElement), default(string),
 									propertyChanged: OnFontFamilyChanged);
 
+		/// <summary>
+		/// The backing store for the <see cref="IFontElement.FontSize" /> bindable property.
+		/// </summary>
 		public static readonly BindableProperty FontSizeProperty =
 			BindableProperty.Create("FontSize", typeof(double), typeof(IFontElement), 0d,
 									propertyChanged: OnFontSizeChanged,
 									defaultValueCreator: FontSizeDefaultValueCreator);
 
+		/// <summary>
+		/// The backing store for the <see cref="IFontElement.FontAttributes" /> bindable property.
+		/// </summary>
 		public static readonly BindableProperty FontAttributesProperty =
 			BindableProperty.Create("FontAttributes", typeof(FontAttributes), typeof(IFontElement), FontAttributes.None,
 									propertyChanged: OnFontAttributesChanged);
 
+		/// <summary>
+		/// The backing store for the <see cref="IFontElement.FontAutoScalingEnabled" /> bindable property.
+		/// </summary>
 		public static readonly BindableProperty FontAutoScalingEnabledProperty =
 			BindableProperty.Create("FontAutoScalingEnabled", typeof(bool), typeof(IFontElement), true,
 									propertyChanged: OnFontAutoScalingEnabledChanged);
diff --git a/src/Controls/src/Core/FontImageSource.cs b/src/Controls/src/Core/FontImageSource.cs
index cda24a27d37b..d9b9015ba9a1 100644
--- a/src/Controls/src/Core/FontImageSource.cs
+++ b/src/Controls/src/Core/FontImageSource.cs
@@ -53,12 +53,10 @@ public double Size
 			set => SetValue(SizeProperty, value);
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/FontImageSource.xml" path="//Member[@MemberName='FontAutoScalingEnabledProperty']/Docs/*" />
 		public static readonly BindableProperty FontAutoScalingEnabledProperty =
 			BindableProperty.Create("FontAutoScalingEnabled", typeof(bool), typeof(FontImageSource), false,
 				propertyChanged: (b, o, n) => ((FontImageSource)b).OnSourceChanged());
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/FontImageSource.xml" path="//Member[@MemberName='FontAutoScalingEnabled']/Docs/*" />
 		public bool FontAutoScalingEnabled
 		{
 			get => (bool)GetValue(FontAutoScalingEnabledProperty);
diff --git a/src/Controls/src/Core/FontSizeConverter.cs b/src/Controls/src/Core/FontSizeConverter.cs
index 86bed03450ec..463684ba259f 100644
--- a/src/Controls/src/Core/FontSizeConverter.cs
+++ b/src/Controls/src/Core/FontSizeConverter.cs
@@ -9,11 +9,9 @@ namespace Microsoft.Maui.Controls
 	[ProvideCompiled("Microsoft.Maui.Controls.XamlC.FontSizeTypeConverter")]
 	public class FontSizeConverter : TypeConverter, IExtendedTypeConverter
 	{
-		/// <include file="../../docs/Microsoft.Maui.Controls/FontSizeConverter.xml" path="//Member[@MemberName='CanConvertFrom']/Docs/*" />
 		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
 			=> sourceType == typeof(string);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/FontSizeConverter.xml" path="//Member[@MemberName='CanConvertTo']/Docs/*" />
 		public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
 			=> destinationType == typeof(string);
 
@@ -63,7 +61,6 @@ object IExtendedTypeConverter.ConvertFromInvariantString(string value, IServiceP
 			throw new InvalidOperationException(string.Format("Cannot convert \"{0}\" into {1}", value, typeof(double)));
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/FontSizeConverter.xml" path="//Member[@MemberName='ConvertFrom']/Docs/*" />
 		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
 		{
 			var strValue = value?.ToString();
@@ -102,7 +99,6 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
 			throw new InvalidOperationException(string.Format("Cannot convert \"{0}\" into {1}", strValue, typeof(double)));
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/FontSizeConverter.xml" path="//Member[@MemberName='ConvertTo']/Docs/*" />
 		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
 		{
 			if (value is not double d)
@@ -110,4 +106,4 @@ public override object ConvertTo(ITypeDescriptorContext context, CultureInfo cul
 			return $"{d.ToString(CultureInfo.InvariantCulture)}";
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/GestureRecognizer.cs b/src/Controls/src/Core/GestureRecognizer.cs
index 3003249a4db1..800c7f1ecab9 100644
--- a/src/Controls/src/Core/GestureRecognizer.cs
+++ b/src/Controls/src/Core/GestureRecognizer.cs
@@ -3,9 +3,8 @@ namespace Microsoft.Maui.Controls
 	/// <include file="../../docs/Microsoft.Maui.Controls/GestureRecognizer.xml" path="Type[@FullName='Microsoft.Maui.Controls.GestureRecognizer']/Docs/*" />
 	public class GestureRecognizer : Element, IGestureRecognizer
 	{
-		/// <include file="../../docs/Microsoft.Maui.Controls/GestureRecognizer.xml" path="//Member[@MemberName='.ctor']/Docs/*" />
 		public GestureRecognizer()
 		{
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/GridLengthTypeConverter.cs b/src/Controls/src/Core/GridLengthTypeConverter.cs
index 94d5c17b3876..6d2b09ae7f5c 100644
--- a/src/Controls/src/Core/GridLengthTypeConverter.cs
+++ b/src/Controls/src/Core/GridLengthTypeConverter.cs
@@ -5,19 +5,15 @@
 
 namespace Microsoft.Maui.Controls
 {
-	/// <include file="../../docs/Microsoft.Maui.Controls/GridLengthTypeConverter.xml" path="Type[@FullName='Microsoft.Maui.Controls.GridLengthTypeConverter']/Docs/*" />
 	[ProvideCompiled("Microsoft.Maui.Controls.XamlC.GridLengthTypeConverter")]
 	public class GridLengthTypeConverter : TypeConverter
 	{
-		/// <include file="../../docs/Microsoft.Maui.Controls/GridLengthTypeConverter.xml" path="//Member[@MemberName='CanConvertFrom']/Docs/*" />
 		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
 			=> sourceType == typeof(string);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/GridLengthTypeConverter.xml" path="//Member[@MemberName='CanConvertTo']/Docs/*" />
 		public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
 			=> true;
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/GridLengthTypeConverter.xml" path="//Member[@MemberName='ConvertFrom']/Docs/*" />
 		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
 		{
 			var strValue = value?.ToString();
@@ -38,7 +34,6 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
 			throw new FormatException();
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/GridLengthTypeConverter.xml" path="//Member[@MemberName='ConvertTo']/Docs/*" />
 		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
 		{
 			if (value is not GridLength length)
@@ -50,4 +45,4 @@ public override object ConvertTo(ITypeDescriptorContext context, CultureInfo cul
 			return $"{length.Value.ToString(CultureInfo.InvariantCulture)}";
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/HandlerImpl/Button/Button.Impl.cs b/src/Controls/src/Core/HandlerImpl/Button/Button.Impl.cs
index dba82d634754..c5ac6ca268e5 100644
--- a/src/Controls/src/Core/HandlerImpl/Button/Button.Impl.cs
+++ b/src/Controls/src/Core/HandlerImpl/Button/Button.Impl.cs
@@ -3,7 +3,6 @@
 
 namespace Microsoft.Maui.Controls
 {
-	/// <include file="../../../../docs/Microsoft.Maui.Controls/Button.xml" path="Type[@FullName='Microsoft.Maui.Controls.Button']/Docs/*" />
 	public partial class Button : IButton, ITextButton, IImageButton
 	{
 		bool _wasImageLoading;
diff --git a/src/Controls/src/Core/HandlerImpl/Button/Button.Standard.cs b/src/Controls/src/Core/HandlerImpl/Button/Button.Standard.cs
index 3913c63a71cd..f7dff83ad886 100644
--- a/src/Controls/src/Core/HandlerImpl/Button/Button.Standard.cs
+++ b/src/Controls/src/Core/HandlerImpl/Button/Button.Standard.cs
@@ -1,11 +1,19 @@
 namespace Microsoft.Maui.Controls
 {
-	/// <include file="../../../../docs/Microsoft.Maui.Controls/Button.xml" path="Type[@FullName='Microsoft.Maui.Controls.Button']/Docs/*" />
 	public partial class Button
 	{
-		/// <include file="../../../../docs/Microsoft.Maui.Controls/Button.xml" path="//Member[@MemberName='MapText']/Docs/*" />
+		/// <summary>
+		/// Maps the abstract <see cref="Text"/> property to the platform implementation.
+		/// </summary>
+		/// <param name="handler">The handler associated to this control.</param>
+		/// <param name="button">The abstract control that is being mapped.</param>
 		public static void MapText(ButtonHandler handler, Button button) { }
 
+		/// <summary>
+		/// Maps the abstract <see cref="LineBreakMode"/> property to the platform implementation.
+		/// </summary>
+		/// <param name="handler">The handler associated to this control.</param>
+		/// <param name="button">The abstract control that is being mapped.</param>
 		public static void MapLineBreakMode(ButtonHandler handler, Button button) { }
 	}
 }
diff --git a/src/Controls/src/Core/HandlerImpl/Button/Button.cs b/src/Controls/src/Core/HandlerImpl/Button/Button.cs
index 266981ec99e1..2b9d4308e444 100644
--- a/src/Controls/src/Core/HandlerImpl/Button/Button.cs
+++ b/src/Controls/src/Core/HandlerImpl/Button/Button.cs
@@ -6,12 +6,13 @@
 
 namespace Microsoft.Maui.Controls
 {
-	/// <include file="../../../../docs/Microsoft.Maui.Controls/Button.xml" path="Type[@FullName='Microsoft.Maui.Controls.Button']/Docs/*" />
 	public partial class Button
 	{
 		// IButton does not include the ContentType property, so we map it here to handle Image Positioning
 
-		/// <include file="../../../../docs/Microsoft.Maui.Controls/Button.xml" path="//Member[@MemberName='ControlsButtonMapper']/Docs/*" />
+		/// <summary>
+		/// The property mapper that maps the abstract properties to the platform-specific methods for further processing.
+		/// </summary>
 		public static IPropertyMapper<IButton, ButtonHandler> ControlsButtonMapper = new PropertyMapper<Button, ButtonHandler>(ButtonHandler.Mapper)
 		{
 			[nameof(ContentLayout)] = MapContentLayout,
@@ -32,7 +33,11 @@ public partial class Button
 			ButtonHandler.Mapper = ControlsButtonMapper;
 		}
 
-		/// <include file="../../../../docs/Microsoft.Maui.Controls/Button.xml" path="//Member[@MemberName='MapContentLayout']/Docs/*" />
+		/// <summary>
+		/// Maps the abstract <see cref="ContentLayout"/> property to the platform implementation.
+		/// </summary>
+		/// <param name="handler">The handler associated to this control.</param>
+		/// <param name="button">The abstract control that is being mapped.</param>
 		public static void MapContentLayout(ButtonHandler handler, Button button)
 		{
 			handler.PlatformView.UpdateContentLayout(button);
diff --git a/src/Controls/src/Core/HandlerImpl/CheckBox/CheckBox.Impl.cs b/src/Controls/src/Core/HandlerImpl/CheckBox/CheckBox.Impl.cs
index cb14e720a4be..4edfc40ba287 100644
--- a/src/Controls/src/Core/HandlerImpl/CheckBox/CheckBox.Impl.cs
+++ b/src/Controls/src/Core/HandlerImpl/CheckBox/CheckBox.Impl.cs
@@ -1,4 +1,4 @@
-using System.Runtime.CompilerServices;
+using System.Runtime.CompilerServices;
 using Microsoft.Maui.Graphics;
 
 namespace Microsoft.Maui.Controls
@@ -6,7 +6,6 @@ namespace Microsoft.Maui.Controls
 	/// <include file="../../../../docs/Microsoft.Maui.Controls/CheckBox.xml" path="Type[@FullName='Microsoft.Maui.Controls.CheckBox']/Docs/*" />
 	public partial class CheckBox : ICheckBox, IMapColorPropertyToPaint
 	{
-		/// <include file="../../../../docs/Microsoft.Maui.Controls/CheckBox.xml" path="//Member[@MemberName='Foreground']/Docs/*" />
 		public Paint Foreground { get; private set; }
 
 		void IMapColorPropertyToPaint.MapColorPropertyToPaint(Color color)
@@ -14,4 +13,4 @@ void IMapColorPropertyToPaint.MapColorPropertyToPaint(Color color)
 			Foreground = color?.AsPaint();
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/HandlerImpl/Element/Element.Impl.cs b/src/Controls/src/Core/HandlerImpl/Element/Element.Impl.cs
index 9b2b86cf5e41..5083cb19caf2 100644
--- a/src/Controls/src/Core/HandlerImpl/Element/Element.Impl.cs
+++ b/src/Controls/src/Core/HandlerImpl/Element/Element.Impl.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Maui.Controls.Hosting;
 
@@ -13,7 +13,6 @@ public partial class Element : Maui.IElement, IEffectControlProvider
 		Maui.IElement Maui.IElement.Parent => Parent;
 		EffectsFactory EffectsFactory => _effectsFactory ??= Handler.MauiContext.Services.GetRequiredService<EffectsFactory>();
 
-		/// <include file="../../../../docs/Microsoft.Maui.Controls/Element.xml" path="//Member[@MemberName='Handler']/Docs/*" />
 		public IElementHandler Handler
 		{
 			get => _handler;
diff --git a/src/Controls/src/Core/HandlerImpl/Element/Element.Standard.cs b/src/Controls/src/Core/HandlerImpl/Element/Element.Standard.cs
index 848435ff25d1..38ac18dd13d1 100644
--- a/src/Controls/src/Core/HandlerImpl/Element/Element.Standard.cs
+++ b/src/Controls/src/Core/HandlerImpl/Element/Element.Standard.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text;
 
@@ -7,12 +7,10 @@ namespace Microsoft.Maui.Controls
 	/// <include file="../../../../docs/Microsoft.Maui.Controls/Element.xml" path="Type[@FullName='Microsoft.Maui.Controls.Element']/Docs/*" />
 	public partial class Element
 	{
-		/// <include file="../../../../docs/Microsoft.Maui.Controls/Element.xml" path="//Member[@MemberName='MapAutomationPropertiesIsInAccessibleTree']/Docs/*" />
 		public static void MapAutomationPropertiesIsInAccessibleTree(IElementHandler handler, Element element)
 		{
 		}
 
-		/// <include file="../../../../docs/Microsoft.Maui.Controls/Element.xml" path="//Member[@MemberName='MapAutomationPropertiesExcludedWithChildren']/Docs/*" />
 		public static void MapAutomationPropertiesExcludedWithChildren(IElementHandler handler, Element element)
 		{
 		}
diff --git a/src/Controls/src/Core/HandlerImpl/Element/Element.cs b/src/Controls/src/Core/HandlerImpl/Element/Element.cs
index 517b96565f7f..45071c8eea89 100644
--- a/src/Controls/src/Core/HandlerImpl/Element/Element.cs
+++ b/src/Controls/src/Core/HandlerImpl/Element/Element.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Microsoft.Maui.Handlers;
 
 
@@ -7,7 +7,6 @@ namespace Microsoft.Maui.Controls
 	/// <include file="../../../../docs/Microsoft.Maui.Controls/Element.xml" path="Type[@FullName='Microsoft.Maui.Controls.Element']/Docs/*" />
 	public partial class Element
 	{
-		/// <include file="../../../../docs/Microsoft.Maui.Controls/Element.xml" path="//Member[@MemberName='ControlsElementMapper']/Docs/*" />
 		public static IPropertyMapper<Maui.IElement, IElementHandler> ControlsElementMapper = new PropertyMapper<Element, IElementHandler>(ViewHandler.ViewMapper)
 		{
 			[AutomationProperties.IsInAccessibleTreeProperty.PropertyName] = MapAutomationPropertiesIsInAccessibleTree,
diff --git a/src/Controls/src/Core/HandlerImpl/Ellipse.Impl.cs b/src/Controls/src/Core/HandlerImpl/Ellipse.Impl.cs
index 65e491602e81..84ae469bf133 100644
--- a/src/Controls/src/Core/HandlerImpl/Ellipse.Impl.cs
+++ b/src/Controls/src/Core/HandlerImpl/Ellipse.Impl.cs
@@ -1,4 +1,4 @@
-using System.Runtime.CompilerServices;
+using System.Runtime.CompilerServices;
 using Microsoft.Maui.Graphics;
 
 namespace Microsoft.Maui.Controls.Shapes
@@ -19,7 +19,6 @@ protected override void OnPropertyChanged([CallerMemberName] string propertyName
 			}
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/Ellipse.xml" path="//Member[@MemberName='GetPath']/Docs/*" />
 		public override PathF GetPath()
 		{
 			var path = new PathF();
@@ -34,4 +33,4 @@ public override PathF GetPath()
 			return path;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/HandlerImpl/Entry/Entry.Impl.cs b/src/Controls/src/Core/HandlerImpl/Entry/Entry.Impl.cs
index 2863e418dc03..d52b6abb970b 100644
--- a/src/Controls/src/Core/HandlerImpl/Entry/Entry.Impl.cs
+++ b/src/Controls/src/Core/HandlerImpl/Entry/Entry.Impl.cs
@@ -1,6 +1,5 @@
 namespace Microsoft.Maui.Controls
 {
-	/// <include file="../../../../docs/Microsoft.Maui.Controls/Entry.xml" path="Type[@FullName='Microsoft.Maui.Controls.Entry']/Docs/*" />
 	public partial class Entry : IEntry
 	{
 		Font ITextStyle.Font => this.ToFont();
diff --git a/src/Controls/src/Core/HandlerImpl/FlyoutPage/FlyoutPage.cs b/src/Controls/src/Core/HandlerImpl/FlyoutPage/FlyoutPage.cs
index f329fe5c9975..055f83e4919d 100644
--- a/src/Controls/src/Core/HandlerImpl/FlyoutPage/FlyoutPage.cs
+++ b/src/Controls/src/Core/HandlerImpl/FlyoutPage/FlyoutPage.cs
@@ -1,11 +1,10 @@
-#nullable enable
+#nullable enable
 
 namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../../../docs/Microsoft.Maui.Controls/FlyoutPage.xml" path="Type[@FullName='Microsoft.Maui.Controls.FlyoutPage']/Docs/*" />
 	public partial class FlyoutPage
 	{
-		/// <include file="../../../../docs/Microsoft.Maui.Controls/FlyoutPage.xml" path="//Member[@MemberName='ControlsFlyoutPageMapper']/Docs/*" />
 		public static IPropertyMapper<IFlyoutView, FlyoutViewHandler> ControlsFlyoutPageMapper = new PropertyMapper<IFlyoutView, FlyoutViewHandler>(FlyoutViewHandler.Mapper)
 		{
 			[nameof(FlyoutLayoutBehavior)] = (handler, __) => handler.UpdateValue(nameof(IFlyoutView.FlyoutBehavior)),
diff --git a/src/Controls/src/Core/HandlerImpl/Label/Label.Standard.cs b/src/Controls/src/Core/HandlerImpl/Label/Label.Standard.cs
index 4e941d437310..8ab30b8e2545 100644
--- a/src/Controls/src/Core/HandlerImpl/Label/Label.Standard.cs
+++ b/src/Controls/src/Core/HandlerImpl/Label/Label.Standard.cs
@@ -1,13 +1,11 @@
-using Microsoft.Maui.Handlers;
+using Microsoft.Maui.Handlers;
 
 namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../../../docs/Microsoft.Maui.Controls/Label.xml" path="Type[@FullName='Microsoft.Maui.Controls.Label']/Docs/*" />
 	public partial class Label
 	{
-		/// <include file="../../../../docs/Microsoft.Maui.Controls/Label.xml" path="//Member[@MemberName='MapTextType']/Docs/*" />
 		public static void MapTextType(LabelHandler handler, Label label) { }
-		/// <include file="../../../../docs/Microsoft.Maui.Controls/Label.xml" path="//Member[@MemberName='MapText']/Docs/*" />
 		public static void MapText(LabelHandler handler, Label label) { }
 
 		public static void MapLineBreakMode(LabelHandler handler, Label label) { }
diff --git a/src/Controls/src/Core/HandlerImpl/Label/Label.cs b/src/Controls/src/Core/HandlerImpl/Label/Label.cs
index 2533c79b759b..594d99dc8808 100644
--- a/src/Controls/src/Core/HandlerImpl/Label/Label.cs
+++ b/src/Controls/src/Core/HandlerImpl/Label/Label.cs
@@ -1,11 +1,10 @@
-using Microsoft.Maui.Handlers;
+using Microsoft.Maui.Handlers;
 
 namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../../../docs/Microsoft.Maui.Controls/Label.xml" path="Type[@FullName='Microsoft.Maui.Controls.Label']/Docs/*" />
 	public partial class Label
 	{
-		/// <include file="../../../../docs/Microsoft.Maui.Controls/Label.xml" path="//Member[@MemberName='ControlsLabelMapper']/Docs/*" />
 		public static IPropertyMapper<ILabel, LabelHandler> ControlsLabelMapper = new PropertyMapper<Label, LabelHandler>(LabelHandler.Mapper)
 		{
 			[nameof(TextType)] = MapTextType,
diff --git a/src/Controls/src/Core/HandlerImpl/Line.Impl.cs b/src/Controls/src/Core/HandlerImpl/Line.Impl.cs
index 5bcb9e21420f..103fc6420ec5 100644
--- a/src/Controls/src/Core/HandlerImpl/Line.Impl.cs
+++ b/src/Controls/src/Core/HandlerImpl/Line.Impl.cs
@@ -1,4 +1,4 @@
-using System.Runtime.CompilerServices;
+using System.Runtime.CompilerServices;
 using Microsoft.Maui.Graphics;
 
 namespace Microsoft.Maui.Controls.Shapes
@@ -17,7 +17,6 @@ protected override void OnPropertyChanged([CallerMemberName] string propertyName
 				Handler?.UpdateValue(nameof(IShapeView.Shape));
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/Line.xml" path="//Member[@MemberName='GetPath']/Docs/*" />
 		public override PathF GetPath()
 		{
 			var path = new PathF();
@@ -28,4 +27,4 @@ public override PathF GetPath()
 			return path;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/HandlerImpl/Page.Impl.cs b/src/Controls/src/Core/HandlerImpl/Page.Impl.cs
index 9687f3ebd795..6efd4d47348a 100644
--- a/src/Controls/src/Core/HandlerImpl/Page.Impl.cs
+++ b/src/Controls/src/Core/HandlerImpl/Page.Impl.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Microsoft.Maui.Controls.Internals;
 using Microsoft.Maui.Graphics;
 
@@ -68,7 +68,6 @@ protected virtual void OnNavigatedTo(NavigatedToEventArgs args) { }
 		protected virtual void OnNavigatingFrom(NavigatingFromEventArgs args) { }
 		protected virtual void OnNavigatedFrom(NavigatedFromEventArgs args) { }
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Page.xml" path="//Member[@MemberName='GetParentWindow']/Docs/*" />
 		public virtual Window GetParentWindow()
 			=> this.FindParentOfType<Window>();
 	}
diff --git a/src/Controls/src/Core/HandlerImpl/Path.Impl.cs b/src/Controls/src/Core/HandlerImpl/Path.Impl.cs
index b3a066b6f61f..07029adef3db 100644
--- a/src/Controls/src/Core/HandlerImpl/Path.Impl.cs
+++ b/src/Controls/src/Core/HandlerImpl/Path.Impl.cs
@@ -1,4 +1,4 @@
-using System.Runtime.CompilerServices;
+using System.Runtime.CompilerServices;
 using Microsoft.Maui.Graphics;
 
 namespace Microsoft.Maui.Controls.Shapes
@@ -17,7 +17,6 @@ protected override void OnPropertyChanged([CallerMemberName] string propertyName
 			}
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/Path.xml" path="//Member[@MemberName='GetPath']/Docs/*" />
 		public override PathF GetPath()
 		{
 			var path = new PathF();
diff --git a/src/Controls/src/Core/HandlerImpl/Polygon.Impl.cs b/src/Controls/src/Core/HandlerImpl/Polygon.Impl.cs
index a278b99e5b50..d64cccb6f773 100644
--- a/src/Controls/src/Core/HandlerImpl/Polygon.Impl.cs
+++ b/src/Controls/src/Core/HandlerImpl/Polygon.Impl.cs
@@ -1,4 +1,4 @@
-using System.Runtime.CompilerServices;
+using System.Runtime.CompilerServices;
 using Microsoft.Maui.Graphics;
 
 namespace Microsoft.Maui.Controls.Shapes
@@ -18,7 +18,6 @@ protected override void OnPropertyChanged([CallerMemberName] string propertyName
 				Handler?.UpdateValue(nameof(IShapeView.Shape));
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/Polygon.xml" path="//Member[@MemberName='GetPath']/Docs/*" />
 		public override PathF GetPath()
 		{
 			var path = new PathF();
@@ -36,4 +35,4 @@ public override PathF GetPath()
 			return path;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/HandlerImpl/Polyline.Impl.cs b/src/Controls/src/Core/HandlerImpl/Polyline.Impl.cs
index 201e53253eb5..4c97f62ca89f 100644
--- a/src/Controls/src/Core/HandlerImpl/Polyline.Impl.cs
+++ b/src/Controls/src/Core/HandlerImpl/Polyline.Impl.cs
@@ -1,4 +1,4 @@
-using System.Runtime.CompilerServices;
+using System.Runtime.CompilerServices;
 using Microsoft.Maui.Graphics;
 
 namespace Microsoft.Maui.Controls.Shapes
@@ -18,7 +18,6 @@ protected override void OnPropertyChanged([CallerMemberName] string propertyName
 				Handler?.UpdateValue(nameof(IShapeView.Shape));
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/Polyline.xml" path="//Member[@MemberName='GetPath']/Docs/*" />
 		public override PathF GetPath()
 		{
 			var path = new PathF();
@@ -34,4 +33,4 @@ public override PathF GetPath()
 			return path;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/HandlerImpl/RadioButton/RadioButton.cs b/src/Controls/src/Core/HandlerImpl/RadioButton/RadioButton.cs
index 9aedda6e965e..2b8c3fdcd239 100644
--- a/src/Controls/src/Core/HandlerImpl/RadioButton/RadioButton.cs
+++ b/src/Controls/src/Core/HandlerImpl/RadioButton/RadioButton.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Microsoft.Maui.Controls
 {
@@ -7,7 +7,6 @@ public partial class RadioButton
 	{
 		IMauiContext MauiContext => Handler?.MauiContext ?? throw new InvalidOperationException("MauiContext not set");
 
-		/// <include file="../../../../docs/Microsoft.Maui.Controls/RadioButton.xml" path="//Member[@MemberName='ControlsRadioButtonMapper']/Docs/*" />
 		public static IPropertyMapper<RadioButton, RadioButtonHandler> ControlsRadioButtonMapper =
 			   new PropertyMapper<RadioButton, RadioButtonHandler>(RadioButtonHandler.Mapper)
 			   {
diff --git a/src/Controls/src/Core/HandlerImpl/Rectangle.Impl.cs b/src/Controls/src/Core/HandlerImpl/Rectangle.Impl.cs
index 43c2c482b977..e6ce9a79b46c 100644
--- a/src/Controls/src/Core/HandlerImpl/Rectangle.Impl.cs
+++ b/src/Controls/src/Core/HandlerImpl/Rectangle.Impl.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Runtime.CompilerServices;
 using Microsoft.Maui.Graphics;
 
@@ -16,7 +16,6 @@ protected override void OnPropertyChanged([CallerMemberName] string propertyName
 				Handler?.UpdateValue(nameof(IShapeView.Shape));
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/Rectangle.xml" path="//Member[@MemberName='GetPath']/Docs/*" />
 		public override PathF GetPath()
 		{
 			var path = new PathF();
@@ -33,4 +32,4 @@ public override PathF GetPath()
 			return path;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/HandlerImpl/VisualElement/VisualElement.Impl.cs b/src/Controls/src/Core/HandlerImpl/VisualElement/VisualElement.Impl.cs
index 87cb9041e925..bf95ee76496f 100644
--- a/src/Controls/src/Core/HandlerImpl/VisualElement/VisualElement.Impl.cs
+++ b/src/Controls/src/Core/HandlerImpl/VisualElement/VisualElement.Impl.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable enable
 using System;
 using System.ComponentModel;
 using Microsoft.Maui.Graphics;
@@ -17,7 +17,6 @@ public partial class VisualElement : IView
 
 		Rect _frame = new Rect(0, 0, -1, -1);
 
-		/// <include file="../../../../docs/Microsoft.Maui.Controls/VisualElement.xml" path="//Member[@MemberName='Frame']/Docs/*" />
 		public Rect Frame
 		{
 			get => _frame;
@@ -30,7 +29,6 @@ public Rect Frame
 			}
 		}
 
-		/// <include file="../../../../docs/Microsoft.Maui.Controls/VisualElement.xml" path="//Member[@MemberName='Handler']/Docs/*" />
 		new public IViewHandler? Handler
 		{
 			get => (IViewHandler?)base.Handler;
@@ -62,7 +60,6 @@ private protected override void OnHandlerChangedCore()
 
 		IShadow IView.Shadow => Shadow;
 
-		/// <include file="../../../../docs/Microsoft.Maui.Controls/VisualElement.xml" path="//Member[@MemberName='ShadowProperty']/Docs/*" />
 		public static readonly BindableProperty ShadowProperty =
  			BindableProperty.Create(nameof(Shadow), typeof(Shadow), typeof(VisualElement), defaultValue: null,
 				propertyChanging: (bindable, oldvalue, newvalue) =>
@@ -76,7 +73,6 @@ private protected override void OnHandlerChangedCore()
 						(bindable as VisualElement)?.NotifyShadowChanges();
 				});
 
-		/// <include file="../../../../docs/Microsoft.Maui.Controls/VisualElement.xml" path="//Member[@MemberName='Shadow']/Docs/*" />
 		public Shadow Shadow
 		{
 			get { return (Shadow)GetValue(ShadowProperty); }
@@ -95,17 +91,14 @@ static void ZIndexPropertyChanged(BindableObject bindable, object oldValue, obje
 			}
 		}
 
-		/// <include file="../../../../docs/Microsoft.Maui.Controls/VisualElement.xml" path="//Member[@MemberName='ZIndex']/Docs/*" />
 		public int ZIndex
 		{
 			get { return (int)GetValue(ZIndexProperty); }
 			set { SetValue(ZIndexProperty, value); }
 		}
 
-		/// <include file="../../../../docs/Microsoft.Maui.Controls/VisualElement.xml" path="//Member[@MemberName='DesiredSize']/Docs/*" />
 		public Size DesiredSize { get; protected set; }
 
-		/// <include file="../../../../docs/Microsoft.Maui.Controls/VisualElement.xml" path="//Member[@MemberName='Arrange']/Docs/*" />
 		public void Arrange(Rect bounds)
 		{
 			Layout(bounds);
@@ -338,6 +331,9 @@ void PropagateBindingContextToShadow()
 				SetInheritedBindingContext(Shadow, BindingContext);
 		}
 
+		/// <summary>
+		/// Indicates if a VisualElement is connected to the main object tree.
+		/// </summary>
 		public bool IsLoaded
 		{
 			get
@@ -352,6 +348,10 @@ public bool IsLoaded
 			}
 		}
 
+		/// <summary>
+		/// Occurs when a VisualElement has been constructed and added to the object tree.
+		/// This event may occur before the VisualElement has been measured so should not be relied on for size information.  
+		/// </summary>
 		public event EventHandler? Loaded
 		{
 			add
@@ -369,6 +369,9 @@ public event EventHandler? Loaded
 			}
 		}
 
+		/// <summary>
+		/// Occurs when this VisualElement is no longer connected to the main object tree.
+		/// </summary>
 		public event EventHandler? Unloaded
 		{
 			add
@@ -458,4 +461,4 @@ void UpdatePlatformUnloadedLoadedWiring(Window? window)
 
 		internal IView? ParentView => ((this as IView)?.Parent as IView);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/HandlerImpl/VisualElement/VisualElement.cs b/src/Controls/src/Core/HandlerImpl/VisualElement/VisualElement.cs
index 7a31adfe8469..86028a52e471 100644
--- a/src/Controls/src/Core/HandlerImpl/VisualElement/VisualElement.cs
+++ b/src/Controls/src/Core/HandlerImpl/VisualElement/VisualElement.cs
@@ -5,7 +5,6 @@ namespace Microsoft.Maui.Controls
 	/// <include file="../../../../docs/Microsoft.Maui.Controls/VisualElement.xml" path="Type[@FullName='Microsoft.Maui.Controls.VisualElement']/Docs/*" />
 	public partial class VisualElement
 	{
-		/// <include file="../../../../docs/Microsoft.Maui.Controls/VisualElement.xml" path="//Member[@MemberName='ControlsVisualElementMapper']/Docs/*" />
 		public static IPropertyMapper<IView, IViewHandler> ControlsVisualElementMapper =
 			new PropertyMapper<IView, IViewHandler>(Element.ControlsElementMapper)
 			{
@@ -24,7 +23,6 @@ internal static void RemapForControls()
 			ViewHandler.ViewMapper = ControlsVisualElementMapper;
 		}
 
-		/// <include file="../../../../docs/Microsoft.Maui.Controls/VisualElement.xml" path="//Member[@MemberName='MapBackgroundColor']/Docs/*" />
 		public static void MapBackgroundColor(IViewHandler handler, IView view)
 		{
 			handler.UpdateValue(nameof(Background));
diff --git a/src/Controls/src/Core/ImageSourceConverter.cs b/src/Controls/src/Core/ImageSourceConverter.cs
index 428539e0daad..1342572af30f 100644
--- a/src/Controls/src/Core/ImageSourceConverter.cs
+++ b/src/Controls/src/Core/ImageSourceConverter.cs
@@ -7,15 +7,12 @@ namespace Microsoft.Maui.Controls
 	/// <include file="../../docs/Microsoft.Maui.Controls/ImageSourceConverter.xml" path="Type[@FullName='Microsoft.Maui.Controls.ImageSourceConverter']/Docs/*" />
 	public sealed class ImageSourceConverter : TypeConverter
 	{
-		/// <include file="../../docs/Microsoft.Maui.Controls/ImageSourceConverter.xml" path="//Member[@MemberName='CanConvertFrom']/Docs/*" />
 		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
 			=> sourceType == typeof(string);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/ImageSourceConverter.xml" path="//Member[@MemberName='CanConvertTo']/Docs/*" />
 		public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
 			=> destinationType == typeof(string);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/ImageSourceConverter.xml" path="//Member[@MemberName='ConvertFrom']/Docs/*" />
 		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
 		{
 			var strValue = value?.ToString();
@@ -25,7 +22,6 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
 			throw new InvalidOperationException(string.Format("Cannot convert \"{0}\" into {1}", strValue, typeof(ImageSource)));
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/ImageSourceConverter.xml" path="//Member[@MemberName='ConvertTo']/Docs/*" />
 		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
 		{
 			if (value is FileImageSource fis)
@@ -35,4 +31,4 @@ public override object ConvertTo(ITypeDescriptorContext context, CultureInfo cul
 			throw new NotSupportedException();
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/Interactivity/TriggerAction.cs b/src/Controls/src/Core/Interactivity/TriggerAction.cs
index 1294d155de69..689fe6caff78 100644
--- a/src/Controls/src/Core/Interactivity/TriggerAction.cs
+++ b/src/Controls/src/Core/Interactivity/TriggerAction.cs
@@ -2,7 +2,6 @@
 
 namespace Microsoft.Maui.Controls
 {
-	/// <include file="../../../docs/Microsoft.Maui.Controls/TriggerAction.xml" path="Type[@FullName='Microsoft.Maui.Controls.TriggerAction' and position()=0]/Docs/*" />
 	public abstract class TriggerAction
 	{
 		internal TriggerAction(Type associatedType)
diff --git a/src/Controls/src/Core/Internals/AsyncValue.cs b/src/Controls/src/Core/Internals/AsyncValue.cs
index e5c67c8dd45e..70b3aa5295e5 100644
--- a/src/Controls/src/Core/Internals/AsyncValue.cs
+++ b/src/Controls/src/Core/Internals/AsyncValue.cs
@@ -93,8 +93,7 @@ void OnPropertyChanged([CallerMemberName] string propertyName = null) =>
 	[EditorBrowsable(EditorBrowsableState.Never)]
 	public static class AsyncValueExtensions
 	{
-		/// <include file="../../../docs/Microsoft.Maui.Controls.Internals/AsyncValueExtensions.xml" path="//Member[@MemberName='AsAsyncValue']/Docs/*" />
 		public static AsyncValue<T> AsAsyncValue<T>(this Task<T> valueTask, T defaultValue = default(T)) =>
 			new AsyncValue<T>(valueTask, defaultValue);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/Internals/CellExtensions.cs b/src/Controls/src/Core/Internals/CellExtensions.cs
index 1ca34b5179b9..0dce1d4c36da 100644
--- a/src/Controls/src/Core/Internals/CellExtensions.cs
+++ b/src/Controls/src/Core/Internals/CellExtensions.cs
@@ -8,32 +8,27 @@ namespace Microsoft.Maui.Controls.Internals
 	[EditorBrowsable(EditorBrowsableState.Never)]
 	public static class CellExtensions
 	{
-		/// <include file="../../../docs/Microsoft.Maui.Controls.Internals/CellExtensions.xml" path="//Member[@MemberName='GetIsGroupHeader']/Docs/*" />
 		public static bool GetIsGroupHeader<TView, [DynamicallyAccessedMembers(BindableProperty.DeclaringTypeMembers)] TItem>(this TItem cell) where TView : BindableObject, ITemplatedItemsView<TItem> where TItem : BindableObject
 		{
 			return TemplatedItemsList<TView, TItem>.GetIsGroupHeader(cell);
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls.Internals/CellExtensions.xml" path="//Member[@MemberName='SetIsGroupHeader']/Docs/*" />
 		public static void SetIsGroupHeader<TView, [DynamicallyAccessedMembers(BindableProperty.DeclaringTypeMembers)] TItem>(this TItem cell, bool value) where TView : BindableObject, ITemplatedItemsView<TItem> where TItem : BindableObject
 		{
 			TemplatedItemsList<TView, TItem>.SetIsGroupHeader(cell, value);
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls.Internals/CellExtensions.xml" path="//Member[@MemberName='GetGroupHeaderContent']/Docs/*" />
 		public static TItem GetGroupHeaderContent<TView, [DynamicallyAccessedMembers(BindableProperty.DeclaringTypeMembers)] TItem>(this TItem cell) where TView : BindableObject, ITemplatedItemsView<TItem> where TItem : BindableObject
 		{
 			var group = TemplatedItemsList<TView, TItem>.GetGroup(cell);
 			return group.HeaderContent;
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls.Internals/CellExtensions.xml" path="//Member[@MemberName='GetIndex']/Docs/*" />
 		public static int GetIndex<TView, [DynamicallyAccessedMembers(BindableProperty.DeclaringTypeMembers)] TItem>(this TItem cell) where TView : BindableObject, ITemplatedItemsView<TItem> where TItem : BindableObject
 		{
 			return TemplatedItemsList<TView, TItem>.GetIndex(cell);
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls.Internals/CellExtensions.xml" path="//Member[@MemberName='GetGroup']/Docs/*" />
 		public static ITemplatedItemsList<TItem> GetGroup<TView, [DynamicallyAccessedMembers(BindableProperty.DeclaringTypeMembers)] TItem>(this TItem cell) where TView : BindableObject, ITemplatedItemsView<TItem> where TItem : BindableObject
 		{
 			return TemplatedItemsList<TView, TItem>.GetGroup(cell);
diff --git a/src/Controls/src/Core/Internals/ImageParser.cs b/src/Controls/src/Core/Internals/ImageParser.cs
index 0934f5705001..1ed9b0666e68 100644
--- a/src/Controls/src/Core/Internals/ImageParser.cs
+++ b/src/Controls/src/Core/Internals/ImageParser.cs
@@ -321,13 +321,9 @@ public class GIFBitmap
 	{
 		public enum DisposeMethod
 		{
-			/// <include file="../../../docs/Microsoft.Maui.Controls.Internals/GIFBitmap.xml" path="//Member[@MemberName='NoAction']/Docs/*" />
 			NoAction = 0,
-			/// <include file="../../../docs/Microsoft.Maui.Controls.Internals/GIFBitmap.xml" path="//Member[@MemberName='LeaveInPlace']/Docs/*" />
 			LeaveInPlace = 1,
-			/// <include file="../../../docs/Microsoft.Maui.Controls.Internals/GIFBitmap.xml" path="//Member[@MemberName='RestoreToBackground']/Docs/*" />
 			RestoreToBackground = 2,
-			/// <include file="../../../docs/Microsoft.Maui.Controls.Internals/GIFBitmap.xml" path="//Member[@MemberName='RestoreToPrevious']/Docs/*" />
 			RestoreToPrevious = 3
 		};
 
diff --git a/src/Controls/src/Core/Internals/TextTransformUtilites.cs b/src/Controls/src/Core/Internals/TextTransformUtilites.cs
index 33d83de599b9..875ca5f65624 100644
--- a/src/Controls/src/Core/Internals/TextTransformUtilites.cs
+++ b/src/Controls/src/Core/Internals/TextTransformUtilites.cs
@@ -2,11 +2,20 @@
 
 namespace Microsoft.Maui.Controls.Internals
 {
-	/// <include file="../../../docs/Microsoft.Maui.Controls.Internals/TextTransformUtilites.xml" path="Type[@FullName='Microsoft.Maui.Controls.Internals.TextTransformUtilites']/Docs/*" />
+	/// <summary>
+	/// A utilities class for text transformations.
+	/// </summary>
+	/// <remarks>For internal use by the .NET MAUI platform.</remarks>
 	[EditorBrowsable(EditorBrowsableState.Never)]
 	public static class TextTransformUtilites
 	{
-		/// <include file="../../../docs/Microsoft.Maui.Controls.Internals/TextTransformUtilites.xml" path="//Member[@MemberName='GetTransformedText']/Docs/*" />
+		/// <summary>
+		/// Applies the <paramref name="textTransform"/> to <paramref name="source"/>.
+		/// </summary>
+		/// <remarks>For internal use by the .NET MAUI platform mostly.</remarks>
+		/// <param name="source">The text to transform.</param>
+		/// <param name="textTransform">The transform to apply to <paramref name="source"/>.</param>
+		/// <returns>The transformed text.</returns>
 		[EditorBrowsable(EditorBrowsableState.Never)]
 		public static string GetTransformedText(string source, TextTransform textTransform)
 		{
@@ -25,8 +34,12 @@ public static string GetTransformedText(string source, TextTransform textTransfo
 			}
 		}
 
-
-		/// <include file="../../../docs/Microsoft.Maui.Controls.Internals/TextTransformUtilites.xml" path="//Member[@MemberName='SetPlainText']/Docs/*" />
+		/// <summary>
+		/// Sets the plain text value to the specified input view.
+		/// </summary>
+		/// <remarks>For internal use by the .NET MAUI platform.</remarks>
+		/// <param name="inputView">The view that will receive the text value.</param>
+		/// <param name="platformText">The text that will be applied to the view.</param>
 		[EditorBrowsable(EditorBrowsableState.Never)]
 		public static void SetPlainText(InputView inputView, string platformText)
 		{
diff --git a/src/Controls/src/Core/Items/CarouselLayoutTypeConverter.cs b/src/Controls/src/Core/Items/CarouselLayoutTypeConverter.cs
index 56cfe3f33c69..b1498157bc7c 100644
--- a/src/Controls/src/Core/Items/CarouselLayoutTypeConverter.cs
+++ b/src/Controls/src/Core/Items/CarouselLayoutTypeConverter.cs
@@ -7,15 +7,12 @@ namespace Microsoft.Maui.Controls
 	/// <include file="../../../docs/Microsoft.Maui.Controls/CarouselLayoutTypeConverter.xml" path="Type[@FullName='Microsoft.Maui.Controls.CarouselLayoutTypeConverter']/Docs/*" />
 	public class CarouselLayoutTypeConverter : TypeConverter
 	{
-		/// <include file="../../../docs/Microsoft.Maui.Controls/CarouselLayoutTypeConverter.xml" path="//Member[@MemberName='CanConvertFrom']/Docs/*" />
 		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
 			=> sourceType == typeof(string);
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/CarouselLayoutTypeConverter.xml" path="//Member[@MemberName='CanConvertTo']/Docs/*" />
 		public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
 			=> destinationType == typeof(string);
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/CarouselLayoutTypeConverter.xml" path="//Member[@MemberName='ConvertFrom']/Docs/*" />
 		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
 		{
 			var strValue = value?.ToString();
@@ -29,7 +26,6 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
 			throw new InvalidOperationException($"Cannot convert \"{strValue}\" into {typeof(LinearItemsLayout)}");
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/CarouselLayoutTypeConverter.xml" path="//Member[@MemberName='ConvertTo']/Docs/*" />
 		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
 		{
 			if (value is not LinearItemsLayout lil)
@@ -44,4 +40,4 @@ public override object ConvertTo(ITypeDescriptorContext context, CultureInfo cul
 			throw new NotSupportedException();
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/Items/ItemsLayoutTypeConverter.cs b/src/Controls/src/Core/Items/ItemsLayoutTypeConverter.cs
index de7f9618c867..09043c5a7c8f 100644
--- a/src/Controls/src/Core/Items/ItemsLayoutTypeConverter.cs
+++ b/src/Controls/src/Core/Items/ItemsLayoutTypeConverter.cs
@@ -7,15 +7,12 @@ namespace Microsoft.Maui.Controls
 	/// <include file="../../../docs/Microsoft.Maui.Controls/ItemsLayoutTypeConverter.xml" path="Type[@FullName='Microsoft.Maui.Controls.ItemsLayoutTypeConverter']/Docs/*" />
 	public class ItemsLayoutTypeConverter : TypeConverter
 	{
-		/// <include file="../../../docs/Microsoft.Maui.Controls/ItemsLayoutTypeConverter.xml" path="//Member[@MemberName='CanConvertFrom']/Docs/*" />
 		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
 			=> sourceType == typeof(string);
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/ItemsLayoutTypeConverter.xml" path="//Member[@MemberName='CanConvertTo']/Docs/*" />
 		public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
 			=> destinationType == typeof(string);
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/ItemsLayoutTypeConverter.xml" path="//Member[@MemberName='ConvertFrom']/Docs/*" />
 		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
 		{
 			var strValue = value?.ToString();
@@ -55,7 +52,6 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
 			throw new InvalidOperationException($"Cannot convert \"{strValue}\" into {typeof(IItemsLayout)}");
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/ItemsLayoutTypeConverter.xml" path="//Member[@MemberName='ConvertTo']/Docs/*" />
 		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
 		{
 			if (value is LinearItemsLayout && value == LinearItemsLayout.Vertical)
@@ -67,4 +63,4 @@ public override object ConvertTo(ITypeDescriptorContext context, CultureInfo cul
 			throw new NotSupportedException();
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/ItemsView.cs b/src/Controls/src/Core/ItemsView.cs
index 972bf355b13f..3a6f13e49a48 100644
--- a/src/Controls/src/Core/ItemsView.cs
+++ b/src/Controls/src/Core/ItemsView.cs
@@ -55,7 +55,6 @@ public DataTemplate ItemTemplate
 
 		ITemplatedItemsList<TVisual> ITemplatedItemsView<TVisual>.TemplatedItems => TemplatedItems;
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/ItemsView.xml" path="//Member[@MemberName='TemplatedItems']/Docs/*" />
 		[EditorBrowsable(EditorBrowsableState.Never)]
 		public TemplatedItemsList<ItemsView<TVisual>, TVisual> TemplatedItems { get; }
 
@@ -85,4 +84,4 @@ static void OnItemsSourceChanged(BindableObject bindable, object oldValue, objec
 
 		protected virtual bool ValidateItemTemplate(DataTemplate template) => true;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/Label.cs b/src/Controls/src/Core/Label.cs
index c71e6995d1a9..223ce50f99ea 100644
--- a/src/Controls/src/Core/Label.cs
+++ b/src/Controls/src/Core/Label.cs
@@ -37,7 +37,6 @@ public partial class Label : View, IFontElement, ITextElement, ITextAlignmentEle
 		/// <include file="../../docs/Microsoft.Maui.Controls/Label.xml" path="//Member[@MemberName='FontAttributesProperty']/Docs/*" />
 		public static readonly BindableProperty FontAttributesProperty = FontElement.FontAttributesProperty;
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Label.xml" path="//Member[@MemberName='FontAutoScalingEnabledProperty']/Docs/*" />
 		public static readonly BindableProperty FontAutoScalingEnabledProperty = FontElement.FontAutoScalingEnabledProperty;
 
 		/// <include file="../../docs/Microsoft.Maui.Controls/Label.xml" path="//Member[@MemberName='TextTransformProperty']/Docs/*" />
@@ -207,7 +206,6 @@ public double FontSize
 			set { SetValue(FontSizeProperty, value); }
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Label.xml" path="//Member[@MemberName='FontAutoScalingEnabled']/Docs/*" />
 		public bool FontAutoScalingEnabled
 		{
 			get => (bool)GetValue(FontAutoScalingEnabledProperty);
diff --git a/src/Controls/src/Core/Layout/AbsoluteLayout.cs b/src/Controls/src/Core/Layout/AbsoluteLayout.cs
index 9a63825ad574..c29c45682b57 100644
--- a/src/Controls/src/Core/Layout/AbsoluteLayout.cs
+++ b/src/Controls/src/Core/Layout/AbsoluteLayout.cs
@@ -63,7 +63,6 @@ public static void SetLayoutBounds(BindableObject bindable, Rect bounds)
 
 		#endregion
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/AbsoluteLayout.xml" path="//Member[@MemberName='GetLayoutFlags'][2]/Docs/*" />
 		public AbsoluteLayoutFlags GetLayoutFlags(IView view)
 		{
 			return view switch
@@ -73,7 +72,6 @@ public AbsoluteLayoutFlags GetLayoutFlags(IView view)
 			};
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/AbsoluteLayout.xml" path="//Member[@MemberName='GetLayoutBounds'][2]/Docs/*" />
 		public Rect GetLayoutBounds(IView view)
 		{
 			return view switch
diff --git a/src/Controls/src/Core/Layout/BoundsTypeConverter.cs b/src/Controls/src/Core/Layout/BoundsTypeConverter.cs
index e1d0b6685bdf..8cba9c0638af 100644
--- a/src/Controls/src/Core/Layout/BoundsTypeConverter.cs
+++ b/src/Controls/src/Core/Layout/BoundsTypeConverter.cs
@@ -9,15 +9,12 @@ namespace Microsoft.Maui.Controls
 	[Xaml.ProvideCompiled("Microsoft.Maui.Controls.XamlC.BoundsTypeConverter")]
 	public sealed class BoundsTypeConverter : TypeConverter
 	{
-		/// <include file="../../../docs/Microsoft.Maui.Controls/BoundsTypeConverter.xml" path="//Member[@MemberName='CanConvertFrom']/Docs/*" />
 		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
 			=> sourceType == typeof(string);
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/BoundsTypeConverter.xml" path="//Member[@MemberName='CanConvertTo']/Docs/*" />
 		public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
 			=> destinationType == typeof(string);
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/BoundsTypeConverter.xml" path="//Member[@MemberName='ConvertFrom']/Docs/*" />
 		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
 		{
 			var strValue = value?.ToString();
@@ -54,7 +51,6 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
 			throw new InvalidOperationException($"Cannot convert \"{value}\" into {typeof(Rect)}");
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/BoundsTypeConverter.xml" path="//Member[@MemberName='ConvertTo']/Docs/*" />
 		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
 		{
 			if (value is not Rect rect)
@@ -62,4 +58,4 @@ public override object ConvertTo(ITypeDescriptorContext context, CultureInfo cul
 			return $"{rect.X.ToString(CultureInfo.InvariantCulture)}, {rect.Y.ToString(CultureInfo.InvariantCulture)}, {(rect.Width == AbsoluteLayout.AutoSize ? nameof(AbsoluteLayout.AutoSize) : rect.Width.ToString(CultureInfo.InvariantCulture))}, {(rect.Height == AbsoluteLayout.AutoSize ? nameof(AbsoluteLayout.AutoSize) : rect.Height.ToString(CultureInfo.InvariantCulture))}";
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/Layout/FlexLayout.cs b/src/Controls/src/Core/Layout/FlexLayout.cs
index 0d753528be9d..6c55fcf9107e 100644
--- a/src/Controls/src/Core/Layout/FlexLayout.cs
+++ b/src/Controls/src/Core/Layout/FlexLayout.cs
@@ -264,7 +264,6 @@ class FlexInfo
 			public Flex.Item FlexItem { get; set; }
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/FlexLayout.xml" path="//Member[@MemberName='GetOrder'][2]/Docs/*" />
 		public int GetOrder(IView view)
 		{
 			return view switch
@@ -274,7 +273,6 @@ public int GetOrder(IView view)
 			};
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/FlexLayout.xml" path="//Member[@MemberName='SetOrder'][2]/Docs/*" />
 		public void SetOrder(IView view, int order)
 		{
 			switch (view)
@@ -288,7 +286,6 @@ public void SetOrder(IView view, int order)
 			}
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/FlexLayout.xml" path="//Member[@MemberName='GetGrow'][2]/Docs/*" />
 		public float GetGrow(IView view)
 		{
 			return view switch
@@ -298,7 +295,6 @@ public float GetGrow(IView view)
 			};
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/FlexLayout.xml" path="//Member[@MemberName='SetGrow'][2]/Docs/*" />
 		public void SetGrow(IView view, float grow)
 		{
 			switch (view)
@@ -312,7 +308,6 @@ public void SetGrow(IView view, float grow)
 			}
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/FlexLayout.xml" path="//Member[@MemberName='GetShrink'][2]/Docs/*" />
 		public float GetShrink(IView view)
 		{
 			return view switch
@@ -322,7 +317,6 @@ public float GetShrink(IView view)
 			};
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/FlexLayout.xml" path="//Member[@MemberName='SetShrink'][2]/Docs/*" />
 		public void SetShrink(IView view, float shrink)
 		{
 			switch (view)
@@ -336,7 +330,6 @@ public void SetShrink(IView view, float shrink)
 			}
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/FlexLayout.xml" path="//Member[@MemberName='GetAlignSelf'][2]/Docs/*" />
 		public FlexAlignSelf GetAlignSelf(IView view)
 		{
 			return view switch
@@ -346,7 +339,6 @@ public FlexAlignSelf GetAlignSelf(IView view)
 			};
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/FlexLayout.xml" path="//Member[@MemberName='SetAlignSelf'][2]/Docs/*" />
 		public void SetAlignSelf(IView view, FlexAlignSelf alignSelf)
 		{
 			switch (view)
@@ -360,7 +352,6 @@ public void SetAlignSelf(IView view, FlexAlignSelf alignSelf)
 			}
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/FlexLayout.xml" path="//Member[@MemberName='GetBasis'][2]/Docs/*" />
 		public FlexBasis GetBasis(IView view)
 		{
 			return view switch
@@ -370,7 +361,6 @@ public FlexBasis GetBasis(IView view)
 			};
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/FlexLayout.xml" path="//Member[@MemberName='SetBasis'][2]/Docs/*" />
 		public void SetBasis(IView view, FlexBasis basis)
 		{
 			switch (view)
@@ -547,7 +537,6 @@ protected override ILayoutManager CreateLayoutManager()
 			return new FlexLayoutManager(this);
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/FlexLayout.xml" path="//Member[@MemberName='GetFlexFrame']/Docs/*" />
 		public Graphics.Rect GetFlexFrame(IView view)
 		{
 			return view switch
@@ -568,7 +557,6 @@ void EnsureFlexItemPropertiesUpdated()
 			}
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/FlexLayout.xml" path="//Member[@MemberName='Layout']/Docs/*" />
 		public void Layout(double width, double height)
 		{
 			if (_root.Parent != null)   //Layout is only computed at root level
diff --git a/src/Controls/src/Core/Layout/Grid.cs b/src/Controls/src/Core/Layout/Grid.cs
index 92e5a84e127b..fba04c34c0b4 100644
--- a/src/Controls/src/Core/Layout/Grid.cs
+++ b/src/Controls/src/Core/Layout/Grid.cs
@@ -145,7 +145,6 @@ public double ColumnSpacing
 			set { SetValue(ColumnSpacingProperty, value); }
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Grid.xml" path="//Member[@MemberName='GetColumn'][2]/Docs/*" />
 		public int GetColumn(IView view)
 		{
 			return view switch
@@ -155,7 +154,6 @@ public int GetColumn(IView view)
 			};
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Grid.xml" path="//Member[@MemberName='GetColumnSpan'][2]/Docs/*" />
 		public int GetColumnSpan(IView view)
 		{
 			return view switch
@@ -165,7 +163,6 @@ public int GetColumnSpan(IView view)
 			};
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Grid.xml" path="//Member[@MemberName='GetRow'][2]/Docs/*" />
 		public int GetRow(IView view)
 		{
 			return view switch
@@ -175,7 +172,6 @@ public int GetRow(IView view)
 			};
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Grid.xml" path="//Member[@MemberName='GetRowSpan'][2]/Docs/*" />
 		public int GetRowSpan(IView view)
 		{
 			return view switch
@@ -185,19 +181,16 @@ public int GetRowSpan(IView view)
 			};
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Grid.xml" path="//Member[@MemberName='AddRowDefinition']/Docs/*" />
 		public void AddRowDefinition(RowDefinition gridRowDefinition)
 		{
 			RowDefinitions.Add(gridRowDefinition);
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Grid.xml" path="//Member[@MemberName='AddColumnDefinition']/Docs/*" />
 		public void AddColumnDefinition(ColumnDefinition gridColumnDefinition)
 		{
 			ColumnDefinitions.Add(gridColumnDefinition);
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Grid.xml" path="//Member[@MemberName='SetRow'][2]/Docs/*" />
 		public void SetRow(IView view, int row)
 		{
 			switch (view)
@@ -212,7 +205,6 @@ public void SetRow(IView view, int row)
 			}
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Grid.xml" path="//Member[@MemberName='SetRowSpan'][2]/Docs/*" />
 		public void SetRowSpan(IView view, int span)
 		{
 			switch (view)
@@ -227,7 +219,6 @@ public void SetRowSpan(IView view, int span)
 			}
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Grid.xml" path="//Member[@MemberName='SetColumn'][2]/Docs/*" />
 		public void SetColumn(IView view, int col)
 		{
 			switch (view)
@@ -242,7 +233,6 @@ public void SetColumn(IView view, int col)
 			}
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Grid.xml" path="//Member[@MemberName='SetColumnSpan'][2]/Docs/*" />
 		public void SetColumnSpan(IView view, int span)
 		{
 			switch (view)
diff --git a/src/Controls/src/Core/Layout/Layout.cs b/src/Controls/src/Core/Layout/Layout.cs
index 63001eda4f0c..e2c20144f451 100644
--- a/src/Controls/src/Core/Layout/Layout.cs
+++ b/src/Controls/src/Core/Layout/Layout.cs
@@ -28,10 +28,8 @@ public abstract partial class Layout : View, Maui.ILayout, IList<IView>, IBindab
 		internal override IReadOnlyList<Element> LogicalChildrenInternal =>
 			_logicalChildren ??= new ReadOnlyCastingList<Element, IView>(_children);
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Layout.xml" path="//Member[@MemberName='Count']/Docs/*" />
 		public int Count => _children.Count;
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Layout.xml" path="//Member[@MemberName='IsReadOnly']/Docs/*" />
 		public bool IsReadOnly => ((ICollection<IView>)_children).IsReadOnly;
 
 		public IView this[int index]
@@ -96,17 +94,14 @@ public Thickness Padding
 			set => SetValue(PaddingElement.PaddingProperty, value);
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Layout.xml" path="//Member[@MemberName='IgnoreSafeArea']/Docs/*" />
 		public bool IgnoreSafeArea { get; set; }
 
 		protected abstract ILayoutManager CreateLayoutManager();
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Layout.xml" path="//Member[@MemberName='GetEnumerator']/Docs/*" />
 		public IEnumerator<IView> GetEnumerator() => _children.GetEnumerator();
 
 		IEnumerator IEnumerable.GetEnumerator() => _children.GetEnumerator();
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Layout.xml" path="//Member[@MemberName='Measure']/Docs/*" />
 		public override SizeRequest Measure(double widthConstraint, double heightConstraint, MeasureFlags flags = MeasureFlags.None)
 		{
 			var size = (this as IView).Measure(widthConstraint, heightConstraint);
@@ -118,7 +113,6 @@ protected override void InvalidateMeasureOverride()
 			base.InvalidateMeasureOverride();
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Layout.xml" path="//Member[@MemberName='Add']/Docs/*" />
 		public void Add(IView child)
 		{
 			if (child == null)
@@ -130,7 +124,6 @@ public void Add(IView child)
 			OnAdd(index, child);
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Layout.xml" path="//Member[@MemberName='Clear']/Docs/*" />
 		public void Clear()
 		{
 			for (var index = Count - 1; index >= 0; index--)
@@ -145,25 +138,21 @@ public void Clear()
 			OnClear();
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Layout.xml" path="//Member[@MemberName='Contains']/Docs/*" />
 		public bool Contains(IView item)
 		{
 			return _children.Contains(item);
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Layout.xml" path="//Member[@MemberName='CopyTo']/Docs/*" />
 		public void CopyTo(IView[] array, int arrayIndex)
 		{
 			_children.CopyTo(array, arrayIndex);
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Layout.xml" path="//Member[@MemberName='IndexOf']/Docs/*" />
 		public int IndexOf(IView item)
 		{
 			return _children.IndexOf(item);
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Layout.xml" path="//Member[@MemberName='Insert']/Docs/*" />
 		public void Insert(int index, IView child)
 		{
 			if (child == null)
@@ -174,7 +163,6 @@ public void Insert(int index, IView child)
 			OnInsert(index, child);
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Layout.xml" path="//Member[@MemberName='Remove']/Docs/*" />
 		public bool Remove(IView child)
 		{
 			if (child == null)
@@ -192,7 +180,6 @@ public bool Remove(IView child)
 			return true;
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Layout.xml" path="//Member[@MemberName='RemoveAt']/Docs/*" />
 		public void RemoveAt(int index)
 		{
 			if (index >= Count)
@@ -277,13 +264,11 @@ Thickness IPaddingElement.PaddingDefaultValueCreator()
 
 		IReadOnlyList<IVisualTreeElement> IVisualTreeElement.GetVisualChildren() => Children.Cast<IVisualTreeElement>().ToList().AsReadOnly();
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Layout.xml" path="//Member[@MemberName='CrossPlatformMeasure']/Docs/*" />
 		public Graphics.Size CrossPlatformMeasure(double widthConstraint, double heightConstraint)
 		{
 			return LayoutManager.Measure(widthConstraint, heightConstraint);
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Layout.xml" path="//Member[@MemberName='CrossPlatformArrange']/Docs/*" />
 		public Graphics.Size CrossPlatformArrange(Graphics.Rect bounds)
 		{
 			return LayoutManager.ArrangeChildren(bounds);
diff --git a/src/Controls/src/Core/LayoutOptionsConverter.cs b/src/Controls/src/Core/LayoutOptionsConverter.cs
index b74866f89ada..6bea823bc966 100644
--- a/src/Controls/src/Core/LayoutOptionsConverter.cs
+++ b/src/Controls/src/Core/LayoutOptionsConverter.cs
@@ -11,16 +11,13 @@ namespace Microsoft.Maui.Controls
 	[Xaml.ProvideCompiled("Microsoft.Maui.Controls.XamlC.LayoutOptionsConverter")]
 	public sealed class LayoutOptionsConverter : TypeConverter
 	{
-		/// <include file="../../docs/Microsoft.Maui.Controls/LayoutOptionsConverter.xml" path="//Member[@MemberName='CanConvertFrom']/Docs/*" />
 		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
 			=> sourceType == typeof(string);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/LayoutOptionsConverter.xml" path="//Member[@MemberName='CanConvertTo']/Docs/*" />
 		public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
 			=> true;
 
 #pragma warning disable CS0618 // Type or member is obsolete (AndExpand options)
-		/// <include file="../../docs/Microsoft.Maui.Controls/LayoutOptionsConverter.xml" path="//Member[@MemberName='ConvertFrom']/Docs/*" />
 		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
 		{
 			var strValue = value?.ToString();
@@ -59,7 +56,6 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
 		}
 #pragma warning restore CS0618 // Type or member is obsolete
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/LayoutOptionsConverter.xml" path="//Member[@MemberName='ConvertTo']/Docs/*" />
 		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
 		{
 			if (value is not LayoutOptions options)
@@ -75,15 +71,12 @@ public override object ConvertTo(ITypeDescriptorContext context, CultureInfo cul
 			throw new NotSupportedException();
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/LayoutOptionsConverter.xml" path="//Member[@MemberName='GetStandardValuesSupported']/Docs/*" />
 		public override bool GetStandardValuesSupported(ITypeDescriptorContext context)
 			=> true;
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/LayoutOptionsConverter.xml" path="//Member[@MemberName='GetStandardValuesExclusive']/Docs/*" />
 		public override bool GetStandardValuesExclusive(ITypeDescriptorContext context)
 			=> false;
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/LayoutOptionsConverter.xml" path="//Member[@MemberName='GetStandardValues']/Docs/*" />
 		public override StandardValuesCollection GetStandardValues(ITypeDescriptorContext context)
 			=> new(new[] {
 				"Start",
@@ -96,4 +89,4 @@ public override StandardValuesCollection GetStandardValues(ITypeDescriptorContex
 				"FillAndExpand"
 			});
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/ListStringTypeConverter.cs b/src/Controls/src/Core/ListStringTypeConverter.cs
index 40fbad374989..9a51aa9194a1 100644
--- a/src/Controls/src/Core/ListStringTypeConverter.cs
+++ b/src/Controls/src/Core/ListStringTypeConverter.cs
@@ -10,15 +10,12 @@ namespace Microsoft.Maui.Controls
 	[Xaml.ProvideCompiled("Microsoft.Maui.Controls.XamlC.ListStringTypeConverter")]
 	public class ListStringTypeConverter : TypeConverter
 	{
-		/// <include file="../../docs/Microsoft.Maui.Controls/ListStringTypeConverter.xml" path="//Member[@MemberName='CanConvertFrom']/Docs/*" />
 		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
 			=> sourceType == typeof(string);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/ListStringTypeConverter.xml" path="//Member[@MemberName='CanConvertTo']/Docs/*" />
 		public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
 			=> destinationType == typeof(string);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/ListStringTypeConverter.xml" path="//Member[@MemberName='ConvertFrom']/Docs/*" />
 		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
 		{
 			var strValue = value?.ToString();
@@ -28,7 +25,6 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
 			return strValue.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(s => s.Trim()).ToList();
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/ListStringTypeConverter.xml" path="//Member[@MemberName='ConvertTo']/Docs/*" />
 		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
 		{
 			if (value is not List<string> list)
@@ -36,4 +32,4 @@ public override object ConvertTo(ITypeDescriptorContext context, CultureInfo cul
 			return string.Join(", ", list);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/MessagingCenter.cs b/src/Controls/src/Core/MessagingCenter.cs
index 58b2f431db38..f40698c3a661 100644
--- a/src/Controls/src/Core/MessagingCenter.cs
+++ b/src/Controls/src/Core/MessagingCenter.cs
@@ -105,7 +105,6 @@ public bool CanBeRemoved()
 		readonly Dictionary<Sender, List<Subscription>> _subscriptions =
 			new Dictionary<Sender, List<Subscription>>();
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/MessagingCenter.xml" path="//Member[@MemberName='Send'][1]/Docs/*" />
 		public static void Send<TSender, TArgs>(TSender sender, string message, TArgs args) where TSender : class
 		{
 			Instance.Send(sender, message, args);
@@ -118,7 +117,6 @@ void IMessagingCenter.Send<TSender, TArgs>(TSender sender, string message, TArgs
 			InnerSend(message, typeof(TSender), typeof(TArgs), sender, args);
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/MessagingCenter.xml" path="//Member[@MemberName='Send'][2]/Docs/*" />
 		public static void Send<TSender>(TSender sender, string message) where TSender : class
 		{
 			Instance.Send(sender, message);
@@ -131,7 +129,6 @@ void IMessagingCenter.Send<TSender>(TSender sender, string message)
 			InnerSend(message, typeof(TSender), null, sender, null);
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/MessagingCenter.xml" path="//Member[@MemberName='Subscribe'][1]/Docs/*" />
 		public static void Subscribe<TSender, TArgs>(object subscriber, string message, Action<TSender, TArgs> callback, TSender source = null) where TSender : class
 		{
 			Instance.Subscribe(subscriber, message, callback, source);
@@ -155,7 +152,6 @@ void IMessagingCenter.Subscribe<TSender, TArgs>(object subscriber, string messag
 			InnerSubscribe(subscriber, message, typeof(TSender), typeof(TArgs), target, callback.GetMethodInfo(), filter);
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/MessagingCenter.xml" path="//Member[@MemberName='Subscribe'][2]/Docs/*" />
 		public static void Subscribe<TSender>(object subscriber, string message, Action<TSender> callback, TSender source = null) where TSender : class
 		{
 			Instance.Subscribe(subscriber, message, callback, source);
@@ -179,7 +175,6 @@ void IMessagingCenter.Subscribe<TSender>(object subscriber, string message, Acti
 			InnerSubscribe(subscriber, message, typeof(TSender), null, target, callback.GetMethodInfo(), filter);
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/MessagingCenter.xml" path="//Member[@MemberName='Unsubscribe'][1]/Docs/*" />
 		public static void Unsubscribe<TSender, TArgs>(object subscriber, string message) where TSender : class
 		{
 			Instance.Unsubscribe<TSender, TArgs>(subscriber, message);
@@ -190,7 +185,6 @@ void IMessagingCenter.Unsubscribe<TSender, TArgs>(object subscriber, string mess
 			InnerUnsubscribe(message, typeof(TSender), typeof(TArgs), subscriber);
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/MessagingCenter.xml" path="//Member[@MemberName='Unsubscribe'][2]/Docs/*" />
 		public static void Unsubscribe<TSender>(object subscriber, string message) where TSender : class
 		{
 			Instance.Unsubscribe<TSender>(subscriber, message);
diff --git a/src/Controls/src/Core/NameScopeExtensions.cs b/src/Controls/src/Core/NameScopeExtensions.cs
index 6ee1f3dc716c..7d0c08349e81 100644
--- a/src/Controls/src/Core/NameScopeExtensions.cs
+++ b/src/Controls/src/Core/NameScopeExtensions.cs
@@ -6,7 +6,6 @@ namespace Microsoft.Maui.Controls
 	/// <include file="../../docs/Microsoft.Maui.Controls/NameScopeExtensions.xml" path="Type[@FullName='Microsoft.Maui.Controls.NameScopeExtensions']/Docs/*" />
 	public static class NameScopeExtensions
 	{
-		/// <include file="../../docs/Microsoft.Maui.Controls/NameScopeExtensions.xml" path="//Member[@MemberName='FindByName']/Docs/*" />
 		public static T FindByName<T>(this Element element, string name)
 		{
 			try
@@ -23,4 +22,4 @@ public static T FindByName<T>(this Element element, string name)
 		internal static T FindByName<T>(this INameScope namescope, string name)
 			=> (T)namescope.FindByName(name);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/NavigationModel.cs b/src/Controls/src/Core/NavigationModel.cs
index 62a4ee3b43d4..cae8a246abfa 100644
--- a/src/Controls/src/Core/NavigationModel.cs
+++ b/src/Controls/src/Core/NavigationModel.cs
@@ -20,7 +20,6 @@ public Page CurrentPage
 			}
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls.Internals/NavigationModel.xml" path="//Member[@MemberName='LastRoot']/Docs/*" />
 		public Page LastRoot
 		{
 			get
@@ -221,4 +220,4 @@ public bool RemovePage(Page page)
 			return found;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/Page.cs b/src/Controls/src/Core/Page.cs
index bc7f9519e03b..a3a692dbbb5c 100644
--- a/src/Controls/src/Core/Page.cs
+++ b/src/Controls/src/Core/Page.cs
@@ -189,7 +189,6 @@ public Task<string> DisplayActionSheet(string title, string cancel, string destr
 			return DisplayActionSheet(title, cancel, destruction, FlowDirection.MatchParent, buttons);
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Page.xml" path="//Member[@MemberName='DisplayActionSheet'][2]/Docs/*" />
 		public Task<string> DisplayActionSheet(string title, string cancel, string destruction, FlowDirection flowDirection, params string[] buttons)
 		{
 			var args = new ActionSheetArguments(title, cancel, destruction, buttons);
diff --git a/src/Controls/src/Core/PanGestureRecognizer.cs b/src/Controls/src/Core/PanGestureRecognizer.cs
index 30900ea59cb1..6af5b1473a8c 100644
--- a/src/Controls/src/Core/PanGestureRecognizer.cs
+++ b/src/Controls/src/Core/PanGestureRecognizer.cs
@@ -7,7 +7,6 @@ namespace Microsoft.Maui.Controls
 	/// <include file="../../docs/Microsoft.Maui.Controls/PanGestureRecognizer.xml" path="Type[@FullName='Microsoft.Maui.Controls.PanGestureRecognizer']/Docs/*" />
 	public class PanGestureRecognizer : GestureRecognizer, IPanGestureController
 	{
-		/// <include file="../../docs/Microsoft.Maui.Controls/PanGestureRecognizer.xml" path="//Member[@MemberName='CurrentId']/Docs/*" />
 		[EditorBrowsable(EditorBrowsableState.Never)]
 		public static AutoId CurrentId { get; } = new();
 
@@ -43,4 +42,4 @@ void IPanGestureController.SendPanStarted(Element sender, int gestureId)
 
 		public event EventHandler<PanUpdatedEventArgs> PanUpdated;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/Picker.cs b/src/Controls/src/Core/Picker.cs
index bb1c5fb79e18..1455e3bb0f5e 100644
--- a/src/Controls/src/Core/Picker.cs
+++ b/src/Controls/src/Core/Picker.cs
@@ -51,7 +51,6 @@ public partial class Picker : View, IFontElement, ITextElement, ITextAlignmentEl
 		/// <include file="../../docs/Microsoft.Maui.Controls/Picker.xml" path="//Member[@MemberName='FontAttributesProperty']/Docs/*" />
 		public static readonly BindableProperty FontAttributesProperty = FontElement.FontAttributesProperty;
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Picker.xml" path="//Member[@MemberName='FontAutoScalingEnabledProperty']/Docs/*" />
 		public static readonly BindableProperty FontAutoScalingEnabledProperty = FontElement.FontAutoScalingEnabledProperty;
 
 		/// <include file="../../docs/Microsoft.Maui.Controls/Picker.xml" path="//Member[@MemberName='HorizontalTextAlignmentProperty']/Docs/*" />
@@ -90,7 +89,6 @@ public double FontSize
 			set { SetValue(FontSizeProperty, value); }
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Picker.xml" path="//Member[@MemberName='FontAutoScalingEnabled']/Docs/*" />
 		public bool FontAutoScalingEnabled
 		{
 			get => (bool)GetValue(FontAutoScalingEnabledProperty);
diff --git a/src/Controls/src/Core/PlatformBindingHelpers.cs b/src/Controls/src/Core/PlatformBindingHelpers.cs
index f8818fcf93ca..d6bc68b89806 100644
--- a/src/Controls/src/Core/PlatformBindingHelpers.cs
+++ b/src/Controls/src/Core/PlatformBindingHelpers.cs
@@ -13,7 +13,6 @@ namespace Microsoft.Maui.Controls.Internals
 	/// <include file="../../docs/Microsoft.Maui.Controls.Internals/PlatformBindingHelpers.xml" path="Type[@FullName='Microsoft.Maui.Controls.Internals.PlatformBindingHelpers']/Docs/*" />	
 	internal static class PlatformBindingHelpers
 	{
-		/// <include file="../../docs/Microsoft.Maui.Controls.Internals/PlatformBindingHelpers.xml" path="//Member[@MemberName='SetBinding'][1]/Docs/*" />
 		public static void SetBinding<TPlatformView>(TPlatformView target, string targetProperty, BindingBase bindingBase, string updateSourceEventName = null) where TPlatformView : class
 		{
 			var binding = bindingBase as Binding;
@@ -27,7 +26,6 @@ public static void SetBinding<TPlatformView>(TPlatformView target, string target
 			SetBinding(target, targetProperty, bindingBase, eventWrapper);
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls.Internals/PlatformBindingHelpers.xml" path="//Member[@MemberName='SetBinding'][2]/Docs/*" />
 		public static void SetBinding<TPlatformView>(TPlatformView target, string targetProperty, BindingBase bindingBase, INotifyPropertyChanged propertyChanged) where TPlatformView : class
 		{
 			if (target == null)
@@ -99,7 +97,6 @@ static void SetValueFromRenderer(BindableObject bindable, BindableProperty prope
 			bindable.SetValueCore(property, value);
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls.Internals/PlatformBindingHelpers.xml" path="//Member[@MemberName='SetBinding'][3]/Docs/*" />
 		public static void SetBinding<TPlatformView>(TPlatformView target, BindableProperty targetProperty, BindingBase binding) where TPlatformView : class
 		{
 			if (target == null)
@@ -113,7 +110,6 @@ public static void SetBinding<TPlatformView>(TPlatformView target, BindablePrope
 			proxy.BindingsBackpack.Add(new KeyValuePair<BindableProperty, BindingBase>(targetProperty, binding));
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls.Internals/PlatformBindingHelpers.xml" path="//Member[@MemberName='SetValue']/Docs/*" />
 		public static void SetValue<TPlatformView>(TPlatformView target, BindableProperty targetProperty, object value) where TPlatformView : class
 		{
 			if (target == null)
@@ -125,7 +121,6 @@ public static void SetValue<TPlatformView>(TPlatformView target, BindablePropert
 			proxy.ValuesBackpack.Add(new KeyValuePair<BindableProperty, object>(targetProperty, value));
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls.Internals/PlatformBindingHelpers.xml" path="//Member[@MemberName='SetBindingContext']/Docs/*" />
 		public static void SetBindingContext<TPlatformView>(TPlatformView target, object bindingContext, Func<TPlatformView, IEnumerable<TPlatformView>> getChild = null) where TPlatformView : class
 		{
 			if (target == null)
@@ -143,7 +138,6 @@ public static void SetBindingContext<TPlatformView>(TPlatformView target, object
 					SetBindingContext(child, bindingContext, getChild);
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls.Internals/PlatformBindingHelpers.xml" path="//Member[@MemberName='TransferBindablePropertiesToWrapper']/Docs/*" />
 		public static void TransferBindablePropertiesToWrapper<TPlatformView, TPlatformWrapper>(TPlatformView platformView, TPlatformWrapper wrapper)
 			where TPlatformView : class
 			where TPlatformWrapper : View
diff --git a/src/Controls/src/Core/PlatformConfiguration/WindowsSpecific/RefreshView.cs b/src/Controls/src/Core/PlatformConfiguration/WindowsSpecific/RefreshView.cs
index d155be29d453..ee17ad38920d 100644
--- a/src/Controls/src/Core/PlatformConfiguration/WindowsSpecific/RefreshView.cs
+++ b/src/Controls/src/Core/PlatformConfiguration/WindowsSpecific/RefreshView.cs
@@ -7,13 +7,9 @@ public static class RefreshView
 	{
 		public enum RefreshPullDirection
 		{
-			/// <include file="../../../../docs/Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific/RefreshView.xml" path="//Member[@MemberName='LeftToRight']/Docs/*" />
 			LeftToRight,
-			/// <include file="../../../../docs/Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific/RefreshView.xml" path="//Member[@MemberName='TopToBottom']/Docs/*" />
 			TopToBottom,
-			/// <include file="../../../../docs/Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific/RefreshView.xml" path="//Member[@MemberName='RightToLeft']/Docs/*" />
 			RightToLeft,
-			/// <include file="../../../../docs/Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific/RefreshView.xml" path="//Member[@MemberName='BottomToTop']/Docs/*" />
 			BottomToTop
 		}
 
diff --git a/src/Controls/src/Core/PlatformConfiguration/WindowsSpecific/WebView.cs b/src/Controls/src/Core/PlatformConfiguration/WindowsSpecific/WebView.cs
index 22e0638b7e66..421faa39a503 100644
--- a/src/Controls/src/Core/PlatformConfiguration/WindowsSpecific/WebView.cs
+++ b/src/Controls/src/Core/PlatformConfiguration/WindowsSpecific/WebView.cs
@@ -36,28 +36,23 @@ public static IPlatformElementConfiguration<Windows, FormsElement> SetIsJavaScri
 
 
 
-		/// <include file="../../../../docs/Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific/WebView.xml" path="//Member[@MemberName='ExecutionModeProperty']/Docs/*" />
 		public static readonly BindableProperty ExecutionModeProperty = BindableProperty.Create("ExecutionMode", typeof(WebViewExecutionMode), typeof(WebView), WebViewExecutionMode.SameThread);
 
-		/// <include file="../../../../docs/Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific/WebView.xml" path="//Member[@MemberName='GetExecutionMode'][1]/Docs/*" />
 		public static WebViewExecutionMode GetExecutionMode(BindableObject element)
 		{
 			return (WebViewExecutionMode)element.GetValue(ExecutionModeProperty);
 		}
 
-		/// <include file="../../../../docs/Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific/WebView.xml" path="//Member[@MemberName='SetExecutionMode'][1]/Docs/*" />
 		public static void SetExecutionMode(BindableObject element, WebViewExecutionMode value)
 		{
 			element.SetValue(ExecutionModeProperty, value);
 		}
 
-		/// <include file="../../../../docs/Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific/WebView.xml" path="//Member[@MemberName='GetExecutionMode'][2]/Docs/*" />
 		public static WebViewExecutionMode GetExecutionMode(this IPlatformElementConfiguration<Windows, FormsElement> config)
 		{
 			return GetExecutionMode(config.Element);
 		}
 
-		/// <include file="../../../../docs/Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific/WebView.xml" path="//Member[@MemberName='SetExecutionMode'][2]/Docs/*" />
 		public static IPlatformElementConfiguration<Windows, FormsElement> SetExecutionMode(this IPlatformElementConfiguration<Windows, FormsElement> config, WebViewExecutionMode value)
 		{
 			SetExecutionMode(config.Element, value);
diff --git a/src/Controls/src/Core/RadioButton.cs b/src/Controls/src/Core/RadioButton.cs
index 7a9b44e8d893..62e84715c52d 100644
--- a/src/Controls/src/Core/RadioButton.cs
+++ b/src/Controls/src/Core/RadioButton.cs
@@ -76,7 +76,6 @@ public partial class RadioButton : TemplatedView, IElementConfiguration<RadioBut
 		/// <include file="../../docs/Microsoft.Maui.Controls/RadioButton.xml" path="//Member[@MemberName='FontSizeProperty']/Docs/*" />
 		public static readonly BindableProperty FontSizeProperty = FontElement.FontSizeProperty;
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/RadioButton.xml" path="//Member[@MemberName='FontAutoScalingEnabledProperty']/Docs/*" />
 		public static readonly BindableProperty FontAutoScalingEnabledProperty = FontElement.FontAutoScalingEnabledProperty;
 
 		/// <include file="../../docs/Microsoft.Maui.Controls/RadioButton.xml" path="//Member[@MemberName='BorderColorProperty']/Docs/*" />
@@ -166,7 +165,6 @@ public double FontSize
 			set { SetValue(FontSizeProperty, value); }
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/RadioButton.xml" path="//Member[@MemberName='FontAutoScalingEnabled']/Docs/*" />
 		public bool FontAutoScalingEnabled
 		{
 			get => (bool)GetValue(FontAutoScalingEnabledProperty);
diff --git a/src/Controls/src/Core/RadioButtonGroup.cs b/src/Controls/src/Core/RadioButtonGroup.cs
index 82436a6a759d..f3a548f86553 100644
--- a/src/Controls/src/Core/RadioButtonGroup.cs
+++ b/src/Controls/src/Core/RadioButtonGroup.cs
@@ -29,7 +29,6 @@ public static string GetGroupName(BindableObject b)
 			return (string)b.GetValue(GroupNameProperty);
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/RadioButtonGroup.xml" path="//Member[@MemberName='SetGroupName']/Docs/*" />
 		public static void SetGroupName(BindableObject bindable, string groupName)
 		{
 			bindable.SetValue(GroupNameProperty, groupName);
@@ -47,7 +46,6 @@ public static object GetSelectedValue(BindableObject bindableObject)
 			return bindableObject.GetValue(SelectedValueProperty);
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/RadioButtonGroup.xml" path="//Member[@MemberName='SetSelectedValue']/Docs/*" />
 		public static void SetSelectedValue(BindableObject bindable, object selectedValue)
 		{
 			bindable.SetValue(SelectedValueProperty, selectedValue);
@@ -105,4 +103,4 @@ internal static Element GetVisualRoot(Element element)
 			return parent;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/ReferenceTypeConverter.cs b/src/Controls/src/Core/ReferenceTypeConverter.cs
index 3be7a5d48f48..537537e56f04 100644
--- a/src/Controls/src/Core/ReferenceTypeConverter.cs
+++ b/src/Controls/src/Core/ReferenceTypeConverter.cs
@@ -12,11 +12,9 @@ namespace Microsoft.Maui.Controls
 	public sealed class ReferenceTypeConverter : TypeConverter, IExtendedTypeConverter
 	{
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/ReferenceTypeConverter.xml" path="//Member[@MemberName='CanConvertFrom']/Docs/*" />
 		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
 			=> sourceType == typeof(string);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/ReferenceTypeConverter.xml" path="//Member[@MemberName='CanConvertTo']/Docs/*" />
 		public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
 			=> destinationType == typeof(string);
 
@@ -43,12 +41,10 @@ object IExtendedTypeConverter.ConvertFromInvariantString(string value, IServiceP
 			throw new Exception("Can't resolve name on Element");
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/ReferenceTypeConverter.xml" path="//Member[@MemberName='ConvertFrom']/Docs/*" />
 		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
 			=> throw new NotImplementedException();
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/ReferenceTypeConverter.xml" path="//Member[@MemberName='ConvertTo']/Docs/*" />
 		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
 			=> throw new NotSupportedException();
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/Registrar.cs b/src/Controls/src/Core/Registrar.cs
index fc8b1e2b2f04..9806c1241771 100644
--- a/src/Controls/src/Core/Registrar.cs
+++ b/src/Controls/src/Core/Registrar.cs
@@ -14,14 +14,12 @@ public enum InitializationFlags : long
 	{
 		/// <include file="../../docs/Microsoft.Maui.Controls/InitializationFlags.xml" path="//Member[@MemberName='DisableCss']/Docs/*" />
 		DisableCss = 1 << 0,
-		/// <include file="../../docs/Microsoft.Maui.Controls/InitializationFlags.xml" path="//Member[@MemberName='SkipRenderers']/Docs/*" />
 		SkipRenderers = 1 << 1,
 	}
 }
 
 namespace Microsoft.Maui.Controls.Internals
 {
-	/// <include file="../../docs/Microsoft.Maui.Controls.Internals/Registrar.xml" path="Type[@FullName='Microsoft.Maui.Controls.Internals.Registrar' and position()=0]/Docs/*" />
 	[EditorBrowsable(EditorBrowsableState.Never)]
 	public class Registrar<TRegistrable> where TRegistrable : class
 	{
@@ -31,7 +29,6 @@ public class Registrar<TRegistrable> where TRegistrable : class
 
 		static Type[] _defaultVisualRenderers = new[] { _defaultVisualType };
 
-		/// <include file="../../docs/Microsoft.Maui.Controls.Internals/Registrar.xml" path="//Member[@MemberName='Register'][1]/Docs/*" />
 		public void Register(Type tview, Type trender, Type[] supportedVisuals, short priority)
 		{
 			supportedVisuals = supportedVisuals ?? _defaultVisualRenderers;
@@ -73,10 +70,8 @@ public void Register(Type tview, Type trender, Type[] supportedVisuals, short pr
 			//	});
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls.Internals/Registrar.xml" path="//Member[@MemberName='Register'][2]/Docs/*" />
 		public void Register(Type tview, Type trender, Type[] supportedVisual) => Register(tview, trender, supportedVisual, 0);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls.Internals/Registrar.xml" path="//Member[@MemberName='Register'][3]/Docs/*" />
 		public void Register(Type tview, Type trender) => Register(tview, trender, _defaultVisualRenderers);
 
 		internal TRegistrable GetHandler(Type type) => GetHandler(type, _defaultVisualType);
@@ -109,19 +104,16 @@ internal TRegistrable GetHandler(Type type, object source, IVisual visual, param
 			return returnValue;
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls.Internals/Registrar.xml" path="//Member[@MemberName='GetHandler'][1]/Docs/*" />
 		public TOut GetHandler<TOut>(Type type) where TOut : class, TRegistrable
 		{
 			return GetHandler(type) as TOut;
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls.Internals/Registrar.xml" path="//Member[@MemberName='GetHandler'][2]/Docs/*" />
 		public TOut GetHandler<TOut>(Type type, params object[] args) where TOut : class, TRegistrable
 		{
 			return GetHandler(type, null, null, args) as TOut;
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls.Internals/Registrar.xml" path="//Member[@MemberName='GetHandlerForObject'][1]/Docs/*" />
 		public TOut GetHandlerForObject<TOut>(object obj) where TOut : class, TRegistrable
 		{
 			if (obj == null)
@@ -133,7 +125,6 @@ public TOut GetHandlerForObject<TOut>(object obj) where TOut : class, TRegistrab
 			return GetHandler(type, (obj as IVisualController)?.EffectiveVisual?.GetType()) as TOut;
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls.Internals/Registrar.xml" path="//Member[@MemberName='GetHandlerForObject'][2]/Docs/*" />
 		public TOut GetHandlerForObject<TOut>(object obj, params object[] args) where TOut : class, TRegistrable
 		{
 			if (obj == null)
@@ -145,10 +136,8 @@ public TOut GetHandlerForObject<TOut>(object obj, params object[] args) where TO
 			return GetHandler(type, obj, (obj as IVisualController)?.EffectiveVisual, args) as TOut;
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls.Internals/Registrar.xml" path="//Member[@MemberName='GetHandlerType'][1]/Docs/*" />
 		public Type GetHandlerType(Type viewType) => GetHandlerType(viewType, _defaultVisualType);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls.Internals/Registrar.xml" path="//Member[@MemberName='GetHandlerType'][2]/Docs/*" />
 		public Type GetHandlerType(Type viewType, Type visualType)
 		{
 			visualType = visualType ?? _defaultVisualType;
@@ -174,7 +163,6 @@ public Type GetHandlerType(Type viewType, Type visualType)
 				return null;
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls.Internals/Registrar.xml" path="//Member[@MemberName='GetHandlerTypeForObject']/Docs/*" />
 		public Type GetHandlerTypeForObject(object obj)
 		{
 			if (obj == null)
@@ -312,7 +300,6 @@ public static void RegisterRenderers(HandlerAttribute[] attributes)
 		// If the user has called Forms.Init() this will register all found types 
 		// into the handlers registrar and then it will use this factory to create a shim
 		internal static Func<object, IViewHandler> RendererToHandlerShim { get; private set; }
-		/// <include file="../../docs/Microsoft.Maui.Controls.Internals/Registrar.xml" path="//Member[@MemberName='RegisterRendererToHandlerShim']/Docs/*" />
 		public static void RegisterRendererToHandlerShim(Func<object, IViewHandler> handlerShim)
 		{
 			RendererToHandlerShim = handlerShim;
@@ -377,7 +364,6 @@ public static void RegisterEffects(string resolutionName, ExportEffectAttribute[
 			}
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls.Internals/Registrar.xml" path="//Member[@MemberName='RegisterEffect']/Docs/*" />
 		public static void RegisterEffect(string resolutionName, string id, Type effectType)
 		{
 			Effects[resolutionName + "." + id] = effectType;
diff --git a/src/Controls/src/Core/RouteFactory.cs b/src/Controls/src/Core/RouteFactory.cs
index fb781a70a74f..c8083fcbdd18 100644
--- a/src/Controls/src/Core/RouteFactory.cs
+++ b/src/Controls/src/Core/RouteFactory.cs
@@ -7,7 +7,6 @@ public abstract class RouteFactory
 	{
 		/// <include file="../../docs/Microsoft.Maui.Controls/RouteFactory.xml" path="//Member[@MemberName='GetOrCreate'][1]/Docs/*" />
 		public abstract Element GetOrCreate();
-		/// <include file="../../docs/Microsoft.Maui.Controls/RouteFactory.xml" path="//Member[@MemberName='GetOrCreate'][2]/Docs/*" />
 		public abstract Element GetOrCreate(IServiceProvider services);
 	}
 }
diff --git a/src/Controls/src/Core/RowDefinitionCollectionTypeConverter.cs b/src/Controls/src/Core/RowDefinitionCollectionTypeConverter.cs
index e2adba3a5e3e..2771f4e95995 100644
--- a/src/Controls/src/Core/RowDefinitionCollectionTypeConverter.cs
+++ b/src/Controls/src/Core/RowDefinitionCollectionTypeConverter.cs
@@ -10,15 +10,12 @@ namespace Microsoft.Maui.Controls
 	[ProvideCompiled("Microsoft.Maui.Controls.XamlC.RowDefinitionCollectionTypeConverter")]
 	public class RowDefinitionCollectionTypeConverter : TypeConverter
 	{
-		/// <include file="../../docs/Microsoft.Maui.Controls/RowDefinitionCollectionTypeConverter.xml" path="//Member[@MemberName='CanConvertFrom']/Docs/*" />
 		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
 			=> sourceType == typeof(string);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/RowDefinitionCollectionTypeConverter.xml" path="//Member[@MemberName='CanConvertTo']/Docs/*" />
 		public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
 			=> true;
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/RowDefinitionCollectionTypeConverter.xml" path="//Member[@MemberName='ConvertFrom']/Docs/*" />
 		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
 		{
 			var strValue = value?.ToString();
@@ -36,7 +33,6 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
 			throw new InvalidOperationException(string.Format("Cannot convert \"{0}\" into {1}", strValue, typeof(RowDefinitionCollection)));
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/RowDefinitionCollectionTypeConverter.xml" path="//Member[@MemberName='ConvertTo']/Docs/*" />
 		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
 		{
 			if (value is not RowDefinitionCollection rdc)
@@ -45,4 +41,4 @@ public override object ConvertTo(ITypeDescriptorContext context, CultureInfo cul
 			return string.Join(", ", rdc.Select(rd => converter.ConvertToInvariantString(rd.Height)));
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/ScrollToRequestedEventArgs.cs b/src/Controls/src/Core/ScrollToRequestedEventArgs.cs
index 72370c82fe69..0f25839fe9a1 100644
--- a/src/Controls/src/Core/ScrollToRequestedEventArgs.cs
+++ b/src/Controls/src/Core/ScrollToRequestedEventArgs.cs
@@ -74,10 +74,9 @@ object ITemplatedItemsListScrollToRequestedEventArgs.Item
 			}
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/ScrollToRequestedEventArgs.xml" path="//Member[@MemberName='ToRequest']/Docs/*" />
 		public ScrollToRequest ToRequest()
 		{
 			return new ScrollToRequest(ScrollX, ScrollY, !ShouldAnimate);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/SearchBar.cs b/src/Controls/src/Core/SearchBar.cs
index 50ecf266953b..44fa9263e7f9 100644
--- a/src/Controls/src/Core/SearchBar.cs
+++ b/src/Controls/src/Core/SearchBar.cs
@@ -36,16 +36,12 @@ public partial class SearchBar : InputView, IFontElement, ITextAlignmentElement,
 		/// <include file="../../docs/Microsoft.Maui.Controls/SearchBar.xml" path="//Member[@MemberName='FontAttributesProperty']/Docs/*" />
 		public static readonly BindableProperty FontAttributesProperty = FontElement.FontAttributesProperty;
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/SearchBar.xml" path="//Member[@MemberName='IsTextPredictionEnabledProperty']/Docs/*" />
 		public static readonly BindableProperty IsTextPredictionEnabledProperty = BindableProperty.Create(nameof(IsTextPredictionEnabled), typeof(bool), typeof(SearchBar), true, BindingMode.Default);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/SearchBar.xml" path="//Member[@MemberName='CursorPositionProperty']/Docs/*" />
 		public static readonly BindableProperty CursorPositionProperty = BindableProperty.Create(nameof(CursorPosition), typeof(int), typeof(SearchBar), 0, validateValue: (b, v) => (int)v >= 0);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/SearchBar.xml" path="//Member[@MemberName='SelectionLengthProperty']/Docs/*" />
 		public static readonly BindableProperty SelectionLengthProperty = BindableProperty.Create(nameof(SelectionLength), typeof(int), typeof(SearchBar), 0, validateValue: (b, v) => (int)v >= 0);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/SearchBar.xml" path="//Member[@MemberName='FontAutoScalingEnabledProperty']/Docs/*" />
 		public static readonly BindableProperty FontAutoScalingEnabledProperty = FontElement.FontAutoScalingEnabledProperty;
 
 		/// <include file="../../docs/Microsoft.Maui.Controls/SearchBar.xml" path="//Member[@MemberName='HorizontalTextAlignmentProperty']/Docs/*" />
@@ -109,21 +105,18 @@ public FontAttributes FontAttributes
 			set { SetValue(FontAttributesProperty, value); }
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/SearchBar.xml" path="//Member[@MemberName='IsTextPredictionEnabled']/Docs/*" />
 		public bool IsTextPredictionEnabled
 		{
 			get { return (bool)GetValue(IsTextPredictionEnabledProperty); }
 			set { SetValue(IsTextPredictionEnabledProperty, value); }
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/SearchBar.xml" path="//Member[@MemberName='CursorPosition']/Docs/*" />
 		public int CursorPosition
 		{
 			get { return (int)GetValue(CursorPositionProperty); }
 			set { SetValue(CursorPositionProperty, value); }
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/SearchBar.xml" path="//Member[@MemberName='SelectionLength']/Docs/*" />
 		public int SelectionLength
 		{
 			get { return (int)GetValue(SelectionLengthProperty); }
@@ -145,7 +138,6 @@ public double FontSize
 			set { SetValue(FontSizeProperty, value); }
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/SearchBar.xml" path="//Member[@MemberName='FontAutoScalingEnabled']/Docs/*" />
 		public bool FontAutoScalingEnabled
 		{
 			get => (bool)GetValue(FontAutoScalingEnabledProperty);
diff --git a/src/Controls/src/Core/Shapes/EllipseGeometry.cs b/src/Controls/src/Core/Shapes/EllipseGeometry.cs
index 30cc9557820d..0b2d41ab93d4 100644
--- a/src/Controls/src/Core/Shapes/EllipseGeometry.cs
+++ b/src/Controls/src/Core/Shapes/EllipseGeometry.cs
@@ -53,7 +53,6 @@ public double RadiusY
 			get { return (double)GetValue(RadiusYProperty); }
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/EllipseGeometry.xml" path="//Member[@MemberName='AppendPath']/Docs/*" />
 		public override void AppendPath(PathF path)
 		{
 			var centerX = (float)Center.X;
@@ -65,4 +64,4 @@ public override void AppendPath(PathF path)
 			path.AppendEllipse(centerX - radiusX, centerY - radiusY, radiusX * 2f, radiusY * 2f);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/Shapes/Geometry.cs b/src/Controls/src/Core/Shapes/Geometry.cs
index 1bdfc940b809..7a9d8a6a43cb 100644
--- a/src/Controls/src/Core/Shapes/Geometry.cs
+++ b/src/Controls/src/Core/Shapes/Geometry.cs
@@ -5,7 +5,6 @@ namespace Microsoft.Maui.Controls.Shapes
 	/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/Geometry.xml" path="Type[@FullName='Microsoft.Maui.Controls.Shapes.Geometry']/Docs/*" />
 	public abstract class Geometry : BindableObject, IGeometry
 	{
-		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/Geometry.xml" path="//Member[@MemberName='AppendPath']/Docs/*" />
 		public abstract void AppendPath(PathF path);
 
 		PathF IShape.PathForBounds(Graphics.Rect bounds)
@@ -17,4 +16,4 @@ PathF IShape.PathForBounds(Graphics.Rect bounds)
 			return path;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/Shapes/GeometryGroup.cs b/src/Controls/src/Core/Shapes/GeometryGroup.cs
index 694a6002b256..8cc9a03163a6 100644
--- a/src/Controls/src/Core/Shapes/GeometryGroup.cs
+++ b/src/Controls/src/Core/Shapes/GeometryGroup.cs
@@ -104,7 +104,6 @@ void Invalidate()
 			InvalidateGeometryRequested?.Invoke(this, EventArgs.Empty);
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/GeometryGroup.xml" path="//Member[@MemberName='AppendPath']/Docs/*" />
 		public override void AppendPath(Graphics.PathF path)
 		{
 			foreach (var c in Children)
@@ -113,4 +112,4 @@ public override void AppendPath(Graphics.PathF path)
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/Shapes/Line.cs b/src/Controls/src/Core/Shapes/Line.cs
index 7813ce784d37..0192f5deed8d 100644
--- a/src/Controls/src/Core/Shapes/Line.cs
+++ b/src/Controls/src/Core/Shapes/Line.cs
@@ -8,7 +8,6 @@ public Line() : base()
 		{
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/Line.xml" path="//Member[@MemberName='.ctor'][2]/Docs/*" />
 		public Line(double x1, double y1, double x2, double y2) : this()
 		{
 			X1 = x1;
diff --git a/src/Controls/src/Core/Shapes/LineGeometry.cs b/src/Controls/src/Core/Shapes/LineGeometry.cs
index 5ae8b68b00dd..783a10cdfc05 100644
--- a/src/Controls/src/Core/Shapes/LineGeometry.cs
+++ b/src/Controls/src/Core/Shapes/LineGeometry.cs
@@ -41,7 +41,6 @@ public Point EndPoint
 			get { return (Point)GetValue(EndPointProperty); }
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/LineGeometry.xml" path="//Member[@MemberName='AppendPath']/Docs/*" />
 		public override void AppendPath(PathF path)
 		{
 			float startPointX = (float)StartPoint.X;
@@ -54,4 +53,4 @@ public override void AppendPath(PathF path)
 			path.LineTo(endPointX, endPointY);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/Shapes/MatrixTypeConverter.cs b/src/Controls/src/Core/Shapes/MatrixTypeConverter.cs
index cf2702ed5d5a..d167e8143613 100644
--- a/src/Controls/src/Core/Shapes/MatrixTypeConverter.cs
+++ b/src/Controls/src/Core/Shapes/MatrixTypeConverter.cs
@@ -7,15 +7,12 @@ namespace Microsoft.Maui.Controls.Shapes
 	/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/MatrixTypeConverter.xml" path="Type[@FullName='Microsoft.Maui.Controls.Shapes.MatrixTypeConverter']/Docs/*" />
 	public class MatrixTypeConverter : TypeConverter
 	{
-		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/MatrixTypeConverter.xml" path="//Member[@MemberName='CanConvertFrom']/Docs/*" />
 		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
 			=> sourceType == typeof(string);
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/MatrixTypeConverter.xml" path="//Member[@MemberName='CanConvertTo']/Docs/*" />
 		public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
 			=> destinationType == typeof(string);
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/MatrixTypeConverter.xml" path="//Member[@MemberName='ConvertFrom']/Docs/*" />
 		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
 			=> CreateMatrix(value?.ToString());
 
@@ -38,7 +35,6 @@ internal static Matrix CreateMatrix(string value)
 			return new Matrix(values[0], values[1], values[2], values[3], values[4], values[5]);
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/MatrixTypeConverter.xml" path="//Member[@MemberName='ConvertTo']/Docs/*" />
 		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
 		{
 			if (value is not Matrix matrix)
@@ -46,4 +42,4 @@ public override object ConvertTo(ITypeDescriptorContext context, CultureInfo cul
 			return $"{matrix.M11.ToString(CultureInfo.InvariantCulture)}, {matrix.M12.ToString(CultureInfo.InvariantCulture)}, {matrix.M21.ToString(CultureInfo.InvariantCulture)}, {matrix.M22.ToString(CultureInfo.InvariantCulture)}, {matrix.OffsetX.ToString(CultureInfo.InvariantCulture)}, {matrix.OffsetY.ToString(CultureInfo.InvariantCulture)}";
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/Shapes/Path.cs b/src/Controls/src/Core/Shapes/Path.cs
index 2eb6a41bc015..6651475aabf4 100644
--- a/src/Controls/src/Core/Shapes/Path.cs
+++ b/src/Controls/src/Core/Shapes/Path.cs
@@ -10,7 +10,6 @@ public Path() : base()
 		{
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/Path.xml" path="//Member[@MemberName='.ctor'][2]/Docs/*" />
 		public Path(Geometry data) : this()
 		{
 			Data = data;
diff --git a/src/Controls/src/Core/Shapes/PathFigureCollectionConverter.cs b/src/Controls/src/Core/Shapes/PathFigureCollectionConverter.cs
index 074993e5b9ba..d196625e9e3b 100644
--- a/src/Controls/src/Core/Shapes/PathFigureCollectionConverter.cs
+++ b/src/Controls/src/Core/Shapes/PathFigureCollectionConverter.cs
@@ -9,11 +9,9 @@ namespace Microsoft.Maui.Controls.Shapes
 	/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/PathFigureCollectionConverter.xml" path="Type[@FullName='Microsoft.Maui.Controls.Shapes.PathFigureCollectionConverter']/Docs/*" />
 	public class PathFigureCollectionConverter : TypeConverter
 	{
-		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/PathFigureCollectionConverter.xml" path="//Member[@MemberName='CanConvertFrom']/Docs/*" />
 		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
 			=> sourceType == typeof(string);
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/PathFigureCollectionConverter.xml" path="//Member[@MemberName='CanConvertTo']/Docs/*" />
 		public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
 			=> false;
 
@@ -29,7 +27,6 @@ public override bool CanConvertTo(ITypeDescriptorContext context, Type destinati
 		static Point _secondLastPoint;
 		static char _token;
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/PathFigureCollectionConverter.xml" path="//Member[@MemberName='ConvertFrom']/Docs/*" />
 		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
 		{
 			var strValue = value?.ToString();
@@ -578,8 +575,7 @@ static void SkipDigits(bool signAllowed)
 			}
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/PathFigureCollectionConverter.xml" path="//Member[@MemberName='ConvertTo']/Docs/*" />
 		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
 			=> throw new NotSupportedException();
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/Shapes/PathGeometry.cs b/src/Controls/src/Core/Shapes/PathGeometry.cs
index b0bc660a6213..23f765cad829 100644
--- a/src/Controls/src/Core/Shapes/PathGeometry.cs
+++ b/src/Controls/src/Core/Shapes/PathGeometry.cs
@@ -50,7 +50,6 @@ public FillRule FillRule
 			get { return (FillRule)GetValue(FillRuleProperty); }
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/PathGeometry.xml" path="//Member[@MemberName='AppendPath']/Docs/*" />
 		public override void AppendPath(PathF path)
 		{
 			foreach (var figure in Figures)
@@ -170,4 +169,4 @@ void AddPolyQuad(PathF path, PolyQuadraticBezierSegment polyQuadraticBezierSegme
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/Shapes/PathGeometryConverter.cs b/src/Controls/src/Core/Shapes/PathGeometryConverter.cs
index 209c25ac8a63..574f7af93a3c 100644
--- a/src/Controls/src/Core/Shapes/PathGeometryConverter.cs
+++ b/src/Controls/src/Core/Shapes/PathGeometryConverter.cs
@@ -7,15 +7,12 @@ namespace Microsoft.Maui.Controls.Shapes
 	/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/PathGeometryConverter.xml" path="Type[@FullName='Microsoft.Maui.Controls.Shapes.PathGeometryConverter']/Docs/*" />
 	public class PathGeometryConverter : TypeConverter
 	{
-		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/PathGeometryConverter.xml" path="//Member[@MemberName='CanConvertFrom']/Docs/*" />
 		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
 			=> sourceType == typeof(string);
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/PathGeometryConverter.xml" path="//Member[@MemberName='CanConvertTo']/Docs/*" />
 		public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
 			=> false;
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/PathGeometryConverter.xml" path="//Member[@MemberName='ConvertFrom']/Docs/*" />
 		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
 		{
 			var strValue = value?.ToString();
@@ -26,8 +23,7 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
 			return pathGeometry;
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/PathGeometryConverter.xml" path="//Member[@MemberName='ConvertTo']/Docs/*" />
 		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
 			=> throw new NotSupportedException();
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/Shapes/PointCollectionConverter.cs b/src/Controls/src/Core/Shapes/PointCollectionConverter.cs
index cdfb1c22c0b2..5f30f6e35a5d 100644
--- a/src/Controls/src/Core/Shapes/PointCollectionConverter.cs
+++ b/src/Controls/src/Core/Shapes/PointCollectionConverter.cs
@@ -10,15 +10,12 @@ namespace Microsoft.Maui.Controls.Shapes
 	/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/PointCollectionConverter.xml" path="Type[@FullName='Microsoft.Maui.Controls.Shapes.PointCollectionConverter']/Docs/*" />
 	public class PointCollectionConverter : TypeConverter
 	{
-		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/PointCollectionConverter.xml" path="//Member[@MemberName='CanConvertFrom']/Docs/*" />
 		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
 			=> sourceType == typeof(string);
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/PointCollectionConverter.xml" path="//Member[@MemberName='CanConvertTo']/Docs/*" />
 		public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
 			=> destinationType == typeof(string);
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/PointCollectionConverter.xml" path="//Member[@MemberName='ConvertFrom']/Docs/*" />
 		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
 		{
 			var strValue = value?.ToString();
@@ -55,7 +52,6 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
 			return pointCollection;
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/PointCollectionConverter.xml" path="//Member[@MemberName='ConvertTo']/Docs/*" />
 		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
 		{
 			if (value is not PointCollection pc)
@@ -65,4 +61,4 @@ public override object ConvertTo(ITypeDescriptorContext context, CultureInfo cul
 			return string.Join(", ", pc.Select(p => converter.ConvertToInvariantString(p)));
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/Shapes/Polygon.cs b/src/Controls/src/Core/Shapes/Polygon.cs
index a5141be3a8de..6f7a86aa3cf8 100644
--- a/src/Controls/src/Core/Shapes/Polygon.cs
+++ b/src/Controls/src/Core/Shapes/Polygon.cs
@@ -8,7 +8,6 @@ public Polygon() : base()
 		{
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/Polygon.xml" path="//Member[@MemberName='.ctor'][2]/Docs/*" />
 		public Polygon(PointCollection points) : this()
 		{
 			Points = points;
diff --git a/src/Controls/src/Core/Shapes/Polyline.cs b/src/Controls/src/Core/Shapes/Polyline.cs
index 1d6b512ade9b..c777f48c793f 100644
--- a/src/Controls/src/Core/Shapes/Polyline.cs
+++ b/src/Controls/src/Core/Shapes/Polyline.cs
@@ -8,7 +8,6 @@ public Polyline() : base()
 		{
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/Polyline.xml" path="//Member[@MemberName='.ctor'][2]/Docs/*" />
 		public Polyline(PointCollection points) : this()
 		{
 			Points = points;
diff --git a/src/Controls/src/Core/Shapes/RectangleGeometry.cs b/src/Controls/src/Core/Shapes/RectangleGeometry.cs
index 8cad7446b0f7..dc2ad2e2df8f 100644
--- a/src/Controls/src/Core/Shapes/RectangleGeometry.cs
+++ b/src/Controls/src/Core/Shapes/RectangleGeometry.cs
@@ -29,7 +29,6 @@ public Rect Rect
 			get { return (Rect)GetValue(RectProperty); }
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/RectangleGeometry.xml" path="//Member[@MemberName='AppendPath']/Docs/*" />
 		public override void AppendPath(Graphics.PathF path)
 		{
 			float x = (float)Rect.X;
@@ -40,4 +39,4 @@ public override void AppendPath(Graphics.PathF path)
 			path.AppendRectangle(x, y, w, h);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/Shapes/Shape.cs b/src/Controls/src/Core/Shapes/Shape.cs
index 71b8a0c14723..f07a60100800 100644
--- a/src/Controls/src/Core/Shapes/Shape.cs
+++ b/src/Controls/src/Core/Shapes/Shape.cs
@@ -15,7 +15,6 @@ public Shape()
 		{
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/Shape.xml" path="//Member[@MemberName='GetPath']/Docs/*" />
 		public abstract PathF GetPath();
 
 		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/Shape.xml" path="//Member[@MemberName='FillProperty']/Docs/*" />
@@ -154,7 +153,6 @@ PathAspect IShapeView.Aspect
 				_ => LineJoin.Round
 			};
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/Shape.xml" path="//Member[@MemberName='StrokeDashPattern']/Docs/*" />
 		public float[] StrokeDashPattern
 			=> StrokeDashArray.Select(a => (float)a).ToArray();
 
@@ -322,4 +320,4 @@ protected override Size MeasureOverride(double widthConstraint, double heightCon
 			return result;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/Shapes/TransformTypeConverter.cs b/src/Controls/src/Core/Shapes/TransformTypeConverter.cs
index 67ae295a3d65..59f8fab00f77 100644
--- a/src/Controls/src/Core/Shapes/TransformTypeConverter.cs
+++ b/src/Controls/src/Core/Shapes/TransformTypeConverter.cs
@@ -7,22 +7,18 @@ namespace Microsoft.Maui.Controls.Shapes
 	/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/TransformTypeConverter.xml" path="Type[@FullName='Microsoft.Maui.Controls.Shapes.TransformTypeConverter']/Docs/*" />
 	public class TransformTypeConverter : TypeConverter
 	{
-		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/TransformTypeConverter.xml" path="//Member[@MemberName='CanConvertFrom']/Docs/*" />
 		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
 			=> sourceType == typeof(string);
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/TransformTypeConverter.xml" path="//Member[@MemberName='CanConvertTo']/Docs/*" />
 		public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
 			=> destinationType == typeof(string);
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/TransformTypeConverter.xml" path="//Member[@MemberName='ConvertFrom']/Docs/*" />
 		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
 			=> new MatrixTransform
 			{
 				Matrix = MatrixTypeConverter.CreateMatrix(value?.ToString())
 			};
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/TransformTypeConverter.xml" path="//Member[@MemberName='ConvertTo']/Docs/*" />
 		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
 		{
 			if (value is not MatrixTransform mt)
@@ -31,4 +27,4 @@ public override object ConvertTo(ITypeDescriptorContext context, CultureInfo cul
 			return converter.ConvertToInvariantString(mt.Matrix);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/Shell/BackButtonBehavior.cs b/src/Controls/src/Core/Shell/BackButtonBehavior.cs
index be2538453f31..6fe255864369 100644
--- a/src/Controls/src/Core/Shell/BackButtonBehavior.cs
+++ b/src/Controls/src/Core/Shell/BackButtonBehavior.cs
@@ -24,7 +24,6 @@ public class BackButtonBehavior : BindableObject
 		public static readonly BindableProperty IsEnabledProperty =
 			BindableProperty.Create(nameof(IsEnabled), typeof(bool), typeof(BackButtonBehavior), true, BindingMode.OneTime);
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/BackButtonBehavior.xml" path="//Member[@MemberName='IsVisibleProperty']/Docs/*" />
 		public static readonly BindableProperty IsVisibleProperty =
 			BindableProperty.Create(nameof(IsVisible), typeof(bool), typeof(BackButtonBehavior), true, BindingMode.OneTime);
 
@@ -60,7 +59,6 @@ public bool IsEnabled
 			set { SetValue(IsEnabledProperty, value); }
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/BackButtonBehavior.xml" path="//Member[@MemberName='IsVisible']/Docs/*" />
 		public bool IsVisible
 		{
 			get { return (bool)GetValue(IsVisibleProperty); }
@@ -118,4 +116,4 @@ void OnCommandParameterChanged()
 				IsEnabledCore = Command.CanExecute(CommandParameter);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/Shell/BaseShellItem.cs b/src/Controls/src/Core/Shell/BaseShellItem.cs
index 05b9bc5326ae..83fee90e05b5 100644
--- a/src/Controls/src/Core/Shell/BaseShellItem.cs
+++ b/src/Controls/src/Core/Shell/BaseShellItem.cs
@@ -98,7 +98,6 @@ public bool IsVisible
 			set => SetValue(IsVisibleProperty, value);
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/BaseShellItem.xml" path="//Member[@MemberName='FlyoutItemIsVisible']/Docs/*" />
 		public bool FlyoutItemIsVisible
 		{
 			get => (bool)GetValue(Shell.FlyoutItemIsVisibleProperty);
diff --git a/src/Controls/src/Core/Shell/SearchHandler.cs b/src/Controls/src/Core/Shell/SearchHandler.cs
index bbedc3057697..f3294b95673a 100644
--- a/src/Controls/src/Core/Shell/SearchHandler.cs
+++ b/src/Controls/src/Core/Shell/SearchHandler.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -152,7 +152,6 @@ public Color TextColor
 		/// <include file="../../../docs/Microsoft.Maui.Controls/SearchHandler.xml" path="//Member[@MemberName='FontAttributesProperty']/Docs/*" />
 		public static readonly BindableProperty FontAttributesProperty = FontElement.FontAttributesProperty;
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/SearchHandler.xml" path="//Member[@MemberName='FontAutoScalingEnabledProperty']/Docs/*" />
 		public static readonly BindableProperty FontAutoScalingEnabledProperty = FontElement.FontAutoScalingEnabledProperty;
 
 		/// <include file="../../../docs/Microsoft.Maui.Controls/SearchHandler.xml" path="//Member[@MemberName='PlaceholderProperty']/Docs/*" />
@@ -216,7 +215,6 @@ public double FontSize
 			set { SetValue(FontSizeProperty, value); }
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/SearchHandler.xml" path="//Member[@MemberName='FontAutoScalingEnabled']/Docs/*" />
 		public bool FontAutoScalingEnabled
 		{
 			get => (bool)GetValue(FontAutoScalingEnabledProperty);
@@ -305,7 +303,6 @@ void ISearchHandlerController.QueryConfirmed()
 			OnQueryConfirmed();
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/SearchHandler.xml" path="//Member[@MemberName='AutomationIdProperty']/Docs/*" />
 		public static readonly BindableProperty AutomationIdProperty = BindableProperty.Create(nameof(AutomationId), typeof(string), typeof(SearchHandler), null);
 
 		/// <include file="../../../docs/Microsoft.Maui.Controls/SearchHandler.xml" path="//Member[@MemberName='ClearIconHelpTextProperty']/Docs/*" />
@@ -414,7 +411,6 @@ void ISearchHandlerController.QueryConfirmed()
 
 		private ListProxy _listProxy;
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/SearchHandler.xml" path="//Member[@MemberName='AutomationId']/Docs/*" />
 		public string AutomationId
 		{
 			get { return (string)GetValue(AutomationIdProperty); }
diff --git a/src/Controls/src/Core/Shell/Shell.cs b/src/Controls/src/Core/Shell/Shell.cs
index b323a4409ffd..49f1713a197d 100644
--- a/src/Controls/src/Core/Shell/Shell.cs
+++ b/src/Controls/src/Core/Shell/Shell.cs
@@ -68,12 +68,9 @@ static void OnSearchHandlerPropertyChanged(BindableObject bindable, object oldVa
 				SetInheritedBindingContext(newHandler, bindable.BindingContext);
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Shell.xml" path="//Member[@MemberName='FlyoutItemIsVisibleProperty']/Docs/*" />
 		public static readonly BindableProperty FlyoutItemIsVisibleProperty =
 			BindableProperty.CreateAttached(nameof(IsVisible), typeof(bool), typeof(Shell), true, propertyChanged: OnFlyoutItemIsVisibleChanged);
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Shell.xml" path="//Member[@MemberName='GetFlyoutItemIsVisible']/Docs/*" />
 		public static bool GetFlyoutItemIsVisible(BindableObject obj) => (bool)obj.GetValue(FlyoutItemIsVisibleProperty);
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Shell.xml" path="//Member[@MemberName='SetFlyoutItemIsVisible']/Docs/*" />
 		public static void SetFlyoutItemIsVisible(BindableObject obj, bool isVisible) => obj.SetValue(FlyoutItemIsVisibleProperty, isVisible);
 
 		static void OnFlyoutItemIsVisibleChanged(BindableObject bindable, object oldValue, object newValue)
@@ -125,14 +122,10 @@ static void OnFlyoutItemIsVisibleChanged(BindableObject bindable, object oldValu
 		/// <include file="../../../docs/Microsoft.Maui.Controls/Shell.xml" path="//Member[@MemberName='SetFlyoutBehavior']/Docs/*" />
 		public static void SetFlyoutBehavior(BindableObject obj, FlyoutBehavior value) => obj.SetValue(FlyoutBehaviorProperty, value);
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Shell.xml" path="//Member[@MemberName='GetFlyoutWidth']/Docs/*" />
 		public static double GetFlyoutWidth(BindableObject obj) => (double)obj.GetValue(FlyoutWidthProperty);
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Shell.xml" path="//Member[@MemberName='SetFlyoutWidth']/Docs/*" />
 		public static void SetFlyoutWidth(BindableObject obj, double value) => obj.SetValue(FlyoutWidthProperty, value);
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Shell.xml" path="//Member[@MemberName='GetFlyoutHeight']/Docs/*" />
 		public static double GetFlyoutHeight(BindableObject obj) => (double)obj.GetValue(FlyoutHeightProperty);
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Shell.xml" path="//Member[@MemberName='SetFlyoutHeight']/Docs/*" />
 		public static void SetFlyoutHeight(BindableObject obj, double value) => obj.SetValue(FlyoutHeightProperty, value);
 
 
@@ -228,12 +221,10 @@ static void OnFlyoutBehaviorChanged(BindableObject bindable, object oldValue, ob
 			BindableProperty.CreateAttached("FlyoutBackdrop", typeof(Brush), typeof(Shell), Brush.Default,
 				propertyChanged: OnShellAppearanceValueChanged);
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Shell.xml" path="//Member[@MemberName='FlyoutWidthProperty']/Docs/*" />
 		public static readonly BindableProperty FlyoutWidthProperty =
 			BindableProperty.CreateAttached("FlyoutWidth", typeof(double), typeof(Shell), -1d,
 				propertyChanged: OnShellAppearanceValueChanged);
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Shell.xml" path="//Member[@MemberName='FlyoutHeightProperty']/Docs/*" />
 		public static readonly BindableProperty FlyoutHeightProperty =
 			BindableProperty.CreateAttached("FlyoutHeight", typeof(double), typeof(Shell), -1d,
 				propertyChanged: OnShellAppearanceValueChanged);
@@ -695,7 +686,6 @@ public Task GoToAsync(ShellNavigationState state, bool animate, IDictionary<stri
 			return _navigationManager.GoToAsync(state, animate, false, parameters: new ShellRouteParameters(parameters));
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Shell.xml" path="//Member[@MemberName='AddLogicalChild']/Docs/*" />
 		public void AddLogicalChild(Element element)
 		{
 			if (element == null)
@@ -712,7 +702,6 @@ public void AddLogicalChild(Element element)
 			VisualDiagnostics.OnChildAdded(this, element);
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Shell.xml" path="//Member[@MemberName='RemoveLogicalChild']/Docs/*" />
 		public void RemoveLogicalChild(Element element)
 		{
 			if (element == null)
@@ -765,7 +754,6 @@ public void RemoveLogicalChild(Element element)
 			BindableProperty.Create(nameof(FlyoutHeader), typeof(object), typeof(Shell), null, BindingMode.OneTime,
 				propertyChanging: OnFlyoutHeaderChanging);
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Shell.xml" path="//Member[@MemberName='FlyoutFooterProperty']/Docs/*" />
 		public static readonly BindableProperty FlyoutFooterProperty =
 			BindableProperty.Create(nameof(FlyoutFooter), typeof(object), typeof(Shell), null, BindingMode.OneTime,
 				propertyChanging: OnFlyoutFooterChanging);
@@ -775,7 +763,6 @@ public void RemoveLogicalChild(Element element)
 			BindableProperty.Create(nameof(FlyoutHeaderTemplate), typeof(DataTemplate), typeof(Shell), null, BindingMode.OneTime,
 				propertyChanging: OnFlyoutHeaderTemplateChanging);
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Shell.xml" path="//Member[@MemberName='FlyoutFooterTemplateProperty']/Docs/*" />
 		public static readonly BindableProperty FlyoutFooterTemplateProperty =
 			BindableProperty.Create(nameof(FlyoutFooterTemplate), typeof(DataTemplate), typeof(Shell), null, BindingMode.OneTime,
 				propertyChanging: OnFlyoutFooterTemplateChanging);
@@ -996,14 +983,12 @@ public Brush FlyoutBackdrop
 			set => SetValue(FlyoutBackdropProperty, value);
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Shell.xml" path="//Member[@MemberName='FlyoutWidth']/Docs/*" />
 		public double FlyoutWidth
 		{
 			get => (double)GetValue(FlyoutWidthProperty);
 			set => SetValue(FlyoutWidthProperty, value);
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Shell.xml" path="//Member[@MemberName='FlyoutHeight']/Docs/*" />
 		public double FlyoutHeight
 		{
 			get => (double)GetValue(FlyoutHeightProperty);
@@ -1024,7 +1009,6 @@ public object FlyoutHeader
 			set => SetValue(FlyoutHeaderProperty, value);
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Shell.xml" path="//Member[@MemberName='FlyoutFooter']/Docs/*" />
 		public object FlyoutFooter
 		{
 			get => GetValue(FlyoutFooterProperty);
@@ -1045,7 +1029,6 @@ public DataTemplate FlyoutHeaderTemplate
 			set => SetValue(FlyoutHeaderTemplateProperty, value);
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Shell.xml" path="//Member[@MemberName='FlyoutFooterTemplate']/Docs/*" />
 		public DataTemplate FlyoutFooterTemplate
 		{
 			get => (DataTemplate)GetValue(FlyoutFooterTemplateProperty);
@@ -1113,7 +1096,6 @@ protected override void OnBindingContextChanged()
 
 		internal void SendFlyoutItemsChanged() => _flyoutManager.CheckIfFlyoutItemsChanged();
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Shell.xml" path="//Member[@MemberName='FlyoutItems']/Docs/*" />
 		public IEnumerable FlyoutItems => _flyoutManager.FlyoutItems;
 
 		List<List<Element>> IShellController.GenerateFlyoutGrouping() =>
@@ -1579,24 +1561,20 @@ protected override void LayoutChildren(double x, double y, double width, double
 		#region Shell Flyout Content
 
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Shell.xml" path="//Member[@MemberName='FlyoutContentProperty']/Docs/*" />
 		public static readonly BindableProperty FlyoutContentProperty =
 			BindableProperty.Create(nameof(FlyoutContent), typeof(object), typeof(Shell), null, BindingMode.OneTime, propertyChanging: OnFlyoutContentChanging);
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Shell.xml" path="//Member[@MemberName='FlyoutContentTemplateProperty']/Docs/*" />
 		public static readonly BindableProperty FlyoutContentTemplateProperty =
 			BindableProperty.Create(nameof(FlyoutContentTemplate), typeof(DataTemplate), typeof(Shell), null, BindingMode.OneTime, propertyChanging: OnFlyoutContentTemplateChanging);
 
 		View _flyoutContentView;
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Shell.xml" path="//Member[@MemberName='FlyoutContent']/Docs/*" />
 		public object FlyoutContent
 		{
 			get => GetValue(FlyoutContentProperty);
 			set => SetValue(FlyoutContentProperty, value);
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/Shell.xml" path="//Member[@MemberName='FlyoutContentTemplate']/Docs/*" />
 		public DataTemplate FlyoutContentTemplate
 		{
 			get => (DataTemplate)GetValue(FlyoutContentTemplateProperty);
diff --git a/src/Controls/src/Core/Shell/ShellAppearance.cs b/src/Controls/src/Core/Shell/ShellAppearance.cs
index 575d842d05e4..3f8c2e9ee880 100644
--- a/src/Controls/src/Core/Shell/ShellAppearance.cs
+++ b/src/Controls/src/Core/Shell/ShellAppearance.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using Microsoft.Maui.Graphics;
@@ -70,9 +70,7 @@ public class ShellAppearance : IShellAppearanceElement
 
 		/// <include file="../../../docs/Microsoft.Maui.Controls/ShellAppearance.xml" path="//Member[@MemberName='FlyoutBackdrop']/Docs/*" />
 		public Brush FlyoutBackdrop => _brushArray[0];
-		/// <include file="../../../docs/Microsoft.Maui.Controls/ShellAppearance.xml" path="//Member[@MemberName='FlyoutWidth']/Docs/*" />
 		public double FlyoutWidth => _doubleArray[0];
-		/// <include file="../../../docs/Microsoft.Maui.Controls/ShellAppearance.xml" path="//Member[@MemberName='FlyoutHeight']/Docs/*" />
 		public double FlyoutHeight => _doubleArray[1];
 
 		Color IShellAppearanceElement.EffectiveTabBarBackgroundColor =>
@@ -200,4 +198,4 @@ public void MakeComplete()
 			return !(appearance1 == appearance2);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/Span.cs b/src/Controls/src/Core/Span.cs
index b8d15480dddc..66dd7f3fb2b3 100644
--- a/src/Controls/src/Core/Span.cs
+++ b/src/Controls/src/Core/Span.cs
@@ -95,7 +95,6 @@ public string Text
 		/// <include file="../../docs/Microsoft.Maui.Controls/Span.xml" path="//Member[@MemberName='FontAttributesProperty']/Docs/*" />
 		public static readonly BindableProperty FontAttributesProperty = FontElement.FontAttributesProperty;
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Span.xml" path="//Member[@MemberName='FontAutoScalingEnabledProperty']/Docs/*" />
 		public static readonly BindableProperty FontAutoScalingEnabledProperty = FontElement.FontAutoScalingEnabledProperty;
 
 		/// <include file="../../docs/Microsoft.Maui.Controls/Span.xml" path="//Member[@MemberName='LineHeightProperty']/Docs/*" />
@@ -123,7 +122,6 @@ public double FontSize
 			set { SetValue(FontElement.FontSizeProperty, value); }
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/Span.xml" path="//Member[@MemberName='FontAutoScalingEnabled']/Docs/*" />
 		public bool FontAutoScalingEnabled
 		{
 			get => (bool)GetValue(FontAutoScalingEnabledProperty);
diff --git a/src/Controls/src/Core/TableSection.cs b/src/Controls/src/Core/TableSection.cs
index 26713e74c3c5..dd8749e95967 100644
--- a/src/Controls/src/Core/TableSection.cs
+++ b/src/Controls/src/Core/TableSection.cs
@@ -29,7 +29,6 @@ protected TableSectionBase(string title) : base(title)
 			_children.CollectionChanged += OnChildrenChanged;
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/TableSectionBase.xml" path="//Member[@MemberName='Add'][1]/Docs/*" />
 		public void Add(T item)
 		{
 			_children.Add(item);
@@ -39,7 +38,6 @@ public void Add(T item)
 			}
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/TableSectionBase.xml" path="//Member[@MemberName='Clear']/Docs/*" />
 		public void Clear()
 		{
 			foreach (T item in _children)
@@ -53,19 +51,16 @@ public void Clear()
 			_children.Clear();
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/TableSectionBase.xml" path="//Member[@MemberName='Contains']/Docs/*" />
 		public bool Contains(T item)
 		{
 			return _children.Contains(item);
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/TableSectionBase.xml" path="//Member[@MemberName='CopyTo']/Docs/*" />
 		public void CopyTo(T[] array, int arrayIndex)
 		{
 			_children.CopyTo(array, arrayIndex);
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/TableSectionBase.xml" path="//Member[@MemberName='Count']/Docs/*" />
 		public int Count
 		{
 			get { return _children.Count; }
@@ -76,7 +71,6 @@ bool ICollection<T>.IsReadOnly
 			get { return false; }
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/TableSectionBase.xml" path="//Member[@MemberName='Remove']/Docs/*" />
 		public bool Remove(T item)
 		{
 			if (item is IVisualTreeElement element)
@@ -92,19 +86,16 @@ IEnumerator IEnumerable.GetEnumerator()
 			return GetEnumerator();
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/TableSectionBase.xml" path="//Member[@MemberName='GetEnumerator']/Docs/*" />
 		public IEnumerator<T> GetEnumerator()
 		{
 			return _children.GetEnumerator();
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/TableSectionBase.xml" path="//Member[@MemberName='IndexOf']/Docs/*" />
 		public int IndexOf(T item)
 		{
 			return _children.IndexOf(item);
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/TableSectionBase.xml" path="//Member[@MemberName='Insert']/Docs/*" />
 		public void Insert(int index, T item)
 		{
 			if (item is IVisualTreeElement element)
@@ -121,7 +112,6 @@ public T this[int index]
 			set { _children[index] = value; }
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/TableSectionBase.xml" path="//Member[@MemberName='RemoveAt']/Docs/*" />
 		public void RemoveAt(int index)
 		{
 			T item = _children[index];
@@ -139,7 +129,6 @@ public event NotifyCollectionChangedEventHandler CollectionChanged
 			remove { _children.CollectionChanged -= value; }
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/TableSectionBase.xml" path="//Member[@MemberName='Add'][2]/Docs/*" />
 		public void Add(IEnumerable<T> items)
 		{
 			items.ForEach(_children.Add);
diff --git a/src/Controls/src/Core/TextAlignment.cs b/src/Controls/src/Core/TextAlignment.cs
index c9f6d349e53a..384bbd778095 100644
--- a/src/Controls/src/Core/TextAlignment.cs
+++ b/src/Controls/src/Core/TextAlignment.cs
@@ -4,18 +4,14 @@
 
 namespace Microsoft.Maui.Controls
 {
-	/// <include file="../../docs/Microsoft.Maui.Controls/TextAlignmentConverter.xml" path="Type[@FullName='Microsoft.Maui.Controls.TextAlignmentConverter']/Docs/*" />
 	public class TextAlignmentConverter : TypeConverter
 	{
-		/// <include file="../../docs/Microsoft.Maui.Controls/TextAlignmentConverter.xml" path="//Member[@MemberName='CanConvertFrom']/Docs/*" />
 		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
 			=> sourceType == typeof(string);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/TextAlignmentConverter.xml" path="//Member[@MemberName='CanConvertTo']/Docs/*" />
 		public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
 			=> destinationType == typeof(string);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/TextAlignmentConverter.xml" path="//Member[@MemberName='ConvertFrom']/Docs/*" />
 		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
 		{
 			var strValue = value?.ToString();
@@ -44,7 +40,6 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
 			throw new InvalidOperationException(string.Format("Cannot convert \"{0}\" into {1}", strValue, typeof(TextAlignment)));
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/TextAlignmentConverter.xml" path="//Member[@MemberName='ConvertTo']/Docs/*" />
 		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
 		{
 			if (value is not TextAlignment ta)
@@ -58,4 +53,4 @@ public override object ConvertTo(ITypeDescriptorContext context, CultureInfo cul
 			throw new NotSupportedException();
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/TextElement.cs b/src/Controls/src/Core/TextElement.cs
index 4d409ab04af7..da2bff3741c6 100644
--- a/src/Controls/src/Core/TextElement.cs
+++ b/src/Controls/src/Core/TextElement.cs
@@ -4,10 +4,16 @@ namespace Microsoft.Maui.Controls
 {
 	static class TextElement
 	{
+		/// <summary>
+		/// The backing store for the <see cref="ITextElement.TextColor" /> bindable property.
+		/// </summary>
 		public static readonly BindableProperty TextColorProperty =
 			BindableProperty.Create(nameof(ITextElement.TextColor), typeof(Color), typeof(ITextElement), null,
 									propertyChanged: OnTextColorPropertyChanged);
 
+		/// <summary>
+		/// The backing store for the <see cref="ITextElement.CharacterSpacing" /> bindable property.
+		/// </summary>
 		public static readonly BindableProperty CharacterSpacingProperty =
 			BindableProperty.Create(nameof(ITextElement.CharacterSpacing), typeof(double), typeof(ITextElement), 0.0d,
 				propertyChanged: OnCharacterSpacingPropertyChanged);
@@ -22,6 +28,9 @@ static void OnCharacterSpacingPropertyChanged(BindableObject bindable, object ol
 			((ITextElement)bindable).OnCharacterSpacingPropertyChanged((double)oldValue, (double)newValue);
 		}
 
+		/// <summary>
+		/// The backing store for the <see cref="ITextElement.TextTransform" /> bindable property.
+		/// </summary>
 		public static readonly BindableProperty TextTransformProperty =
 			BindableProperty.Create(nameof(ITextElement.TextTransform), typeof(TextTransform), typeof(ITextElement), TextTransform.Default,
 							propertyChanged: OnTextTransformPropertyChanged);
diff --git a/src/Controls/src/Core/TimePicker.cs b/src/Controls/src/Core/TimePicker.cs
index f731472f0b7f..c92bb3842de3 100644
--- a/src/Controls/src/Core/TimePicker.cs
+++ b/src/Controls/src/Core/TimePicker.cs
@@ -33,7 +33,6 @@ public partial class TimePicker : View, IFontElement, ITextElement, IElementConf
 		/// <include file="../../docs/Microsoft.Maui.Controls/TimePicker.xml" path="//Member[@MemberName='FontAttributesProperty']/Docs/*" />
 		public static readonly BindableProperty FontAttributesProperty = FontElement.FontAttributesProperty;
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/TimePicker.xml" path="//Member[@MemberName='FontAutoScalingEnabledProperty']/Docs/*" />
 		public static readonly BindableProperty FontAutoScalingEnabledProperty = FontElement.FontAutoScalingEnabledProperty;
 
 		readonly Lazy<PlatformConfigurationRegistry<TimePicker>> _platformConfigurationRegistry;
@@ -94,7 +93,6 @@ public double FontSize
 			set { SetValue(FontSizeProperty, value); }
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/TimePicker.xml" path="//Member[@MemberName='FontAutoScalingEnabled']/Docs/*" />
 		public bool FontAutoScalingEnabled
 		{
 			get => (bool)GetValue(FontAutoScalingEnabledProperty);
diff --git a/src/Controls/src/Core/TypeTypeConverter.cs b/src/Controls/src/Core/TypeTypeConverter.cs
index c842ea2791cf..3c4c2fe307df 100644
--- a/src/Controls/src/Core/TypeTypeConverter.cs
+++ b/src/Controls/src/Core/TypeTypeConverter.cs
@@ -9,11 +9,9 @@ namespace Microsoft.Maui.Controls
 	[ProvideCompiled("Microsoft.Maui.Controls.XamlC.TypeTypeConverter")]
 	public sealed class TypeTypeConverter : TypeConverter, IExtendedTypeConverter
 	{
-		/// <include file="../../docs/Microsoft.Maui.Controls/TypeTypeConverter.xml" path="//Member[@MemberName='CanConvertFrom']/Docs/*" />
 		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
 			=> sourceType == typeof(string);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/TypeTypeConverter.xml" path="//Member[@MemberName='CanConvertTo']/Docs/*" />
 		public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
 			=> false;
 
@@ -27,12 +25,10 @@ object IExtendedTypeConverter.ConvertFromInvariantString(string value, IServiceP
 			return typeResolver.Resolve(value, serviceProvider);
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/TypeTypeConverter.xml" path="//Member[@MemberName='ConvertFrom']/Docs/*" />
 		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
 			=> throw new NotImplementedException();
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/TypeTypeConverter.xml" path="//Member[@MemberName='ConvertTo']/Docs/*" />
 		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
 			=> throw new NotSupportedException();
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/UriImageSource.cs b/src/Controls/src/Core/UriImageSource.cs
index ac97392b5ca5..3cad7601d861 100644
--- a/src/Controls/src/Core/UriImageSource.cs
+++ b/src/Controls/src/Core/UriImageSource.cs
@@ -17,11 +17,9 @@ public sealed partial class UriImageSource : ImageSource, IStreamImageSource
 			propertyChanged: (bindable, oldvalue, newvalue) => ((UriImageSource)bindable).OnUriChanged(),
 			validateValue: (bindable, value) => value == null || ((Uri)value).IsAbsoluteUri);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/UriImageSource.xml" path="//Member[@MemberName='CacheValidityProperty']/Docs/*" />
 		public static readonly BindableProperty CacheValidityProperty = BindableProperty.Create(
 			nameof(CacheValidity), typeof(TimeSpan), typeof(UriImageSource), TimeSpan.FromDays(1));
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/UriImageSource.xml" path="//Member[@MemberName='CachingEnabledProperty']/Docs/*" />
 		public static readonly BindableProperty CachingEnabledProperty = BindableProperty.Create(
 			nameof(CachingEnabled), typeof(bool), typeof(UriImageSource), true);
 
@@ -134,4 +132,4 @@ void OnUriChanged()
 			OnSourceChanged();
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/UriTypeConverter.cs b/src/Controls/src/Core/UriTypeConverter.cs
index aafcbc4d9d00..64a8fd09a078 100644
--- a/src/Controls/src/Core/UriTypeConverter.cs
+++ b/src/Controls/src/Core/UriTypeConverter.cs
@@ -8,15 +8,12 @@ namespace Microsoft.Maui.Controls
 	[Xaml.ProvideCompiled("Microsoft.Maui.Controls.XamlC.UriTypeConverter")]
 	public class UriTypeConverter : TypeConverter
 	{
-		/// <include file="../../docs/Microsoft.Maui.Controls/UriTypeConverter.xml" path="//Member[@MemberName='CanConvertFrom']/Docs/*" />
 		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
 			=> sourceType == typeof(string);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/UriTypeConverter.xml" path="//Member[@MemberName='CanConvertTo']/Docs/*" />
 		public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
 			=> destinationType == typeof(string);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/UriTypeConverter.xml" path="//Member[@MemberName='ConvertFrom']/Docs/*" />
 		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
 		{
 			var strValue = value?.ToString();
@@ -25,7 +22,6 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
 			return new Uri(strValue, UriKind.RelativeOrAbsolute);
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/UriTypeConverter.xml" path="//Member[@MemberName='ConvertTo']/Docs/*" />
 		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
 		{
 			if (value is not Uri uri)
diff --git a/src/Controls/src/Core/VisualElement.cs b/src/Controls/src/Core/VisualElement.cs
index 553b6a8353e8..9efe2f7e5072 100644
--- a/src/Controls/src/Core/VisualElement.cs
+++ b/src/Controls/src/Core/VisualElement.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Globalization;
@@ -312,10 +312,8 @@ void InvalidateGradientBrushRequested(object sender, EventArgs e)
 		/// <include file="../../docs/Microsoft.Maui.Controls/VisualElement.xml" path="//Member[@MemberName='MinimumHeightRequestProperty']/Docs/*" />
 		public static readonly BindableProperty MinimumHeightRequestProperty = BindableProperty.Create(nameof(MinimumHeightRequest), typeof(double), typeof(VisualElement), -1d, propertyChanged: OnRequestChanged);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/VisualElement.xml" path="//Member[@MemberName='MaximumWidthRequestProperty']/Docs/*" />
 		public static readonly BindableProperty MaximumWidthRequestProperty = BindableProperty.Create(nameof(MaximumWidthRequest), typeof(double), typeof(VisualElement), double.PositiveInfinity, propertyChanged: OnRequestChanged);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/VisualElement.xml" path="//Member[@MemberName='MaximumHeightRequestProperty']/Docs/*" />
 		public static readonly BindableProperty MaximumHeightRequestProperty = BindableProperty.Create(nameof(MaximumHeightRequest), typeof(double), typeof(VisualElement), double.PositiveInfinity, propertyChanged: OnRequestChanged);
 
 		/// <include file="../../docs/Microsoft.Maui.Controls/VisualElement.xml" path="//Member[@MemberName='IsFocusedPropertyKey']/Docs/*" />
@@ -501,14 +499,12 @@ public double MinimumWidthRequest
 			set { SetValue(MinimumWidthRequestProperty, value); }
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/VisualElement.xml" path="//Member[@MemberName='MaximumHeightRequest']/Docs/*" />
 		public double MaximumHeightRequest
 		{
 			get { return (double)GetValue(MaximumHeightRequestProperty); }
 			set { SetValue(MaximumHeightRequestProperty, value); }
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/VisualElement.xml" path="//Member[@MemberName='MaximumWidthRequest']/Docs/*" />
 		public double MaximumWidthRequest
 		{
 			get { return (double)GetValue(MaximumWidthRequestProperty); }
@@ -643,7 +639,6 @@ internal LayoutConstraint ComputedConstraint
 		[EditorBrowsable(EditorBrowsableState.Never)]
 		public bool DisableLayout { get; set; }
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/VisualElement.xml" path="//Member[@MemberName='IsInPlatformLayout']/Docs/*" />
 		[EditorBrowsable(EditorBrowsableState.Never)]
 		public bool IsInPlatformLayout
 		{
@@ -665,7 +660,6 @@ public bool IsInPlatformLayout
 			set { _isInPlatformLayout = value; }
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/VisualElement.xml" path="//Member[@MemberName='IsPlatformStateConsistent']/Docs/*" />
 		[EditorBrowsable(EditorBrowsableState.Never)]
 		public bool IsPlatformStateConsistent
 		{
@@ -764,7 +758,6 @@ public ResourceDictionary Resources
 			}
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/VisualElement.xml" path="//Member[@MemberName='PlatformSizeChanged']/Docs/*" />
 		[EditorBrowsable(EditorBrowsableState.Never)]
 		public void PlatformSizeChanged() => InvalidateMeasureInternal(InvalidationTrigger.MeasureChanged);
 
diff --git a/src/Controls/src/Core/Visuals/VisualTypeConverter.cs b/src/Controls/src/Core/Visuals/VisualTypeConverter.cs
index 6bfcf7b207c2..c949eb3a724a 100644
--- a/src/Controls/src/Core/Visuals/VisualTypeConverter.cs
+++ b/src/Controls/src/Core/Visuals/VisualTypeConverter.cs
@@ -15,11 +15,9 @@ namespace Microsoft.Maui.Controls
 	/// <include file="../../../docs/Microsoft.Maui.Controls/VisualTypeConverter.xml" path="Type[@FullName='Microsoft.Maui.Controls.VisualTypeConverter']/Docs/*" />
 	public class VisualTypeConverter : TypeConverter
 	{
-		/// <include file="../../../docs/Microsoft.Maui.Controls/VisualTypeConverter.xml" path="//Member[@MemberName='CanConvertFrom']/Docs/*" />
 		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
 			=> sourceType == typeof(string);
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/VisualTypeConverter.xml" path="//Member[@MemberName='CanConvertTo']/Docs/*" />
 		public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
 			=> destinationType == typeof(string);
 
@@ -128,7 +126,6 @@ static IVisual CreateVisual(
 			return null;
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/VisualTypeConverter.xml" path="//Member[@MemberName='ConvertFrom']/Docs/*" />
 		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
 		{
 			var strValue = value?.ToString();
@@ -146,7 +143,6 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
 			throw new XamlParseException($"Cannot convert \"{strValue}\" into {typeof(IVisual)}");
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/VisualTypeConverter.xml" path="//Member[@MemberName='ConvertTo']/Docs/*" />
 		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
 		{
 			if (value is not IVisual visual)
@@ -163,19 +159,16 @@ public override object ConvertTo(ITypeDescriptorContext context, CultureInfo cul
 			throw new NotSupportedException();
 		}
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/VisualTypeConverter.xml" path="//Member[@MemberName='GetStandardValuesExclusive']/Docs/*" />
 		public override bool GetStandardValuesExclusive(ITypeDescriptorContext context)
 			=> false;
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/VisualTypeConverter.xml" path="//Member[@MemberName='GetStandardValuesSupported']/Docs/*" />
 		public override bool GetStandardValuesSupported(ITypeDescriptorContext context)
 			=> true;
 
-		/// <include file="../../../docs/Microsoft.Maui.Controls/VisualTypeConverter.xml" path="//Member[@MemberName='GetStandardValues']/Docs/*" />
 		public override StandardValuesCollection GetStandardValues(ITypeDescriptorContext context)
 			=> new(new[] {
 				nameof(VisualMarker.Default), 
 				// nameof(VisualMarker.Material)
 			});
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/WebViewSourceTypeConverter.cs b/src/Controls/src/Core/WebViewSourceTypeConverter.cs
index f35a2a882505..54b3de00f456 100644
--- a/src/Controls/src/Core/WebViewSourceTypeConverter.cs
+++ b/src/Controls/src/Core/WebViewSourceTypeConverter.cs
@@ -7,15 +7,12 @@ namespace Microsoft.Maui.Controls
 	/// <include file="../../docs/Microsoft.Maui.Controls/WebViewSourceTypeConverter.xml" path="Type[@FullName='Microsoft.Maui.Controls.WebViewSourceTypeConverter']/Docs/*" />
 	public class WebViewSourceTypeConverter : TypeConverter
 	{
-		/// <include file="../../docs/Microsoft.Maui.Controls/WebViewSourceTypeConverter.xml" path="//Member[@MemberName='CanConvertFrom']/Docs/*" />
 		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
 			=> sourceType == typeof(string);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/WebViewSourceTypeConverter.xml" path="//Member[@MemberName='CanConvertTo']/Docs/*" />
 		public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
 			=> destinationType == typeof(string);
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/WebViewSourceTypeConverter.xml" path="//Member[@MemberName='ConvertFrom']/Docs/*" />
 		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
 		{
 			var strValue = value?.ToString();
@@ -25,7 +22,6 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
 			throw new InvalidOperationException(string.Format("Cannot convert \"{0}\" into {1}", strValue, typeof(UrlWebViewSource)));
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Controls/WebViewSourceTypeConverter.xml" path="//Member[@MemberName='ConvertTo']/Docs/*" />
 		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
 		{
 			if (value is not UrlWebViewSource uwvs)
@@ -33,4 +29,4 @@ public override object ConvertTo(ITypeDescriptorContext context, CultureInfo cul
 			return uwvs.Url;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Core/src/Core/IButton.cs b/src/Core/src/Core/IButton.cs
index 85259fe106e6..a9898d273871 100644
--- a/src/Core/src/Core/IButton.cs
+++ b/src/Core/src/Core/IButton.cs
@@ -1,22 +1,22 @@
 namespace Microsoft.Maui
 {
 	/// <summary>
-	/// Represents a View that reacts to touch events.
+	/// Represents a <see cref="IView"/> that reacts to touch events.
 	/// </summary>
 	public interface IButton : IView, IPadding, IButtonStroke
 	{
 		/// <summary>
-		/// Occurs when the Button is pressed.
+		/// Occurs when the button is pressed.
 		/// </summary>
 		void Pressed();
 
 		/// <summary>
-		/// Occurs when the Button is released.
+		/// Occurs when the button is released.
 		/// </summary>
 		void Released();
 
 		/// <summary>
-		/// Occurs when the Button is clicked.
+		/// Occurs when the button is clicked/tapped.
 		/// </summary>
 		void Clicked();
 	}
diff --git a/src/Core/src/Core/IEntry.cs b/src/Core/src/Core/IEntry.cs
index 80b90ca9e200..f66cbaff5978 100644
--- a/src/Core/src/Core/IEntry.cs
+++ b/src/Core/src/Core/IEntry.cs
@@ -1,7 +1,7 @@
 namespace Microsoft.Maui
 {
 	/// <summary>
-	/// Represents a View that is used for single-line text input.
+	/// Represents a <see cref="IView"/> that is used for single-line text input.
 	/// </summary>
 	public interface IEntry : IView, ITextInput, ITextAlignment
 	{
diff --git a/src/Core/src/Platform/ViewExtensions.cs b/src/Core/src/Platform/ViewExtensions.cs
index 73281f10a41a..171e3b1c6cff 100644
--- a/src/Core/src/Platform/ViewExtensions.cs
+++ b/src/Core/src/Platform/ViewExtensions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Numerics;
 using Microsoft.Maui.Graphics;
 using System.Threading.Tasks;
@@ -38,7 +38,6 @@ public static partial class ViewExtensions
 
 		internal static double ExtractAngleInDegrees(this Matrix4x4 matrix) => ExtractAngleInRadians(matrix) * 180 / Math.PI;
 
-		/// <include file="../../docs/Microsoft.Maui/ViewExtensions.xml" path="//Member[@MemberName='ToHandler']/Docs/*" />
 
 		public static IPlatformViewHandler ToHandler(this IView view, IMauiContext context) =>
 			(IPlatformViewHandler)ElementExtensions.ToHandler(view, context);
diff --git a/src/Core/src/Primitives/Aspect.cs b/src/Core/src/Primitives/Aspect.cs
index 4a25f3c26e54..9045707298e1 100644
--- a/src/Core/src/Primitives/Aspect.cs
+++ b/src/Core/src/Primitives/Aspect.cs
@@ -9,7 +9,6 @@ public enum Aspect
 		AspectFill,
 		/// <include file="../../docs/Microsoft.Maui/Aspect.xml" path="//Member[@MemberName='Fill']/Docs/*" />
 		Fill,
-		/// <include file="../../docs/Microsoft.Maui/Aspect.xml" path="//Member[@MemberName='Center']/Docs/*" />
 		Center
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Core/src/Primitives/ClearButtonVisibility.cs b/src/Core/src/Primitives/ClearButtonVisibility.cs
index 9b69bb0eeb09..a6b64928fb2b 100644
--- a/src/Core/src/Primitives/ClearButtonVisibility.cs
+++ b/src/Core/src/Primitives/ClearButtonVisibility.cs
@@ -1,11 +1,19 @@
 namespace Microsoft.Maui
 {
-	/// <include file="../../docs/Microsoft.Maui/ClearButtonVisibility.xml" path="Type[@FullName='Microsoft.Maui.ClearButtonVisibility']/Docs/*" />
+	/// <summary>
+	/// Enumerates values that influence clear button visibility behavior on input fields.
+	/// Typically this is a button inside of the input field, near the end, which clears the input when pressed.
+	/// </summary>
 	public enum ClearButtonVisibility
 	{
-		/// <include file="../../docs/Microsoft.Maui/ClearButtonVisibility.xml" path="//Member[@MemberName='Never']/Docs/*" />
+		/// <summary>
+		/// Never show a clear button.
+		/// </summary>
 		Never,
-		/// <include file="../../docs/Microsoft.Maui/ClearButtonVisibility.xml" path="//Member[@MemberName='WhileEditing']/Docs/*" />
+
+		/// <summary>
+		/// Only show a clear button in the input field while the input field has focus and is being edited.
+		/// </summary>
 		WhileEditing
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Primitives/Font.cs b/src/Core/src/Primitives/Font.cs
index f9c8662ddea9..97760bf97f72 100644
--- a/src/Core/src/Primitives/Font.cs
+++ b/src/Core/src/Primitives/Font.cs
@@ -12,7 +12,6 @@ namespace Microsoft.Maui
 		/// <include file="../../docs/Microsoft.Maui/Font.xml" path="//Member[@MemberName='Size']/Docs/*" />
 		public double Size { get; }
 
-		/// <include file="../../docs/Microsoft.Maui/Font.xml" path="//Member[@MemberName='Slant']/Docs/*" />
 		public FontSlant Slant { get; }
 
 		/// <include file="../../docs/Microsoft.Maui/Font.xml" path="//Member[@MemberName='IsDefault']/Docs/*" />
@@ -24,7 +23,6 @@ namespace Microsoft.Maui
 
 		readonly FontWeight _weight;
 
-		/// <include file="../../docs/Microsoft.Maui/Font.xml" path="//Member[@MemberName='Weight']/Docs/*" />
 		public FontWeight Weight
 		{
 			get => _weight <= 0 ? FontWeight.Regular : _weight;
@@ -41,13 +39,11 @@ private Font(string? family, double size, FontSlant slant, FontWeight weight, bo
 
 
 		readonly bool _disableScaling;
-		/// <include file="../../docs/Microsoft.Maui/Font.xml" path="//Member[@MemberName='AutoScalingEnabled']/Docs/*" />
 		public bool AutoScalingEnabled
 		{
 			get => !_disableScaling;
 		}
 
-		/// <include file="../../docs/Microsoft.Maui/Font.xml" path="//Member[@MemberName='WithAutoScaling']/Docs/*" />
 		public Font WithAutoScaling(bool enabled)
 		{
 			return new Font(Family, Size, Slant, Weight, enabled);
@@ -59,19 +55,16 @@ public Font WithSize(double size)
 			return new Font(Family, size, Slant, Weight, AutoScalingEnabled);
 		}
 
-		/// <include file="../../docs/Microsoft.Maui/Font.xml" path="//Member[@MemberName='WithSlant']/Docs/*" />
 		public Font WithSlant(FontSlant fontSlant)
 		{
 			return new Font(Family, Size, fontSlant, Weight, AutoScalingEnabled);
 		}
 
-		/// <include file="../../docs/Microsoft.Maui/Font.xml" path="//Member[@MemberName='WithWeight'][1]/Docs/*" />
 		public Font WithWeight(FontWeight weight)
 		{
 			return new Font(Family, Size, Slant, weight, AutoScalingEnabled);
 		}
 
-		/// <include file="../../docs/Microsoft.Maui/Font.xml" path="//Member[@MemberName='WithWeight'][2]/Docs/*" />
 		public Font WithWeight(FontWeight weight, FontSlant fontSlant)
 		{
 			return new Font(Family, Size, fontSlant, weight, AutoScalingEnabled);
@@ -89,7 +82,6 @@ public static Font SystemFontOfSize(double size, FontWeight weight = FontWeight.
 #pragma warning restore CS1573 // Parameter has no matching param tag in the XML comment (but other parameters do)
 			new(null, size, fontSlant, weight, enableScaling);
 
-		/// <include file="../../docs/Microsoft.Maui/Font.xml" path="//Member[@MemberName='SystemFontOfWeight']/Docs/*" />
 		public static Font SystemFontOfWeight(FontWeight weight, FontSlant fontSlant = FontSlant.Default, bool enableScaling = true) =>
 			new(null, default(double), fontSlant, weight, enableScaling);
 
diff --git a/src/Core/src/Primitives/LineBreakMode.cs b/src/Core/src/Primitives/LineBreakMode.cs
index 37274063ec0d..02b84c06dfd9 100644
--- a/src/Core/src/Primitives/LineBreakMode.cs
+++ b/src/Core/src/Primitives/LineBreakMode.cs
@@ -1,19 +1,39 @@
 namespace Microsoft.Maui
 {
-	/// <include file="../../docs/Microsoft.Maui/LineBreakMode.xml" path="Type[@FullName='Microsoft.Maui.LineBreakMode']/Docs/*" />
+	/// <summary>
+	/// Enumeration specifying various options for line breaking.
+	/// </summary>
+	/// <remarks>How lines are broken or text is truncated might be different depending on the platform.</remarks>
 	public enum LineBreakMode
 	{
-		/// <include file="../../docs/Microsoft.Maui/LineBreakMode.xml" path="//Member[@MemberName='NoWrap']/Docs/*" />
+		/// <summary>
+		/// Do not wrap text.
+		/// </summary>
 		NoWrap,
-		/// <include file="../../docs/Microsoft.Maui/LineBreakMode.xml" path="//Member[@MemberName='WordWrap']/Docs/*" />
+
+		/// <summary>
+		/// Wrap at word boundaries.
+		/// </summary>
 		WordWrap,
-		/// <include file="../../docs/Microsoft.Maui/LineBreakMode.xml" path="//Member[@MemberName='CharacterWrap']/Docs/*" />
+
+		/// <summary>
+		/// Wrap at character boundaries.
+		/// </summary>
 		CharacterWrap,
-		/// <include file="../../docs/Microsoft.Maui/LineBreakMode.xml" path="//Member[@MemberName='HeadTruncation']/Docs/*" />
+
+		/// <summary>
+		/// Truncate the head of text.
+		/// </summary>
 		HeadTruncation,
-		/// <include file="../../docs/Microsoft.Maui/LineBreakMode.xml" path="//Member[@MemberName='TailTruncation']/Docs/*" />
+
+		/// <summary>
+		/// Truncate the tail of text.
+		/// </summary>
 		TailTruncation,
-		/// <include file="../../docs/Microsoft.Maui/LineBreakMode.xml" path="//Member[@MemberName='MiddleTruncation']/Docs/*" />
+
+		/// <summary>
+		/// Truncate the middle of text. This may be done, for example, by replacing it with an ellipsis.
+		/// </summary>
 		MiddleTruncation
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Primitives/ReturnType.cs b/src/Core/src/Primitives/ReturnType.cs
index ec318a1e43df..de752f198c83 100644
--- a/src/Core/src/Primitives/ReturnType.cs
+++ b/src/Core/src/Primitives/ReturnType.cs
@@ -1,21 +1,39 @@
-using System;
-
 namespace Microsoft.Maui
 {
-	/// <include file="../../docs/Microsoft.Maui/ReturnType.xml" path="Type[@FullName='Microsoft.Maui.ReturnType']/Docs/*" />
+	/// <summary>
+	/// Enumerates return button styles.
+	/// Typically the operating system on-screen keyboard will visually style the return key based on this value.
+	/// </summary>
 	public enum ReturnType
 	{
-		/// <include file="../../docs/Microsoft.Maui/ReturnType.xml" path="//Member[@MemberName='Default']/Docs/*" />
+		/// <summary>
+		/// Indicates the default style on the platform.
+		/// </summary>
 		Default,
-		/// <include file="../../docs/Microsoft.Maui/ReturnType.xml" path="//Member[@MemberName='Done']/Docs/*" />
+
+		/// <summary>
+		/// Indicates a "Done" button.
+		/// </summary>
 		Done,
-		/// <include file="../../docs/Microsoft.Maui/ReturnType.xml" path="//Member[@MemberName='Go']/Docs/*" />
+
+		/// <summary>
+		/// Indicates a "Go" button.
+		/// </summary>
 		Go,
-		/// <include file="../../docs/Microsoft.Maui/ReturnType.xml" path="//Member[@MemberName='Next']/Docs/*" />
+		
+		/// <summary>
+		/// Indicates a "Next" button. 
+		/// </summary>
 		Next,
-		/// <include file="../../docs/Microsoft.Maui/ReturnType.xml" path="//Member[@MemberName='Search']/Docs/*" />
+
+		/// <summary>
+		/// Indicates a "Search" button.
+		/// </summary>
 		Search,
-		/// <include file="../../docs/Microsoft.Maui/ReturnType.xml" path="//Member[@MemberName='Send']/Docs/*" />
+		
+		/// <summary>
+		/// Indicates a "Send" button.
+		/// </summary>
 		Send,
 	}
 }
diff --git a/src/Core/src/Primitives/TextTransform.cs b/src/Core/src/Primitives/TextTransform.cs
index 91f9ca445ff7..bf8b687d561b 100644
--- a/src/Core/src/Primitives/TextTransform.cs
+++ b/src/Core/src/Primitives/TextTransform.cs
@@ -1,15 +1,28 @@
 namespace Microsoft.Maui
 {
-	/// <include file="../../docs/Microsoft.Maui/TextTransform.xml" path="Type[@FullName='Microsoft.Maui.TextTransform']/Docs/*" />
+	/// <summary>
+	/// Enumerates values that determine the text transformation on an element.
+	/// </summary>
 	public enum TextTransform
 	{
-		/// <include file="../../docs/Microsoft.Maui/TextTransform.xml" path="//Member[@MemberName='None']/Docs/*" />
+		/// <summary>
+		/// No text transformation is applied.
+		/// </summary>
 		None = 0,
-		/// <include file="../../docs/Microsoft.Maui/TextTransform.xml" path="//Member[@MemberName='Default']/Docs/*" />
+
+		/// <summary>
+		/// The default text transformation is applied.
+		/// </summary>
 		Default,
-		/// <include file="../../docs/Microsoft.Maui/TextTransform.xml" path="//Member[@MemberName='Lowercase']/Docs/*" />
+
+		/// <summary>
+		/// The text will be transformed into lowercase.
+		/// </summary>
 		Lowercase,
-		/// <include file="../../docs/Microsoft.Maui/TextTransform.xml" path="//Member[@MemberName='Uppercase']/Docs/*" />
+
+		/// <summary>
+		/// The text will be transformed into uppercase.
+		/// </summary>
 		Uppercase
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Primitives/Thickness.cs b/src/Core/src/Primitives/Thickness.cs
index b1d46fef15ec..774eec664638 100644
--- a/src/Core/src/Primitives/Thickness.cs
+++ b/src/Core/src/Primitives/Thickness.cs
@@ -31,7 +31,6 @@ public struct Thickness
 		/// <include file="../../docs/Microsoft.Maui/Thickness.xml" path="//Member[@MemberName='IsEmpty']/Docs/*" />
 		public bool IsEmpty => Left == 0 && Top == 0 && Right == 0 && Bottom == 0;
 
-		/// <include file="../../docs/Microsoft.Maui/Thickness.xml" path="//Member[@MemberName='IsNaN']/Docs/*" />
 		public bool IsNaN => double.IsNaN(Left) && double.IsNaN(Top) && double.IsNaN(Right) && double.IsNaN(Bottom);
 
 		/// <include file="../../docs/Microsoft.Maui/Thickness.xml" path="//Member[@MemberName='.ctor'][1]/Docs/*" />
@@ -108,7 +107,6 @@ public void Deconstruct(out double left, out double top, out double right, out d
 			bottom = Bottom;
 		}
 
-		/// <include file="../../docs/Microsoft.Maui/Thickness.xml" path="//Member[@MemberName='Zero']/Docs/*" />
 		public static Thickness Zero = new Thickness(0);
 
 		public static Thickness operator +(Thickness left, double addend) =>
@@ -120,4 +118,4 @@ public void Deconstruct(out double left, out double top, out double right, out d
 		public static Thickness operator -(Thickness left, double addend) =>
 			left + (-addend);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Core/src/VisualDiagnostics/VisualDiagnostics.cs b/src/Core/src/VisualDiagnostics/VisualDiagnostics.cs
index a55711b3533e..a054b1cb0877 100644
--- a/src/Core/src/VisualDiagnostics/VisualDiagnostics.cs
+++ b/src/Core/src/VisualDiagnostics/VisualDiagnostics.cs
@@ -10,7 +10,6 @@
 
 namespace Microsoft.Maui
 {
-	/// <include file="../../docs/Microsoft.Maui/VisualDiagnostics.xml" path="Type[@FullName='Microsoft.Maui.VisualDiagnostics']/Docs/*" />
 	public static class VisualDiagnostics
 	{
 		static ConditionalWeakTable<object, SourceInfo> sourceInfos = new ConditionalWeakTable<object, SourceInfo>();
@@ -37,7 +36,6 @@ public static void RegisterSourceInfo(object target, Uri uri, int lineNumber, in
 		public static SourceInfo? GetSourceInfo(object obj) =>
 			sourceInfos.TryGetValue(obj, out var sourceinfo) ? sourceinfo : null;
 
-		/// <include file="../../docs/Microsoft.Maui/VisualDiagnostics.xml" path="//Member[@MemberName='OnChildAdded'][1]/Docs/*" />
 		public static void OnChildAdded(IVisualTreeElement parent, IVisualTreeElement child)
 		{
 			if (!DebuggerHelper.DebuggerIsAttached)
@@ -51,7 +49,6 @@ public static void OnChildAdded(IVisualTreeElement parent, IVisualTreeElement ch
 			OnChildAdded(parent, child, index);
 		}
 
-		/// <include file="../../docs/Microsoft.Maui/VisualDiagnostics.xml" path="//Member[@MemberName='OnChildAdded'][2]/Docs/*" />
 		public static void OnChildAdded(IVisualTreeElement? parent, IVisualTreeElement child, int newLogicalIndex)
 		{
 			if (!DebuggerHelper.DebuggerIsAttached)
@@ -63,7 +60,6 @@ public static void OnChildAdded(IVisualTreeElement? parent, IVisualTreeElement c
 			OnVisualTreeChanged(new VisualTreeChangeEventArgs(parent, child, newLogicalIndex, VisualTreeChangeType.Add));
 		}
 
-		/// <include file="../../docs/Microsoft.Maui/VisualDiagnostics.xml" path="//Member[@MemberName='OnChildRemoved']/Docs/*" />
 		public static void OnChildRemoved(IVisualTreeElement parent, IVisualTreeElement child, int oldLogicalIndex)
 		{
 			if (!DebuggerHelper.DebuggerIsAttached)
diff --git a/src/Core/src/VisualDiagnostics/VisualTreeChangeEventArgs.cs b/src/Core/src/VisualDiagnostics/VisualTreeChangeEventArgs.cs
index 0c03da046e86..2b819a22bb73 100644
--- a/src/Core/src/VisualDiagnostics/VisualTreeChangeEventArgs.cs
+++ b/src/Core/src/VisualDiagnostics/VisualTreeChangeEventArgs.cs
@@ -5,7 +5,6 @@
 
 namespace Microsoft.Maui
 {
-	/// <include file="../../docs/Microsoft.Maui/VisualTreeChangeEventArgs.xml" path="Type[@FullName='Microsoft.Maui.VisualTreeChangeEventArgs']/Docs/*" />
 	public class VisualTreeChangeEventArgs : EventArgs
 	{
 		public VisualTreeChangeEventArgs(object? parent, object child, int childIndex, VisualTreeChangeType changeType)
diff --git a/src/Core/src/WeakEventManager.cs b/src/Core/src/WeakEventManager.cs
index 9ee193c58f13..8c5ea0f5e6fb 100644
--- a/src/Core/src/WeakEventManager.cs
+++ b/src/Core/src/WeakEventManager.cs
@@ -25,7 +25,6 @@ public void AddEventHandler<TEventArgs>(EventHandler<TEventArgs> handler, [Calle
 			AddEventHandler(eventName, handler.Target, handler.GetMethodInfo());
 		}
 
-		/// <include file="../docs/Microsoft.Maui/WeakEventManager.xml" path="//Member[@MemberName='AddEventHandler'][2]/Docs/*" />
 		public void AddEventHandler(Delegate? handler, [CallerMemberName] string eventName = "")
 		{
 			if (IsNullOrEmpty(eventName))
@@ -92,7 +91,6 @@ public void RemoveEventHandler<TEventArgs>(EventHandler<TEventArgs> handler, [Ca
 			RemoveEventHandler(eventName, handler.Target, handler.GetMethodInfo());
 		}
 
-		/// <include file="../docs/Microsoft.Maui/WeakEventManager.xml" path="//Member[@MemberName='RemoveEventHandler'][2]/Docs/*" />
 		public void RemoveEventHandler(Delegate? handler, [CallerMemberName] string eventName = "")
 		{
 			if (IsNullOrEmpty(eventName))
@@ -148,9 +146,7 @@ public Subscription(WeakReference? subscriber, MethodInfo handler)
 				Handler = handler ?? throw new ArgumentNullException(nameof(handler));
 			}
 
-			/// <include file="../docs/Microsoft.Maui/WeakEventManager.xml" path="//Member[@MemberName='Subscriber']/Docs/*" />
 			public readonly WeakReference? Subscriber;
-			/// <include file="../docs/Microsoft.Maui/WeakEventManager.xml" path="//Member[@MemberName='Handler']/Docs/*" />
 			public readonly MethodInfo Handler;
 		}
 	}
diff --git a/src/Essentials/src/AppActions/AppActions.shared.cs b/src/Essentials/src/AppActions/AppActions.shared.cs
index 04acc2629ab7..ebfa6592cae2 100755
--- a/src/Essentials/src/AppActions/AppActions.shared.cs
+++ b/src/Essentials/src/AppActions/AppActions.shared.cs
@@ -46,7 +46,6 @@ public static Task SetAsync(params AppAction[] actions)
 		public static Task SetAsync(IEnumerable<AppAction> actions)
 			=> Current.SetAsync(actions);
 
-		/// <include file="../../docs/Microsoft.Maui.Essentials/AppActions.xml" path="//Member[@MemberName='OnAppAction'][2]/Docs/*" />
 		public static event EventHandler<AppActionEventArgs>? OnAppAction
 		{
 			add => Current.AppActionActivated += value;
diff --git a/src/Essentials/src/Compass/Compass.shared.cs b/src/Essentials/src/Compass/Compass.shared.cs
index b3e1bb317985..742fbe366099 100644
--- a/src/Essentials/src/Compass/Compass.shared.cs
+++ b/src/Essentials/src/Compass/Compass.shared.cs
@@ -176,7 +176,6 @@ public void Start(SensorSpeed sensorSpeed, bool applyLowPassFilter)
 			}
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Essentials/Compass.xml" path="//Member[@MemberName='Stop'][2]/Docs/*" />
 		public void Stop()
 		{
 			if (!PlatformIsSupported)
diff --git a/src/Essentials/src/DeviceDisplay/DeviceDisplay.shared.cs b/src/Essentials/src/DeviceDisplay/DeviceDisplay.shared.cs
index 1b61fab2b1ef..e38907db2cb1 100644
--- a/src/Essentials/src/DeviceDisplay/DeviceDisplay.shared.cs
+++ b/src/Essentials/src/DeviceDisplay/DeviceDisplay.shared.cs
@@ -54,7 +54,6 @@ public static event EventHandler<DisplayInfoChangedEventArgs> MainDisplayInfoCha
 		public static IDeviceDisplay Current =>
 			currentImplementation ??= new DeviceDisplayImplementation();
 
-		/// <include file="../../docs/Microsoft.Maui.Essentials/DeviceDisplay.xml" path="//Member[@MemberName='SetCurrent']/Docs/*" />
 		internal static void SetCurrent(IDeviceDisplay? implementation) =>
 			currentImplementation = implementation;
 	}
@@ -130,4 +129,4 @@ protected void OnMainDisplayInfoChanged()
 
 		protected abstract void StopScreenMetricsListeners();
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Essentials/src/Magnetometer/Magnetometer.shared.cs b/src/Essentials/src/Magnetometer/Magnetometer.shared.cs
index 78190ac20172..6f1942c16da3 100644
--- a/src/Essentials/src/Magnetometer/Magnetometer.shared.cs
+++ b/src/Essentials/src/Magnetometer/Magnetometer.shared.cs
@@ -138,7 +138,6 @@ public void Start(SensorSpeed sensorSpeed)
 			}
 		}
 
-		/// <include file="../../docs/Microsoft.Maui.Essentials/Magnetometer.xml" path="//Member[@MemberName='Stop'][2]/Docs/*" />
 		public void Stop()
 		{
 			if (!PlatformIsSupported)
diff --git a/src/Essentials/src/Permissions/Permissions.shared.cs b/src/Essentials/src/Permissions/Permissions.shared.cs
index 34b5a11e9716..02ef4a4bafe4 100644
--- a/src/Essentials/src/Permissions/Permissions.shared.cs
+++ b/src/Essentials/src/Permissions/Permissions.shared.cs
@@ -5,17 +5,14 @@ namespace Microsoft.Maui.ApplicationModel
 	/// <include file="../../docs/Microsoft.Maui.Essentials/Permissions.xml" path="Type[@FullName='Microsoft.Maui.Essentials.Permissions']/Docs/*" />
 	public static partial class Permissions
 	{
-		/// <include file="../../docs/Microsoft.Maui.Essentials/Permissions.xml" path="//Member[@MemberName='CheckStatusAsync']/Docs/*" />
 		public static Task<PermissionStatus> CheckStatusAsync<TPermission>()
 			where TPermission : BasePermission, new() =>
 				new TPermission().CheckStatusAsync();
 
-		/// <include file="../../docs/Microsoft.Maui.Essentials/Permissions.xml" path="//Member[@MemberName='RequestAsync']/Docs/*" />
 		public static Task<PermissionStatus> RequestAsync<TPermission>()
 			where TPermission : BasePermission, new() =>
 				new TPermission().RequestAsync();
 
-		/// <include file="../../docs/Microsoft.Maui.Essentials/Permissions.xml" path="//Member[@MemberName='ShouldShowRationale']/Docs/*" />
 		public static bool ShouldShowRationale<TPermission>()
 			where TPermission : BasePermission, new() =>
 				new TPermission().ShouldShowRationale();
diff --git a/src/Essentials/src/Screenshot/Screenshot.shared.cs b/src/Essentials/src/Screenshot/Screenshot.shared.cs
index 4f3e944f4db4..013823d89157 100644
--- a/src/Essentials/src/Screenshot/Screenshot.shared.cs
+++ b/src/Essentials/src/Screenshot/Screenshot.shared.cs
@@ -45,7 +45,6 @@ public interface IScreenshotResult
 		Task<Stream> OpenReadAsync(ScreenshotFormat format = ScreenshotFormat.Png, int quality = 100);
 #pragma warning restore CS1573 // Parameter has no matching param tag in the XML comment (but other parameters do)
 
-		/// <include file="../../docs/Microsoft.Maui.Essentials/IScreenshotResult.xml" path="//Member[@MemberName='CopyToAsync']/Docs/*" />
 		Task CopyToAsync(Stream destination, ScreenshotFormat format = ScreenshotFormat.Png, int quality = 100);
 	}
 
diff --git a/src/Essentials/src/SecureStorage/SecureStorage.shared.cs b/src/Essentials/src/SecureStorage/SecureStorage.shared.cs
index 967482931cdf..8ccf7b4c46ce 100644
--- a/src/Essentials/src/SecureStorage/SecureStorage.shared.cs
+++ b/src/Essentials/src/SecureStorage/SecureStorage.shared.cs
@@ -31,7 +31,6 @@ public static partial class SecureStorage
 		public static Task<string> GetAsync(string key) =>
 			Current.GetAsync(key);
 
-		/// <include file="../../docs/Microsoft.Maui.Essentials/SecureStorage.xml" path="//Member[@MemberName='SetAsync'][0 and position()=0]/Docs/*" />
 		public static Task SetAsync(string key, string value) =>
 			Current.SetAsync(key, value);
 
diff --git a/src/Essentials/src/Types/Contact.shared.cs b/src/Essentials/src/Types/Contact.shared.cs
index 1169d5f7652d..0dd6141b45ee 100644
--- a/src/Essentials/src/Types/Contact.shared.cs
+++ b/src/Essentials/src/Types/Contact.shared.cs
@@ -81,7 +81,6 @@ string BuildDisplayName()
 		}
 	}
 
-	/// <include file="../../docs/Microsoft.Maui.Essentials/ContactEmail.xml" path="Type[@FullName='Microsoft.Maui.ApplicationModel.CommunicationEmail']/Docs/*" />
 	public class ContactEmail
 	{
 		/// <include file="../../docs/Microsoft.Maui.Essentials/ContactEmail.xml" path="//Member[@MemberName='.ctor'][1]/Docs/*" />
@@ -102,7 +101,6 @@ public ContactEmail(string emailAddress)
 		public override string ToString() => EmailAddress;
 	}
 
-	/// <include file="../../docs/Microsoft.Maui.Essentials/ContactPhone.xml" path="Type[@FullName='Microsoft.Maui.ApplicationModel.CommunicationPhone']/Docs/*" />
 	public class ContactPhone
 	{
 		/// <include file="../../docs/Microsoft.Maui.Essentials/ContactPhone.xml" path="//Member[@MemberName='.ctor'][1]/Docs/*" />
diff --git a/src/Essentials/src/WebAuthenticator/WebAuthenticator.shared.cs b/src/Essentials/src/WebAuthenticator/WebAuthenticator.shared.cs
index b592d2e973f1..4ccc1af72966 100644
--- a/src/Essentials/src/WebAuthenticator/WebAuthenticator.shared.cs
+++ b/src/Essentials/src/WebAuthenticator/WebAuthenticator.shared.cs
@@ -25,7 +25,6 @@ public static class WebAuthenticator
 		public static Task<WebAuthenticatorResult> AuthenticateAsync(Uri url, Uri callbackUrl)
 			=> Current.AuthenticateAsync(url, callbackUrl);
 
-		/// <include file="../../docs/Microsoft.Maui.Essentials/WebAuthenticator.xml" path="//Member[@MemberName='AuthenticateAsync'][2]/Docs/*" />
 		public static Task<WebAuthenticatorResult> AuthenticateAsync(WebAuthenticatorOptions webAuthenticatorOptions)
 			=> Current.AuthenticateAsync(webAuthenticatorOptions);
 

From a0f8641bdd7959578603f1e35d48d5bfca19d4ee Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 25 Oct 2022 11:20:06 +0100
Subject: [PATCH 35/77] [create-pull-request] automated change (#10879)

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

diff --git a/src/Essentials/src/Screenshot/Screenshot.android.cs b/src/Essentials/src/Screenshot/Screenshot.android.cs
index f07ca44834f3..b34425ae9205 100644
--- a/src/Essentials/src/Screenshot/Screenshot.android.cs
+++ b/src/Essentials/src/Screenshot/Screenshot.android.cs
@@ -44,7 +44,7 @@ public Task<IScreenshotResult> CaptureAsync(View view)
 			_ = view ?? throw new ArgumentNullException(nameof(view));
 
 			var bitmap = Render(view);
-			var result = bitmap is null ? null :  new ScreenshotResult(bitmap);
+			var result = bitmap is null ? null : new ScreenshotResult(bitmap);
 
 			return Task.FromResult<IScreenshotResult>(result);
 		}

From 88c5f80d16d8cb68f0119b4f6239b23cce2ba91c Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 25 Oct 2022 12:26:24 +0200
Subject: [PATCH 36/77] Update Versions.props (#10871)

---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 97080bdd7339..fef263ce7531 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <!-- Current previous .NET SDK major version's stable release of MAUI packages -->
-    <MicrosoftMauiPreviousDotNetReleasedVersion>6.0.544</MicrosoftMauiPreviousDotNetReleasedVersion>
+    <MicrosoftMauiPreviousDotNetReleasedVersion>6.0.545</MicrosoftMauiPreviousDotNetReleasedVersion>
     <!-- dotnet/installer -->
     <MicrosoftDotnetSdkInternalPackageVersion>7.0.100-rtm.22519.39</MicrosoftDotnetSdkInternalPackageVersion>
     <!-- dotnet/runtime -->

From 0ee1bf0094b7d568c72bf881239a43c0a83a8c1d Mon Sep 17 00:00:00 2001
From: Gerald Versluis <gerald.versluis@microsoft.com>
Date: Tue, 25 Oct 2022 13:33:12 +0200
Subject: [PATCH 37/77] Minor API doc fixes

---
 src/Controls/src/Core/Button.cs             | 42 +++++++++++++++------
 src/Controls/src/Core/Entry.cs              |  2 +-
 src/Core/src/Animations/Animation.cs        |  5 ++-
 src/Core/src/Animations/AnimationManager.cs |  6 ++-
 src/Core/src/Animations/LerpingAnimation.cs | 30 ++++++++++++++-
 src/Core/src/Fonts/FontRegistrar.cs         |  2 +-
 src/Core/src/Fonts/IEmbeddedFontLoader.cs   |  2 +-
 src/Core/src/Fonts/IFontRegistrar.cs        | 10 ++---
 8 files changed, 74 insertions(+), 25 deletions(-)

diff --git a/src/Controls/src/Core/Button.cs b/src/Controls/src/Core/Button.cs
index dcf49ca50dc1..050df0167dd9 100644
--- a/src/Controls/src/Core/Button.cs
+++ b/src/Controls/src/Core/Button.cs
@@ -15,7 +15,9 @@ public partial class Button : View, IFontElement, ITextElement, IBorderElement,
 	{
 		const double DefaultSpacing = 10;
 
-		/// <inheritdoc cref="ButtonElement.CommandProperty"/>
+		/// <summary>
+		/// The backing store for the <see cref="Command" /> bindable property.
+		/// </summary>
 		public static readonly BindableProperty CommandProperty = ButtonElement.CommandProperty;
 
 		/// <summary>
@@ -37,22 +39,34 @@ public partial class Button : View, IFontElement, ITextElement, IBorderElement,
 			nameof(Text), typeof(string), typeof(Button), null,
 			propertyChanged: (bindable, oldVal, newVal) => ((Button)bindable).InvalidateMeasureInternal(InvalidationTrigger.MeasureChanged));
 
-		/// <inheritdoc cref="TextElement.TextColorProperty"/>
+		/// <summary>
+		/// The backing store for the <see cref="TextColor" /> bindable property.
+		/// </summary>
 		public static readonly BindableProperty TextColorProperty = TextElement.TextColorProperty;
 
-		/// <inheritdoc cref="TextElement.CharacterSpacingProperty"/>
+		/// <summary>
+		/// The backing store for the <see cref="CharacterSpacing" /> bindable property.
+		/// </summary>
 		public static readonly BindableProperty CharacterSpacingProperty = TextElement.CharacterSpacingProperty;
 
-		/// <inheritdoc cref="FontElement.FontFamilyProperty"/>
+		/// <summary>
+		/// The backing store for the <see cref="FontFamily" /> bindable property.
+		/// </summary>
 		public static readonly BindableProperty FontFamilyProperty = FontElement.FontFamilyProperty;
 
-		/// <inheritdoc cref="FontElement.FontSizeProperty"/>
+		/// <summary>
+		/// The backing store for the <see cref="FontSize" /> bindable property.
+		/// </summary>
 		public static readonly BindableProperty FontSizeProperty = FontElement.FontSizeProperty;
 
-		/// <inheritdoc cref="TextElement.TextTransformProperty"/>
+		/// <summary>
+		/// The backing store for the <see cref="TextTransform" /> bindable property.
+		/// </summary>
 		public static readonly BindableProperty TextTransformProperty = TextElement.TextTransformProperty;
 
-		/// <inheritdoc cref="FontElement.FontAttributesProperty"/>
+		/// <summary>
+		/// The backing store for the <see cref="FontAttributes" /> bindable property.
+		/// </summary>
 		public static readonly BindableProperty FontAttributesProperty = FontElement.FontAttributesProperty;
 
 		/// <inheritdoc cref="FontElement.FontAutoScalingEnabledProperty"/>
@@ -63,7 +77,9 @@ public partial class Button : View, IFontElement, ITextElement, IBorderElement,
 		/// </summary>
 		public static readonly BindableProperty BorderWidthProperty = BindableProperty.Create(nameof(BorderWidth), typeof(double), typeof(Button), -1d);
 
-		/// <inheritdoc cref="BorderElement.BorderColorProperty"/>
+		/// <summary>
+		/// The backing store for the <see cref="BorderColor" /> bindable property.
+		/// </summary>
 		public static readonly BindableProperty BorderColorProperty = BorderElement.BorderColorProperty;
 
 		/// <summary>
@@ -71,10 +87,14 @@ public partial class Button : View, IFontElement, ITextElement, IBorderElement,
 		/// </summary>
 		public static readonly BindableProperty CornerRadiusProperty = BindableProperty.Create(nameof(CornerRadius), typeof(int), typeof(Button), defaultValue: BorderElement.DefaultCornerRadius);
 
-		/// <inheritdoc cref="ImageElement.ImageSourceProperty"/>
+		/// <summary>
+		/// The backing store for the <see cref="ImageSource" /> bindable property.
+		/// </summary>
 		public static readonly BindableProperty ImageSourceProperty = ImageElement.ImageSourceProperty;
 
-		/// <inheritdoc cref="PaddingElement.PaddingProperty"/>
+		/// <summary>
+		/// The backing store for the <see cref="Padding" /> bindable property.
+		/// </summary>
 		public static readonly BindableProperty PaddingProperty = PaddingElement.PaddingProperty;
 
 		/// <summary>
@@ -110,7 +130,6 @@ void IPaddingElement.OnPaddingPropertyChanged(Thickness oldValue, Thickness newV
 			InvalidateMeasureInternal(InvalidationTrigger.MeasureChanged);
 		}
 
-
 		internal static readonly BindablePropertyKey IsPressedPropertyKey = BindableProperty.CreateReadOnly(nameof(IsPressed), typeof(bool), typeof(Button), default(bool));
 		
 		/// <summary>
@@ -118,7 +137,6 @@ void IPaddingElement.OnPaddingPropertyChanged(Thickness oldValue, Thickness newV
 		/// </summary>
 		public static readonly BindableProperty IsPressedProperty = IsPressedPropertyKey.BindableProperty;
 
-
 		readonly Lazy<PlatformConfigurationRegistry<Button>> _platformConfigurationRegistry;
 
 		/// <summary>
diff --git a/src/Controls/src/Core/Entry.cs b/src/Controls/src/Core/Entry.cs
index dfec86cc7216..2f3a3c125cb6 100644
--- a/src/Controls/src/Core/Entry.cs
+++ b/src/Controls/src/Core/Entry.cs
@@ -49,7 +49,7 @@ public partial class Entry : InputView, IFontElement, ITextAlignmentElement, IEn
 		public new static readonly BindableProperty CharacterSpacingProperty = InputView.CharacterSpacingProperty;
 
 		/// <summary>
-		/// Backing store for the <see cref="TextAlignmentElement.HorizontalTextAlignmentProperty"/> property.
+		/// Backing store for the <see cref="HorizontalTextAlignment"/> property.
 		/// </summary>
 		public static readonly BindableProperty HorizontalTextAlignmentProperty = TextAlignmentElement.HorizontalTextAlignmentProperty;
 
diff --git a/src/Core/src/Animations/Animation.cs b/src/Core/src/Animations/Animation.cs
index ddab9c57ea96..958a18d16d00 100644
--- a/src/Core/src/Animations/Animation.cs
+++ b/src/Core/src/Animations/Animation.cs
@@ -344,12 +344,13 @@ public void RemoveFromParent()
 				view?.RemoveAnimation(this);
 		}
 
-		/// <inheritdoc/>
+		/// <summary>
+		/// Gets a value that specifies if this animation has been disposed.
+		/// </summary>
 		public bool IsDisposed => _disposedValue;
 
 		private bool _disposedValue = false; // To detect redundant calls
 
-		/// <inheritdoc/>
 		protected virtual void Dispose(bool disposing)
 		{
 			if (!_disposedValue)
diff --git a/src/Core/src/Animations/AnimationManager.cs b/src/Core/src/Animations/AnimationManager.cs
index e9494b521936..3f72c551821c 100644
--- a/src/Core/src/Animations/AnimationManager.cs
+++ b/src/Core/src/Animations/AnimationManager.cs
@@ -10,7 +10,10 @@ public class AnimationManager : IAnimationManager, IDisposable
 		long _lastUpdate;
 		bool _disposedValue;
 
-		/// <inheritdoc/>
+		/// <summary>
+		/// Instantiate a new <see cref="AnimationManager"/> object.
+		/// </summary>
+		/// <param name="ticker">An instance of <see cref="ITicker"/> that will be used to time the animations.</param>
 		public AnimationManager(ITicker ticker)
 		{
 			_lastUpdate = GetCurrentTick();
@@ -93,7 +96,6 @@ void OnAnimationTick(Animation animation)
 			}
 		}
 
-		/// <inheritdoc/>
 		protected virtual void Dispose(bool disposing)
 		{
 			if (!_disposedValue)
diff --git a/src/Core/src/Animations/LerpingAnimation.cs b/src/Core/src/Animations/LerpingAnimation.cs
index 285eacfba2e6..0dbd1e9120f9 100644
--- a/src/Core/src/Animations/LerpingAnimation.cs
+++ b/src/Core/src/Animations/LerpingAnimation.cs
@@ -3,6 +3,9 @@
 
 namespace Microsoft.Maui.Animations
 {
+	/// <summary>
+	/// Represents a linear interpolation animation.
+	/// </summary>
 	public class LerpingAnimation : Animation
 	{
 		/// <summary>
@@ -12,6 +15,14 @@ public LerpingAnimation()
 		{
 		}
 
+		/// <summary>
+		/// Instantiate a new <see cref="LerpingAnimation"/> object with the given parameters.
+		/// </summary>
+		/// <param name="callback">The <see cref="Action{T}"/> that is invoked after each tick of this animation.</param>
+		/// <param name="start">Specifies a delay (in seconds) taken into account before the animation starts.</param>
+		/// <param name="end">Specifies the duration that this animation should take in seconds.</param>
+		/// <param name="easing">The easing function to apply to this animation.</param>
+		/// <param name="finished">A callback <see cref="Action{T}"/> that is invoked after the animation has finished.</param>
 		public LerpingAnimation(Action<double> callback, double start = 0, double end = 1, Easing? easing = null, Action? finished = null) 
 			: base(callback, start, end, easing, finished)
 		{
@@ -26,9 +37,24 @@ public LerpingAnimation(List<Animation> animations)
 		{
 		}
 
+		/// <summary>
+		/// Gets or sets a callback that is invoked when <see cref="CurrentValue"/> is changed.
+		/// </summary>
 		public Action? ValueChanged { get; set; }
+
+		/// <summary>
+		/// Gets or sets the start value of this animation.
+		/// </summary>
 		public object? StartValue { get; set; }
+
+		/// <summary>
+		/// Gets or sets the end value of this animation.
+		/// </summary>
 		public object? EndValue { get; set; }
+
+		/// <summary>
+		/// Gets the current value for this animation.
+		/// </summary>
 		public object? CurrentValue
 		{
 			get => _currentValue;
@@ -43,7 +69,9 @@ protected set
 		Lerp? _lerp;
 		private object? _currentValue;
 
-
+		/// <summary>
+		/// Gets or sets the linear interpolation for this animation.
+		/// </summary>
 		public Lerp? Lerp
 		{
 			get
diff --git a/src/Core/src/Fonts/FontRegistrar.cs b/src/Core/src/Fonts/FontRegistrar.cs
index 889f0a9c7419..1e62c3189ced 100644
--- a/src/Core/src/Fonts/FontRegistrar.cs
+++ b/src/Core/src/Fonts/FontRegistrar.cs
@@ -7,7 +7,7 @@
 
 namespace Microsoft.Maui
 {
-	/// <inheritdoc/>
+	/// <inheritdoc cref="IFontRegistrar"/>
 	public partial class FontRegistrar : IFontRegistrar
 	{
 		readonly Dictionary<string, (string Filename, string? Alias, Assembly Assembly)> _embeddedFonts = new();
diff --git a/src/Core/src/Fonts/IEmbeddedFontLoader.cs b/src/Core/src/Fonts/IEmbeddedFontLoader.cs
index 08bf9f883013..1ed17291f841 100644
--- a/src/Core/src/Fonts/IEmbeddedFontLoader.cs
+++ b/src/Core/src/Fonts/IEmbeddedFontLoader.cs
@@ -9,7 +9,7 @@ public interface IEmbeddedFontLoader
 		/// <summary>
 		/// Load the font from the embedded resources.
 		/// </summary>
-		/// <param name="font">And <see cref="EmbeddedFont"/> object with the information on the font to load.</param>
+		/// <param name="font">A <see cref="EmbeddedFont"/> object with the information on the font to load.</param>
 		/// <returns>The font name if the font was loaded correctly, otherwise <see langword="null"/>.</returns>
 		// TODO: this should be async as it involves copying files
 		string? LoadFont(EmbeddedFont font);
diff --git a/src/Core/src/Fonts/IFontRegistrar.cs b/src/Core/src/Fonts/IFontRegistrar.cs
index ccd5b3cf02ab..e12a55f47f7a 100644
--- a/src/Core/src/Fonts/IFontRegistrar.cs
+++ b/src/Core/src/Fonts/IFontRegistrar.cs
@@ -19,15 +19,15 @@ public interface IFontRegistrar
 		/// <summary>
 		/// Registers a font in the app font cache.
 		/// </summary>
-		/// <param name="filename"></param>
-		/// <param name="alias"></param>
+		/// <param name="filename">The filename of the font to register.</param>
+		/// <param name="alias">An optional alias with which you can also refer to this font.</param>
 		void Register(string filename, string? alias);
 
 		/// <summary>
-		/// 
+		/// Retrieves the font for actual usages.
 		/// </summary>
-		/// <param name="font"></param>
-		/// <returns></returns>
+		/// <param name="font">The key with which the font is registered with the cache.</param>
+		/// <returns>The name of then font when it's found, otherwise <see langword="null"/>.</returns>
 		// TODO: this should be async as it involves copying files
 		string? GetFont(string font);
 	}

From 1f68a7037d8bbe16861e102959fc23542cc9c88f Mon Sep 17 00:00:00 2001
From: Gerald Versluis <gerald.versluis@microsoft.com>
Date: Tue, 25 Oct 2022 14:04:52 +0200
Subject: [PATCH 38/77] Minor XML doc fixes

---
 src/Controls/src/Core/Button.cs      | 4 +++-
 src/Core/src/Animations/Animation.cs | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Controls/src/Core/Button.cs b/src/Controls/src/Core/Button.cs
index 050df0167dd9..323049630144 100644
--- a/src/Controls/src/Core/Button.cs
+++ b/src/Controls/src/Core/Button.cs
@@ -69,7 +69,9 @@ public partial class Button : View, IFontElement, ITextElement, IBorderElement,
 		/// </summary>
 		public static readonly BindableProperty FontAttributesProperty = FontElement.FontAttributesProperty;
 
-		/// <inheritdoc cref="FontElement.FontAutoScalingEnabledProperty"/>
+		/// <summary>
+		/// The backing store for the <see cref="FontAutoScalingEnabled" /> bindable property.
+		/// </summary>
 		public static readonly BindableProperty FontAutoScalingEnabledProperty = FontElement.FontAutoScalingEnabledProperty;
 
 		/// <summary>
diff --git a/src/Core/src/Animations/Animation.cs b/src/Core/src/Animations/Animation.cs
index 958a18d16d00..9c2ea3f87d04 100644
--- a/src/Core/src/Animations/Animation.cs
+++ b/src/Core/src/Animations/Animation.cs
@@ -334,8 +334,8 @@ public void Resume()
 		}
 
 		/// <summary>
-		/// Removes this animation from it's <see cref="Parent"/>.
-		/// If there is no <see cref="Parent"/>, nothing will happen.
+		/// Removes this animation from it's parent.
+		/// If there is no parent, nothing will happen.
 		/// </summary>
 		public void RemoveFromParent()
 		{

From d7c69e5680975a28962e9ddf1272545caf080d62 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 25 Oct 2022 14:33:48 +0100
Subject: [PATCH 39/77] [net7.0] Update dependencies from
 xamarin/xamarin-macios (#10878)

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221024.17

Microsoft.iOS.Sdk
 From Version 16.0.1470 -> To Version 16.0.1471

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221024.17

Microsoft.tvOS.Sdk
 From Version 16.0.1470 -> To Version 16.0.1471

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221025.1

Microsoft.iOS.Sdk
 From Version 16.0.1470 -> To Version 16.0.1472

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221025.1

Microsoft.tvOS.Sdk
 From Version 16.0.1470 -> To Version 16.0.1472

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221025.4

Microsoft.macOS.Sdk
 From Version 12.3.2366 -> To Version 12.3.2367

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221025.4

Microsoft.MacCatalyst.Sdk
 From Version 15.4.2366 -> To Version 15.4.2367

* Update NuGet.config

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Rui Marinho <me@ruimarinho.net>
---
 eng/Version.Details.xml | 16 ++++++++--------
 eng/Versions.props      |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index ef0ae8549261..c08f13a89f1c 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -12,21 +12,21 @@
       <Uri>https://github.com/xamarin/xamarin-android</Uri>
       <Sha>8f1d9a47205ead80132661f68b0cee9ed0e0220b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.4.2366">
+    <Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.4.2367">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>bf2c75cdfd53558b2a25de623cd4e7cb1d60a496</Sha>
+      <Sha>42be8a5bba623032464c79823ebf4a187dd656fd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.macOS.Sdk" Version="12.3.2366">
+    <Dependency Name="Microsoft.macOS.Sdk" Version="12.3.2367">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>bf2c75cdfd53558b2a25de623cd4e7cb1d60a496</Sha>
+      <Sha>42be8a5bba623032464c79823ebf4a187dd656fd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.iOS.Sdk" Version="16.0.1470">
+    <Dependency Name="Microsoft.iOS.Sdk" Version="16.0.1472">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>ded7fcc2b795c76190faf07c33e1e8f83d17355c</Sha>
+      <Sha>4876d7bea50e2258f4167b07eabbcd88129ff171</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.tvOS.Sdk" Version="16.0.1470">
+    <Dependency Name="Microsoft.tvOS.Sdk" Version="16.0.1472">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>ded7fcc2b795c76190faf07c33e1e8f83d17355c</Sha>
+      <Sha>4876d7bea50e2258f4167b07eabbcd88129ff171</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.0-rtm.22504.3" CoherentParentDependency="Microsoft.NETCore.App.Ref">
       <Uri>https://github.com/dotnet/emsdk</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index fef263ce7531..e7529ab37a78 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -13,10 +13,10 @@
     <!-- xamarin/xamarin-android -->
     <MicrosoftAndroidSdkWindowsPackageVersion>33.0.4</MicrosoftAndroidSdkWindowsPackageVersion>
     <!-- xamarin/xamarin-macios -->
-    <MicrosoftMacCatalystSdkPackageVersion>15.4.2366</MicrosoftMacCatalystSdkPackageVersion>
-    <MicrosoftmacOSSdkPackageVersion>12.3.2366</MicrosoftmacOSSdkPackageVersion>
-    <MicrosoftiOSSdkPackageVersion>16.0.1470</MicrosoftiOSSdkPackageVersion>
-    <MicrosofttvOSSdkPackageVersion>16.0.1470</MicrosofttvOSSdkPackageVersion>
+    <MicrosoftMacCatalystSdkPackageVersion>15.4.2367</MicrosoftMacCatalystSdkPackageVersion>
+    <MicrosoftmacOSSdkPackageVersion>12.3.2367</MicrosoftmacOSSdkPackageVersion>
+    <MicrosoftiOSSdkPackageVersion>16.0.1472</MicrosoftiOSSdkPackageVersion>
+    <MicrosofttvOSSdkPackageVersion>16.0.1472</MicrosofttvOSSdkPackageVersion>
     <!-- Samsung/Tizen.NET -->
     <SamsungTizenSdkPackageVersion>7.0.100</SamsungTizenSdkPackageVersion>
     <!-- emsdk -->

From a3f78f42215b898757e71bc37484528707d553b9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 25 Oct 2022 14:39:11 +0100
Subject: [PATCH 40/77] Bump Xamarin.Google.Android.Material from 1.6.1.1 to
 1.7.0 (#10890)

Bumps [Xamarin.Google.Android.Material](https://github.com/xamarin/AndroidX) from 1.6.1.1 to 1.7.0.
- [Release notes](https://github.com/xamarin/AndroidX/releases)
- [Commits](https://github.com/xamarin/AndroidX/commits/20220705-stable-updates-kotlin-1.7.0)

---
updated-dependencies:
- dependency-name: Xamarin.Google.Android.Material
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

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

diff --git a/eng/AndroidX.targets b/eng/AndroidX.targets
index d59b6a90bc6b..773baf0d564d 100644
--- a/eng/AndroidX.targets
+++ b/eng/AndroidX.targets
@@ -50,7 +50,7 @@
     />
     <PackageReference
         Update="Xamarin.Google.Android.Material"
-        Version="1.6.1.1"
+        Version="1.7.0"
     />
     <PackageReference
         Update="Xamarin.AndroidX.Migration"

From 68942c41ec94a88c4e1b9a49dd5b6953014d5f41 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 25 Oct 2022 17:15:24 +0100
Subject: [PATCH 41/77] Update dependencies from
 https://github.com/xamarin/xamarin-macios build 20221025.16 (#10900)

Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk
 From Version 16.0.525 -> To Version 16.0.526

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

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 9eb42b303d1d..786c80a77273 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -16,13 +16,13 @@
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
       <Sha>10eff25d69496f01de7a1c213463efce4f4d6387</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.iOS.Sdk" Version="16.0.525">
+    <Dependency Name="Microsoft.iOS.Sdk" Version="16.0.526">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>dc7da0d737499409bed6be24c4a0f16683d7739e</Sha>
+      <Sha>a7025b0e1b5cb5d0bd34e29354f280c79f323054</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.tvOS.Sdk" Version="16.0.525">
+    <Dependency Name="Microsoft.tvOS.Sdk" Version="16.0.526">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>dc7da0d737499409bed6be24c4a0f16683d7739e</Sha>
+      <Sha>a7025b0e1b5cb5d0bd34e29354f280c79f323054</Sha>
     </Dependency>
     <Dependency Name="Microsoft.macOS.Sdk" Version="12.3.469">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 7edfbee6dae3..7c1fbef4fe0b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -11,10 +11,10 @@
     <!-- xamarin/xamarin-android -->
     <MicrosoftAndroidSdkWindowsPackageVersion>32.0.478</MicrosoftAndroidSdkWindowsPackageVersion>
     <!-- xamarin/xamarin-macios -->
-    <MicrosoftiOSSdkPackageVersion>16.0.525</MicrosoftiOSSdkPackageVersion>
+    <MicrosoftiOSSdkPackageVersion>16.0.526</MicrosoftiOSSdkPackageVersion>
     <MicrosoftMacCatalystSdkPackageVersion>15.4.469</MicrosoftMacCatalystSdkPackageVersion>
     <MicrosoftmacOSSdkPackageVersion>12.3.469</MicrosoftmacOSSdkPackageVersion>
-    <MicrosofttvOSSdkPackageVersion>16.0.525</MicrosofttvOSSdkPackageVersion>
+    <MicrosofttvOSSdkPackageVersion>16.0.526</MicrosofttvOSSdkPackageVersion>
     <!-- Samsung/Tizen.NET -->
     <SamsungTizenSdkPackageVersion>7.0.400-preview.1.0</SamsungTizenSdkPackageVersion>
     <!-- emsdk -->

From e97ecafad2f906df63deca22cfc416c2b61a9d21 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 25 Oct 2022 17:33:15 +0100
Subject: [PATCH 42/77] Bump Microsoft.CodeAnalysis.NetAnalyzers (#10891)

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

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

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

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

diff --git a/eng/Versions.props b/eng/Versions.props
index 78ff149718a6..afcd6ea75460 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -38,7 +38,7 @@
     <MicrosoftAspNetCoreMetadataPackageVersion>6.0.10</MicrosoftAspNetCoreMetadataPackageVersion>
     <MicrosoftJSInteropPackageVersion>6.0.10</MicrosoftJSInteropPackageVersion>
     <!-- Other packages -->
-    <MicrosoftCodeAnalysisNetAnalyzersVersion>7.0.0-preview1.22521.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
+    <MicrosoftCodeAnalysisNetAnalyzersVersion>7.0.0-preview1.22524.2</MicrosoftCodeAnalysisNetAnalyzersVersion>
     <MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.3.3</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
     <MicrosoftCodeAnalysisBannedApiAnalyzersVersion>3.3.3</MicrosoftCodeAnalysisBannedApiAnalyzersVersion>
     <MicrosoftMauiGraphicsVersion>6.0.501</MicrosoftMauiGraphicsVersion>

From ae930fd3f8f616298589540b81bea669750733a4 Mon Sep 17 00:00:00 2001
From: Rui Marinho <me@ruimarinho.net>
Date: Tue, 25 Oct 2022 18:37:22 +0100
Subject: [PATCH 43/77] Fix permissions

---
 .github/workflows/dotnet-autoformat-pr-push.yml | 4 ++++
 .github/workflows/dotnet-autoformat-pr.yml      | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/.github/workflows/dotnet-autoformat-pr-push.yml b/.github/workflows/dotnet-autoformat-pr-push.yml
index cc303d7bc767..36bbec44475a 100644
--- a/.github/workflows/dotnet-autoformat-pr-push.yml
+++ b/.github/workflows/dotnet-autoformat-pr-push.yml
@@ -5,6 +5,10 @@ on:
     types:
       - completed
 
+permissions:
+  pull-requests: write
+  contents: write
+  
 jobs:
   push-and-notify:
     name: Push autoformatted code and notify user
diff --git a/.github/workflows/dotnet-autoformat-pr.yml b/.github/workflows/dotnet-autoformat-pr.yml
index 51b49e6b3762..8333354d0072 100644
--- a/.github/workflows/dotnet-autoformat-pr.yml
+++ b/.github/workflows/dotnet-autoformat-pr.yml
@@ -1,6 +1,10 @@
 name: PR code format check
 on: pull_request
 
+# This action only need a single permission in order to autoformat the code.
+permissions:
+  contents: read
+  
 jobs:
   autoformat-code:
     name: code format check

From 2c6a8ab450b319991504b6c94cf97a6721940e2a Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 26 Oct 2022 00:16:48 +0100
Subject: [PATCH 44/77] [net6.0] Update dependencies from
 xamarin/xamarin-macios (#10906)

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221025.23

Microsoft.iOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.macOS.Sdk , Microsoft.tvOS.Sdk
 From Version 16.0.526 -> To Version 15.4.470

* Revert bumps for tvOS and iOS

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Rui Marinho <me@ruimarinho.net>
---
 eng/Version.Details.xml | 8 ++++----
 eng/Versions.props      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 786c80a77273..3581877386da 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -12,9 +12,9 @@
       <Uri>https://github.com/xamarin/xamarin-android</Uri>
       <Sha>28f788ced6282094aaf18fab26b47f7d1e6e88cd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.4.469">
+    <Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.4.470">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>10eff25d69496f01de7a1c213463efce4f4d6387</Sha>
+      <Sha>5d52b8bbdf09688cca31f17e6fcea45002059f9e</Sha>
     </Dependency>
     <Dependency Name="Microsoft.iOS.Sdk" Version="16.0.526">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
@@ -24,9 +24,9 @@
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
       <Sha>a7025b0e1b5cb5d0bd34e29354f280c79f323054</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.macOS.Sdk" Version="12.3.469">
+    <Dependency Name="Microsoft.macOS.Sdk" Version="12.3.470">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>10eff25d69496f01de7a1c213463efce4f4d6387</Sha>
+      <Sha>5d52b8bbdf09688cca31f17e6fcea45002059f9e</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.10" CoherentParentDependency="Microsoft.NETCore.App.Ref">
       <Uri>https://github.com/dotnet/emsdk</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 7c1fbef4fe0b..ff144e244698 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -12,8 +12,8 @@
     <MicrosoftAndroidSdkWindowsPackageVersion>32.0.478</MicrosoftAndroidSdkWindowsPackageVersion>
     <!-- xamarin/xamarin-macios -->
     <MicrosoftiOSSdkPackageVersion>16.0.526</MicrosoftiOSSdkPackageVersion>
-    <MicrosoftMacCatalystSdkPackageVersion>15.4.469</MicrosoftMacCatalystSdkPackageVersion>
-    <MicrosoftmacOSSdkPackageVersion>12.3.469</MicrosoftmacOSSdkPackageVersion>
+    <MicrosoftMacCatalystSdkPackageVersion>15.4.470</MicrosoftMacCatalystSdkPackageVersion>
+    <MicrosoftmacOSSdkPackageVersion>12.3.470</MicrosoftmacOSSdkPackageVersion>
     <MicrosofttvOSSdkPackageVersion>16.0.526</MicrosofttvOSSdkPackageVersion>
     <!-- Samsung/Tizen.NET -->
     <SamsungTizenSdkPackageVersion>7.0.400-preview.1.0</SamsungTizenSdkPackageVersion>

From e189169e4ec32d97a75cb410244689c5c858c47b Mon Sep 17 00:00:00 2001
From: Matt Johnson-Pint <mattjohnsonpint@gmail.com>
Date: Wed, 26 Oct 2022 01:10:14 -0700
Subject: [PATCH 45/77] Run Android tests on background thread (#10841)

---
 .../Android/MauiTestActivity.cs               | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/TestUtils/src/DeviceTests.Runners/HeadlessRunner/Android/MauiTestActivity.cs b/src/TestUtils/src/DeviceTests.Runners/HeadlessRunner/Android/MauiTestActivity.cs
index 06168ab271ea..f0dc9ff8720c 100644
--- a/src/TestUtils/src/DeviceTests.Runners/HeadlessRunner/Android/MauiTestActivity.cs
+++ b/src/TestUtils/src/DeviceTests.Runners/HeadlessRunner/Android/MauiTestActivity.cs
@@ -11,24 +11,28 @@ public abstract class MauiTestActivity : AppCompatActivity
 	{
 		public TaskCompletionSource<Bundle> TaskCompletionSource { get; } = new TaskCompletionSource<Bundle>();
 
-		protected override async void OnCreate(Bundle? savedInstanceState)
+		protected override void OnCreate(Bundle? savedInstanceState)
 		{
 			base.OnCreate(savedInstanceState);
 
-			try
-			{
-				var runner = MauiTestInstrumentation.Current.Services.GetRequiredService<HeadlessTestRunner>();
+			// Do the work on the background thread to avoid a keyDispatchingTimedOut ANR
+            Task.Run(async () =>
+            { 
+				try
+				{
+					var runner = MauiTestInstrumentation.Current.Services.GetRequiredService<HeadlessTestRunner>();
 
-				var bundle = await runner.RunTestsAsync();
+					var bundle = await runner.RunTestsAsync();
 
-				TaskCompletionSource.TrySetResult(bundle);
-			}
-			catch (Exception ex)
-			{
-				TaskCompletionSource.TrySetException(ex);
-			}
+					TaskCompletionSource.TrySetResult(bundle);
+				}
+				catch (Exception ex)
+				{
+					TaskCompletionSource.TrySetException(ex);
+				}
 
-			Finish();
+				Finish();
+			});
 		}
 	}
 }
\ No newline at end of file

From bfddf6d7ad78a871cb41b5a1f5cd01f61ff3b138 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 26 Oct 2022 13:57:39 +0100
Subject: [PATCH 46/77] Update dependencies from
 https://github.com/xamarin/xamarin-macios build 20221026.6 (#10919)

Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk
 From Version 16.0.526 -> To Version 16.0.527

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

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 3581877386da..2b53c7d99979 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -16,13 +16,13 @@
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
       <Sha>5d52b8bbdf09688cca31f17e6fcea45002059f9e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.iOS.Sdk" Version="16.0.526">
+    <Dependency Name="Microsoft.iOS.Sdk" Version="16.0.527">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>a7025b0e1b5cb5d0bd34e29354f280c79f323054</Sha>
+      <Sha>3dd3dc52ce4679db3aa2111527ca7329ae8552c5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.tvOS.Sdk" Version="16.0.526">
+    <Dependency Name="Microsoft.tvOS.Sdk" Version="16.0.527">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>a7025b0e1b5cb5d0bd34e29354f280c79f323054</Sha>
+      <Sha>3dd3dc52ce4679db3aa2111527ca7329ae8552c5</Sha>
     </Dependency>
     <Dependency Name="Microsoft.macOS.Sdk" Version="12.3.470">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index ff144e244698..fd3d2dad97f1 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -11,10 +11,10 @@
     <!-- xamarin/xamarin-android -->
     <MicrosoftAndroidSdkWindowsPackageVersion>32.0.478</MicrosoftAndroidSdkWindowsPackageVersion>
     <!-- xamarin/xamarin-macios -->
-    <MicrosoftiOSSdkPackageVersion>16.0.526</MicrosoftiOSSdkPackageVersion>
+    <MicrosoftiOSSdkPackageVersion>16.0.527</MicrosoftiOSSdkPackageVersion>
     <MicrosoftMacCatalystSdkPackageVersion>15.4.470</MicrosoftMacCatalystSdkPackageVersion>
     <MicrosoftmacOSSdkPackageVersion>12.3.470</MicrosoftmacOSSdkPackageVersion>
-    <MicrosofttvOSSdkPackageVersion>16.0.526</MicrosofttvOSSdkPackageVersion>
+    <MicrosofttvOSSdkPackageVersion>16.0.527</MicrosofttvOSSdkPackageVersion>
     <!-- Samsung/Tizen.NET -->
     <SamsungTizenSdkPackageVersion>7.0.400-preview.1.0</SamsungTizenSdkPackageVersion>
     <!-- emsdk -->

From db2f9283236a9a0156ff4dbc3f2955d0465b9e52 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 26 Oct 2022 14:15:15 +0100
Subject: [PATCH 47/77] Update dependencies from
 https://github.com/xamarin/xamarin-android build
 6.0.4xx-5cfa2384805e6f95cbaf8227e6bbba1131aa1420-1 (#10912)

Microsoft.Android.Sdk.Windows
 From Version 32.0.478 -> To Version 32.0.479

Dependency coherency updates

Microsoft.NETCore.App.Ref
 From Version 6.0.10 -> To Version 6.0.11 (parent: Microsoft.Android.Sdk.Windows

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---
 NuGet.config            | 1 +
 eng/Version.Details.xml | 8 ++++----
 eng/Versions.props      | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 43b6c8313d71..31c7d30b0be4 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -6,6 +6,7 @@
     <!--  Begin: Package sources from dotnet-aspnetcore -->
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-pub-dotnet-runtime-c35dae2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-c35dae27/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <!--  End: Package sources from dotnet-windowsdesktop -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 2b53c7d99979..7a27497d51bb 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -4,13 +4,13 @@
       <Uri>https://github.com/dotnet/installer</Uri>
       <Sha>5f500d02d2d9533cf2b56364024cd9956c2af0b8</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.10" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.11" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>cdf48abd370f148a537960141f73769e678660e7</Sha>
+      <Sha>c35dae276d7b684200166dfab58fefaebf55b9a7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Android.Sdk.Windows" Version="32.0.478">
+    <Dependency Name="Microsoft.Android.Sdk.Windows" Version="32.0.479">
       <Uri>https://github.com/xamarin/xamarin-android</Uri>
-      <Sha>28f788ced6282094aaf18fab26b47f7d1e6e88cd</Sha>
+      <Sha>5cfa2384805e6f95cbaf8227e6bbba1131aa1420</Sha>
     </Dependency>
     <Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.4.470">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index fd3d2dad97f1..ac7d6330d2d8 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -3,13 +3,13 @@
     <!-- dotnet/installer -->
     <MicrosoftDotnetSdkInternalPackageVersion>6.0.403-servicing.22517.2</MicrosoftDotnetSdkInternalPackageVersion>
     <!-- dotnet/runtime -->
-    <MicrosoftNETCoreAppRefPackageVersion>6.0.10</MicrosoftNETCoreAppRefPackageVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>6.0.11</MicrosoftNETCoreAppRefPackageVersion>
     <!-- NOTE: should eventually revert back to $(MicrosoftNETCoreAppRefPackageVersion) in .NET 7 -->
     <MicrosoftExtensionsPackageVersion>6.0.0</MicrosoftExtensionsPackageVersion>
     <MicrosoftExtensionsServicingPackageVersion>6.0.1</MicrosoftExtensionsServicingPackageVersion>
     <SystemCodeDomPackageVersion>6.0.0</SystemCodeDomPackageVersion>
     <!-- xamarin/xamarin-android -->
-    <MicrosoftAndroidSdkWindowsPackageVersion>32.0.478</MicrosoftAndroidSdkWindowsPackageVersion>
+    <MicrosoftAndroidSdkWindowsPackageVersion>32.0.479</MicrosoftAndroidSdkWindowsPackageVersion>
     <!-- xamarin/xamarin-macios -->
     <MicrosoftiOSSdkPackageVersion>16.0.527</MicrosoftiOSSdkPackageVersion>
     <MicrosoftMacCatalystSdkPackageVersion>15.4.470</MicrosoftMacCatalystSdkPackageVersion>

From a3f6766d11531d10cb1d0a2facaee47f6ebb8c45 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 26 Oct 2022 14:23:42 +0100
Subject: [PATCH 48/77] [net7.0] Update dependencies from
 xamarin/xamarin-macios (#10910)

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221025.31

Microsoft.iOS.Sdk
 From Version 16.0.1472 -> To Version 16.0.1473

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221025.31

Microsoft.tvOS.Sdk
 From Version 16.0.1472 -> To Version 16.0.1473

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221025.34

Microsoft.macOS.Sdk
 From Version 12.3.2367 -> To Version 12.3.2368

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221025.34

Microsoft.MacCatalyst.Sdk
 From Version 15.4.2367 -> To Version 15.4.2368

* Update NuGet.config

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221026.3

Microsoft.macOS.Sdk
 From Version 12.3.2367 -> To Version 12.3.2369

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221026.3

Microsoft.MacCatalyst.Sdk
 From Version 15.4.2367 -> To Version 15.4.2369

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221026.5

Microsoft.iOS.Sdk
 From Version 16.0.1472 -> To Version 16.0.1474

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221026.5

Microsoft.tvOS.Sdk
 From Version 16.0.1472 -> To Version 16.0.1474

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221026.14

Microsoft.macOS.Sdk
 From Version 12.3.2367 -> To Version 12.3.2370

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221026.14

Microsoft.MacCatalyst.Sdk
 From Version 15.4.2367 -> To Version 15.4.2370

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221026.12

Microsoft.iOS.Sdk
 From Version 16.0.1472 -> To Version 16.0.1475

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221026.12

Microsoft.tvOS.Sdk
 From Version 16.0.1472 -> To Version 16.0.1475

* Update NuGet.config

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Rui Marinho <me@ruimarinho.net>
---
 eng/Version.Details.xml | 16 ++++++++--------
 eng/Versions.props      |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index c08f13a89f1c..cd578f52f04e 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -12,21 +12,21 @@
       <Uri>https://github.com/xamarin/xamarin-android</Uri>
       <Sha>8f1d9a47205ead80132661f68b0cee9ed0e0220b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.4.2367">
+    <Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.4.2370">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>42be8a5bba623032464c79823ebf4a187dd656fd</Sha>
+      <Sha>16925e40c98a9789323ade1c8a0660968d8ac244</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.macOS.Sdk" Version="12.3.2367">
+    <Dependency Name="Microsoft.macOS.Sdk" Version="12.3.2370">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>42be8a5bba623032464c79823ebf4a187dd656fd</Sha>
+      <Sha>16925e40c98a9789323ade1c8a0660968d8ac244</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.iOS.Sdk" Version="16.0.1472">
+    <Dependency Name="Microsoft.iOS.Sdk" Version="16.0.1475">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>4876d7bea50e2258f4167b07eabbcd88129ff171</Sha>
+      <Sha>12993a6a15caf9793f3b65db21407f085ea2ae4f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.tvOS.Sdk" Version="16.0.1472">
+    <Dependency Name="Microsoft.tvOS.Sdk" Version="16.0.1475">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>4876d7bea50e2258f4167b07eabbcd88129ff171</Sha>
+      <Sha>12993a6a15caf9793f3b65db21407f085ea2ae4f</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.0-rtm.22504.3" CoherentParentDependency="Microsoft.NETCore.App.Ref">
       <Uri>https://github.com/dotnet/emsdk</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index e7529ab37a78..16bf8ceff5d7 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -13,10 +13,10 @@
     <!-- xamarin/xamarin-android -->
     <MicrosoftAndroidSdkWindowsPackageVersion>33.0.4</MicrosoftAndroidSdkWindowsPackageVersion>
     <!-- xamarin/xamarin-macios -->
-    <MicrosoftMacCatalystSdkPackageVersion>15.4.2367</MicrosoftMacCatalystSdkPackageVersion>
-    <MicrosoftmacOSSdkPackageVersion>12.3.2367</MicrosoftmacOSSdkPackageVersion>
-    <MicrosoftiOSSdkPackageVersion>16.0.1472</MicrosoftiOSSdkPackageVersion>
-    <MicrosofttvOSSdkPackageVersion>16.0.1472</MicrosofttvOSSdkPackageVersion>
+    <MicrosoftMacCatalystSdkPackageVersion>15.4.2370</MicrosoftMacCatalystSdkPackageVersion>
+    <MicrosoftmacOSSdkPackageVersion>12.3.2370</MicrosoftmacOSSdkPackageVersion>
+    <MicrosoftiOSSdkPackageVersion>16.0.1475</MicrosoftiOSSdkPackageVersion>
+    <MicrosofttvOSSdkPackageVersion>16.0.1475</MicrosofttvOSSdkPackageVersion>
     <!-- Samsung/Tizen.NET -->
     <SamsungTizenSdkPackageVersion>7.0.100</SamsungTizenSdkPackageVersion>
     <!-- emsdk -->

From 83880b04944b844b250e7dcbb13cda7ca42d8c96 Mon Sep 17 00:00:00 2001
From: "E.Z. Hart" <hartez@users.noreply.github.com>
Date: Wed, 26 Oct 2022 08:00:45 -0600
Subject: [PATCH 49/77] Fix minimum sizing for * cells with multiple children
 (#10836)

---
 src/Core/src/Layouts/GridLayoutManager.cs     |  2 +-
 .../Layouts/GridLayoutManagerTests.cs         | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/Core/src/Layouts/GridLayoutManager.cs b/src/Core/src/Layouts/GridLayoutManager.cs
index 61f2b580b939..f28e335b2c3a 100644
--- a/src/Core/src/Layouts/GridLayoutManager.cs
+++ b/src/Core/src/Layouts/GridLayoutManager.cs
@@ -810,7 +810,7 @@ static void ExpandStarsInSpan(double spaceNeeded, Definition[] original, Definit
 					{
 						if (updated[n].IsStar)
 						{
-							updated[n].Update(toAdd);
+							updated[n].Size += toAdd;
 						}
 					}
 				}
diff --git a/src/Core/tests/UnitTests/Layouts/GridLayoutManagerTests.cs b/src/Core/tests/UnitTests/Layouts/GridLayoutManagerTests.cs
index f5e9468b4630..943ac8d45280 100644
--- a/src/Core/tests/UnitTests/Layouts/GridLayoutManagerTests.cs
+++ b/src/Core/tests/UnitTests/Layouts/GridLayoutManagerTests.cs
@@ -1436,6 +1436,26 @@ public void MeasureRespectsMinHeight(double minHeight, double viewHeight, double
 			Assert.Equal(expectedHeight, measure.Height);
 		}
 
+		[Theory]
+		[InlineData("*", "*")]
+		[InlineData("auto", "auto")]
+		public void MeasureRespectsLargestChildMinimumSize(string columns, string rows)
+		{
+			var grid = CreateGridLayout(columns: columns, rows: rows);
+			var view0 = CreateTestView(new Size(100, 100));
+			var view1 = CreateTestView(new Size(200, 200));
+
+			SubstituteChildren(grid, view0, view1);
+			SetLocation(grid, view0);
+			SetLocation(grid, view1);
+
+			var layoutManager = new GridLayoutManager(grid);
+			var measure = layoutManager.Measure(double.PositiveInfinity, double.PositiveInfinity);
+
+			Assert.Equal(200, measure.Height);
+			Assert.Equal(200, measure.Width);
+		}
+
 		[Category(GridAbsoluteSizing)]
 		[Theory]
 		[InlineData(50, 10, 50)]

From 5ba81306ba4de29a337fb0a6484e6b25475126d9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 26 Oct 2022 15:43:02 +0100
Subject: [PATCH 50/77] Bump Xamarin.AndroidX.Navigation.Fragment from 2.5.2 to
 2.5.2.1 (#10925)

* Bump Xamarin.AndroidX.Navigation.Fragment from 2.5.2 to 2.5.2.1

Bumps [Xamarin.AndroidX.Navigation.Fragment](https://github.com/xamarin/AndroidX) from 2.5.2 to 2.5.2.1.
- [Release notes](https://github.com/xamarin/AndroidX/releases)
- [Commits](https://github.com/xamarin/AndroidX/commits)

---
updated-dependencies:
- dependency-name: Xamarin.AndroidX.Navigation.Fragment
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

* Auto-format source code

* Update other Xamarin.AndroidX.Navigation

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: GitHub Actions Autoformatter <autoformat@example.com>
Co-authored-by: Rui Marinho <me@ruimarinho.net>
---
 eng/AndroidX.targets                          |  10 +-
 .../BlazorWebViewDeveloperTools.cs            |   6 +-
 ...lazorWebViewServiceCollectionExtensions.cs |  18 +-
 src/Graphics/src/Graphics.Win2D/W2DCanvas.cs  |  62 +++---
 .../src/Graphics.Win2D/W2DExtensions.cs       | 192 +++++++++---------
 .../Android/MauiTestActivity.cs               |   4 +-
 6 files changed, 146 insertions(+), 146 deletions(-)

diff --git a/eng/AndroidX.targets b/eng/AndroidX.targets
index 773baf0d564d..f46ce170d18a 100644
--- a/eng/AndroidX.targets
+++ b/eng/AndroidX.targets
@@ -14,23 +14,23 @@
     />
     <PackageReference
         Update="Xamarin.AndroidX.Lifecycle.LiveData"
-        Version="2.5.1"
+        Version="2.5.1.1"
     />
     <PackageReference
         Update="Xamarin.AndroidX.Navigation.UI"
-        Version="2.5.2"
+        Version="2.5.2.1"
     />
     <PackageReference
         Update="Xamarin.AndroidX.Navigation.Fragment"
-        Version="2.5.2"
+        Version="2.5.2.1"
     />
     <PackageReference
         Update="Xamarin.AndroidX.Navigation.Runtime"
-        Version="2.5.2"
+        Version="2.5.2.1"
     />
     <PackageReference
         Update="Xamarin.AndroidX.Navigation.Common"
-        Version="2.5.2"
+        Version="2.5.2.1"
     />
     <PackageReference
         Update="Xamarin.AndroidX.MediaRouter"
diff --git a/src/BlazorWebView/src/SharedSource/BlazorWebViewDeveloperTools.cs b/src/BlazorWebView/src/SharedSource/BlazorWebViewDeveloperTools.cs
index 424fd1f3d22d..0f088fb3d261 100644
--- a/src/BlazorWebView/src/SharedSource/BlazorWebViewDeveloperTools.cs
+++ b/src/BlazorWebView/src/SharedSource/BlazorWebViewDeveloperTools.cs
@@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.Components.WebView.Maui
 #endif
 {
 	internal class BlazorWebViewDeveloperTools
-{
-	public bool Enabled { get; set; } = false;
-}
+	{
+		public bool Enabled { get; set; } = false;
+	}
 }
diff --git a/src/BlazorWebView/src/SharedSource/BlazorWebViewServiceCollectionExtensions.cs b/src/BlazorWebView/src/SharedSource/BlazorWebViewServiceCollectionExtensions.cs
index 65765deacd7a..20150d38c056 100644
--- a/src/BlazorWebView/src/SharedSource/BlazorWebViewServiceCollectionExtensions.cs
+++ b/src/BlazorWebView/src/SharedSource/BlazorWebViewServiceCollectionExtensions.cs
@@ -54,14 +54,14 @@ public static IMauiBlazorWebViewBuilder AddMauiBlazorWebView(this IServiceCollec
 #endif
 		}
 
-/// <summary>
-/// Enables Developer tools on the underlying WebView controls.
-/// </summary>
-/// <param name="services">The <see cref="IServiceCollection"/>.</param>
-/// <returns>The <see cref="IServiceCollection"/>.</returns>
-public static IServiceCollection AddBlazorWebViewDeveloperTools(this IServiceCollection services)
-{
-	return services.AddSingleton<BlazorWebViewDeveloperTools>(new BlazorWebViewDeveloperTools { Enabled = true });
-}
+		/// <summary>
+		/// Enables Developer tools on the underlying WebView controls.
+		/// </summary>
+		/// <param name="services">The <see cref="IServiceCollection"/>.</param>
+		/// <returns>The <see cref="IServiceCollection"/>.</returns>
+		public static IServiceCollection AddBlazorWebViewDeveloperTools(this IServiceCollection services)
+		{
+			return services.AddSingleton<BlazorWebViewDeveloperTools>(new BlazorWebViewDeveloperTools { Enabled = true });
+		}
 	}
 }
diff --git a/src/Graphics/src/Graphics.Win2D/W2DCanvas.cs b/src/Graphics/src/Graphics.Win2D/W2DCanvas.cs
index 9c4d2b6f06a3..6aded7399e53 100644
--- a/src/Graphics/src/Graphics.Win2D/W2DCanvas.cs
+++ b/src/Graphics/src/Graphics.Win2D/W2DCanvas.cs
@@ -239,42 +239,42 @@ public override void DrawString(string value, float x, float y, HorizontalAlignm
 			try
 			{
 #endif
-			var textFormat = (CurrentState.Font ?? Graphics.Font.Default).ToCanvasTextFormat(CurrentState.FontSize);
-			textFormat.VerticalAlignment = CanvasVerticalAlignment.Top;
+				var textFormat = (CurrentState.Font ?? Graphics.Font.Default).ToCanvasTextFormat(CurrentState.FontSize);
+				textFormat.VerticalAlignment = CanvasVerticalAlignment.Top;
 
-			switch (horizontalAlignment)
-			{
-				case HorizontalAlignment.Left:
-					_rect.X = x;
-					_rect.Width = CanvasSize.Width;
-					textFormat.HorizontalAlignment = CanvasHorizontalAlignment.Left;
-					break;
-				case HorizontalAlignment.Right:
-					_rect.X = x - CanvasSize.Width;
-					_rect.Width = CanvasSize.Width;
-					textFormat.HorizontalAlignment = CanvasHorizontalAlignment.Right;
-					break;
-				default:
-					_rect.X = x - _canvasSize.Width;
-					_rect.Width = _canvasSize.Width * 2;
-					textFormat.HorizontalAlignment = CanvasHorizontalAlignment.Center;
-					break;
-			}
+				switch (horizontalAlignment)
+				{
+					case HorizontalAlignment.Left:
+						_rect.X = x;
+						_rect.Width = CanvasSize.Width;
+						textFormat.HorizontalAlignment = CanvasHorizontalAlignment.Left;
+						break;
+					case HorizontalAlignment.Right:
+						_rect.X = x - CanvasSize.Width;
+						_rect.Width = CanvasSize.Width;
+						textFormat.HorizontalAlignment = CanvasHorizontalAlignment.Right;
+						break;
+					default:
+						_rect.X = x - _canvasSize.Width;
+						_rect.Width = _canvasSize.Width * 2;
+						textFormat.HorizontalAlignment = CanvasHorizontalAlignment.Center;
+						break;
+				}
 
-			_rect.Y = y - CurrentState.FontSize;
-			_rect.Height = CurrentState.FontSize * 2;
+				_rect.Y = y - CurrentState.FontSize;
+				_rect.Height = CurrentState.FontSize * 2;
 
-			_point1.X = (float)_rect.X;
-			_point1.Y = (float)_rect.Y;
+				_point1.X = (float)_rect.X;
+				_point1.Y = (float)_rect.Y;
 
-			var textLayout = new CanvasTextLayout(
-				_session,
-				value,
-				textFormat,
-				(float)_rect.Width,
-				(float)_rect.Height);
+				var textLayout = new CanvasTextLayout(
+					_session,
+					value,
+					textFormat,
+					(float)_rect.Width,
+					(float)_rect.Height);
 
-			Draw(ctx => ctx.DrawTextLayout(textLayout, _point1, CurrentState.PlatformFontBrush));
+				Draw(ctx => ctx.DrawTextLayout(textLayout, _point1, CurrentState.PlatformFontBrush));
 
 #if DEBUG
 
diff --git a/src/Graphics/src/Graphics.Win2D/W2DExtensions.cs b/src/Graphics/src/Graphics.Win2D/W2DExtensions.cs
index ad5ad78f89cc..10bea0bbd407 100644
--- a/src/Graphics/src/Graphics.Win2D/W2DExtensions.cs
+++ b/src/Graphics/src/Graphics.Win2D/W2DExtensions.cs
@@ -66,122 +66,122 @@ public static CanvasGeometry AsPath(this PathF path, float ox, float oy, float f
 			try
 			{
 #endif
-			builder.SetFilledRegionDetermination(fillMode);
+				builder.SetFilledRegionDetermination(fillMode);
 
-			var pointIndex = 0;
-			var arcAngleIndex = 0;
-			var arcClockwiseIndex = 0;
-			var figureOpen = false;
-			var segmentIndex = -1;
+				var pointIndex = 0;
+				var arcAngleIndex = 0;
+				var arcClockwiseIndex = 0;
+				var figureOpen = false;
+				var segmentIndex = -1;
 
-			var lastOperation = PathOperation.Move;
+				var lastOperation = PathOperation.Move;
 
-			foreach (var type in path.SegmentTypes)
-			{
-				segmentIndex++;
-
-				if (type == PathOperation.Move)
+				foreach (var type in path.SegmentTypes)
 				{
-					if (lastOperation != PathOperation.Close && lastOperation != PathOperation.Move)
-					{
-						builder.EndFigure(CanvasFigureLoop.Open);
-					}
+					segmentIndex++;
 
-					var point = path[pointIndex++];
-					var begin = CanvasFigureFill.Default;
-					builder.BeginFigure(ox + point.X * fx, oy + point.Y * fy, begin);
-					figureOpen = true;
-				}
-				else if (type == PathOperation.Line)
-				{
-					var point = path[pointIndex++];
-					builder.AddLine(ox + point.X * fx, oy + point.Y * fy);
-				}
-
-				else if (type == PathOperation.Quad)
-				{
-					var controlPoint = path[pointIndex++];
-					var endPoint = path[pointIndex++];
-
-					builder.AddQuadraticBezier(
-						new Vector2(ox + controlPoint.X * fx, oy + controlPoint.Y * fy),
-						new Vector2(ox + endPoint.X * fx, oy + endPoint.Y * fy));
-				}
-				else if (type == PathOperation.Cubic)
-				{
-					var controlPoint1 = path[pointIndex++];
-					var controlPoint2 = path[pointIndex++];
-					var endPoint = path[pointIndex++];
-					builder.AddCubicBezier(
-						new Vector2(ox + controlPoint1.X * fx, oy + controlPoint1.Y * fy),
-						new Vector2(ox + controlPoint2.X * fx, oy + controlPoint2.Y * fy),
-						new Vector2(ox + endPoint.X * fx, oy + endPoint.Y * fy));
-				}
-				else if (type == PathOperation.Arc)
-				{
-					var topLeft = path[pointIndex++];
-					var bottomRight = path[pointIndex++];
-					var startAngle = path.GetArcAngle(arcAngleIndex++);
-					var endAngle = path.GetArcAngle(arcAngleIndex++);
-					var clockwise = path.GetArcClockwise(arcClockwiseIndex++);
-
-					while (startAngle < 0)
+					if (type == PathOperation.Move)
 					{
-						startAngle += 360;
-					}
+						if (lastOperation != PathOperation.Close && lastOperation != PathOperation.Move)
+						{
+							builder.EndFigure(CanvasFigureLoop.Open);
+						}
 
-					while (endAngle < 0)
+						var point = path[pointIndex++];
+						var begin = CanvasFigureFill.Default;
+						builder.BeginFigure(ox + point.X * fx, oy + point.Y * fy, begin);
+						figureOpen = true;
+					}
+					else if (type == PathOperation.Line)
 					{
-						endAngle += 360;
+						var point = path[pointIndex++];
+						builder.AddLine(ox + point.X * fx, oy + point.Y * fy);
 					}
 
-					var rotation = GeometryUtil.GetSweep(startAngle, endAngle, clockwise);
-					var absRotation = Math.Abs(rotation);
-
-					var rectX = ox + topLeft.X * fx;
-					var rectY = oy + topLeft.Y * fy;
-					var rectWidth = (ox + bottomRight.X * fx) - rectX;
-					var rectHeight = (oy + bottomRight.Y * fy) - rectY;
-
-					var startPoint = GeometryUtil.EllipseAngleToPoint(rectX, rectY, rectWidth, rectHeight, -startAngle);
-					var endPoint = GeometryUtil.EllipseAngleToPoint(rectX, rectY, rectWidth, rectHeight, -endAngle);
-
+					else if (type == PathOperation.Quad)
+					{
+						var controlPoint = path[pointIndex++];
+						var endPoint = path[pointIndex++];
 
-					if (!figureOpen)
+						builder.AddQuadraticBezier(
+							new Vector2(ox + controlPoint.X * fx, oy + controlPoint.Y * fy),
+							new Vector2(ox + endPoint.X * fx, oy + endPoint.Y * fy));
+					}
+					else if (type == PathOperation.Cubic)
 					{
-						var begin = CanvasFigureFill.Default;
-						builder.BeginFigure(startPoint.X, startPoint.Y, begin);
-						figureOpen = true;
+						var controlPoint1 = path[pointIndex++];
+						var controlPoint2 = path[pointIndex++];
+						var endPoint = path[pointIndex++];
+						builder.AddCubicBezier(
+							new Vector2(ox + controlPoint1.X * fx, oy + controlPoint1.Y * fy),
+							new Vector2(ox + controlPoint2.X * fx, oy + controlPoint2.Y * fy),
+							new Vector2(ox + endPoint.X * fx, oy + endPoint.Y * fy));
+					}
+					else if (type == PathOperation.Arc)
+					{
+						var topLeft = path[pointIndex++];
+						var bottomRight = path[pointIndex++];
+						var startAngle = path.GetArcAngle(arcAngleIndex++);
+						var endAngle = path.GetArcAngle(arcAngleIndex++);
+						var clockwise = path.GetArcClockwise(arcClockwiseIndex++);
+
+						while (startAngle < 0)
+						{
+							startAngle += 360;
+						}
+
+						while (endAngle < 0)
+						{
+							endAngle += 360;
+						}
+
+						var rotation = GeometryUtil.GetSweep(startAngle, endAngle, clockwise);
+						var absRotation = Math.Abs(rotation);
+
+						var rectX = ox + topLeft.X * fx;
+						var rectY = oy + topLeft.Y * fy;
+						var rectWidth = (ox + bottomRight.X * fx) - rectX;
+						var rectHeight = (oy + bottomRight.Y * fy) - rectY;
+
+						var startPoint = GeometryUtil.EllipseAngleToPoint(rectX, rectY, rectWidth, rectHeight, -startAngle);
+						var endPoint = GeometryUtil.EllipseAngleToPoint(rectX, rectY, rectWidth, rectHeight, -endAngle);
+
+
+						if (!figureOpen)
+						{
+							var begin = CanvasFigureFill.Default;
+							builder.BeginFigure(startPoint.X, startPoint.Y, begin);
+							figureOpen = true;
+						}
+						else
+						{
+							builder.AddLine(startPoint.X, startPoint.Y);
+						}
+
+						builder.AddArc(
+							 new Vector2(endPoint.X, endPoint.Y),
+							 rectWidth / 2,
+							 rectHeight / 2,
+							 0,
+							 clockwise ? CanvasSweepDirection.Clockwise : CanvasSweepDirection.CounterClockwise,
+							 absRotation >= 180 ? CanvasArcSize.Large : CanvasArcSize.Small
+							);
 					}
-					else
+					else if (type == PathOperation.Close)
 					{
-						builder.AddLine(startPoint.X, startPoint.Y);
+						builder.EndFigure(CanvasFigureLoop.Closed);
 					}
 
-					builder.AddArc(
-						 new Vector2(endPoint.X, endPoint.Y),
-						 rectWidth / 2,
-						 rectHeight / 2,
-						 0,
-						 clockwise ? CanvasSweepDirection.Clockwise : CanvasSweepDirection.CounterClockwise,
-						 absRotation >= 180 ? CanvasArcSize.Large : CanvasArcSize.Small
-						);
+					lastOperation = type;
 				}
-				else if (type == PathOperation.Close)
+
+				if (segmentIndex >= 0 && lastOperation != PathOperation.Close)
 				{
-					builder.EndFigure(CanvasFigureLoop.Closed);
+					builder.EndFigure(CanvasFigureLoop.Open);
 				}
 
-				lastOperation = type;
-			}
-
-			if (segmentIndex >= 0 && lastOperation != PathOperation.Close)
-			{
-				builder.EndFigure(CanvasFigureLoop.Open);
-			}
-
-			var geometry = CanvasGeometry.CreatePath(builder);
-			return geometry;
+				var geometry = CanvasGeometry.CreatePath(builder);
+				return geometry;
 #if DEBUG
 			}
 			catch (Exception exc)
diff --git a/src/TestUtils/src/DeviceTests.Runners/HeadlessRunner/Android/MauiTestActivity.cs b/src/TestUtils/src/DeviceTests.Runners/HeadlessRunner/Android/MauiTestActivity.cs
index f0dc9ff8720c..18394d6a2200 100644
--- a/src/TestUtils/src/DeviceTests.Runners/HeadlessRunner/Android/MauiTestActivity.cs
+++ b/src/TestUtils/src/DeviceTests.Runners/HeadlessRunner/Android/MauiTestActivity.cs
@@ -16,8 +16,8 @@ protected override void OnCreate(Bundle? savedInstanceState)
 			base.OnCreate(savedInstanceState);
 
 			// Do the work on the background thread to avoid a keyDispatchingTimedOut ANR
-            Task.Run(async () =>
-            { 
+			Task.Run(async () =>
+			{
 				try
 				{
 					var runner = MauiTestInstrumentation.Current.Services.GetRequiredService<HeadlessTestRunner>();

From fc4b956e05ec96f5a5ff461b80e58e271a948d11 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 26 Oct 2022 15:51:54 +0100
Subject: [PATCH 51/77] Bump Xamarin.AndroidX.MediaRouter from 1.3.1 to 1.3.1.1
 (#10926)

* Bump Xamarin.AndroidX.MediaRouter from 1.3.1 to 1.3.1.1

Bumps [Xamarin.AndroidX.MediaRouter](https://github.com/xamarin/AndroidX) from 1.3.1 to 1.3.1.1.
- [Release notes](https://github.com/xamarin/AndroidX/releases)
- [Commits](https://github.com/xamarin/AndroidX/commits)

---
updated-dependencies:
- dependency-name: Xamarin.AndroidX.MediaRouter
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

* Auto-format source code

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: GitHub Actions Autoformatter <autoformat@example.com>
---
 eng/AndroidX.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/AndroidX.targets b/eng/AndroidX.targets
index f46ce170d18a..abe41ca7682f 100644
--- a/eng/AndroidX.targets
+++ b/eng/AndroidX.targets
@@ -34,7 +34,7 @@
     />
     <PackageReference
         Update="Xamarin.AndroidX.MediaRouter"
-        Version="1.3.1"
+        Version="1.3.1.1"
     />
     <PackageReference
         Update="Xamarin.AndroidX.Palette"

From 95f787d80aa8472cdf252db1310009751b01f3c1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 26 Oct 2022 18:35:27 +0100
Subject: [PATCH 52/77] Bump Xamarin.AndroidX.Legacy.Support.V4 from 1.0.0.14
 to 1.0.0.15 (#10934)

Bumps [Xamarin.AndroidX.Legacy.Support.V4](https://github.com/xamarin/AndroidX) from 1.0.0.14 to 1.0.0.15.
- [Release notes](https://github.com/xamarin/AndroidX/releases)
- [Commits](https://github.com/xamarin/AndroidX/commits)

---
updated-dependencies:
- dependency-name: Xamarin.AndroidX.Legacy.Support.V4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

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

diff --git a/eng/AndroidX.targets b/eng/AndroidX.targets
index abe41ca7682f..ccca431d2dde 100644
--- a/eng/AndroidX.targets
+++ b/eng/AndroidX.targets
@@ -10,7 +10,7 @@
     />
     <PackageReference
         Update="Xamarin.AndroidX.Legacy.Support.V4"
-        Version="1.0.0.14"
+        Version="1.0.0.15"
     />
     <PackageReference
         Update="Xamarin.AndroidX.Lifecycle.LiveData"

From 95ee1a3273de34c41e2445c318b74d623b093842 Mon Sep 17 00:00:00 2001
From: Rui Marinho <me@ruimarinho.net>
Date: Wed, 26 Oct 2022 18:39:01 +0100
Subject: [PATCH 53/77] Revert MicrosoftCodeAnalysisNetAnalyzersVersion

---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index fa642f2668a5..96494530c3ed 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -39,7 +39,7 @@
     <MicrosoftAspNetCoreMetadataPackageVersion>7.0.0</MicrosoftAspNetCoreMetadataPackageVersion>
     <MicrosoftJSInteropPackageVersion>7.0.0</MicrosoftJSInteropPackageVersion>
     <!-- Other packages -->
-    <MicrosoftCodeAnalysisNetAnalyzersVersion>7.0.0-preview1.22524.2</MicrosoftCodeAnalysisNetAnalyzersVersion>
+    <MicrosoftCodeAnalysisNetAnalyzersVersion>7.0.0-preview1.22274.2</MicrosoftCodeAnalysisNetAnalyzersVersion>
     <MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.3.3</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
     <MicrosoftCodeAnalysisBannedApiAnalyzersVersion>3.3.3</MicrosoftCodeAnalysisBannedApiAnalyzersVersion>
     <SystemNumericsVectorsVersion>4.5.0</SystemNumericsVectorsVersion>

From d9312ed21380b2720bffa262898efd9ebcd34076 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 26 Oct 2022 18:48:34 +0100
Subject: [PATCH 54/77] [net6.0] Update dependencies from
 xamarin/xamarin-macios (#10941)

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221026.18

Microsoft.iOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.macOS.Sdk , Microsoft.tvOS.Sdk
 From Version 16.0.527 -> To Version 15.4.471

* Revert iOS and tvOS

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Rui Marinho <me@ruimarinho.net>
---
 eng/Version.Details.xml | 8 ++++----
 eng/Versions.props      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 7a27497d51bb..3e10599a57d8 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -12,9 +12,9 @@
       <Uri>https://github.com/xamarin/xamarin-android</Uri>
       <Sha>5cfa2384805e6f95cbaf8227e6bbba1131aa1420</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.4.470">
+    <Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.4.471">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>5d52b8bbdf09688cca31f17e6fcea45002059f9e</Sha>
+      <Sha>9382aa8e0e4354c53c57dc271447d18ca7892a51</Sha>
     </Dependency>
     <Dependency Name="Microsoft.iOS.Sdk" Version="16.0.527">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
@@ -24,9 +24,9 @@
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
       <Sha>3dd3dc52ce4679db3aa2111527ca7329ae8552c5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.macOS.Sdk" Version="12.3.470">
+    <Dependency Name="Microsoft.macOS.Sdk" Version="12.3.471">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>5d52b8bbdf09688cca31f17e6fcea45002059f9e</Sha>
+      <Sha>9382aa8e0e4354c53c57dc271447d18ca7892a51</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.10" CoherentParentDependency="Microsoft.NETCore.App.Ref">
       <Uri>https://github.com/dotnet/emsdk</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index ac7d6330d2d8..cc1ea9faf22f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -12,8 +12,8 @@
     <MicrosoftAndroidSdkWindowsPackageVersion>32.0.479</MicrosoftAndroidSdkWindowsPackageVersion>
     <!-- xamarin/xamarin-macios -->
     <MicrosoftiOSSdkPackageVersion>16.0.527</MicrosoftiOSSdkPackageVersion>
-    <MicrosoftMacCatalystSdkPackageVersion>15.4.470</MicrosoftMacCatalystSdkPackageVersion>
-    <MicrosoftmacOSSdkPackageVersion>12.3.470</MicrosoftmacOSSdkPackageVersion>
+    <MicrosoftMacCatalystSdkPackageVersion>15.4.471</MicrosoftMacCatalystSdkPackageVersion>
+    <MicrosoftmacOSSdkPackageVersion>12.3.471</MicrosoftmacOSSdkPackageVersion>
     <MicrosofttvOSSdkPackageVersion>16.0.527</MicrosofttvOSSdkPackageVersion>
     <!-- Samsung/Tizen.NET -->
     <SamsungTizenSdkPackageVersion>7.0.400-preview.1.0</SamsungTizenSdkPackageVersion>

From c4fea7836a46796d2ee39bad895e015a50cd183d Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 27 Oct 2022 13:48:19 +0100
Subject: [PATCH 55/77] Squashed commit of the following: (#10942)

commit 22b30337d9c3664c7d4b82ee527e7f482436dd7e
Merge: 50866a744 95ee1a327
Author: Matthew Leibowitz <mattleibow@live.com>
Date:   Thu Oct 27 11:10:47 2022 +0200

    Merge branch 'net7.0' into darc-net7.0-45fa6a48-68f2-4992-95f2-e40e8e14afd5

commit 50866a744fc66f9c308b08c2236b9f7d130b6080
Author: Jonathan Dick <jondick@gmail.com>
Date:   Wed Oct 26 21:22:02 2022 -0400

    Bump net6 version for SR7

commit 8edadd392e6553fca3e87f268276db7d160a4f07
Author: Rui Marinho <me@ruimarinho.net>
Date:   Wed Oct 26 18:55:17 2022 +0100

    Update NuGet.config

commit b7c541171ac4b9d031811e28953673c146af4c44
Author: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Date:   Wed Oct 26 17:48:49 2022 +0000

    Update dependencies from https://github.com/xamarin/xamarin-macios build 20221026.24

    Microsoft.tvOS.Sdk
     From Version 16.0.1475 -> To Version 16.0.1477

commit 4c57036bcdddded8f01e0d647244f4fc84d30b14
Author: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Date:   Wed Oct 26 17:48:09 2022 +0000

    Update dependencies from https://github.com/xamarin/xamarin-macios build 20221026.24

    Microsoft.iOS.Sdk
     From Version 16.0.1475 -> To Version 16.0.1477

commit 89f722e748f67dcb06574785eaf7c4c05ceb417b
Author: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Date:   Wed Oct 26 16:51:31 2022 +0000

    Update dependencies from https://github.com/xamarin/xamarin-macios build 20221026.21

    Microsoft.tvOS.Sdk
     From Version 16.0.1475 -> To Version 16.0.1476

commit 9dc4a41a1b3888a479da132d7ffc9023d1033e7b
Author: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Date:   Wed Oct 26 16:51:01 2022 +0000

    Update dependencies from https://github.com/xamarin/xamarin-macios build 20221026.21

    Microsoft.iOS.Sdk
     From Version 16.0.1475 -> To Version 16.0.1476

commit dde2135edce1d2c123abf457458e24af3b270cf7
Author: Rui Marinho <me@ruimarinho.net>
Date:   Wed Oct 26 17:46:35 2022 +0100

    Add Nuget.config feed

commit bad35092e52f3b3a20e080a63150bff80797fae6
Author: GitHub Actions Autoformatter <autoformat@example.com>
Date:   Wed Oct 26 16:41:26 2022 +0000

    Auto-format source code

commit 6d56d6c0ad67f7d3d0fd5490c9980184bab4b3d5
Author: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Date:   Wed Oct 26 16:40:27 2022 +0000

    Update dependencies from https://github.com/xamarin/xamarin-macios build 20221026.22

    Microsoft.MacCatalyst.Sdk
     From Version 15.4.2370 -> To Version 15.4.2371

commit 2da2d4dee1b8c5f55dc94669140ef945230d2530
Author: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Date:   Wed Oct 26 16:40:10 2022 +0000

    Update dependencies from https://github.com/xamarin/xamarin-macios build 20221026.22

    Microsoft.macOS.Sdk
     From Version 12.3.2370 -> To Version 12.3.2371

Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
---
 eng/Version.Details.xml | 16 ++++++++--------
 eng/Versions.props      | 10 +++++-----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 6b2203859266..aa0b284490bd 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -12,21 +12,21 @@
       <Uri>https://github.com/xamarin/xamarin-android</Uri>
       <Sha>8f1d9a47205ead80132661f68b0cee9ed0e0220b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.4.2370">
+    <Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.4.2371">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>16925e40c98a9789323ade1c8a0660968d8ac244</Sha>
+      <Sha>efd24e1e4f4b92c8d4a098c90c7dabcc053f9f32</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.macOS.Sdk" Version="12.3.2370">
+    <Dependency Name="Microsoft.macOS.Sdk" Version="12.3.2371">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>16925e40c98a9789323ade1c8a0660968d8ac244</Sha>
+      <Sha>efd24e1e4f4b92c8d4a098c90c7dabcc053f9f32</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.iOS.Sdk" Version="16.0.1475">
+    <Dependency Name="Microsoft.iOS.Sdk" Version="16.0.1477">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>12993a6a15caf9793f3b65db21407f085ea2ae4f</Sha>
+      <Sha>4402959f7d048f253a627915131ea2219bdba2fc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.tvOS.Sdk" Version="16.0.1475">
+    <Dependency Name="Microsoft.tvOS.Sdk" Version="16.0.1477">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>12993a6a15caf9793f3b65db21407f085ea2ae4f</Sha>
+      <Sha>4402959f7d048f253a627915131ea2219bdba2fc</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.0-rtm.22504.3" CoherentParentDependency="Microsoft.NETCore.App.Ref">
       <Uri>https://github.com/dotnet/emsdk</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 96494530c3ed..7bd3cc41f121 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <!-- Current previous .NET SDK major version's stable release of MAUI packages -->
-    <MicrosoftMauiPreviousDotNetReleasedVersion>6.0.545</MicrosoftMauiPreviousDotNetReleasedVersion>
+    <MicrosoftMauiPreviousDotNetReleasedVersion>6.0.546</MicrosoftMauiPreviousDotNetReleasedVersion>
     <!-- dotnet/installer -->
     <MicrosoftDotnetSdkInternalPackageVersion>7.0.100-rtm.22519.39</MicrosoftDotnetSdkInternalPackageVersion>
     <!-- dotnet/runtime -->
@@ -13,10 +13,10 @@
     <!-- xamarin/xamarin-android -->
     <MicrosoftAndroidSdkWindowsPackageVersion>33.0.4</MicrosoftAndroidSdkWindowsPackageVersion>
     <!-- xamarin/xamarin-macios -->
-    <MicrosoftMacCatalystSdkPackageVersion>15.4.2370</MicrosoftMacCatalystSdkPackageVersion>
-    <MicrosoftmacOSSdkPackageVersion>12.3.2370</MicrosoftmacOSSdkPackageVersion>
-    <MicrosoftiOSSdkPackageVersion>16.0.1475</MicrosoftiOSSdkPackageVersion>
-    <MicrosofttvOSSdkPackageVersion>16.0.1475</MicrosofttvOSSdkPackageVersion>
+    <MicrosoftMacCatalystSdkPackageVersion>15.4.2371</MicrosoftMacCatalystSdkPackageVersion>
+    <MicrosoftmacOSSdkPackageVersion>12.3.2371</MicrosoftmacOSSdkPackageVersion>
+    <MicrosoftiOSSdkPackageVersion>16.0.1477</MicrosoftiOSSdkPackageVersion>
+    <MicrosofttvOSSdkPackageVersion>16.0.1477</MicrosofttvOSSdkPackageVersion>
     <!-- Samsung/Tizen.NET -->
     <SamsungTizenSdkPackageVersion>7.0.100</SamsungTizenSdkPackageVersion>
     <!-- emsdk -->

From 50e1a8b97b0524468f7788bfdf506cd16b3baaa0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 27 Oct 2022 14:24:48 +0100
Subject: [PATCH 56/77] Bump Xamarin.AndroidX.Palette from 1.0.0.14 to 1.0.0.15
 (#10927)

Bumps [Xamarin.AndroidX.Palette](https://github.com/xamarin/AndroidX) from 1.0.0.14 to 1.0.0.15.
- [Release notes](https://github.com/xamarin/AndroidX/releases)
- [Commits](https://github.com/xamarin/AndroidX/commits)

---
updated-dependencies:
- dependency-name: Xamarin.AndroidX.Palette
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

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

diff --git a/eng/AndroidX.targets b/eng/AndroidX.targets
index ccca431d2dde..56ba457722b1 100644
--- a/eng/AndroidX.targets
+++ b/eng/AndroidX.targets
@@ -38,7 +38,7 @@
     />
     <PackageReference
         Update="Xamarin.AndroidX.Palette"
-        Version="1.0.0.14"
+        Version="1.0.0.15"
     />
     <PackageReference
         Update="Xamarin.AndroidX.RecyclerView"

From d3f78c8faab11ec6a148d033f5a78e46fe4a5620 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 27 Oct 2022 14:25:16 +0100
Subject: [PATCH 57/77] Bump Xamarin.AndroidX.AppCompat.AppCompatResources from
 1.5.1 to 1.5.1.1 (#10928)

Bumps [Xamarin.AndroidX.AppCompat.AppCompatResources](https://github.com/xamarin/AndroidX) from 1.5.1 to 1.5.1.1.
- [Release notes](https://github.com/xamarin/AndroidX/releases)
- [Commits](https://github.com/xamarin/AndroidX/commits)

---
updated-dependencies:
- dependency-name: Xamarin.AndroidX.AppCompat.AppCompatResources
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

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

diff --git a/eng/AndroidX.targets b/eng/AndroidX.targets
index 56ba457722b1..bbd6937c979f 100644
--- a/eng/AndroidX.targets
+++ b/eng/AndroidX.targets
@@ -2,7 +2,7 @@
   <ItemGroup>
     <PackageReference
         Update="Xamarin.AndroidX.AppCompat.AppCompatResources"
-        Version="1.5.1"
+        Version="1.5.1.1"
     />
     <PackageReference
         Update="Xamarin.AndroidX.Browser"

From cd1f4c8ff8166e769b08a2b2c21fb2f19e0d5cae Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 27 Oct 2022 14:26:04 +0100
Subject: [PATCH 58/77] Bump Xamarin.AndroidX.RecyclerView from 1.2.1.7 to
 1.2.1.8 (#10929)

Bumps [Xamarin.AndroidX.RecyclerView](https://github.com/xamarin/AndroidX) from 1.2.1.7 to 1.2.1.8.
- [Release notes](https://github.com/xamarin/AndroidX/releases)
- [Commits](https://github.com/xamarin/AndroidX/commits)

---
updated-dependencies:
- dependency-name: Xamarin.AndroidX.RecyclerView
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

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

diff --git a/eng/AndroidX.targets b/eng/AndroidX.targets
index bbd6937c979f..dde929fa5075 100644
--- a/eng/AndroidX.targets
+++ b/eng/AndroidX.targets
@@ -42,7 +42,7 @@
     />
     <PackageReference
         Update="Xamarin.AndroidX.RecyclerView"
-        Version="1.2.1.7"
+        Version="1.2.1.8"
     />
     <PackageReference
         Update="Xamarin.Build.Download"

From ba60a9f55f371e958d9ea71898d103a00c8707be Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 27 Oct 2022 14:26:41 +0100
Subject: [PATCH 59/77] Bump Xamarin.Google.Crypto.Tink.Android from 1.7.0 to
 1.7.0.1 (#10930)

Bumps [Xamarin.Google.Crypto.Tink.Android](https://github.com/xamarin/AndroidX) from 1.7.0 to 1.7.0.1.
- [Release notes](https://github.com/xamarin/AndroidX/releases)
- [Commits](https://github.com/xamarin/AndroidX/commits)

---
updated-dependencies:
- dependency-name: Xamarin.Google.Crypto.Tink.Android
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

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

diff --git a/eng/Versions.props b/eng/Versions.props
index afcd6ea75460..429e3f661897 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -48,7 +48,7 @@
     <!-- must be kept in sync with the binding library version to it here: -->
     <_XamarinAndroidGlideVersion>4.13.2.2</_XamarinAndroidGlideVersion>
     <_XamarinAndroidXSecurityVersion>1.1.0-alpha03</_XamarinAndroidXSecurityVersion>
-    <_XamarinGoogleCryptoTinkAndroidVersion>1.7.0</_XamarinGoogleCryptoTinkAndroidVersion>
+    <_XamarinGoogleCryptoTinkAndroidVersion>1.7.0.1</_XamarinGoogleCryptoTinkAndroidVersion>
     <!-- Android Maps -->
     <XamarinGooglePlayServicesMaps>118.1.0</XamarinGooglePlayServicesMaps>
     <!--

From 35a8994d071bd57ab8b76deede40359b9010a41c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 27 Oct 2022 14:27:21 +0100
Subject: [PATCH 60/77] Bump Xamarin.AndroidX.Browser from 1.4.0.2 to 1.4.0.3
 (#10932)

Bumps [Xamarin.AndroidX.Browser](https://github.com/xamarin/AndroidX) from 1.4.0.2 to 1.4.0.3.
- [Release notes](https://github.com/xamarin/AndroidX/releases)
- [Commits](https://github.com/xamarin/AndroidX/commits)

---
updated-dependencies:
- dependency-name: Xamarin.AndroidX.Browser
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

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

diff --git a/eng/AndroidX.targets b/eng/AndroidX.targets
index dde929fa5075..d0ed9dab8368 100644
--- a/eng/AndroidX.targets
+++ b/eng/AndroidX.targets
@@ -6,7 +6,7 @@
     />
     <PackageReference
         Update="Xamarin.AndroidX.Browser"
-        Version="1.4.0.2"
+        Version="1.4.0.3"
     />
     <PackageReference
         Update="Xamarin.AndroidX.Legacy.Support.V4"

From c68bfca97742a48230b78e3544f781fccb5a4a5e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 27 Oct 2022 14:28:39 +0100
Subject: [PATCH 61/77] Bump Xamarin.AndroidX.Window.WindowJava from 1.0.0.9 to
 1.0.0.10 (#10935)

Bumps [Xamarin.AndroidX.Window.WindowJava](https://github.com/xamarin/AndroidX) from 1.0.0.9 to 1.0.0.10.
- [Release notes](https://github.com/xamarin/AndroidX/releases)
- [Commits](https://github.com/xamarin/AndroidX/commits)

---
updated-dependencies:
- dependency-name: Xamarin.AndroidX.Window.WindowJava
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

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

diff --git a/eng/AndroidX.targets b/eng/AndroidX.targets
index d0ed9dab8368..9259253e0cae 100644
--- a/eng/AndroidX.targets
+++ b/eng/AndroidX.targets
@@ -59,7 +59,7 @@
     />
     <PackageReference
         Update="Xamarin.AndroidX.Window.WindowJava"
-        Version="1.0.0.9"
+        Version="1.0.0.10"
     />
   </ItemGroup>
 </Project>

From dbfaf45b11ceeb34b0a68fef03dab9d9be9a1dc4 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Thu, 27 Oct 2022 16:43:08 +0200
Subject: [PATCH 62/77] Dispose empty sets and try/catch exceptions (#10955)

Workaround for https://github.com/xamarin/xamarin-macios/issues/13704
---
 .../src/Platform/iOS/ApplicationExtensions.cs | 20 +++++++++----
 .../src/Platform/WindowStateManager.ios.cs    | 30 +++++++++++++++----
 2 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/src/Core/src/Platform/iOS/ApplicationExtensions.cs b/src/Core/src/Platform/iOS/ApplicationExtensions.cs
index cdaff59c07d6..41683e290f83 100644
--- a/src/Core/src/Platform/iOS/ApplicationExtensions.cs
+++ b/src/Core/src/Platform/iOS/ApplicationExtensions.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Runtime.Versioning;
 using Foundation;
 using Microsoft.Extensions.Logging;
@@ -57,14 +58,23 @@ public static void CreatePlatformWindow(this IUIWindowSceneDelegate sceneDelegat
 				dicts.Add(session.UserInfo);
 			if (session.StateRestorationActivity?.UserInfo is not null)
 				dicts.Add(session.StateRestorationActivity.UserInfo);
-			if (connectionOptions.UserActivities is not null)
+			try
 			{
-				foreach (var u in connectionOptions.UserActivities)
+				using var activities = connectionOptions.UserActivities;
+				if (activities is not null)
 				{
-					if (u is NSUserActivity userActivity && userActivity.UserInfo is not null)
-						dicts.Add(userActivity.UserInfo);
+					foreach (var u in activities)
+					{
+						if (u is NSUserActivity userActivity && userActivity.UserInfo is not null)
+							dicts.Add(userActivity.UserInfo);
+					}
 				}
 			}
+			catch (InvalidCastException)
+			{
+				// HACK: Workaround for https://github.com/xamarin/xamarin-macios/issues/13704
+				//       This only throws if the collection is empty.
+			}
 
 			var window = CreatePlatformWindow(application, scene as UIWindowScene, dicts.ToArray());
 			if (window is not null)
diff --git a/src/Essentials/src/Platform/WindowStateManager.ios.cs b/src/Essentials/src/Platform/WindowStateManager.ios.cs
index b03f794ac24c..16e64f18a1bf 100644
--- a/src/Essentials/src/Platform/WindowStateManager.ios.cs
+++ b/src/Essentials/src/Platform/WindowStateManager.ios.cs
@@ -101,9 +101,18 @@ public void Init(Func<UIViewController?>? getCurrentUIViewController) =>
 			// if we have scene support, use that
 			if (OperatingSystem.IsIOSVersionAtLeast(13) || OperatingSystem.IsMacCatalystVersionAtLeast(13))
 			{
-				var scenes = UIApplication.SharedApplication.ConnectedScenes;
-				var windowScene = scenes.ToArray<UIWindowScene>().FirstOrDefault();
-				return windowScene?.Windows.FirstOrDefault();
+				try
+				{
+					using var scenes = UIApplication.SharedApplication.ConnectedScenes;
+					var windowScene = scenes.ToArray<UIWindowScene>().FirstOrDefault();
+					return windowScene?.Windows.FirstOrDefault();
+				}
+				catch (InvalidCastException)
+				{
+					// HACK: Workaround for https://github.com/xamarin/xamarin-macios/issues/13704
+					//       This only throws if the collection is empty.
+					return null;
+				}
 			}
 
 			// use the windows property (up to 13.0)
@@ -115,9 +124,18 @@ public void Init(Func<UIViewController?>? getCurrentUIViewController) =>
 			// if we have scene support, use that
 			if (OperatingSystem.IsIOSVersionAtLeast(13) || OperatingSystem.IsMacCatalystVersionAtLeast(13))
 			{
-				var scenes = UIApplication.SharedApplication.ConnectedScenes;
-				var windowScene = scenes.ToArray<UIWindowScene>().FirstOrDefault();
-				return windowScene?.Windows;
+				try
+				{
+					using var scenes = UIApplication.SharedApplication.ConnectedScenes;
+					var windowScene = scenes.ToArray<UIWindowScene>().FirstOrDefault();
+					return windowScene?.Windows;
+				}
+				catch (InvalidCastException)
+				{
+					// HACK: Workaround for https://github.com/xamarin/xamarin-macios/issues/13704
+					//       This only throws if the collection is empty.
+					return null;
+				}
 			}
 
 			// use the windows property (up to 15.0)

From c94e11eefd1b9d2241997d772b80ed2822678fff Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Thu, 27 Oct 2022 16:43:08 +0200
Subject: [PATCH 63/77] Dispose empty sets and try/catch exceptions (#10955)

Workaround for https://github.com/xamarin/xamarin-macios/issues/13704
---
 .../src/Platform/iOS/ApplicationExtensions.cs | 20 +++++++++----
 .../src/Platform/WindowStateManager.ios.cs    | 30 +++++++++++++++----
 2 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/src/Core/src/Platform/iOS/ApplicationExtensions.cs b/src/Core/src/Platform/iOS/ApplicationExtensions.cs
index cdaff59c07d6..41683e290f83 100644
--- a/src/Core/src/Platform/iOS/ApplicationExtensions.cs
+++ b/src/Core/src/Platform/iOS/ApplicationExtensions.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Runtime.Versioning;
 using Foundation;
 using Microsoft.Extensions.Logging;
@@ -57,14 +58,23 @@ public static void CreatePlatformWindow(this IUIWindowSceneDelegate sceneDelegat
 				dicts.Add(session.UserInfo);
 			if (session.StateRestorationActivity?.UserInfo is not null)
 				dicts.Add(session.StateRestorationActivity.UserInfo);
-			if (connectionOptions.UserActivities is not null)
+			try
 			{
-				foreach (var u in connectionOptions.UserActivities)
+				using var activities = connectionOptions.UserActivities;
+				if (activities is not null)
 				{
-					if (u is NSUserActivity userActivity && userActivity.UserInfo is not null)
-						dicts.Add(userActivity.UserInfo);
+					foreach (var u in activities)
+					{
+						if (u is NSUserActivity userActivity && userActivity.UserInfo is not null)
+							dicts.Add(userActivity.UserInfo);
+					}
 				}
 			}
+			catch (InvalidCastException)
+			{
+				// HACK: Workaround for https://github.com/xamarin/xamarin-macios/issues/13704
+				//       This only throws if the collection is empty.
+			}
 
 			var window = CreatePlatformWindow(application, scene as UIWindowScene, dicts.ToArray());
 			if (window is not null)
diff --git a/src/Essentials/src/Platform/WindowStateManager.ios.cs b/src/Essentials/src/Platform/WindowStateManager.ios.cs
index b03f794ac24c..16e64f18a1bf 100644
--- a/src/Essentials/src/Platform/WindowStateManager.ios.cs
+++ b/src/Essentials/src/Platform/WindowStateManager.ios.cs
@@ -101,9 +101,18 @@ public void Init(Func<UIViewController?>? getCurrentUIViewController) =>
 			// if we have scene support, use that
 			if (OperatingSystem.IsIOSVersionAtLeast(13) || OperatingSystem.IsMacCatalystVersionAtLeast(13))
 			{
-				var scenes = UIApplication.SharedApplication.ConnectedScenes;
-				var windowScene = scenes.ToArray<UIWindowScene>().FirstOrDefault();
-				return windowScene?.Windows.FirstOrDefault();
+				try
+				{
+					using var scenes = UIApplication.SharedApplication.ConnectedScenes;
+					var windowScene = scenes.ToArray<UIWindowScene>().FirstOrDefault();
+					return windowScene?.Windows.FirstOrDefault();
+				}
+				catch (InvalidCastException)
+				{
+					// HACK: Workaround for https://github.com/xamarin/xamarin-macios/issues/13704
+					//       This only throws if the collection is empty.
+					return null;
+				}
 			}
 
 			// use the windows property (up to 13.0)
@@ -115,9 +124,18 @@ public void Init(Func<UIViewController?>? getCurrentUIViewController) =>
 			// if we have scene support, use that
 			if (OperatingSystem.IsIOSVersionAtLeast(13) || OperatingSystem.IsMacCatalystVersionAtLeast(13))
 			{
-				var scenes = UIApplication.SharedApplication.ConnectedScenes;
-				var windowScene = scenes.ToArray<UIWindowScene>().FirstOrDefault();
-				return windowScene?.Windows;
+				try
+				{
+					using var scenes = UIApplication.SharedApplication.ConnectedScenes;
+					var windowScene = scenes.ToArray<UIWindowScene>().FirstOrDefault();
+					return windowScene?.Windows;
+				}
+				catch (InvalidCastException)
+				{
+					// HACK: Workaround for https://github.com/xamarin/xamarin-macios/issues/13704
+					//       This only throws if the collection is empty.
+					return null;
+				}
 			}
 
 			// use the windows property (up to 15.0)

From b7eb8c1345d3fd58c3923514a7a15dee5fd57c11 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Thu, 27 Oct 2022 21:28:34 +0200
Subject: [PATCH 64/77] Update .NET 6 MAUI version (#10962)

---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 7bd3cc41f121..32726c2cce16 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <!-- Current previous .NET SDK major version's stable release of MAUI packages -->
-    <MicrosoftMauiPreviousDotNetReleasedVersion>6.0.546</MicrosoftMauiPreviousDotNetReleasedVersion>
+    <MicrosoftMauiPreviousDotNetReleasedVersion>6.0.547</MicrosoftMauiPreviousDotNetReleasedVersion>
     <!-- dotnet/installer -->
     <MicrosoftDotnetSdkInternalPackageVersion>7.0.100-rtm.22519.39</MicrosoftDotnetSdkInternalPackageVersion>
     <!-- dotnet/runtime -->

From bd9f41e5aa171a2e0224c5143f0b171ee154fa22 Mon Sep 17 00:00:00 2001
From: ET <48451158+etvorun@users.noreply.github.com>
Date: Thu, 27 Oct 2022 16:01:50 -0700
Subject: [PATCH 65/77] Design time converters should return TRUE for
 CanConvertFrom(typeof(string)) (#10969)

---
 .../GridLengthCollectionDesignTypeConverter.cs            | 8 +++++++-
 .../src/Core.Design/GridLengthDesignTypeConverter.cs      | 4 ++++
 .../GridLengthCollectionDesignTypeConverterTests.cs       | 8 ++++++++
 .../GridLengthDesignTypeConverterTests.cs                 | 8 ++++++++
 4 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/Controls/src/Core.Design/GridLengthCollectionDesignTypeConverter.cs b/src/Controls/src/Core.Design/GridLengthCollectionDesignTypeConverter.cs
index 82d62838821f..0a7258e4ee0f 100644
--- a/src/Controls/src/Core.Design/GridLengthCollectionDesignTypeConverter.cs
+++ b/src/Controls/src/Core.Design/GridLengthCollectionDesignTypeConverter.cs
@@ -1,10 +1,16 @@
-using System.ComponentModel;
+using System;
+using System.ComponentModel;
 using System.Linq;
 
 namespace Microsoft.Maui.Controls.Design
 {
 	public class GridLengthCollectionDesignTypeConverter : TypeConverter
 	{
+		// This tells XAML this converter can be used to process strings
+		// Without this the values won't show up as hints
+		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+			=> sourceType == typeof(string) || base.CanConvertFrom(context, sourceType);
+
 		public override bool IsValid(ITypeDescriptorContext context, object value)
 		{
 			if (value?.ToString() is string strValue)
diff --git a/src/Controls/src/Core.Design/GridLengthDesignTypeConverter.cs b/src/Controls/src/Core.Design/GridLengthDesignTypeConverter.cs
index 7e63cfa3d5c6..2196353db8bb 100644
--- a/src/Controls/src/Core.Design/GridLengthDesignTypeConverter.cs
+++ b/src/Controls/src/Core.Design/GridLengthDesignTypeConverter.cs
@@ -6,6 +6,10 @@ namespace Microsoft.Maui.Controls.Design
 {
 	public class GridLengthDesignTypeConverter : TypeConverter
 	{
+		// This tells XAML this converter can be used to process strings
+		// Without this the values won't show up as hints
+		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+			=> sourceType == typeof(string) || base.CanConvertFrom(context, sourceType);
 
 		public override bool IsValid(ITypeDescriptorContext context, object value)
 		{
diff --git a/src/Controls/tests/Core.Design.UnitTests/GridLengthCollectionDesignTypeConverterTests.cs b/src/Controls/tests/Core.Design.UnitTests/GridLengthCollectionDesignTypeConverterTests.cs
index 5b13645b8493..197866867560 100644
--- a/src/Controls/tests/Core.Design.UnitTests/GridLengthCollectionDesignTypeConverterTests.cs
+++ b/src/Controls/tests/Core.Design.UnitTests/GridLengthCollectionDesignTypeConverterTests.cs
@@ -5,6 +5,14 @@ namespace Microsoft.Maui.Controls.Core.UnitTests
 {
 	public class GridLengthCollectionDesignTypeConverterTests
 	{
+		[Fact]
+		public void GridLengthCollection_CanConvertFromString()
+		{
+			GridLengthCollectionDesignTypeConverter converter = new GridLengthCollectionDesignTypeConverter();
+			bool canConvert = converter.CanConvertFrom(typeof(string));
+			Assert.True(canConvert);
+		}
+
 		[Theory]
 		[InlineData("*,auto,123")]
 		[InlineData("  *, AUTO  ,    123 ")]
diff --git a/src/Controls/tests/Core.Design.UnitTests/GridLengthDesignTypeConverterTests.cs b/src/Controls/tests/Core.Design.UnitTests/GridLengthDesignTypeConverterTests.cs
index 962afd5ab790..8306842a666e 100644
--- a/src/Controls/tests/Core.Design.UnitTests/GridLengthDesignTypeConverterTests.cs
+++ b/src/Controls/tests/Core.Design.UnitTests/GridLengthDesignTypeConverterTests.cs
@@ -5,6 +5,14 @@ namespace Microsoft.Maui.Controls.Core.UnitTests
 {
 	public class GridLengthDesignTypeConverterTests
 	{
+		[Fact]
+		public void GridLength_CanConvertFromString()
+		{
+			GridLengthDesignTypeConverter converter = new GridLengthDesignTypeConverter();
+			bool canConvert = converter.CanConvertFrom(typeof(string));
+			Assert.True(canConvert);
+		}
+
 		[Theory]
 		[InlineData("auto")]
 		[InlineData("Auto ")]

From 5d5711708bbbc0dec7d07781af09eff89e6883d1 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 28 Oct 2022 00:19:44 +0100
Subject: [PATCH 66/77] [net7.0] Update dependencies from
 xamarin/xamarin-macios (#10959)

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221027.8

Microsoft.MacCatalyst.Sdk
 From Version 15.4.2371 -> To Version 15.4.2372

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221027.8

Microsoft.macOS.Sdk
 From Version 12.3.2371 -> To Version 12.3.2372

* Update NuGet.config

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221027.9

Microsoft.iOS.Sdk
 From Version 16.0.1477 -> To Version 16.0.1478

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221027.9

Microsoft.tvOS.Sdk
 From Version 16.0.1477 -> To Version 16.0.1478

* Update NuGet.config

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Rui Marinho <me@ruimarinho.net>
---
 eng/Version.Details.xml | 16 ++++++++--------
 eng/Versions.props      |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index aa0b284490bd..ea99e0ed3ab6 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -12,21 +12,21 @@
       <Uri>https://github.com/xamarin/xamarin-android</Uri>
       <Sha>8f1d9a47205ead80132661f68b0cee9ed0e0220b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.4.2371">
+    <Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.4.2372">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>efd24e1e4f4b92c8d4a098c90c7dabcc053f9f32</Sha>
+      <Sha>754abbf6a3563f6267e5717ae832b4ac25b1f2fb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.macOS.Sdk" Version="12.3.2371">
+    <Dependency Name="Microsoft.macOS.Sdk" Version="12.3.2372">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>efd24e1e4f4b92c8d4a098c90c7dabcc053f9f32</Sha>
+      <Sha>754abbf6a3563f6267e5717ae832b4ac25b1f2fb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.iOS.Sdk" Version="16.0.1477">
+    <Dependency Name="Microsoft.iOS.Sdk" Version="16.0.1478">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>4402959f7d048f253a627915131ea2219bdba2fc</Sha>
+      <Sha>7e129d7643d1d820e9eb20c102d7ab6ad06f7937</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.tvOS.Sdk" Version="16.0.1477">
+    <Dependency Name="Microsoft.tvOS.Sdk" Version="16.0.1478">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>4402959f7d048f253a627915131ea2219bdba2fc</Sha>
+      <Sha>7e129d7643d1d820e9eb20c102d7ab6ad06f7937</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.0-rtm.22504.3" CoherentParentDependency="Microsoft.NETCore.App.Ref">
       <Uri>https://github.com/dotnet/emsdk</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 32726c2cce16..fb8b9e081e88 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -13,10 +13,10 @@
     <!-- xamarin/xamarin-android -->
     <MicrosoftAndroidSdkWindowsPackageVersion>33.0.4</MicrosoftAndroidSdkWindowsPackageVersion>
     <!-- xamarin/xamarin-macios -->
-    <MicrosoftMacCatalystSdkPackageVersion>15.4.2371</MicrosoftMacCatalystSdkPackageVersion>
-    <MicrosoftmacOSSdkPackageVersion>12.3.2371</MicrosoftmacOSSdkPackageVersion>
-    <MicrosoftiOSSdkPackageVersion>16.0.1477</MicrosoftiOSSdkPackageVersion>
-    <MicrosofttvOSSdkPackageVersion>16.0.1477</MicrosofttvOSSdkPackageVersion>
+    <MicrosoftMacCatalystSdkPackageVersion>15.4.2372</MicrosoftMacCatalystSdkPackageVersion>
+    <MicrosoftmacOSSdkPackageVersion>12.3.2372</MicrosoftmacOSSdkPackageVersion>
+    <MicrosoftiOSSdkPackageVersion>16.0.1478</MicrosoftiOSSdkPackageVersion>
+    <MicrosofttvOSSdkPackageVersion>16.0.1478</MicrosofttvOSSdkPackageVersion>
     <!-- Samsung/Tizen.NET -->
     <SamsungTizenSdkPackageVersion>7.0.100</SamsungTizenSdkPackageVersion>
     <!-- emsdk -->

From 5e920a3915bc16e546a492b4fc4ee9aefb139651 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Fri, 28 Oct 2022 01:23:10 +0200
Subject: [PATCH 67/77] Update Microsoft.Maui-mac.slnf (#10954)

---
 Microsoft.Maui-mac.slnf | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Microsoft.Maui-mac.slnf b/Microsoft.Maui-mac.slnf
index 4e808aa48373..748082dc09ee 100644
--- a/Microsoft.Maui-mac.slnf
+++ b/Microsoft.Maui-mac.slnf
@@ -19,6 +19,7 @@
       "src\\Compatibility\\Core\\tests\\iOS\\Compatibility.iOS.UnitTests.csproj",
       "src\\Compatibility\\Maps\\src\\Android\\Compatibility.Maps.Android.csproj",
       "src\\Compatibility\\Maps\\src\\iOS\\Compatibility.Maps.iOS.csproj",
+      "src\\Controls\\Foldable\\src\\Controls.Foldable.csproj",
       "src\\Controls\\Maps\\src\\Controls.Maps.csproj",
       "src\\Controls\\samples\\Controls.Sample.Profiling\\Maui.Controls.Sample.Profiling.csproj",
       "src\\Controls\\samples\\Controls.Sample.Sandbox\\Maui.Controls.Sample.Sandbox.csproj",
@@ -33,6 +34,7 @@
       "src\\Controls\\tests\\CustomAttributes\\Controls.CustomAttributes.csproj",
       "src\\Controls\\tests\\DeviceTests\\Controls.DeviceTests.csproj",
       "src\\Controls\\tests\\Xaml.UnitTests\\Controls.Xaml.UnitTests.csproj",
+      "src\\Core\\maps\\src\\Maps.csproj",
       "src\\Core\\src\\Core.csproj",
       "src\\Core\\tests\\Benchmarks\\Core.Benchmarks.csproj",
       "src\\Core\\tests\\DeviceTests\\Core.DeviceTests.csproj",
@@ -64,4 +66,4 @@
       "src\\Workload\\Microsoft.NET.Sdk.Maui\\Microsoft.NET.Sdk.Maui.csproj"
     ]
   }
-}
\ No newline at end of file
+}

From 033bc87232580e218f8f2d1dbd1b52476ed8272d Mon Sep 17 00:00:00 2001
From: ET <48451158+etvorun@users.noreply.github.com>
Date: Thu, 27 Oct 2022 16:01:50 -0700
Subject: [PATCH 68/77] Design time converters should return TRUE for
 CanConvertFrom(typeof(string)) (#10969)

---
 .../GridLengthCollectionDesignTypeConverter.cs            | 8 +++++++-
 .../src/Core.Design/GridLengthDesignTypeConverter.cs      | 4 ++++
 .../GridLengthCollectionDesignTypeConverterTests.cs       | 8 ++++++++
 .../GridLengthDesignTypeConverterTests.cs                 | 8 ++++++++
 4 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/Controls/src/Core.Design/GridLengthCollectionDesignTypeConverter.cs b/src/Controls/src/Core.Design/GridLengthCollectionDesignTypeConverter.cs
index 82d62838821f..0a7258e4ee0f 100644
--- a/src/Controls/src/Core.Design/GridLengthCollectionDesignTypeConverter.cs
+++ b/src/Controls/src/Core.Design/GridLengthCollectionDesignTypeConverter.cs
@@ -1,10 +1,16 @@
-using System.ComponentModel;
+using System;
+using System.ComponentModel;
 using System.Linq;
 
 namespace Microsoft.Maui.Controls.Design
 {
 	public class GridLengthCollectionDesignTypeConverter : TypeConverter
 	{
+		// This tells XAML this converter can be used to process strings
+		// Without this the values won't show up as hints
+		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+			=> sourceType == typeof(string) || base.CanConvertFrom(context, sourceType);
+
 		public override bool IsValid(ITypeDescriptorContext context, object value)
 		{
 			if (value?.ToString() is string strValue)
diff --git a/src/Controls/src/Core.Design/GridLengthDesignTypeConverter.cs b/src/Controls/src/Core.Design/GridLengthDesignTypeConverter.cs
index 7e63cfa3d5c6..2196353db8bb 100644
--- a/src/Controls/src/Core.Design/GridLengthDesignTypeConverter.cs
+++ b/src/Controls/src/Core.Design/GridLengthDesignTypeConverter.cs
@@ -6,6 +6,10 @@ namespace Microsoft.Maui.Controls.Design
 {
 	public class GridLengthDesignTypeConverter : TypeConverter
 	{
+		// This tells XAML this converter can be used to process strings
+		// Without this the values won't show up as hints
+		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+			=> sourceType == typeof(string) || base.CanConvertFrom(context, sourceType);
 
 		public override bool IsValid(ITypeDescriptorContext context, object value)
 		{
diff --git a/src/Controls/tests/Core.Design.UnitTests/GridLengthCollectionDesignTypeConverterTests.cs b/src/Controls/tests/Core.Design.UnitTests/GridLengthCollectionDesignTypeConverterTests.cs
index 5b13645b8493..197866867560 100644
--- a/src/Controls/tests/Core.Design.UnitTests/GridLengthCollectionDesignTypeConverterTests.cs
+++ b/src/Controls/tests/Core.Design.UnitTests/GridLengthCollectionDesignTypeConverterTests.cs
@@ -5,6 +5,14 @@ namespace Microsoft.Maui.Controls.Core.UnitTests
 {
 	public class GridLengthCollectionDesignTypeConverterTests
 	{
+		[Fact]
+		public void GridLengthCollection_CanConvertFromString()
+		{
+			GridLengthCollectionDesignTypeConverter converter = new GridLengthCollectionDesignTypeConverter();
+			bool canConvert = converter.CanConvertFrom(typeof(string));
+			Assert.True(canConvert);
+		}
+
 		[Theory]
 		[InlineData("*,auto,123")]
 		[InlineData("  *, AUTO  ,    123 ")]
diff --git a/src/Controls/tests/Core.Design.UnitTests/GridLengthDesignTypeConverterTests.cs b/src/Controls/tests/Core.Design.UnitTests/GridLengthDesignTypeConverterTests.cs
index 962afd5ab790..8306842a666e 100644
--- a/src/Controls/tests/Core.Design.UnitTests/GridLengthDesignTypeConverterTests.cs
+++ b/src/Controls/tests/Core.Design.UnitTests/GridLengthDesignTypeConverterTests.cs
@@ -5,6 +5,14 @@ namespace Microsoft.Maui.Controls.Core.UnitTests
 {
 	public class GridLengthDesignTypeConverterTests
 	{
+		[Fact]
+		public void GridLength_CanConvertFromString()
+		{
+			GridLengthDesignTypeConverter converter = new GridLengthDesignTypeConverter();
+			bool canConvert = converter.CanConvertFrom(typeof(string));
+			Assert.True(canConvert);
+		}
+
 		[Theory]
 		[InlineData("auto")]
 		[InlineData("Auto ")]

From e433fb35406fdcd42c77a6704a5a3e6fe01c5127 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Fri, 28 Oct 2022 01:23:10 +0200
Subject: [PATCH 69/77] Update Microsoft.Maui-mac.slnf (#10954)

---
 Microsoft.Maui-mac.slnf | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Microsoft.Maui-mac.slnf b/Microsoft.Maui-mac.slnf
index 77ac8e1cb235..645156a14cfa 100644
--- a/Microsoft.Maui-mac.slnf
+++ b/Microsoft.Maui-mac.slnf
@@ -19,6 +19,7 @@
       "src\\Compatibility\\Core\\tests\\iOS\\Compatibility.iOS.UnitTests.csproj",
       "src\\Compatibility\\Maps\\src\\Android\\Compatibility.Maps.Android.csproj",
       "src\\Compatibility\\Maps\\src\\iOS\\Compatibility.Maps.iOS.csproj",
+      "src\\Controls\\Foldable\\src\\Controls.Foldable.csproj",
       "src\\Controls\\Maps\\src\\Controls.Maps.csproj",
       "src\\Controls\\samples\\Controls.Sample.Profiling\\Maui.Controls.Sample.Profiling.csproj",
       "src\\Controls\\samples\\Controls.Sample.Sandbox\\Maui.Controls.Sample.Sandbox.csproj",
@@ -33,6 +34,7 @@
       "src\\Controls\\tests\\CustomAttributes\\Controls.CustomAttributes.csproj",
       "src\\Controls\\tests\\DeviceTests\\Controls.DeviceTests.csproj",
       "src\\Controls\\tests\\Xaml.UnitTests\\Controls.Xaml.UnitTests.csproj",
+      "src\\Core\\maps\\src\\Maps.csproj",
       "src\\Core\\src\\Core.csproj",
       "src\\Core\\tests\\Benchmarks\\Core.Benchmarks.csproj",
       "src\\Core\\tests\\DeviceTests\\Core.DeviceTests.csproj",
@@ -63,4 +65,4 @@
       "src\\Workload\\Microsoft.NET.Sdk.Maui\\Microsoft.NET.Sdk.Maui.csproj"
     ]
   }
-}
\ No newline at end of file
+}

From a8186c0044755e7d6b45775fa4b8499672745a65 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Fri, 28 Oct 2022 03:24:03 +0200
Subject: [PATCH 70/77] Merge AndroidX from main

---
 eng/AndroidX.targets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/AndroidX.targets b/eng/AndroidX.targets
index 41c56decc730..9259253e0cae 100644
--- a/eng/AndroidX.targets
+++ b/eng/AndroidX.targets
@@ -10,7 +10,7 @@
     />
     <PackageReference
         Update="Xamarin.AndroidX.Legacy.Support.V4"
-        Version="1.0.0.14"
+        Version="1.0.0.15"
     />
     <PackageReference
         Update="Xamarin.AndroidX.Lifecycle.LiveData"
@@ -34,7 +34,7 @@
     />
     <PackageReference
         Update="Xamarin.AndroidX.MediaRouter"
-        Version="1.3.1"
+        Version="1.3.1.1"
     />
     <PackageReference
         Update="Xamarin.AndroidX.Palette"

From ad91996f377bb4fcbe4820560b3518663ba56604 Mon Sep 17 00:00:00 2001
From: Rui Marinho <me@ruimarinho.net>
Date: Thu, 3 Nov 2022 09:32:53 +0000
Subject: [PATCH 71/77] Cherry pick net7 (#11056)

* Fix Author Name (#11015)

* Add await for color check to avoid crash (#11022)

* Remove unused reference (#11048)

* Invoke provisionator with AUTH_TOKEN_GITHUB_COM set (#11041)

# Conflicts:
#	eng/pipelines/common/provision.yml

Co-authored-by: Shane Neuville <shneuvil@microsoft.com>
Co-authored-by: Jonathan Dick <jondick@gmail.com>
Co-authored-by: Connor Adsit <connor.adsit@gmail.com>
---
 eng/pipelines/common/controlgallery-android.yml |  4 +++-
 eng/pipelines/common/controlgallery-ios.yml     |  4 ++++
 eng/pipelines/common/controlgallery-windows.yml |  2 ++
 eng/pipelines/common/provision.yml              |  2 +-
 .../Elements/Label/LabelTests.Android.cs        |  4 ++--
 .../Controls.Xaml.UnitTests.csproj              |  3 +--
 .../Services/Dispatching/DispatcherTests.cs     | 17 ++++++++++++++---
 .../src/DeviceTests.Runners/Assets/credits.html |  2 +-
 8 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/eng/pipelines/common/controlgallery-android.yml b/eng/pipelines/common/controlgallery-android.yml
index 71227846b08c..5b6904bafb94 100644
--- a/eng/pipelines/common/controlgallery-android.yml
+++ b/eng/pipelines/common/controlgallery-android.yml
@@ -8,6 +8,8 @@ steps:
     inputs:
       provisioning_script: $(provisionator.path)
       provisioning_extra_args: $(provisionator.extraArguments)
+    env:
+      AUTH_TOKEN_GITHUB_COM: $(github--pat--vs-mobiletools-engineering-service2)
   
   - task: Bash@3
     displayName: 'Cake Provision'
@@ -70,4 +72,4 @@ steps:
     condition: always()
     inputs:
       PathtoPublish: '$(build.artifactstagingdirectory)'
-      ArtifactName: OSXArtifacts
\ No newline at end of file
+      ArtifactName: OSXArtifacts
diff --git a/eng/pipelines/common/controlgallery-ios.yml b/eng/pipelines/common/controlgallery-ios.yml
index f196d3680247..f8655469516e 100644
--- a/eng/pipelines/common/controlgallery-ios.yml
+++ b/eng/pipelines/common/controlgallery-ios.yml
@@ -7,6 +7,8 @@ steps:
     condition: ne(variables['REQUIRED_XCODE'], '')
     inputs:
       provisioning_script: $(provisionator.xcode)
+    env:
+      AUTH_TOKEN_GITHUB_COM: $(github--pat--vs-mobiletools-engineering-service2)
 
   - task: xamops.azdevex.provisionator-task.provisionator@1
     displayName: 'Provisionator'
@@ -14,6 +16,8 @@ steps:
     inputs:
       provisioning_script: $(provisionator.path)
       provisioning_extra_args: $(provisionator.extraArguments)
+    env:
+      AUTH_TOKEN_GITHUB_COM: $(github--pat--vs-mobiletools-engineering-service2)
 
   - script: |
       echo "##vso[task.prependpath]/Library/Frameworks/Mono.framework/Versions/Current/Commands/"
diff --git a/eng/pipelines/common/controlgallery-windows.yml b/eng/pipelines/common/controlgallery-windows.yml
index c7cc08578b3e..e7f004f54717 100644
--- a/eng/pipelines/common/controlgallery-windows.yml
+++ b/eng/pipelines/common/controlgallery-windows.yml
@@ -8,6 +8,8 @@ steps:
     inputs:
       provisioning_script: $(provisionator.path)
       provisioning_extra_args: $(provisionator.extraArguments)
+    env:
+      AUTH_TOKEN_GITHUB_COM: $(github--pat--vs-mobiletools-engineering-service2)
 
   - powershell: |
       $(System.DefaultWorkingDirectory)/build.ps1 --target provision --TeamProject="$(System.TeamProject)"
diff --git a/eng/pipelines/common/provision.yml b/eng/pipelines/common/provision.yml
index 1a8861540f7c..470947f78f8a 100644
--- a/eng/pipelines/common/provision.yml
+++ b/eng/pipelines/common/provision.yml
@@ -100,6 +100,7 @@ steps:
         provisioning_script: $(provisionator.vs)
       env:
         PROVISIONATOR_CHANNEL: ${{ parameters.provisionatorChannel }}
+        AUTH_TOKEN_GITHUB_COM: $(github--pat--vs-mobiletools-engineering-service2)
     # Provision Additional Software
     - task: xamops.azdevex.provisionator-task.provisionator@1
       displayName: 'Provision Additional Software'
@@ -110,7 +111,6 @@ steps:
       env:
         PROVISIONATOR_CHANNEL: ${{ parameters.provisionatorChannel }}
         AUTH_TOKEN_GITHUB_COM: $(github--pat--vs-mobiletools-engineering-service2)
-
     - pwsh: |
         $msbuild = "$env:ProgramFiles/Microsoft Visual Studio/2022/Preview/MSBuild/Current/Bin/MSBuild.exe"
         echo "##vso[task.setvariable variable=MSBUILD_EXE]$msbuild"
diff --git a/src/Controls/tests/DeviceTests/Elements/Label/LabelTests.Android.cs b/src/Controls/tests/DeviceTests/Elements/Label/LabelTests.Android.cs
index 47203515d0ff..a452edf41e6a 100644
--- a/src/Controls/tests/DeviceTests/Elements/Label/LabelTests.Android.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Label/LabelTests.Android.cs
@@ -49,11 +49,11 @@ int GetPlatformMaxLines(LabelHandler labelHandler) =>
 
 		Task ValidateHasColor(Label label, Color color, Action action = null)
 		{
-			return InvokeOnMainThreadAsync(() =>
+			return InvokeOnMainThreadAsync(async () =>
 			{
 				var labelHandler = CreateHandler<LabelHandler>(label);
 				action?.Invoke();
-				labelHandler.PlatformView.AssertContainsColor(color);
+				await labelHandler.PlatformView.AssertContainsColor(color);
 			});
 		}
 	}
diff --git a/src/Controls/tests/Xaml.UnitTests/Controls.Xaml.UnitTests.csproj b/src/Controls/tests/Xaml.UnitTests/Controls.Xaml.UnitTests.csproj
index db82aec28992..b29560fc0473 100644
--- a/src/Controls/tests/Xaml.UnitTests/Controls.Xaml.UnitTests.csproj
+++ b/src/Controls/tests/Xaml.UnitTests/Controls.Xaml.UnitTests.csproj
@@ -19,7 +19,6 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
-    <PackageReference Include="JetBrains.DotMemoryUnit" Version="3.1.20200127.214830" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
     <PackageReference Include="Mono.Cecil" Version="0.11.4" />
@@ -52,4 +51,4 @@
 
   <Import Project="$(MauiSrcDirectory)Maui.InTree.props" Condition=" '$(UseMaui)' != 'true' " />
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Core/tests/DeviceTests/Services/Dispatching/DispatcherTests.cs b/src/Core/tests/DeviceTests/Services/Dispatching/DispatcherTests.cs
index 322d7e01bf57..ed9e2ab659f7 100644
--- a/src/Core/tests/DeviceTests/Services/Dispatching/DispatcherTests.cs
+++ b/src/Core/tests/DeviceTests/Services/Dispatching/DispatcherTests.cs
@@ -183,21 +183,32 @@ public Task CreateTimerRepeatingRepeats() =>
 				timer.Interval = TimeSpan.FromMilliseconds(200);
 				timer.IsRepeating = true;
 
+				TaskCompletionSource taskCompletionSource = new TaskCompletionSource();
+
 				timer.Tick += (_, _) =>
 				{
 					Assert.True(timer.IsRunning, "Timer was not running DURING the tick.");
 					ticks++;
+
+					if (ticks > 1)
+						taskCompletionSource.SetResult();
 				};
 
 				timer.Start();
 
 				Assert.True(timer.IsRunning, "Timer was not running AFTER the tick.");
 
-				// Give it time to repeat at least once
-				await Task.Delay(TimeSpan.FromSeconds(1));
+				try
+				{
+					await taskCompletionSource.Task.WaitAsync(TimeSpan.FromSeconds(5)).ConfigureAwait(false);
+				}
+				catch (TaskCanceledException)
+				{
+					// If the task is cancelled we want it to just fall through to the assert
+				}
 
 				// If it's repeating, ticks will be greater than 1
-				Assert.True(ticks > 1);
+				Assert.True(ticks > 1, $"# of Ticks: {ticks}, expected > 1");
 			});
 
 		class TimerDisposer : IDisposable
diff --git a/src/TestUtils/src/DeviceTests.Runners/Assets/credits.html b/src/TestUtils/src/DeviceTests.Runners/Assets/credits.html
index 4e88141b25b0..65a209fcf79d 100644
--- a/src/TestUtils/src/DeviceTests.Runners/Assets/credits.html
+++ b/src/TestUtils/src/DeviceTests.Runners/Assets/credits.html
@@ -7,7 +7,7 @@
     All rights reserved.<br />
     <br />
 
-    Author: Oren Novotny<hr />
+    Author: Claire Novotny<hr />
     <br />
 
     <a href="https://xunit.net/">About xUnit</a><br />

From 6ded1cb44d631f32061999a11265253cbd96b5c8 Mon Sep 17 00:00:00 2001
From: Rui Marinho <me@ruimarinho.net>
Date: Thu, 3 Nov 2022 15:21:50 +0000
Subject: [PATCH 72/77] Continue if provisionator fails (#11068) (#11081)

* Continue if provisionator fails

* Try not fail with agent-cleanser

* Centralize the agent-cleanser

* Remove extra   agent-cleanser

* agent-cleanser is on provisionator.yml now
---
 eng/pipelines/common/device-tests-steps.yml |  6 ------
 eng/pipelines/common/pack.yml               |  6 ------
 eng/pipelines/common/provision.yml          |  8 ++++++++
 eng/pipelines/handlers.yml                  | 19 +------------------
 4 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/eng/pipelines/common/device-tests-steps.yml b/eng/pipelines/common/device-tests-steps.yml
index 92f6daff4628..9617544c0932 100644
--- a/eng/pipelines/common/device-tests-steps.yml
+++ b/eng/pipelines/common/device-tests-steps.yml
@@ -6,12 +6,6 @@ parameters:
   provisionatorChannel: 'latest'
 
 steps:
-  - template: agent-cleanser/v1.yml@xamarin-templates
-    parameters:
-      UninstallMono: false
-      UninstallXamarinMac: false
-      CleanseAgentToolsDotNet: true           # Cleanse all .NET versions under the agent tools directory and use only those provisioned by the pipeline
-
   - template: provision.yml
     parameters:
       platform: macos
diff --git a/eng/pipelines/common/pack.yml b/eng/pipelines/common/pack.yml
index 6a457f2efa35..75eaf4d486a6 100644
--- a/eng/pipelines/common/pack.yml
+++ b/eng/pipelines/common/pack.yml
@@ -5,12 +5,6 @@ parameters:
   artifact: 'nuget'
 
 steps:
-  - ${{ if eq(parameters.platform, 'macOS') }}:
-    - template: agent-cleanser/v1.yml@xamarin-templates
-      parameters:
-        UninstallMono: false
-        UninstallXamarinMac: false
-        CleanseAgentToolsDotNet: true           # Cleanse all .NET versions under the agent tools directory and use only those provisioned by the pipeline
   - template: provision.yml
     parameters:
       platform: ${{ parameters.platform }}
diff --git a/eng/pipelines/common/provision.yml b/eng/pipelines/common/provision.yml
index 470947f78f8a..fd22d958d0ef 100644
--- a/eng/pipelines/common/provision.yml
+++ b/eng/pipelines/common/provision.yml
@@ -18,6 +18,13 @@ steps:
 
   # Prepare macOS
   - ${{ if eq(parameters.platform, 'macos') }}:
+    - template: agent-cleanser/v1.yml@xamarin-templates
+      parameters:
+        UninstallMono: false
+        UninstallXamarinMac: false
+        CleanseAgentToolsDotNet: true           # Cleanse all .NET versions under the agent tools directory and use only those provisioned by the pipeline
+        SelfHealPowerShell: false
+        AUTH_TOKEN_GITHUB_COM: $(github--pat--vs-mobiletools-engineering-service2)
     # Provision Xcode
     - ${{ if ne(parameters.skipXcode, 'true') }}:
       - task: xamops.azdevex.provisionator-task.provisionator@1
@@ -33,6 +40,7 @@ steps:
     - task: xamops.azdevex.provisionator-task.provisionator@1
       displayName: 'Provision Additional Software'
       condition: eq(variables['provisioning'], 'true')
+      continueOnError: true 
       inputs:
         provisioning_script: $(provisionator.path)
         provisioning_extra_args: $(provisionator.extraArguments)
diff --git a/eng/pipelines/handlers.yml b/eng/pipelines/handlers.yml
index 860514144f30..d85c6eb77af2 100644
--- a/eng/pipelines/handlers.yml
+++ b/eng/pipelines/handlers.yml
@@ -148,12 +148,6 @@ stages:
                 - Agent.HasDevices -equals False
                 - Agent.IsPaired -equals False
             steps:
-              - ${{ if eq(BuildPlatform.name, 'macOS') }}:
-                - template: agent-cleanser/v1.yml@xamarin-templates
-                  parameters:
-                    UninstallMono: false
-                    UninstallXamarinMac: false
-                    CleanseAgentToolsDotNet: true           # Cleanse all .NET versions under the agent tools directory and use only those provisioned by the pipeline
               - template: common/provision.yml
                 parameters:
                   platform: ${{ BuildPlatform.name }}
@@ -231,18 +225,13 @@ stages:
                 - Agent.HasDevices -equals False
                 - Agent.IsPaired -equals False
             steps:
-              - ${{ if eq(BuildPlatform.name, 'macOS') }}:
-                - template: agent-cleanser/v1.yml@xamarin-templates
-                  parameters:
-                    UninstallMono: false
-                    UninstallXamarinMac: false
-                    CleanseAgentToolsDotNet: true           # Cleanse all .NET versions under the agent tools directory and use only those provisioned by the pipeline
               - template: common/provision.yml
                 parameters:
                   platform: ${{ BuildPlatform.name }}
                   poolName: ${{ BuildPlatform.poolName }}
                   provisioning: true
                   provisionatorChannel: ${{ parameters.provisionatorChannel }}
+                  
               - task: DownloadBuildArtifacts@0
                 displayName: 'Download Packages'
                 inputs:
@@ -290,12 +279,6 @@ stages:
                   - Agent.HasDevices -equals False
                   - Agent.IsPaired -equals False
               steps:
-                - ${{ if eq(BuildPlatform.name, 'macOS') }}:
-                  - template: agent-cleanser/v1.yml@xamarin-templates
-                    parameters:
-                      UninstallMono: false
-                      UninstallXamarinMac: false
-                      CleanseAgentToolsDotNet: true           # Cleanse all .NET versions under the agent tools directory and use only those provisioned by the pipeline
                 - template: common/provision.yml
                   parameters:
                     platform: ${{ BuildPlatform.name }}

From 02a4d8e7ca8c845df52d0b3babf15e076724c059 Mon Sep 17 00:00:00 2001
From: Gerald Versluis <gerald.versluis@microsoft.com>
Date: Thu, 3 Nov 2022 18:35:49 +0100
Subject: [PATCH 73/77] [foldable] XML doc additions (#10972) (#11091)

Co-authored-by: Craig Dunn <craig.dunn@microsoft.com>
---
 .../src/Android/HostBuilderExtensions.cs      |  9 ++++
 src/Controls/Foldable/src/DualScreenInfo.cs   | 47 ++++++++++++++++--
 .../Foldable/src/HostBuilderExtensions.cs     |  1 +
 .../Foldable/src/SpanModeStateTrigger.cs      |  8 ++++
 src/Controls/Foldable/src/TwoPaneView.cs      | 48 +++++++++++++++++++
 src/Controls/Foldable/src/TwoPaneViewMode.cs  | 16 ++++++-
 .../Foldable/src/TwoPaneViewPriority.cs       | 11 +++++
 .../src/TwoPaneViewTallModeConfiguration.cs   | 15 +++++-
 .../src/TwoPaneViewWideModeConfiguration.cs   | 15 +++++-
 .../src/WindowSpanModeStateTrigger.cs         |  8 ++++
 10 files changed, 171 insertions(+), 7 deletions(-)

diff --git a/src/Controls/Foldable/src/Android/HostBuilderExtensions.cs b/src/Controls/Foldable/src/Android/HostBuilderExtensions.cs
index b7195caebb18..a3eab0e2c080 100644
--- a/src/Controls/Foldable/src/Android/HostBuilderExtensions.cs
+++ b/src/Controls/Foldable/src/Android/HostBuilderExtensions.cs
@@ -21,6 +21,15 @@ static FoldableService GetFoldableService(Activity activity)
 
 		}
 
+		/// <summary>
+		/// Configure the .NET MAUI app to listen for fold-related events
+		/// in the Android lifecycle. Ensures <see cref="Microsoft.Maui.Controls.Foldable.TwoPaneView"/>
+		/// can detect and layout around a hinge or screen fold.
+		/// </summary>
+		/// <remarks>
+		/// Relies on Jetpack Window Manager to detect and respond to
+		/// foldable device features and capabilities.
+		/// </remarks>
 		public static MauiAppBuilder UseFoldable(this MauiAppBuilder builder)
 		{
 			builder.Services.AddScoped(typeof(IFoldableContext), (sp) => new FoldableService());
diff --git a/src/Controls/Foldable/src/DualScreenInfo.cs b/src/Controls/Foldable/src/DualScreenInfo.cs
index bd6e57733f0c..01d0da65f381 100644
--- a/src/Controls/Foldable/src/DualScreenInfo.cs
+++ b/src/Controls/Foldable/src/DualScreenInfo.cs
@@ -13,16 +13,31 @@
 
 namespace Microsoft.Maui.Foldable
 {
+	/// <summary>
+	/// Event args for <see cref="Microsoft.Maui.Foldable.DualScreenInfo"/>'s 
+	/// HingeAngleChanged event on foldable devices.
+	/// </summary>
 	public class HingeAngleChangedEventArgs : EventArgs
 	{
+		/// <summary>
+		/// Creates a new HingeAngleChangedEventArgs specifying 
+		/// the angle of the hinge between the screens.
+		/// </summary>
 		public HingeAngleChangedEventArgs(double hingeAngleInDegrees)
 		{
 			HingeAngleInDegrees = hingeAngleInDegrees;
 		}
 
+		/// <summary>
+		/// Current angle of the hinge between the screens on a foldable device (0 - 360 degrees).
+		/// </summary>
 		public double HingeAngleInDegrees { get; }
 	}
 
+	/// <summary>
+	/// Provides details about the visible areas a layout occupies so the content 
+	/// can be positioned around where the screens split.
+	/// </summary>
 	public partial class DualScreenInfo : INotifyPropertyChanged
 	{
 		Rect[] _spanningBounds;
@@ -38,7 +53,14 @@ public partial class DualScreenInfo : INotifyPropertyChanged
 
 		static Lazy<DualScreenInfo> _dualScreenInfo { get; } = new Lazy<DualScreenInfo>(OnCreate);
 
+		/// <summary>
+		/// Singleton that provides information about how the app window is 
+		/// positioned across both screens.
+		/// </summary>
 		public static DualScreenInfo Current => _dualScreenInfo.Value;
+		/// <summary>
+		/// Used to watch for changes of any properties.
+		/// </summary>
 		public event PropertyChangedEventHandler PropertyChanged;
 
 		public DualScreenInfo(VisualElement element) : this(element, null)
@@ -70,6 +92,10 @@ internal void SetFoldableService(IFoldableService foldableService)
 
 		EventHandler<HingeAngleChangedEventArgs> _hingeAngleChanged;
 		int subscriberCount = 0;
+		/// <summary>
+		/// Triggered whenever the hinge angle is changed as a device is 
+		/// folded or unfolded.
+		/// </summary>
 		public event EventHandler<HingeAngleChangedEventArgs> HingeAngleChanged
 		{
 			add
@@ -84,7 +110,11 @@ public event EventHandler<HingeAngleChangedEventArgs> HingeAngleChanged
 			}
 		}
 
-
+		/// <summary>
+		/// When spanned across two regions this will return a 
+		/// <see cref="Microsoft.Maui.Graphics.Rect"/> 
+		/// for each region. If not spanned this will return an empty array.
+		/// </summary>
 		public Rect[] SpanningBounds
 		{
 			get => GetSpanningBounds();
@@ -102,6 +132,10 @@ public Rect[] SpanningBounds
 			}
 		}
 
+		/// <summary>
+		/// A <see cref="Microsoft.Maui.Graphics.Rect"/> 
+		/// representing the absolute screen positioning of the device's hinge.
+		/// </summary>
 		public Rect HingeBounds
 		{
 			get => GetHingeBounds();
@@ -111,11 +145,12 @@ public Rect HingeBounds
 			}
 		}
 
-		/// <summary>
+		/// <summary>Indicates if the device is Landscape.</summary>
+		/// <remarks>
 		/// Used when app is detected to be on a single screen - 
 		/// mainly on Surface Duo (although possible also on other
 		/// foldable with multi-window enabled)
-		/// </summary>
+		/// </remarks>
 		public bool IsLandscape
 		{
 			get => GetIsLandscape();
@@ -126,7 +161,7 @@ public bool IsLandscape
 		}
 
 		/// <summary>
-		/// Determines the layout direction of the panes
+		/// Determines the layout direction of the panes:
 		/// SinglePane, Wide, Tall
 		/// </summary>
 		public TwoPaneViewMode SpanMode
@@ -200,6 +235,10 @@ void ProcessHingeAngleSubscriberCount(int newCount) { }
 #else
 
 		static object hingeAngleLock = new object();
+		/// <summary>
+		/// Query the current hinge angle of the foldable device.
+		/// </summary>
+		/// <returns>Hinge angle between 0 and 360 degrees.</returns>
 		public Task<int> GetHingeAngleAsync() => FoldableService?.GetHingeAngleAsync() ?? Task.FromResult(0);
 
 		void ProcessHingeAngleSubscriberCount(int newCount)
diff --git a/src/Controls/Foldable/src/HostBuilderExtensions.cs b/src/Controls/Foldable/src/HostBuilderExtensions.cs
index 663270c0cb66..4ab8875f591c 100644
--- a/src/Controls/Foldable/src/HostBuilderExtensions.cs
+++ b/src/Controls/Foldable/src/HostBuilderExtensions.cs
@@ -4,6 +4,7 @@ namespace Microsoft.Maui.Foldable
 {
 	public static partial class HostBuilderExtensions
 	{
+		// see Android/HostBuilderExtension.cs for the real implementation
 #if !ANDROID
 		public static MauiAppBuilder UseFoldable(this MauiAppBuilder builder) =>
 			builder;
diff --git a/src/Controls/Foldable/src/SpanModeStateTrigger.cs b/src/Controls/Foldable/src/SpanModeStateTrigger.cs
index 4a3a863034d5..c5e0a39d0015 100644
--- a/src/Controls/Foldable/src/SpanModeStateTrigger.cs
+++ b/src/Controls/Foldable/src/SpanModeStateTrigger.cs
@@ -5,6 +5,10 @@
 
 namespace Microsoft.Maui.Controls.Foldable
 {
+	/// <summary>
+	/// Triggers a state change when the <see cref="Microsoft.Maui.Controls.Foldable.TwoPaneViewMode"/>
+	/// of the attached layout changes.
+	/// </summary>
 	public sealed class SpanModeStateTrigger : StateTriggerBase
 	{
 		VisualElement _visualElement;
@@ -14,6 +18,10 @@ public SpanModeStateTrigger()
 			UpdateState();
 		}
 
+		/// <summary>
+		/// <see cref="Microsoft.Maui.Controls.Foldable.TwoPaneViewMode"/>
+		/// which indicates the span mode to which the visual state should be applied.
+		/// </summary>
 		public TwoPaneViewMode SpanMode
 		{
 			get => (TwoPaneViewMode)GetValue(SpanModeProperty);
diff --git a/src/Controls/Foldable/src/TwoPaneView.cs b/src/Controls/Foldable/src/TwoPaneView.cs
index 62364b606f62..b5d0dfb52375 100644
--- a/src/Controls/Foldable/src/TwoPaneView.cs
+++ b/src/Controls/Foldable/src/TwoPaneView.cs
@@ -8,6 +8,17 @@
 
 namespace Microsoft.Maui.Controls.Foldable
 {
+	/// <summary>
+	/// Layout container with two panes that will position the child content
+	/// side-by-side or vertically. The relative size of the two panes can be 
+	/// configured, but on a foldable Android device the split will be aligned 
+	/// with the hinge or screen fold.
+	/// </summary>
+	/// <remarks>
+	/// Requires <see cref="Microsoft.Maui.Foldable.HostBuilderExtensions.UseFoldable(Maui.Hosting.MauiAppBuilder)"/>
+	/// be configured in the .NET MAUI app to configure the Android lifecycle
+	/// to detect and adapt to foldable device hinges and screen folds.
+	/// </remarks>
 	[ContentProperty("")]
 	public partial class TwoPaneView : Grid
 	{
@@ -68,6 +79,10 @@ public static readonly BindableProperty Pane1LengthProperty
 		public static readonly BindableProperty Pane2LengthProperty
 			= BindableProperty.Create("Pane2Length", typeof(GridLength), typeof(TwoPaneView), defaultValue: GridLength.Star, propertyChanged: TwoPaneViewLayoutPropertyChanged);
 
+		/// <summary>
+		/// Event when the <see cref="Microsoft.Maui.Controls.Foldable.TwoPaneViewMode"/>
+		/// changes on a foldable device.
+		/// </summary>
 		public event EventHandler ModeChanged;
 
 		static object OnMinModePropertyCreate(BindableObject bindable)
@@ -106,54 +121,87 @@ static void OnPanePropertyChanged(BindableObject bindable, object oldValue, obje
 			twoPaneView.UpdateMode();
 		}
 
+		/// <summary>
+		/// Gets or sets the minimum height at which panes are shown in tall mode.
+		/// </summary>
 		public double MinTallModeHeight
 		{
 			get { return (double)GetValue(MinTallModeHeightProperty); }
 			set { SetValue(MinTallModeHeightProperty, value); }
 		}
+
+		/// <summary>
+		/// Gets or sets the minimum width at which panes are shown in wide mode.
+		/// </summary>
 		public double MinWideModeWidth
 		{
 			get { return (double)GetValue(MinWideModeWidthProperty); }
 			set { SetValue(MinWideModeWidthProperty, value); }
 		}
 
+		/// <summary>
+		/// Gets the calculated width (in wide mode) or height (in tall mode) of pane 1, or sets the GridLength value of pane 1.
+		/// </summary>
 		public GridLength Pane1Length
 		{
 			get { return (GridLength)GetValue(Pane1LengthProperty); }
 			set { SetValue(Pane1LengthProperty, value); }
 		}
+
+		/// <summary>
+		/// Gets the calculated width (in wide mode) or height (in tall mode) of pane 2, or sets the GridLength value of pane 2.
+		/// </summary>
 		public GridLength Pane2Length
 		{
 			get { return (GridLength)GetValue(Pane2LengthProperty); }
 			set { SetValue(Pane2LengthProperty, value); }
 		}
 
+		/// <summary>
+		/// Gets a <see cref="Microsoft.Maui.Controls.Foldable.TwoPaneViewMode"/> value
+		/// that indicates how panes are shown.
+		/// </summary>
 		public TwoPaneViewMode Mode { get => (TwoPaneViewMode)GetValue(ModeProperty); }
 
+		/// <summary>
+		/// Gets or sets a value that indicates how panes are shown in tall mode.
+		/// </summary>
 		public TwoPaneViewTallModeConfiguration TallModeConfiguration
 		{
 			get { return (TwoPaneViewTallModeConfiguration)GetValue(TallModeConfigurationProperty); }
 			set { SetValue(TallModeConfigurationProperty, value); }
 		}
 
+		/// <summary>
+		/// Gets or sets a value that indicates how panes are shown in wide mode.
+		/// </summary>
 		public TwoPaneViewWideModeConfiguration WideModeConfiguration
 		{
 			get { return (TwoPaneViewWideModeConfiguration)GetValue(WideModeConfigurationProperty); }
 			set { SetValue(WideModeConfigurationProperty, value); }
 		}
 
+		/// <summary>
+		/// Gets or sets the content of pane 1.
+		/// </summary>
 		public View Pane1
 		{
 			get { return (View)GetValue(Pane1Property); }
 			set { SetValue(Pane1Property, value); }
 		}
 
+		/// <summary>
+		/// Gets or sets the content of pane 2.
+		/// </summary>
 		public View Pane2
 		{
 			get { return (View)GetValue(Pane2Property); }
 			set { SetValue(Pane2Property, value); }
 		}
 
+		/// <summary>
+		/// Gets or sets a value that indicates which pane has priority.
+		/// </summary>
 		public TwoPaneViewPriority PanePriority
 		{
 			get { return (TwoPaneViewPriority)GetValue(PanePriorityProperty); }
diff --git a/src/Controls/Foldable/src/TwoPaneViewMode.cs b/src/Controls/Foldable/src/TwoPaneViewMode.cs
index f6995a3757f2..dc531a999366 100644
--- a/src/Controls/Foldable/src/TwoPaneViewMode.cs
+++ b/src/Controls/Foldable/src/TwoPaneViewMode.cs
@@ -1,7 +1,21 @@
 namespace Microsoft.Maui.Controls.Foldable
 {
+	/// <summary>
+	/// Defines constants that specify how panes are shown in a TwoPaneView.
+	/// </summary>
 	public enum TwoPaneViewMode
 	{
-		SinglePane, Wide, Tall
+		/// <summary>
+		/// Only one pane is shown.
+		/// </summary>
+		SinglePane,
+		/// <summary>
+		/// Panes are shown side-by-side. 
+		/// </summary>
+		Wide,
+		/// <summary>
+		/// Panes are shown top-bottom.
+		/// </summary>
+		Tall
 	}
 }
diff --git a/src/Controls/Foldable/src/TwoPaneViewPriority.cs b/src/Controls/Foldable/src/TwoPaneViewPriority.cs
index b799c0ae74e8..d7177873ec2e 100644
--- a/src/Controls/Foldable/src/TwoPaneViewPriority.cs
+++ b/src/Controls/Foldable/src/TwoPaneViewPriority.cs
@@ -1,8 +1,19 @@
 namespace Microsoft.Maui.Controls.Foldable
 {
+	/// <summary>
+	/// Defines constants that specify which pane has priority in a TwoPaneView.
+	/// Affects the rendering of <see cref="Microsoft.Maui.Controls.Foldable.TwoPaneViewTallModeConfiguration"/> and 
+	/// <see cref="Microsoft.Maui.Controls.Foldable.TwoPaneViewWideModeConfiguration"/>
+	/// </summary>
 	public enum TwoPaneViewPriority
 	{
+		/// <summary>
+		/// Pane 1 has priority.
+		/// </summary>
 		Pane1,
+		/// <summary>
+		/// Pane 2 has priority.
+		/// </summary>
 		Pane2
 	}
 }
diff --git a/src/Controls/Foldable/src/TwoPaneViewTallModeConfiguration.cs b/src/Controls/Foldable/src/TwoPaneViewTallModeConfiguration.cs
index ab4b12d92f08..a465a97b4fab 100644
--- a/src/Controls/Foldable/src/TwoPaneViewTallModeConfiguration.cs
+++ b/src/Controls/Foldable/src/TwoPaneViewTallModeConfiguration.cs
@@ -1,9 +1,22 @@
 namespace Microsoft.Maui.Controls.Foldable
 {
+	/// <summary>
+	/// Defines constants that specify how panes are shown in a TwoPaneView in tall mode, 
+	/// determined by <see cref="Microsoft.Maui.Controls.Foldable.TwoPaneViewPriority" />
+	/// </summary>
 	public enum TwoPaneViewTallModeConfiguration
 	{
+		/// <summary>
+		/// Only the pane that has priority is shown, the other pane is hidden.
+		/// </summary>
 		SinglePane,
+		/// <summary>
+		/// The pane that has priority is shown on top, the other pane is shown on the bottom.
+		/// </summary>
 		TopBottom,
-		BottomTop,
+		/// <summary>
+		/// The pane that has priority is shown on the bottom, the other pane is shown on top.
+		/// </summary>
+		BottomTop
 	}
 }
diff --git a/src/Controls/Foldable/src/TwoPaneViewWideModeConfiguration.cs b/src/Controls/Foldable/src/TwoPaneViewWideModeConfiguration.cs
index a810fe869aaf..0210988cae14 100644
--- a/src/Controls/Foldable/src/TwoPaneViewWideModeConfiguration.cs
+++ b/src/Controls/Foldable/src/TwoPaneViewWideModeConfiguration.cs
@@ -1,9 +1,22 @@
 namespace Microsoft.Maui.Controls.Foldable
 {
+	/// <summary>
+	/// Defines constants that specify how panes are shown in a TwoPaneView in wide mode, 
+	/// determined by <see cref="Microsoft.Maui.Controls.Foldable.TwoPaneViewPriority" />
+	/// </summary>
 	public enum TwoPaneViewWideModeConfiguration
 	{
+		/// <summary>
+		/// Only the pane that has priority is shown, the other pane is hidden.
+		/// </summary>
 		SinglePane,
+		/// <summary>
+		/// The pane that has priority is shown on the left, the other pane is shown on the right.
+		/// </summary>
 		LeftRight,
-		RightLeft,
+		/// <summary>
+		/// The pane that has priority is shown on the right, the other pane is shown on the left.
+		/// </summary>
+		RightLeft
 	}
 }
diff --git a/src/Controls/Foldable/src/WindowSpanModeStateTrigger.cs b/src/Controls/Foldable/src/WindowSpanModeStateTrigger.cs
index 5692529e779c..96de91c4f3e2 100644
--- a/src/Controls/Foldable/src/WindowSpanModeStateTrigger.cs
+++ b/src/Controls/Foldable/src/WindowSpanModeStateTrigger.cs
@@ -4,6 +4,10 @@
 
 namespace Microsoft.Maui.Controls.Foldable
 {
+	/// <summary>
+	/// Triggers a state change when the <see cref="Microsoft.Maui.Controls.Foldable.TwoPaneViewMode"/>
+	/// of the window changes.
+	/// </summary>
 	public sealed class WindowSpanModeStateTrigger : StateTriggerBase
 	{
 		public WindowSpanModeStateTrigger()
@@ -11,6 +15,10 @@ public WindowSpanModeStateTrigger()
 			UpdateState();
 		}
 
+		/// <summary>
+		/// <see cref="Microsoft.Maui.Controls.Foldable.TwoPaneViewMode"/>
+		/// which indicates the span mode to which the visual state should be applied.
+		/// </summary>
 		public TwoPaneViewMode SpanMode
 		{
 			get => (TwoPaneViewMode)GetValue(SpanModeProperty);

From 1803dcea029c285ca23fc0031c705084bc35005c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 3 Nov 2022 20:10:58 +0000
Subject: [PATCH 74/77] Bump provisionator task to version 2 (#11095)

Co-authored-by: Rui Marinho <me@ruimarinho.net>
---
 eng/pipelines/common/provision.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/pipelines/common/provision.yml b/eng/pipelines/common/provision.yml
index fd22d958d0ef..0b6a1a40e891 100644
--- a/eng/pipelines/common/provision.yml
+++ b/eng/pipelines/common/provision.yml
@@ -27,7 +27,7 @@ steps:
         AUTH_TOKEN_GITHUB_COM: $(github--pat--vs-mobiletools-engineering-service2)
     # Provision Xcode
     - ${{ if ne(parameters.skipXcode, 'true') }}:
-      - task: xamops.azdevex.provisionator-task.provisionator@1
+      - task: xamops.azdevex.provisionator-task.provisionator@2
         displayName: 'Provision Xcode'
         condition: ne(variables['REQUIRED_XCODE'], '')
         inputs:
@@ -37,7 +37,7 @@ steps:
           PROVISIONATOR_CHANNEL: ${{ parameters.provisionatorChannel }}
           AUTH_TOKEN_GITHUB_COM: $(github--pat--vs-mobiletools-engineering-service2)
     # Provision Additional Software
-    - task: xamops.azdevex.provisionator-task.provisionator@1
+    - task: xamops.azdevex.provisionator-task.provisionator@2
       displayName: 'Provision Additional Software'
       condition: eq(variables['provisioning'], 'true')
       continueOnError: true 
@@ -101,7 +101,7 @@ steps:
           msiexec.exe /package $output /quiet ADD_EXPLORER_CONTEXT_MENU_OPENPOWERSHELL=1 ENABLE_PSREMOTING=1 REGISTER_MANIFEST=1
         }
       displayName: 'Install PowerShell Core'
-    - task: xamops.azdevex.provisionator-task.provisionator@1
+    - task: xamops.azdevex.provisionator-task.provisionator@2
       displayName: 'Provision Visual Studio'
       condition: eq(variables['provisioningVS'], 'true')
       inputs:

From fae4c514f6fd66b7aa869d8a315b99e38d6127b8 Mon Sep 17 00:00:00 2001
From: Gerald Versluis <gerald.versluis@microsoft.com>
Date: Tue, 8 Nov 2022 11:59:07 +0100
Subject: [PATCH 75/77] Extract Maps, Graphics & Foldable docs during build
 (#10909) (#11142)

* Extract Maps, Graphics & Foldable docs during build (#10909)

* Extract Maps and Graphics docs during build

* Update dotnet.cake

* Add Foldable & Markdig

* Update Controls.Foldable.csproj

* Fix MarkDig

* Update Graphics.Skia.csproj

* Update dotnet.cake

* Update dotnet.cake

* Update dotnet.cake

* Fix bad merge on provisionator version

Co-authored-by: Rui Marinho <me@ruimarinho.net>
---
 eng/cake/dotnet.cake                              | 15 +++++++++++++++
 eng/pipelines/common/provision.yml                |  2 +-
 .../Foldable/src/Controls.Foldable.csproj         |  2 ++
 .../src/Graphics.Skia/Graphics.Skia.csproj        |  2 ++
 .../src/Text.Markdig/Graphics.Text.Markdig.csproj |  2 ++
 .../Text.Markdig/Renderer/ParagraphRenderer.cs    |  2 +-
 6 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/eng/cake/dotnet.cake b/eng/cake/dotnet.cake
index f7128733bee9..ba6e4908e00e 100644
--- a/eng/cake/dotnet.cake
+++ b/eng/cake/dotnet.cake
@@ -323,6 +323,7 @@ Task("dotnet-pack-docs")
         EnsureDirectoryExists(destDir);
         CleanDirectories(destDir);
 
+        // Get the docs for .NET MAUI
         foreach (var nupkg in GetFiles("./artifacts/Microsoft.Maui.*.Ref.*.nupkg"))
         {
             var d = $"{tempDir}/{nupkg.GetFilename()}";
@@ -332,6 +333,20 @@ Task("dotnet-pack-docs")
             CopyDirectory($"{d}/ref", $"{destDir}");
         }
 
+        // Get the docs for libraries separately distributed as NuGets
+        foreach (var pattern in NuGetOnlyPackages)
+        {
+            foreach (var nupkg in GetFiles($"./artifacts/{pattern}"))
+            {
+                var d = $"{tempDir}/{nupkg.GetFilename()}";
+                Unzip(nupkg, d);
+                DeleteFiles($"{d}/**/*.pri");
+                DeleteFiles($"{d}/**/*.aar");
+                DeleteFiles($"{d}/**/*.pdb");
+                CopyDirectory($"{d}/lib", $"{destDir}");
+            }
+        }
+
         CleanDirectories(tempDir);
     });
 
diff --git a/eng/pipelines/common/provision.yml b/eng/pipelines/common/provision.yml
index 0b6a1a40e891..55679a6978d9 100644
--- a/eng/pipelines/common/provision.yml
+++ b/eng/pipelines/common/provision.yml
@@ -110,7 +110,7 @@ steps:
         PROVISIONATOR_CHANNEL: ${{ parameters.provisionatorChannel }}
         AUTH_TOKEN_GITHUB_COM: $(github--pat--vs-mobiletools-engineering-service2)
     # Provision Additional Software
-    - task: xamops.azdevex.provisionator-task.provisionator@1
+    - task: xamops.azdevex.provisionator-task.provisionator@2
       displayName: 'Provision Additional Software'
       condition: and(eq('${{ parameters.provisioning }}', 'true'),ne('${{ parameters.poolName }}', 'Azure Pipelines'))
       inputs:
diff --git a/src/Controls/Foldable/src/Controls.Foldable.csproj b/src/Controls/Foldable/src/Controls.Foldable.csproj
index f9ac2a7747aa..585e7a8f9fd1 100644
--- a/src/Controls/Foldable/src/Controls.Foldable.csproj
+++ b/src/Controls/Foldable/src/Controls.Foldable.csproj
@@ -6,6 +6,8 @@
     <WarningsNotAsErrors>BI1234</WarningsNotAsErrors>
     <IsPackable>true</IsPackable>
     <IsTrimmable>false</IsTrimmable>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <NoWarn>$(NoWarn);CS1591</NoWarn>
     <!-- TODO: remove this when Foldable is made into a nupkg -->
     <UseMaui Condition=" '$(UseWorkload)' == 'true' ">true</UseMaui>
   </PropertyGroup>
diff --git a/src/Graphics/src/Graphics.Skia/Graphics.Skia.csproj b/src/Graphics/src/Graphics.Skia/Graphics.Skia.csproj
index a0a36567d1e4..ec988aa86724 100644
--- a/src/Graphics/src/Graphics.Skia/Graphics.Skia.csproj
+++ b/src/Graphics/src/Graphics.Skia/Graphics.Skia.csproj
@@ -5,6 +5,8 @@
     <RootNamespace>Microsoft.Maui.Graphics.Skia</RootNamespace>
     <AssemblyName>Microsoft.Maui.Graphics.Skia</AssemblyName>
     <IsTrimmable>false</IsTrimmable>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <NoWarn>$(NoWarn);CS1591</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Graphics/src/Text.Markdig/Graphics.Text.Markdig.csproj b/src/Graphics/src/Text.Markdig/Graphics.Text.Markdig.csproj
index b4bd51cc1040..a1e9091c282c 100644
--- a/src/Graphics/src/Text.Markdig/Graphics.Text.Markdig.csproj
+++ b/src/Graphics/src/Text.Markdig/Graphics.Text.Markdig.csproj
@@ -5,6 +5,8 @@
     <RootNamespace>Microsoft.Maui.Graphics.Text</RootNamespace>
     <AssemblyName>Microsoft.Maui.Graphics.Text.Markdig</AssemblyName>
     <IsTrimmable>false</IsTrimmable>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <NoWarn>$(NoWarn);CS1591</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Graphics/src/Text.Markdig/Renderer/ParagraphRenderer.cs b/src/Graphics/src/Text.Markdig/Renderer/ParagraphRenderer.cs
index 7be09917f39d..96094e894b69 100644
--- a/src/Graphics/src/Text.Markdig/Renderer/ParagraphRenderer.cs
+++ b/src/Graphics/src/Text.Markdig/Renderer/ParagraphRenderer.cs
@@ -5,7 +5,7 @@ namespace Microsoft.Maui.Graphics.Text.Renderer
 	/// <summary>
 	/// A HTML renderer for a <see cref="ParagraphBlock"/>.
 	/// </summary>
-	/// <seealso cref="Markdig.Renderers.Html.HtmlObjectRenderer{Markdig.Syntax.ParagraphBlock}" />
+	/// <seealso cref="Markdig.Renderers.Html.HtmlObjectRenderer{ParagraphBlock}"/>
 	public class ParagraphRenderer : AttributedTextObjectRenderer<ParagraphBlock>
 	{
 		protected override void Write(AttributedTextRenderer renderer, ParagraphBlock obj)

From e91a855d85d9805f9655639a5aca27f67c183831 Mon Sep 17 00:00:00 2001
From: Rui Marinho <me@ruimarinho.net>
Date: Tue, 8 Nov 2022 11:33:09 +0000
Subject: [PATCH 76/77] Ignore Authenticate Reunion NuGet sources - net7
 (#11150)

* Ignore Authenticate Reunion NuGet sources (#11145)

* Ignore Authenticate Reunion NuGet sources

* Try install .net after provisioning run

* Fix identation
# Conflicts:
#	eng/pipelines/common/provision.yml

* Fix bad merge on provisionator version
---
 eng/pipelines/common/provision.yml | 51 ++++++++++++++++--------------
 1 file changed, 27 insertions(+), 24 deletions(-)

diff --git a/eng/pipelines/common/provision.yml b/eng/pipelines/common/provision.yml
index 55679a6978d9..447798aef184 100644
--- a/eng/pipelines/common/provision.yml
+++ b/eng/pipelines/common/provision.yml
@@ -5,17 +5,6 @@ parameters:
   provisionatorChannel: 'latest'
 
 steps:
-  - task: UseDotNet@2                 # https://docs.microsoft.com/en-us/azure/devops/pipelines/tasks/tool/dotnet-core-tool-installer?view=azure-devops
-    displayName: 'Use .NET SDK 6'
-    inputs:
-      packageType: sdk
-      version: 6.0.x
-
-  - pwsh: |
-      dotnet --version
-      dotnet --list-sdks
-    displayName: 'Show .NET SDK info'
-
   # Prepare macOS
   - ${{ if eq(parameters.platform, 'macos') }}:
     - template: agent-cleanser/v1.yml@xamarin-templates
@@ -89,7 +78,6 @@ steps:
       inputs:
         certSecureFile: 'Components Mac Certificate.p12'
 
-
   # Prepare Windows
   - ${{ if eq(parameters.platform, 'windows') }}:
     - powershell: |
@@ -125,6 +113,22 @@ steps:
       displayName: 'Setup MSBuild Paths'
       condition: eq(variables['provisioningVS'], 'true')
 
+  # Prepare Both
+  - task: UseDotNet@2
+    displayName: 'Use .NET SDK 6'
+    inputs:
+      packageType: sdk
+      version: 6.0.x
+
+  - pwsh: |
+      dotnet --version
+      dotnet --list-sdks
+    displayName: 'Show .NET SDK info'
+
+  - pwsh: ./build.ps1 --target provision
+    displayName: 'Cake Provision'
+    condition: eq(variables['provisioningCake'], 'true')
+
   - task: PowerShell@2
     condition: eq(variables['PrivateBuild'], 'true')
     displayName: Setup Private Feeds Credentials
@@ -136,16 +140,15 @@ steps:
   - pwsh: dotnet nuget locals all --clear
     displayName: 'Clear all NuGet caches'
 
-
   # Prepare for Reunion packages
-  - ${{ if eq(variables['System.TeamProject'], 'devdiv') }}:
-    - task: NuGetAuthenticate@0
-      displayName: 'Authenticate Reunion NuGet sources'
-      inputs:
-        nuGetServiceConnections: Project.Reunion.nuget.internal
-    - pwsh: |
-        $path = '$(Build.SourcesDirectory)\NuGet.config'
-        [xml]$xml = Get-Content $path
-        $xml.configuration.RemoveChild($xml.configuration.disabledPackageSources)
-        $xml.Save($path)
-      displayName: 'Add "wasdk-internal" to NuGet.config'
+  # - ${{ if eq(variables['System.TeamProject'], 'devdiv') }}:
+  #   - task: NuGetAuthenticate@0
+  #     displayName: 'Authenticate Reunion NuGet sources'
+  #     inputs:
+  #       nuGetServiceConnections: Project.Reunion.nuget.internal
+  #   - pwsh: |
+  #       $path = '$(Build.SourcesDirectory)\NuGet.config'
+  #       [xml]$xml = Get-Content $path
+  #       $xml.configuration.RemoveChild($xml.configuration.disabledPackageSources)
+  #       $xml.Save($path)
+  #     displayName: 'Add "wasdk-internal" to NuGet.config'

From 6c15e16547145cca76d80ad73bd132af937b72d8 Mon Sep 17 00:00:00 2001
From: Rui Marinho <me@ruimarinho.net>
Date: Thu, 10 Nov 2022 12:23:24 +0000
Subject: [PATCH 77/77] Increase timeout to 240 minutes of azdo stages (#11226)

* Increase timeout to 240 minutes of azdo stages

* Fix pipeline
---
 eng/pipelines/handlers.yml     | 8 ++++----
 eng/pipelines/maui-release.yml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/eng/pipelines/handlers.yml b/eng/pipelines/handlers.yml
index d85c6eb77af2..9041d23dbe40 100644
--- a/eng/pipelines/handlers.yml
+++ b/eng/pipelines/handlers.yml
@@ -134,7 +134,7 @@ stages:
             workspace:
               clean: all
             displayName: ${{ BuildPlatform.name }} (${{ BuildConfiguration }})
-            timeoutInMinutes: 120
+            timeoutInMinutes: 240
             condition: or(
               ${{ parameters.BuildEverything }},
               ne(variables['Build.Reason'], 'PullRequest'),
@@ -184,7 +184,7 @@ stages:
           workspace:
             clean: all
           displayName: ${{ PackPlatform.name }}
-          timeoutInMinutes: 120
+          timeoutInMinutes: 240
           pool:
             name: ${{ PackPlatform.poolName }}
             vmImage: ${{ PackPlatform.vmImage }}
@@ -211,7 +211,7 @@ stages:
             workspace:
               clean: all
             displayName: ${{ BuildPlatform.name }} (${{ BuildConfiguration }})
-            timeoutInMinutes: 120
+            timeoutInMinutes: 240
             condition: or(
               ${{ parameters.BuildEverything }},
               ne(variables['Build.Reason'], 'PullRequest'),
@@ -265,7 +265,7 @@ stages:
               workspace:
                 clean: all
               displayName: ${{ BuildPlatform.name }} ${{ TestTFM.tfm }} (${{ BuildConfiguration }})
-              timeoutInMinutes: 120
+              timeoutInMinutes: 240
               condition: or(
                 ${{ parameters.BuildEverything }},
                 ne(variables['Build.Reason'], 'PullRequest'),
diff --git a/eng/pipelines/maui-release.yml b/eng/pipelines/maui-release.yml
index 12d47a235485..ce5110819a12 100644
--- a/eng/pipelines/maui-release.yml
+++ b/eng/pipelines/maui-release.yml
@@ -66,7 +66,7 @@ stages:
           workspace:
             clean: all
           displayName: ${{ PackPlatform.name }}
-          timeoutInMinutes: 120
+          timeoutInMinutes: 240
           pool:
             name: ${{ PackPlatform.poolName }}
             vmImage: ${{ PackPlatform.vmImage }}