Candidate Branch September 22nd

src/Controls/samples/Controls.Sample/Pages/Controls/RadioButtonGalleries/RadioButtonGroupBindingGallery.xaml

@@ -18,6 +18,7 @@
                     <RowDefinition></RowDefinition>
                     <RowDefinition></RowDefinition>
                     <RowDefinition></RowDefinition>
+                    <RowDefinition></RowDefinition>
                 </Grid.RowDefinitions>
 
                 <Grid.ColumnDefinitions>
@@ -28,15 +29,16 @@
                 <Label Grid.ColumnSpan="2" Text="The RadioButtons in this Grid have a GroupName and Selection bound to a ViewModel."></Label>
 
                 <Label Text="{Binding GroupName, StringFormat='The GroupName is {0}'}" Grid.Row="1" />
-                <Label Text="{Binding Selection, StringFormat='The Selection is {0}'}" Grid.Row="1" Grid.Column="1" />
+                <Label Text="{Binding Selection, StringFormat='The Selection is {0}', TargetNullValue='The Selection is (null)'}" Grid.Row="1" Grid.Column="1" />
 
                 <RadioButton Content="Option A" Value="A" Grid.Row="2"></RadioButton>
                 <RadioButton Content="Option B" Value="B" Grid.Row="2" Grid.Column="1"></RadioButton>
                 <RadioButton Content="Option C" Value="C" Grid.Row="3"></RadioButton>
                 <RadioButton Content="Option D" Value="D" Grid.Row="3" Grid.Column="1"></RadioButton>
 
-                <Button Margin="5" Grid.ColumnSpan="2" Grid.Row="4" Text="Set selection in view model to 'B'" Clicked="Button_Clicked"></Button>
-            </Grid>
+                <Button Margin="5" Grid.ColumnSpan="2" Grid.Row="4" Text="Set selection in view model to 'B'" Clicked="Set_Button_Clicked"></Button>
+                <Button Margin="5" Grid.ColumnSpan="2" Grid.Row="5" Text="Clear selection in view model to 'null'" Clicked="Clear_Button_Clicked"></Button>
+      </Grid>
         </StackLayout>
     </ContentPage.Content>
 </ContentPage>

src/Controls/samples/Controls.Sample/Pages/Controls/RadioButtonGalleries/RadioButtonGroupBindingGallery.xaml.cs

@@ -15,10 +15,15 @@ public RadioButtonGroupBindingGallery()
 			BindingContext = _viewModel;
 		}
 
-		private void Button_Clicked(object sender, System.EventArgs e)
+		private void Set_Button_Clicked(object sender, System.EventArgs e)
 		{
 			_viewModel.Selection = "B";
 		}
+
+		private void Clear_Button_Clicked(object sender, System.EventArgs e)
+		{
+			_viewModel.Selection = null;
+		}
 	}
 
 	public class RadioButtonGroupBindingModel : INotifyPropertyChanged

src/Controls/src/Build.Tasks/nuget/buildTransitive/netstandard2.0/Microsoft.Maui.Controls.targets

@@ -270,4 +270,14 @@
     </ItemGroup>
   </Target>
 
+  <Target Name="_MauiSetWinUIDefaultsForPublishAot" BeforeTargets="PrepareForBuild" Condition="'$(PublishAot)' == 'true' and '$(_MauiTargetPlatformIsWindows)' == 'True'">
+    <PropertyGroup>
+      <DebugSymbols Condition="'$(DebugSymbols)' == ''">false</DebugSymbols>
+      <DebugType Condition="'$(DebugType)' == ''">None</DebugType>
+      <EmbedXbfInPri Condition="'$(EmbedXbfInPri)' == ''">false</EmbedXbfInPri>
+      <SelfContained Condition="'$(SelfContained)' == ''">true</SelfContained>
+      <WindowsPackageType Condition="'$(WindowsPackageType)' == ''">None</WindowsPackageType>
+    </PropertyGroup>
+  </Target>
+
 </Project>

src/Controls/src/Core/Compatibility/Handlers/NavigationPage/iOS/NavigationRenderer.cs

@@ -1423,6 +1423,8 @@ void HandleChildPropertyChanged(object sender, PropertyChangedEventArgs e)
 				else if (e.PropertyName == NavigationPage.TitleIconImageSourceProperty.PropertyName ||
 					 e.PropertyName == NavigationPage.TitleViewProperty.PropertyName)
 					UpdateTitleArea(Child);
+				else if (e.PropertyName == NavigationPage.BackButtonTitleProperty.PropertyName)
+					UpdateBackButtonTitle(Child);
 				else if (e.PropertyName == NavigationPage.IconColorProperty.PropertyName)
 					UpdateIconColor();
 			}
@@ -1944,31 +1946,20 @@ public Container(View view, UINavigationBar bar) : base(bar.Bounds)
 				ClipsToBounds = true;
 			}
 
-			UIEdgeInsets CalculateUIEdgeInsets()
+			public override UIEdgeInsets AlignmentRectInsets
 			{
-				var type = UIBarButtonSystemItem.FixedSpace;
-				var spacer = new UIBarButtonItem(type, (_, _) => { });
-				spacer.Width = SystemMargin + (OperatingSystem.IsIOSVersionAtLeast(11) ? 8 : -16);
-
-				nfloat screenWidth = UIScreen.MainScreen.Bounds.Size.Width;
-
-				if (!OperatingSystem.IsIOSVersionAtLeast(11) && screenWidth < 375)
-				{
-					// 3.5 and 4 inch
-					spacer.Width += 8;
-				}
-				else if (screenWidth >= 414)
+				get
 				{
-					// 5.5 inch
-					spacer.Width -= 4;
+					if (_child?.VirtualView is IView view)
+					{
+						var margin = view.Margin;
+						return new UIEdgeInsets(-(nfloat)margin.Top, -(nfloat)margin.Left, -(nfloat)margin.Bottom, -(nfloat)margin.Right);
+					}
+					else
+					{
+						return base.AlignmentRectInsets;
+					}
 				}
-
-				return new UIEdgeInsets(0, spacer.Width, 0, spacer.Width);
-			}
-
-			public override UIEdgeInsets AlignmentRectInsets
-			{
-				get => CalculateUIEdgeInsets();
 			}
 
 			void OnTitleViewParentSet(object sender, EventArgs e)

src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellToolbarTracker.cs

@@ -410,6 +410,7 @@ protected virtual async void UpdateLeftBarButtonItem(Context context, AToolbar t
 			var backButtonHandler = Shell.GetBackButtonBehavior(page);
 			var text = backButtonHandler.GetPropertyIfSet(BackButtonBehavior.TextOverrideProperty, String.Empty);
 			var command = backButtonHandler.GetPropertyIfSet<ICommand>(BackButtonBehavior.CommandProperty, null);
+			var backButtonVisibleFromBehavior = backButtonHandler.GetPropertyIfSet(BackButtonBehavior.IsVisibleProperty, true);
 			bool isEnabled = _shell.Toolbar.BackButtonEnabled;
 			//Add the FlyoutIcon only if the FlyoutBehavior is Flyout
 			var image = _flyoutBehavior == FlyoutBehavior.Flyout ? GetFlyoutIcon(backButtonHandler, page) : null;
@@ -480,7 +481,7 @@ protected virtual async void UpdateLeftBarButtonItem(Context context, AToolbar t
 			{
 				_drawerToggle.DrawerIndicatorEnabled = false;
 
-				if (backButtonVisible)
+				if (backButtonVisibleFromBehavior && (backButtonVisible || !defaultDrawerArrowDrawable))
 					toolbar.NavigationIcon = icon;
 			}
 			else if (_flyoutBehavior == FlyoutBehavior.Flyout || !defaultDrawerArrowDrawable)

src/Controls/src/Core/Handlers/Items/ItemsViewHandler.Windows.cs

@@ -659,7 +659,7 @@ object FindBoundItem(ScrollToRequestEventArgs args)
 			{
 				if (CollectionViewSource.View[n] is ItemTemplateContext pair)
 				{
-					if (pair.Item == args.Item)
+					if (Equals(pair.Item, args.Item))
 					{
 						return CollectionViewSource.View[n];
 					}

src/Controls/src/Core/Handlers/Items2/iOS/LayoutFactory2.cs

@@ -343,7 +343,7 @@ public static UICollectionViewLayout CreateCarouselLayout(
 					return;
 				}
 
-				var page = (offset.X + sectionMargin) / env.Container.ContentSize.Width;
+				var page = (offset.X + sectionMargin) / (env.Container.ContentSize.Width - sectionMargin * 2);
 
 				if (Math.Abs(page % 1) > (double.Epsilon * 100) || cv2Controller.ItemsSource.ItemCount <= 0)
 				{

src/Controls/src/Core/NavigationPage/NavigationPage.cs

@@ -869,11 +869,13 @@ protected override Task OnPushAsync(Page root, bool animated)
 				return Owner.SendHandlerUpdateAsync(animated,
 					() =>
 					{
+						// Move the SendNavigating here so that it's fired prior to the stack being modified
+						// This ensures consistent event ordering across all platforms (iOS, Catalyst, Android, Windows)
+						Owner.SendNavigating(previousPage);
 						Owner.PushPage(root);
 					},
 					() =>
 					{
-						Owner.SendNavigating(previousPage);
 						Owner.FireDisappearing(previousPage);
 						Owner.FireAppearing(root);
 					},

src/Controls/src/Core/Platform/Windows/Extensions/AccessibilityExtensions.cs

@@ -25,7 +25,10 @@ public static void SetAutomationPropertiesAutomationId(this FrameworkElement Con
 				_defaultAutomationPropertiesName = currentValue = (string)Control.GetValue(NativeAutomationProperties.NameProperty);
 			}
 
-			var elemValue = (string)Element.GetValue(SemanticProperties.DescriptionProperty);
+#pragma warning disable CS0618 // Type or member is obsolete
+			var elemValue = (string)Element.GetValue(AutomationProperties.NameProperty);
+#pragma warning restore CS0618 // Type or member is obsolete
+
 			string newValue = !string.IsNullOrWhiteSpace(elemValue) ? elemValue : _defaultAutomationPropertiesName;
 
 			if (currentValue is null || currentValue != newValue)
@@ -85,7 +88,10 @@ public static void SetAutomationPropertiesAutomationId(this FrameworkElement Con
 				_defaultAutomationPropertiesHelpText = currentValue = (string)Control.GetValue(NativeAutomationProperties.HelpTextProperty);
 			}
 
-			var elemValue = (string)Element.GetValue(SemanticProperties.HintProperty);
+#pragma warning disable CS0618 // Type or member is obsolete
+			var elemValue = (string)Element.GetValue(AutomationProperties.HelpTextProperty);
+#pragma warning restore CS0618 // Type or member is obsolete
+
 			string newValue = !string.IsNullOrWhiteSpace(elemValue) ? elemValue : _defaultAutomationPropertiesHelpText;
 
 			if (currentValue is null || newValue != currentValue)
@@ -117,8 +123,9 @@ public static void SetAutomationPropertiesAutomationId(this FrameworkElement Con
 			{
 				_defaultAutomationPropertiesLabeledBy = currentValue = (UIElement)Control.GetValue(NativeAutomationProperties.LabeledByProperty);
 			}
-
-			var elemValue = (VisualElement)Element.GetValue(SemanticProperties.DescriptionProperty);
+#pragma warning disable CS0618 // Type or member is obsolete
+			var elemValue = (VisualElement)Element.GetValue(AutomationProperties.LabeledByProperty);
+#pragma warning restore CS0618 // Type or member is obsolete
 			FrameworkElement? nativeElement = null;
 
 			if (mauiContext != null)
@@ -130,7 +137,9 @@ public static void SetAutomationPropertiesAutomationId(this FrameworkElement Con
 
 			if (currentValue is null || newValue != currentValue)
 			{
-				Control.SetValue(SemanticProperties.DescriptionProperty, newValue);
+#pragma warning disable CS0618 // Type or member is obsolete
+				Control.SetValue(AutomationProperties.LabeledByProperty, newValue);
+#pragma warning restore CS0618 // Type or member is obsolete
 			}
 
 			return _defaultAutomationPropertiesLabeledBy;
@@ -152,8 +161,11 @@ public static void SetBackButtonTitle(this PageControl Control, Element? Element
 
 		static string ConcatenateNameAndHint(Element Element)
 		{
-			var name = (string)Element.GetValue(SemanticProperties.DescriptionProperty);
-			var hint = (string)Element.GetValue(SemanticProperties.HintProperty);
+#pragma warning disable CS0618 // Type or member is obsolete
+			var name = (string)Element.GetValue(AutomationProperties.NameProperty);
+
+			var hint = (string)Element.GetValue(AutomationProperties.HelpTextProperty);
+#pragma warning restore CS0618 // Type or member is obsolete
 
 			string separator = string.IsNullOrWhiteSpace(name) || string.IsNullOrWhiteSpace(hint) ? "" : ". ";
 

src/Controls/src/Core/Platform/Windows/Extensions/TextBlockExtensions.cs

@@ -34,13 +34,16 @@ public static void UpdateText(this TextBlock platformControl, Label label)
 
 				default:
 					if (label.FormattedText != null)
+					{
 						platformControl.UpdateInlines(label);
+					}
 					else
 					{
-						if (platformControl.TextHighlighters.Count > 0)
+						if (!label.IsConnectingHandler() && platformControl.TextHighlighters.Count > 0)
 						{
 							platformControl.TextHighlighters.Clear();
 						}
+
 						platformControl.Text = text;
 					}
 					break;
@@ -69,15 +72,21 @@ public static void UpdateMaxLines(this TextBlock platformControl, Label label)
 		public static void UpdateDetectReadingOrderFromContent(this TextBlock platformControl, Label label)
 		{
 			if (label.IsSet(Specifics.DetectReadingOrderFromContentProperty))
+			{
 				platformControl.SetTextReadingOrder(label.OnThisPlatform().GetDetectReadingOrderFromContent());
+			}
 		}
 
 		internal static void SetLineBreakMode(this TextBlock textBlock, LineBreakMode lineBreakMode, int? maxLines = null)
 		{
 			if (maxLines.HasValue && maxLines >= 0)
+			{
 				textBlock.MaxLines = maxLines.Value;
+			}
 			else
+			{
 				textBlock.MaxLines = 0;
+			}
 
 			switch (lineBreakMode)
 			{

src/Controls/src/Core/RadioButton/RadioButton.cs

@@ -59,7 +59,8 @@ public partial class RadioButton : TemplatedView, IElementConfiguration<RadioBut
 		/// <summary>Bindable property for <see cref="Value"/>.</summary>
 		public static readonly BindableProperty ValueProperty =
 			BindableProperty.Create(nameof(Value), typeof(object), typeof(RadioButton), null,
-			propertyChanged: (b, o, n) => ((RadioButton)b).OnValuePropertyChanged());
+			propertyChanged: (b, o, n) => ((RadioButton)b).OnValuePropertyChanged(),
+			coerceValue: (b,  o) => o ?? b);
 
 		/// <summary>Bindable property for <see cref="IsChecked"/>.</summary>
 		public static readonly BindableProperty IsCheckedProperty = BindableProperty.Create(
@@ -212,6 +213,9 @@ public RadioButton()
 		{
 			_platformConfigurationRegistry = new Lazy<PlatformConfigurationRegistry<RadioButton>>(() =>
 				new PlatformConfigurationRegistry<RadioButton>(this));
+
+			//initialize Value to prevent null value
+			Value = this;
 		}
 
 		/// <inheritdoc/>
@@ -433,12 +437,17 @@ void HandleRadioButtonGroupSelectionChanged(RadioButton selected, RadioButtonGro
 
 		void HandleRadioButtonGroupValueChanged(Element layout, RadioButtonGroupValueChanged args)
 		{
-			if (IsChecked || string.IsNullOrEmpty(GroupName) || GroupName != args.GroupName || !object.Equals(Value, args.Value) || !MatchesScope(args))
+			if (string.IsNullOrEmpty(GroupName) || GroupName != args.GroupName || !MatchesScope(args))
 			{
 				return;
 			}
 
-			SetValue(IsCheckedProperty, true, specificity: SetterSpecificity.FromHandler);
+			var isValueMatching = object.Equals(Value, args.Value);
+
+			if (IsChecked != isValueMatching)
+			{
+				SetValue(IsCheckedProperty, isValueMatching, specificity: SetterSpecificity.FromHandler);
+			}
 		}
 
 		static View BuildDefaultTemplate()

src/Controls/src/Core/RadioButton/RadioButtonGroupController.cs

@@ -74,7 +74,7 @@ void HandleRadioButtonValueChanged(RadioButton radioButton, RadioButtonValueChan
 
 		void ChildAdded(object sender, ElementEventArgs e)
 		{
-			if (string.IsNullOrEmpty(_groupName))
+			if (string.IsNullOrEmpty(_groupName) || _layout == null)
 			{
 				return;
 			}
@@ -135,15 +135,18 @@ void UpdateGroupNames(Element element, string name, string oldName = null)
 
 		void SetSelectedValue(object radioButtonValue)
 		{
+			if(object.Equals(_selectedValue, radioButtonValue))
+			{
+				return;
+			}
+
 			_selectedValue = 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
-			}
+
 		}
 
 		void SetGroupName(string groupName)

src/Controls/src/Core/VisualElement/VisualElement.Platform.cs

@@ -41,7 +41,10 @@ partial void HandlePlatformUnloadedLoaded()
 					// If SendUnloaded caused the unloaded tokens to wire up
 					_loadedUnloadedToken?.Dispose();
 					_loadedUnloadedToken = null;
-					_loadedUnloadedToken = this.OnLoaded(SendLoaded);
+					if (Handler is not null)
+					{
+						_loadedUnloadedToken = this.OnLoaded(SendLoaded);
+					}
 				}
 			}
 			else

src/Controls/src/Xaml/Controls.Xaml.csproj

@@ -14,6 +14,8 @@
 	<PropertyGroup Condition="$(TargetFramework.Contains('-windows')) == true ">
 		<NoWarn>$(NoWarn);CA1416</NoWarn>
 		<DefineConstants>$(DefineConstants);WINDOWS</DefineConstants>
+		<!-- Disable PRI generation to avoid conflicts with Core project's PRI file -->
+		<AppxGeneratePriEnabled>false</AppxGeneratePriEnabled>
 	</PropertyGroup>
 
 	<PropertyGroup>

src/Controls/tests/Core.UnitTests/RadioButtonTests.cs

@@ -236,5 +236,38 @@ public void GroupSelectedValueUpdatesWhenSelectedButtonValueUpdates()
 
 			Assert.Equal("updated", layout.GetValue(RadioButtonGroup.SelectedValueProperty));
 		}
+
+		[Fact]
+		public void GroupNullSelectionClearsAnySelection()
+		{
+			var layout = new Grid();
+			layout.SetValue(RadioButtonGroup.GroupNameProperty, "foo");
+
+			var radioButton1 = new RadioButton() { Value = 1, IsChecked = true };
+			var radioButton2 = new RadioButton() { Value = 2 };
+			var radioButton3 = new RadioButton() { Value = 3 };
+
+			layout.Children.Add(radioButton1);
+			layout.Children.Add(radioButton2);
+			layout.Children.Add(radioButton3);
+
+			Assert.Equal(1, layout.GetValue(RadioButtonGroup.SelectedValueProperty));
+
+			layout.SetValue(RadioButtonGroup.SelectedValueProperty, null);
+
+			Assert.False(radioButton1.IsChecked);
+		}
+
+		[Fact]
+		public void ValuePropertyCoercedToItselfIfSetToNull()
+		{
+			var radioButton = new RadioButton();
+
+			Assert.Equal(radioButton, radioButton.Value);
+
+			radioButton.Value = null;
+
+			Assert.Equal(radioButton, radioButton.Value);
+		}
 	}
 }