From 7df83bcf8412011a892aef0991cbb689ca2f2b0a Mon Sep 17 00:00:00 2001
From: Martin Zikmund <martin@zikmund.dev>
Date: Fri, 19 Nov 2021 21:47:48 +0100
Subject: [PATCH 1/2] chore: RatingControl updates

---
 .../PriorityDefault/RatingControl.xaml        |   7 +-
 .../RatingControl_themeresources.xaml         |   1 +
 .../RatingControl/RatingControlTests.cs       |   1 +
 .../RatingControl/RatingControl.Header.cs     |  58 ++++
 .../Controls/RatingControl/RatingControl.cs   |  44 +--
 .../RatingControlAutomationPeer.cs            | 287 +++++++++---------
 .../RatingControl/RatingControlStates.cs      |  25 +-
 .../Controls/RatingControl/RatingInfoType.cs  |  17 +-
 .../RatingControl/RatingItemFontInfo.cs       | 177 +++++------
 .../RatingControl/RatingItemImageInfo.cs      | 177 +++++------
 .../Controls/RatingControl/RatingItemInfo.cs  |  23 +-
 .../Strings/be-BY/Resources.resw              | 136 ---------
 .../Strings/bn-BD/Resources.resw              | 136 ---------
 .../Strings/ha-Latn-NG/Resources.resw         | 120 --------
 .../Strings/sw-KE/Resources.resw              | 136 ---------
 .../Strings/uz-Latn-UZ/Resources.resw         |   2 +-
 16 files changed, 428 insertions(+), 919 deletions(-)
 create mode 100644 src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/RatingControl.Header.cs
 delete mode 100644 src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/Strings/be-BY/Resources.resw
 delete mode 100644 src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/Strings/bn-BD/Resources.resw
 delete mode 100644 src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/Strings/ha-Latn-NG/Resources.resw
 delete mode 100644 src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/Strings/sw-KE/Resources.resw

diff --git a/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/RatingControl.xaml b/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/RatingControl.xaml
index 3216dff596f0..ed166a816160 100644
--- a/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/RatingControl.xaml
+++ b/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/RatingControl.xaml
@@ -1,9 +1,10 @@
 <!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
+<!-- MUX Reference RatingControl.xaml, commit 29e8b9d -->
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:Microsoft.UI.Xaml.Controls">
-  
+
     <Style TargetType="local:RatingControl">
         <Setter Property="Height" Value="32"/>
         <!-- 9794813: retire these two properties as customisation points once all resource keys available -->
@@ -21,7 +22,7 @@
                                     <VisualState.Setters>
                                         <Setter Target="ForegroundContentPresenter.Foreground" Value="{ThemeResource RatingControlDisabledSelectedForeground}"/>
                                     </VisualState.Setters>
-                                </VisualState>                                
+                                </VisualState>
                                 <VisualState x:Name="Placeholder">
                                     <VisualState.Setters>
                                         <Setter Target="ForegroundContentPresenter.Foreground" Value="{ThemeResource RatingControlPlaceholderForeground}"/>
@@ -35,7 +36,7 @@
                                 <VisualState x:Name="PointerOverUnselected">
                                     <VisualState.Setters>
                                         <Setter Target="ForegroundContentPresenter.Foreground" Value="{ThemeResource RatingControlPointerOverUnselectedForeground}"/>
-                                    </VisualState.Setters>                                    
+                                    </VisualState.Setters>
                                 </VisualState>
                                 <VisualState x:Name="Set">
                                     <VisualState.Setters>
diff --git a/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/RatingControl_themeresources.xaml b/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/RatingControl_themeresources.xaml
index 30b559f37a02..9e764f81b2f0 100644
--- a/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/RatingControl_themeresources.xaml
+++ b/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/RatingControl_themeresources.xaml
@@ -1,4 +1,5 @@
 <!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
+<!-- MUX Reference RatingControl_themeresources.xaml, commit 1b66f00 -->
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/src/Uno.UI.RuntimeTests/MUX/Microsoft_UI_Xaml_Controls/RatingControl/RatingControlTests.cs b/src/Uno.UI.RuntimeTests/MUX/Microsoft_UI_Xaml_Controls/RatingControl/RatingControlTests.cs
index 8f892aa15dc6..d89bad31f6d1 100644
--- a/src/Uno.UI.RuntimeTests/MUX/Microsoft_UI_Xaml_Controls/RatingControl/RatingControlTests.cs
+++ b/src/Uno.UI.RuntimeTests/MUX/Microsoft_UI_Xaml_Controls/RatingControl/RatingControlTests.cs
@@ -1,5 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
+// MUX Reference RatingControlTests.h, commit e7e0823
 
 using System;
 using System.Collections.Generic;
diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/RatingControl.Header.cs b/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/RatingControl.Header.cs
new file mode 100644
index 000000000000..5b00c784189b
--- /dev/null
+++ b/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/RatingControl.Header.cs
@@ -0,0 +1,58 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+// MUX Reference RatingControl.h, commit b853109
+
+#nullable enable
+
+using Uno.Disposables;
+using Uno.UI.Helpers.WinUI;
+using Windows.UI.Composition;
+using Windows.UI.Xaml.Controls;
+
+namespace Microsoft.UI.Xaml.Controls;
+
+public partial class RatingControl
+{
+	private bool IsItemInfoPresentAndFontInfo()
+	{
+		return m_infoType == RatingInfoType.Font;
+	}
+	private bool IsItemInfoPresentAndImageInfo()
+	{
+		return m_infoType == RatingInfoType.Image;
+	}
+
+	// Private members
+	private TextBlock m_captionTextBlock = null;
+
+	private CompositionPropertySet m_sharedPointerPropertySet = null;
+
+	private StackPanel m_backgroundStackPanel = null;
+	private StackPanel m_foregroundStackPanel = null;
+
+	private bool m_isPointerOver = false;
+	private bool m_isPointerDown = false;
+	private double m_mousePercentage = 0.0;
+
+	private RatingInfoType m_infoType = RatingInfoType.Font;
+
+	// Holds the value of the Rating control at the moment of engagement,
+	// used to handle cancel-disengagements where we reset the value.
+	private double m_preEngagementValue = 0.0;
+	private bool m_disengagedWithA = false;
+	private bool m_shouldDiscardValue = true;
+
+	private readonly SerialDisposable m_pointerCancelledToken = new();
+	private readonly SerialDisposable m_pointerCaptureLostToken = new();
+	private readonly SerialDisposable m_pointerMovedToken = new();
+	private readonly SerialDisposable m_pointerEnteredToken = new();
+	private readonly SerialDisposable m_pointerExitedToken = new();
+	private readonly SerialDisposable m_pointerPressedToken = new();
+	private readonly SerialDisposable m_pointerReleasedToken = new();
+	private readonly SerialDisposable m_captionSizeChangedToken = new();
+	private long m_fontFamilyChangedToken;
+
+	private readonly SerialDisposable m_textScaleChangedRevoker = new();
+
+	private DispatcherHelper m_dispatcherHelper = null;
+}
diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/RatingControl.cs b/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/RatingControl.cs
index 92a70c2330f6..27ee17467b60 100644
--- a/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/RatingControl.cs
+++ b/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/RatingControl.cs
@@ -48,33 +48,12 @@ public partial class RatingControl : Control
 
 		private const int c_noValueSetSentinel = -1;
 
-		private static UISettings _uiSettings = null;
-
-		private DispatcherHelper m_dispatcherHelper;
-
-		// Private members
-		private TextBlock m_captionTextBlock;
-
-		private CompositionPropertySet m_sharedPointerPropertySet;
-
-		private StackPanel m_backgroundStackPanel;
-		private StackPanel m_foregroundStackPanel;
-
-		private bool m_isPointerOver = false;
-		private bool m_isPointerDown = false;
-		private double m_mousePercentage = 0.0;
-
-		private RatingInfoType m_infoType = RatingInfoType.Font;
-		private double m_preEngagementValue = 0.0;
-		private bool m_disengagedWithA = false;
-		private bool m_shouldDiscardValue = true;
-		private long m_fontFamilyChangedToken;
-
 		/// <summary>
 		/// Initializes a new instance of the RatingControl class.
 		/// </summary>
 		public RatingControl()
 		{
+			// Uno specific: Needs to be initialized in constructor, as "this" is not available in readonly field initializer
 			m_dispatcherHelper = new DispatcherHelper(this);
 			//__RP_Marker_ClassById(RuntimeProfiler.ProfId_RatingControl);
 
@@ -365,6 +344,13 @@ private void UpdateRatingItemsAppearance()
 
 		private void ApplyScaleExpressionAnimation(UIElement uiElement, int starIndex)
 		{
+			var scaleTransform = new ScaleTransform()
+			{
+				ScaleX = 0.5,
+				ScaleY = 0.5
+			};
+			uiElement.RenderTransform = scaleTransform;
+			uiElement.RenderTransformOrigin = new Point(0.5, 0.5);
 			//TODO: Uno Specific - Expression animations are not supported yet
 
 			//Visual uiElementVisual = ElementCompositionPreview.GetElementVisual(uiElement);
@@ -1211,22 +1197,12 @@ private void OnTextScaleFactorChanged(UISettings setting, object args)
 		}
 
 
+		private UISettings _uiSettings;
+
 		private UISettings GetUISettings()
 		{
 			_uiSettings = _uiSettings ?? new UISettings();
 			return _uiSettings;
 		}
-
-		// Header file
-
-		private bool IsItemInfoPresentAndFontInfo()
-		{
-			return m_infoType == RatingInfoType.Font;
-		}
-
-		private bool IsItemInfoPresentAndImageInfo()
-		{
-			return m_infoType == RatingInfoType.Image;
-		}
 	}
 }
diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/RatingControlAutomationPeer.cs b/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/RatingControlAutomationPeer.cs
index 6d0c84dae63a..a8d941bf9021 100644
--- a/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/RatingControlAutomationPeer.cs
+++ b/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/RatingControlAutomationPeer.cs
@@ -11,207 +11,200 @@
 using Windows.UI.Xaml.Automation.Provider;
 using RatingControl = Microsoft.UI.Xaml.Controls.RatingControl;
 
-namespace Microsoft.UI.Xaml.Automation.Peers
+namespace Microsoft.UI.Xaml.Automation.Peers;
+
+/// <summary>
+/// Exposes RatingControl types to Microsoft UI Automation.
+/// </summary>
+public partial class RatingControlAutomationPeer : FrameworkElementAutomationPeer, IRangeValueProvider, IValueProvider
 {
 	/// <summary>
-	/// Exposes RatingControl types to Microsoft UI Automation.
+	/// Initializes a new instance of the RatingControlAutomationPeer class.
 	/// </summary>
-	public partial class RatingControlAutomationPeer : FrameworkElementAutomationPeer, IRangeValueProvider, IValueProvider
+	/// <param name="owner">Rating control.</param>
+	public RatingControlAutomationPeer(RatingControl owner) : base(owner)
 	{
-		/// <summary>
-		/// Initializes a new instance of the RatingControlAutomationPeer class.
-		/// </summary>
-		/// <param name="owner">Rating control.</param>
-		public RatingControlAutomationPeer(RatingControl owner) : base(owner)
-		{
-		}
+	}
 
-		protected override string GetLocalizedControlTypeCore()
-		{
-			return ResourceAccessor.GetLocalizedStringResource(ResourceAccessor.SR_RatingLocalizedControlType);
-		}
+	protected override string GetLocalizedControlTypeCore()
+	{
+		return ResourceAccessor.GetLocalizedStringResource(ResourceAccessor.SR_RatingLocalizedControlType);
+	}
 
-		// Properties.
-		bool IValueProvider.IsReadOnly => GetRatingControl().IsReadOnly;
+	// Properties.
+	bool IValueProvider.IsReadOnly => GetRatingControl().IsReadOnly;
 
-		string IValueProvider.Value
+	string IValueProvider.Value
+	{
+		get
 		{
-			get
-			{
-				double ratingValue = GetRatingControl().Value;
-				string valueString;
+			double ratingValue = GetRatingControl().Value;
+			string valueString;
 
-				//string ratingString;
+			//string ratingString;
 
-				if (ratingValue == -1)
+			if (ratingValue == -1)
+			{
+				double placeholderValue = GetRatingControl().PlaceholderValue;
+				if (placeholderValue == -1)
 				{
-					double placeholderValue = GetRatingControl().PlaceholderValue;
-					if (placeholderValue == -1)
-					{
-						valueString = ResourceAccessor.GetLocalizedStringResource(ResourceAccessor.SR_RatingUnset);
-					}
-					else
-					{
-						valueString = GenerateValue_ValueString(ResourceAccessor.GetLocalizedStringResource(ResourceAccessor.SR_CommunityRatingString), placeholderValue);
-					}
+					valueString = ResourceAccessor.GetLocalizedStringResource(ResourceAccessor.SR_RatingUnset);
 				}
 				else
 				{
-					valueString = GenerateValue_ValueString(ResourceAccessor.GetLocalizedStringResource(ResourceAccessor.SR_BasicRatingString), ratingValue);
+					valueString = GenerateValue_ValueString(ResourceAccessor.GetLocalizedStringResource(ResourceAccessor.SR_CommunityRatingString), placeholderValue);
 				}
-
-				return valueString;
 			}
-		}
-
-		void IValueProvider.SetValue(string value)
-		{
-			DecimalFormatter formatter = new DecimalFormatter();
-			var potentialRating = formatter.ParseDouble(value);
-			if (potentialRating != null)
+			else
 			{
-				GetRatingControl().Value = potentialRating.Value;
+				valueString = GenerateValue_ValueString(ResourceAccessor.GetLocalizedStringResource(ResourceAccessor.SR_BasicRatingString), ratingValue);
 			}
-		}
 
-		// IRangeValueProvider overrides
-		double IRangeValueProvider.SmallChange => 1.0;
-
-		double IRangeValueProvider.LargeChange => 1.0;
-
-		double IRangeValueProvider.Maximum => GetRatingControl().MaxRating;
-
-		double IRangeValueProvider.Minimum => 0;
-
-		double IRangeValueProvider.Value
-		{
-			get
-			{
-				// Change this to provide a placeholder value too.
-				double value = GetRatingControl().Value;
-				if (value == -1)
-				{
-					return 0;
-				}
-				else
-				{
-					return value;
-				}
-			}
+			return valueString;
 		}
+	}
 
-		void IRangeValueProvider.SetValue(double value)
+	void IValueProvider.SetValue(string value)
+	{
+		DecimalFormatter formatter = new DecimalFormatter();
+		var potentialRating = formatter.ParseDouble(value);
+		if (potentialRating != null)
 		{
-			GetRatingControl().Value = value;
+			GetRatingControl().Value = potentialRating.Value;
 		}
+	}
 
-		bool IRangeValueProvider.IsReadOnly => GetRatingControl().IsReadOnly;
-
-		//IAutomationPeerOverrides
+	// IRangeValueProvider overrides
+	double IRangeValueProvider.SmallChange => 1.0;
 
-		protected override object GetPatternCore(PatternInterface patternInterface)
-		{
-			if (patternInterface == PatternInterface.Value || patternInterface == PatternInterface.RangeValue)
-			{
-				return this;
-			}
+	double IRangeValueProvider.LargeChange => 1.0;
 
-			return base.GetPatternCore(patternInterface);
-		}
+	double IRangeValueProvider.Maximum => GetRatingControl().MaxRating;
 
-		protected override AutomationControlType GetAutomationControlTypeCore()
-		{
-			return AutomationControlType.Slider;
-		}
+	double IRangeValueProvider.Minimum => 0;
 
-		// Protected methods
-		internal void RaisePropertyChangedEvent(double newValue)
+	double IRangeValueProvider.Value
+	{
+		get
 		{
-			// UIA doesn't tolerate a null doubles, so we convert them to zeroes.
-			double oldValue = GetRatingControl().Value;
-			var oldValueProp = PropertyValue.CreateDouble(oldValue);
-
-			if (newValue == -1)
+			// Change this to provide a placeholder value too.
+			double value = GetRatingControl().Value;
+			if (value == -1)
 			{
-				var newValueProp = PropertyValue.CreateDouble(0.0);
-				base.RaisePropertyChangedEvent(ValuePatternIdentifiers.ValueProperty, oldValueProp, newValueProp);
-				base.RaisePropertyChangedEvent(RangeValuePatternIdentifiers.ValueProperty, oldValueProp, newValueProp);
+				return 0;
 			}
 			else
 			{
-				var newValueProp = PropertyValue.CreateDouble(newValue);
-				base.RaisePropertyChangedEvent(ValuePatternIdentifiers.ValueProperty, oldValueProp, newValueProp); // make these strings
-				base.RaisePropertyChangedEvent(RangeValuePatternIdentifiers.ValueProperty, oldValueProp, newValueProp);
+				return value;
 			}
 		}
+	}
+
+	void IRangeValueProvider.SetValue(double value)
+	{
+		GetRatingControl().Value = value;
+	}
+
+	bool IRangeValueProvider.IsReadOnly => GetRatingControl().IsReadOnly;
 
-		// private methods
+	//IAutomationPeerOverrides
 
-		private RatingControl GetRatingControl()
+	protected override object GetPatternCore(PatternInterface patternInterface)
+	{
+		if (patternInterface == PatternInterface.Value || patternInterface == PatternInterface.RangeValue)
 		{
-			UIElement owner = Owner;
-			return owner as RatingControl;
+			return this;
 		}
 
-		private int DetermineFractionDigits(double value)
-		{
-			value = value * 100;
-			int intValue = (int)value;
+		return base.GetPatternCore(patternInterface);
+	}
 
-			// When reading out the Value_Value, we want clients to read out the least number of digits
-			// possible. We don't want a 3 (represented as a double) to be read out as 3.00...
-			// Here we determine the number of digits past the decimal point we care about,
-			// and this number is used by the caller to truncate the Value_Value string.
+	protected override AutomationControlType GetAutomationControlTypeCore()
+	{
+		return AutomationControlType.Slider;
+	}
 
-			if (intValue % 100 == 0)
-			{
-				return 0;
-			}
-			else if (intValue % 10 == 0)
-			{
-				return 1;
-			}
-			else
-			{
-				return 2;
-			}
-		}
+	// Protected methods
+	internal void RaisePropertyChangedEvent(double newValue)
+	{
+		// UIA doesn't tolerate a null doubles, so we convert them to zeroes.
+		double oldValue = GetRatingControl().Value;
+		var oldValueProp = PropertyValue.CreateDouble(oldValue);
 
-		private int DetermineSignificantDigits(double value, int fractionDigits)
+		if (newValue == -1)
 		{
-			int sigFigsInt = (int)value;
-			int length = 0;
-
-			while (sigFigsInt > 0)
-			{
-				sigFigsInt /= 10;
-				length++;
-			}
-
-			return length + fractionDigits;
+			var newValueProp = PropertyValue.CreateDouble(0.0);
+			base.RaisePropertyChangedEvent(ValuePatternIdentifiers.ValueProperty, oldValueProp, newValueProp);
+			base.RaisePropertyChangedEvent(RangeValuePatternIdentifiers.ValueProperty, oldValueProp, newValueProp);
 		}
-
-		private string GenerateValue_ValueString(string resourceString, double ratingValue)
+		else
 		{
-			DecimalFormatter formatter = new DecimalFormatter();
-			SignificantDigitsNumberRounder rounder = new SignificantDigitsNumberRounder();
-			formatter.NumberRounder = rounder;
+			var newValueProp = PropertyValue.CreateDouble(newValue);
+			base.RaisePropertyChangedEvent(ValuePatternIdentifiers.ValueProperty, oldValueProp, newValueProp); // make these strings
+			base.RaisePropertyChangedEvent(RangeValuePatternIdentifiers.ValueProperty, oldValueProp, newValueProp);
+		}
+	}
 
-			string maxRatingString = GetRatingControl().MaxRating.ToString();
+	// private methods
 
-			int fractionDigits = DetermineFractionDigits(ratingValue);
-			int sigDigits = DetermineSignificantDigits(ratingValue, fractionDigits);
-			formatter.FractionDigits = fractionDigits;
-			rounder.SignificantDigits = (uint)sigDigits;
-			string ratingString = formatter.Format(ratingValue);
+	private RatingControl GetRatingControl()
+	{
+		UIElement owner = Owner;
+		return owner as RatingControl;
+	}
 
-			return StringUtil.FormatString(resourceString, ratingString, maxRatingString);
+	private int DetermineFractionDigits(double value)
+	{
+		value = value * 100;
+		int intValue = (int)value;
+
+		// When reading out the Value_Value, we want clients to read out the least number of digits
+		// possible. We don't want a 3 (represented as a double) to be read out as 3.00...
+		// Here we determine the number of digits past the decimal point we care about,
+		// and this number is used by the caller to truncate the Value_Value string.
+
+		if (intValue % 100 == 0)
+		{
+			return 0;
+		}
+		else if (intValue % 10 == 0)
+		{
+			return 1;
+		}
+		else
+		{
+			return 2;
 		}
 	}
-}
 
+	private int DetermineSignificantDigits(double value, int fractionDigits)
+	{
+		int sigFigsInt = (int)value;
+		int length = 0;
 
+		while (sigFigsInt > 0)
+		{
+			sigFigsInt /= 10;
+			length++;
+		}
 
+		return length + fractionDigits;
+	}
+
+	private string GenerateValue_ValueString(string resourceString, double ratingValue)
+	{
+		DecimalFormatter formatter = new DecimalFormatter();
+		SignificantDigitsNumberRounder rounder = new SignificantDigitsNumberRounder();
+		formatter.NumberRounder = rounder;
 
+		string maxRatingString = GetRatingControl().MaxRating.ToString();
 
+		int fractionDigits = DetermineFractionDigits(ratingValue);
+		int sigDigits = DetermineSignificantDigits(ratingValue, fractionDigits);
+		formatter.FractionDigits = fractionDigits;
+		rounder.SignificantDigits = (uint)sigDigits;
+		string ratingString = formatter.Format(ratingValue);
 
+		return StringUtil.FormatString(resourceString, ratingString, maxRatingString);
+	}
+}
diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/RatingControlStates.cs b/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/RatingControlStates.cs
index 5e7d28a520d1..6657f80658aa 100644
--- a/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/RatingControlStates.cs
+++ b/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/RatingControlStates.cs
@@ -1,15 +1,16 @@
-// MUX Reference RatingControl.h, commit de78834
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+// MUX Reference RatingControl.h, commit b853109
 
-namespace Microsoft.UI.Xaml.Controls
+namespace Microsoft.UI.Xaml.Controls;
+
+internal enum RatingControlStates
 {
-	internal enum RatingControlStates
-	{
-		Disabled = 0,
-		Set = 1,
-		PointerOverSet = 2,
-		PointerOverPlaceholder = 3, // Also functions as the pointer over unset state at the moment
-		Placeholder = 4,
-		Unset = 5,
-		Null = 6
-	};
+	Disabled = 0,
+	Set = 1,
+	PointerOverSet = 2,
+	PointerOverPlaceholder = 3, // Also functions as the pointer over unset state at the moment
+	Placeholder = 4,
+	Unset = 5,
+	Null = 6
 }
diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/RatingInfoType.cs b/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/RatingInfoType.cs
index f9cfc2aa7fbf..7513e084569a 100644
--- a/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/RatingInfoType.cs
+++ b/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/RatingInfoType.cs
@@ -1,11 +1,12 @@
-// MUX Reference RatingControl.h, commit de78834
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+// MUX Reference RatingControl.h, commit b853109
 
-namespace Microsoft.UI.Xaml.Controls
+namespace Microsoft.UI.Xaml.Controls;
+
+internal enum RatingInfoType
 {
-	internal enum RatingInfoType
-	{
-		None,
-		Font,
-		Image
-	}
+	None,
+	Font,
+	Image
 }
diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/RatingItemFontInfo.cs b/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/RatingItemFontInfo.cs
index eb94b23be3d9..16bf17175754 100644
--- a/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/RatingItemFontInfo.cs
+++ b/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/RatingItemFontInfo.cs
@@ -1,109 +1,110 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
 // MUX Reference RatingItemFontInfo.properties.cpp, commit de78834
 
 using Windows.UI.Xaml;
 
-namespace Microsoft.UI.Xaml.Controls
+namespace Microsoft.UI.Xaml.Controls;
+
+/// <summary>
+/// Represents information about the visual states of font elements that represent a rating.
+/// </summary>
+public partial class RatingItemFontInfo : RatingItemInfo
 {
 	/// <summary>
-	/// Represents information about the visual states of font elements that represent a rating.
+	/// Initializes a new instance of the RatingItemFontInfo class.
 	/// </summary>
-	public partial class RatingItemFontInfo : RatingItemInfo
+	public RatingItemFontInfo()
 	{
-		/// <summary>
-		/// Initializes a new instance of the RatingItemFontInfo class.
-		/// </summary>
-		public RatingItemFontInfo()
-		{
-		}
-
-		/// <summary>
-		/// Gets or sets a Segoe MDL2 Assets font glyph that represents a rating element that is disabled.
-		/// </summary>
-		public string DisabledGlyph
-		{
-			get => (string)GetValue(DisabledGlyphProperty);
-			set => SetValue(DisabledGlyphProperty, value);
-		}
+	}
 
-		/// <summary>
-		/// Identifies the DisabledGlyph dependency property.
-		/// </summary>
-		public static DependencyProperty DisabledGlyphProperty { get; } =
-			DependencyProperty.Register(nameof(DisabledGlyph), typeof(string), typeof(RatingItemFontInfo), new FrameworkPropertyMetadata(null));
+	/// <summary>
+	/// Gets or sets a Segoe MDL2 Assets font glyph that represents a rating element that is disabled.
+	/// </summary>
+	public string DisabledGlyph
+	{
+		get => (string)GetValue(DisabledGlyphProperty);
+		set => SetValue(DisabledGlyphProperty, value);
+	}
 
-		/// <summary>
-		/// Gets or sets a Segoe MDL2 Assets font glyph that represents a rating element that has been set by the user.
-		/// </summary>
-		public string Glyph
-		{
-			get => (string)GetValue(GlyphProperty);
-			set => SetValue(GlyphProperty, value);
-		}
+	/// <summary>
+	/// Identifies the DisabledGlyph dependency property.
+	/// </summary>
+	public static DependencyProperty DisabledGlyphProperty { get; } =
+		DependencyProperty.Register(nameof(DisabledGlyph), typeof(string), typeof(RatingItemFontInfo), new FrameworkPropertyMetadata(null));
 
-		/// <summary>
-		/// Identifies the Glyph dependency property.
-		/// </summary>
-		public static DependencyProperty GlyphProperty { get; } =
-			DependencyProperty.Register(nameof(Glyph), typeof(string), typeof(RatingItemFontInfo), new FrameworkPropertyMetadata(null));
+	/// <summary>
+	/// Gets or sets a Segoe MDL2 Assets font glyph that represents a rating element that has been set by the user.
+	/// </summary>
+	public string Glyph
+	{
+		get => (string)GetValue(GlyphProperty);
+		set => SetValue(GlyphProperty, value);
+	}
 
-		/// <summary>
-		/// Gets or sets a Segoe MDL2 Assets font glyph that represents a rating element that is showing a placeholder value.
-		/// </summary>
-		public string PlaceholderGlyph
-		{
-			get => (string)GetValue(PlaceholderGlyphProperty);
-			set => SetValue(PlaceholderGlyphProperty, value);
-		}
+	/// <summary>
+	/// Identifies the Glyph dependency property.
+	/// </summary>
+	public static DependencyProperty GlyphProperty { get; } =
+		DependencyProperty.Register(nameof(Glyph), typeof(string), typeof(RatingItemFontInfo), new FrameworkPropertyMetadata(null));
 
-		/// <summary>
-		/// Identifies the PlaceholderGlyph dependency property.
-		/// </summary>
-		public static DependencyProperty PlaceholderGlyphProperty { get; } =
-			DependencyProperty.Register(nameof(PlaceholderGlyph), typeof(string), typeof(RatingItemFontInfo), new FrameworkPropertyMetadata(null));
+	/// <summary>
+	/// Gets or sets a Segoe MDL2 Assets font glyph that represents a rating element that is showing a placeholder value.
+	/// </summary>
+	public string PlaceholderGlyph
+	{
+		get => (string)GetValue(PlaceholderGlyphProperty);
+		set => SetValue(PlaceholderGlyphProperty, value);
+	}
 
-		/// <summary>
-		/// Gets or sets a Segoe MDL2 Assets font glyph that represents a rating element that has the pointer over it.
-		/// </summary>
-		public string PointerOverGlyph
-		{
-			get => (string)GetValue(PointerOverGlyphProperty);
-			set => SetValue(PointerOverGlyphProperty, value);
-		}
+	/// <summary>
+	/// Identifies the PlaceholderGlyph dependency property.
+	/// </summary>
+	public static DependencyProperty PlaceholderGlyphProperty { get; } =
+		DependencyProperty.Register(nameof(PlaceholderGlyph), typeof(string), typeof(RatingItemFontInfo), new FrameworkPropertyMetadata(null));
 
-		/// <summary>
-		/// Identifies the PointerOverGlyph dependency property.
-		/// </summary>
-		public static DependencyProperty PointerOverGlyphProperty { get; } =
-			DependencyProperty.Register(nameof(PointerOverGlyph), typeof(string), typeof(RatingItemFontInfo), new FrameworkPropertyMetadata(null));
+	/// <summary>
+	/// Gets or sets a Segoe MDL2 Assets font glyph that represents a rating element that has the pointer over it.
+	/// </summary>
+	public string PointerOverGlyph
+	{
+		get => (string)GetValue(PointerOverGlyphProperty);
+		set => SetValue(PointerOverGlyphProperty, value);
+	}
 
-		/// <summary>
-		/// Gets or sets a Segoe MDL2 Assets font glyph that represents a rating element showing a placeholder value with the pointer over it.
-		/// </summary>
-		public string PointerOverPlaceholderGlyph
-		{
-			get => (string)GetValue(PointerOverPlaceholderGlyphProperty);
-			set => SetValue(PointerOverPlaceholderGlyphProperty, value);
-		}
+	/// <summary>
+	/// Identifies the PointerOverGlyph dependency property.
+	/// </summary>
+	public static DependencyProperty PointerOverGlyphProperty { get; } =
+		DependencyProperty.Register(nameof(PointerOverGlyph), typeof(string), typeof(RatingItemFontInfo), new FrameworkPropertyMetadata(null));
 
-		/// <summary>
-		/// Identifies the PointerOverPlaceholderGlyph dependency property.
-		/// </summary>
-		public static DependencyProperty PointerOverPlaceholderGlyphProperty { get; } =
-			DependencyProperty.Register(nameof(PointerOverPlaceholderGlyph), typeof(string), typeof(RatingItemFontInfo), new FrameworkPropertyMetadata(null));
+	/// <summary>
+	/// Gets or sets a Segoe MDL2 Assets font glyph that represents a rating element showing a placeholder value with the pointer over it.
+	/// </summary>
+	public string PointerOverPlaceholderGlyph
+	{
+		get => (string)GetValue(PointerOverPlaceholderGlyphProperty);
+		set => SetValue(PointerOverPlaceholderGlyphProperty, value);
+	}
 
-		/// <summary>
-		/// Gets or sets a Segoe MDL2 Assets font glyph that represents a rating element that has not been set.
-		/// </summary>
-		public string UnsetGlyph
-		{
-			get => (string)GetValue(UnsetGlyphProperty);
-			set => SetValue(UnsetGlyphProperty, value);
-		}
+	/// <summary>
+	/// Identifies the PointerOverPlaceholderGlyph dependency property.
+	/// </summary>
+	public static DependencyProperty PointerOverPlaceholderGlyphProperty { get; } =
+		DependencyProperty.Register(nameof(PointerOverPlaceholderGlyph), typeof(string), typeof(RatingItemFontInfo), new FrameworkPropertyMetadata(null));
 
-		/// <summary>
-		/// Identifies the UnsetGlyph dependency property.
-		/// </summary>
-		public static DependencyProperty UnsetGlyphProperty { get; } =
-			DependencyProperty.Register(nameof(UnsetGlyph), typeof(string), typeof(RatingItemFontInfo), new FrameworkPropertyMetadata(null));
+	/// <summary>
+	/// Gets or sets a Segoe MDL2 Assets font glyph that represents a rating element that has not been set.
+	/// </summary>
+	public string UnsetGlyph
+	{
+		get => (string)GetValue(UnsetGlyphProperty);
+		set => SetValue(UnsetGlyphProperty, value);
 	}
+
+	/// <summary>
+	/// Identifies the UnsetGlyph dependency property.
+	/// </summary>
+	public static DependencyProperty UnsetGlyphProperty { get; } =
+		DependencyProperty.Register(nameof(UnsetGlyph), typeof(string), typeof(RatingItemFontInfo), new FrameworkPropertyMetadata(null));
 }
diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/RatingItemImageInfo.cs b/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/RatingItemImageInfo.cs
index f23b68ac0c73..b543b191147f 100644
--- a/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/RatingItemImageInfo.cs
+++ b/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/RatingItemImageInfo.cs
@@ -1,110 +1,111 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
 // MUX Reference RatingItemImageInfo.properties.cpp, commit de78834
 
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Media;
 
-namespace Microsoft.UI.Xaml.Controls
+namespace Microsoft.UI.Xaml.Controls;
+
+/// <summary>
+/// Represents information about the visual states of image elements that represent a rating.
+/// </summary>
+public partial class RatingItemImageInfo : RatingItemInfo
 {
 	/// <summary>
-	/// Represents information about the visual states of image elements that represent a rating.
+	/// Initializes a new instance of the RatingItemImageInfo class.
 	/// </summary>
-	public partial class RatingItemImageInfo : RatingItemInfo
+	public RatingItemImageInfo()
 	{
-		/// <summary>
-		/// Initializes a new instance of the RatingItemImageInfo class.
-		/// </summary>
-		public RatingItemImageInfo()
-		{
-		}
-
-		/// <summary>
-		/// Gets or sets an image that represents a rating element that is disabled.
-		/// </summary>
-		public ImageSource DisabledImage
-		{
-			get => (ImageSource)GetValue(DisabledImageProperty);
-			set => SetValue(DisabledImageProperty, value);
-		}
+	}
 
-		/// <summary>
-		/// Identifies the DisabledImage dependency property.
-		/// </summary>
-		public static DependencyProperty DisabledImageProperty { get; } =
-			DependencyProperty.Register(nameof(DisabledImage), typeof(ImageSource), typeof(RatingItemImageInfo), new FrameworkPropertyMetadata(null));
+	/// <summary>
+	/// Gets or sets an image that represents a rating element that is disabled.
+	/// </summary>
+	public ImageSource DisabledImage
+	{
+		get => (ImageSource)GetValue(DisabledImageProperty);
+		set => SetValue(DisabledImageProperty, value);
+	}
 
-		/// <summary>
-		/// Gets or sets an image that represents a rating element that has been set by the user.
-		/// </summary>
-		public ImageSource Image
-		{
-			get => (ImageSource)GetValue(ImageProperty);
-			set => SetValue(ImageProperty, value);
-		}
+	/// <summary>
+	/// Identifies the DisabledImage dependency property.
+	/// </summary>
+	public static DependencyProperty DisabledImageProperty { get; } =
+		DependencyProperty.Register(nameof(DisabledImage), typeof(ImageSource), typeof(RatingItemImageInfo), new FrameworkPropertyMetadata(null));
 
-		/// <summary>
-		/// Identifies the Image dependency property.
-		/// </summary>
-		public static DependencyProperty ImageProperty { get; } =
-			DependencyProperty.Register(nameof(Image), typeof(ImageSource), typeof(RatingItemImageInfo), new FrameworkPropertyMetadata(null));
+	/// <summary>
+	/// Gets or sets an image that represents a rating element that has been set by the user.
+	/// </summary>
+	public ImageSource Image
+	{
+		get => (ImageSource)GetValue(ImageProperty);
+		set => SetValue(ImageProperty, value);
+	}
 
-		/// <summary>
-		/// Gets or sets an image that represents a rating element that is showing a placeholder value.
-		/// </summary>
-		public ImageSource PlaceholderImage
-		{
-			get => (ImageSource)GetValue(PlaceholderImageProperty);
-			set => SetValue(PlaceholderImageProperty, value);
-		}
+	/// <summary>
+	/// Identifies the Image dependency property.
+	/// </summary>
+	public static DependencyProperty ImageProperty { get; } =
+		DependencyProperty.Register(nameof(Image), typeof(ImageSource), typeof(RatingItemImageInfo), new FrameworkPropertyMetadata(null));
 
-		/// <summary>
-		/// Identifies the PlaceholderImage dependency property.
-		/// </summary>
-		public static DependencyProperty PlaceholderImageProperty { get; } =
-			DependencyProperty.Register(nameof(PlaceholderImage), typeof(ImageSource), typeof(RatingItemImageInfo), new FrameworkPropertyMetadata(null));
+	/// <summary>
+	/// Gets or sets an image that represents a rating element that is showing a placeholder value.
+	/// </summary>
+	public ImageSource PlaceholderImage
+	{
+		get => (ImageSource)GetValue(PlaceholderImageProperty);
+		set => SetValue(PlaceholderImageProperty, value);
+	}
 
-		/// <summary>
-		/// Gets or sets an image that represents a rating element that has the pointer over it.
-		/// </summary>
-		public ImageSource PointerOverImage
-		{
-			get => (ImageSource)GetValue(PointerOverImageProperty);
-			set => SetValue(PointerOverImageProperty, value);
-		}
+	/// <summary>
+	/// Identifies the PlaceholderImage dependency property.
+	/// </summary>
+	public static DependencyProperty PlaceholderImageProperty { get; } =
+		DependencyProperty.Register(nameof(PlaceholderImage), typeof(ImageSource), typeof(RatingItemImageInfo), new FrameworkPropertyMetadata(null));
 
-		/// <summary>
-		/// Identifies the PointerOverImage dependency property.
-		/// </summary>
-		public static DependencyProperty PointerOverImageProperty { get; } =
-			DependencyProperty.Register(nameof(PointerOverImage), typeof(ImageSource), typeof(RatingItemImageInfo), new FrameworkPropertyMetadata(null));
+	/// <summary>
+	/// Gets or sets an image that represents a rating element that has the pointer over it.
+	/// </summary>
+	public ImageSource PointerOverImage
+	{
+		get => (ImageSource)GetValue(PointerOverImageProperty);
+		set => SetValue(PointerOverImageProperty, value);
+	}
 
-		/// <summary>
-		/// Gets or sets an image that represents a rating element showing a placeholder value with the pointer over it.
-		/// </summary>
-		public ImageSource PointerOverPlaceholderImage
-		{
-			get => (ImageSource)GetValue(PointerOverPlaceholderImageProperty);
-			set => SetValue(PointerOverPlaceholderImageProperty, value);
-		}
+	/// <summary>
+	/// Identifies the PointerOverImage dependency property.
+	/// </summary>
+	public static DependencyProperty PointerOverImageProperty { get; } =
+		DependencyProperty.Register(nameof(PointerOverImage), typeof(ImageSource), typeof(RatingItemImageInfo), new FrameworkPropertyMetadata(null));
 
-		/// <summary>
-		/// Identifies the PointerOverPlaceholderImage dependency property.
-		/// </summary>
-		public static DependencyProperty PointerOverPlaceholderImageProperty { get; } =
-			DependencyProperty.Register(nameof(PointerOverPlaceholderImage), typeof(ImageSource), typeof(RatingItemImageInfo), new FrameworkPropertyMetadata(null));
+	/// <summary>
+	/// Gets or sets an image that represents a rating element showing a placeholder value with the pointer over it.
+	/// </summary>
+	public ImageSource PointerOverPlaceholderImage
+	{
+		get => (ImageSource)GetValue(PointerOverPlaceholderImageProperty);
+		set => SetValue(PointerOverPlaceholderImageProperty, value);
+	}
 
-		/// <summary>
-		/// Gets or sets an image that represents a rating element that has not been set.
-		/// </summary>
-		public ImageSource UnsetImage
-		{
-			get => (ImageSource)GetValue(UnsetImageProperty);
-			set => SetValue(UnsetImageProperty, value);
-		}
+	/// <summary>
+	/// Identifies the PointerOverPlaceholderImage dependency property.
+	/// </summary>
+	public static DependencyProperty PointerOverPlaceholderImageProperty { get; } =
+		DependencyProperty.Register(nameof(PointerOverPlaceholderImage), typeof(ImageSource), typeof(RatingItemImageInfo), new FrameworkPropertyMetadata(null));
 
-		/// <summary>
-		/// Identifies the UnsetImage dependency property.
-		/// </summary>
-		public static DependencyProperty UnsetImageProperty { get; } =
-			DependencyProperty.Register(nameof(UnsetImage), typeof(ImageSource), typeof(RatingItemImageInfo), new FrameworkPropertyMetadata(null));
+	/// <summary>
+	/// Gets or sets an image that represents a rating element that has not been set.
+	/// </summary>
+	public ImageSource UnsetImage
+	{
+		get => (ImageSource)GetValue(UnsetImageProperty);
+		set => SetValue(UnsetImageProperty, value);
 	}
+
+	/// <summary>
+	/// Identifies the UnsetImage dependency property.
+	/// </summary>
+	public static DependencyProperty UnsetImageProperty { get; } =
+		DependencyProperty.Register(nameof(UnsetImage), typeof(ImageSource), typeof(RatingItemImageInfo), new FrameworkPropertyMetadata(null));
 }
diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/RatingItemInfo.cs b/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/RatingItemInfo.cs
index 65cab43f5304..97a4d492d089 100644
--- a/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/RatingItemInfo.cs
+++ b/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/RatingItemInfo.cs
@@ -1,19 +1,22 @@
-// MUX Reference RatingItemInfo.properties.cpp, commit de78834
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+// MUX Reference RatingItemInfo.cpp, commit 46f9da3
+
+#nullable enable
 
 using Windows.UI.Xaml;
 
-namespace Microsoft.UI.Xaml.Controls
+namespace Microsoft.UI.Xaml.Controls;
+
+/// <summary>
+/// Represents information about the visual states of the elements that represent a rating.
+/// </summary>
+public partial class RatingItemInfo : DependencyObject
 {
 	/// <summary>
-	/// Represents information about the visual states of the elements that represent a rating.
+	/// Initializes a new instance of the RatingItemInfo class.
 	/// </summary>
-	public partial class RatingItemInfo : DependencyObject
+	public RatingItemInfo()
 	{
-		/// <summary>
-		/// Initializes a new instance of the RatingItemInfo class.
-		/// </summary>
-		public RatingItemInfo()
-		{
-		}
 	}
 }
diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/Strings/be-BY/Resources.resw b/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/Strings/be-BY/Resources.resw
deleted file mode 100644
index 2755e4166456..000000000000
--- a/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/Strings/be-BY/Resources.resw
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="BasicRatingString" xml:space="preserve">
-    <value>Ацэнка, %1 з %2</value>
-    <comment>English example: Rating, 1.0 of 5.</comment>
-  </data>
-  <data name="CommunityRatingString" xml:space="preserve">
-    <value>Ацэнка супольнасці, %1 з %2</value>
-    <comment>English example: Community Rating, 3.3 of 6.</comment>
-  </data>
-  <data name="RatingUnset" xml:space="preserve">
-    <value>Ацэнка не зададзена</value>
-    <comment>This text is used to show the number of stars none are selected.</comment>
-  </data>
-  <data name="RatingLocalizedControlType" xml:space="preserve">
-    <value>Паўзунок ацэнкі</value>
-    <comment>A simple description of the control for UIA</comment>
-  </data>
-</root>
\ No newline at end of file
diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/Strings/bn-BD/Resources.resw b/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/Strings/bn-BD/Resources.resw
deleted file mode 100644
index 5582e481ff34..000000000000
--- a/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/Strings/bn-BD/Resources.resw
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="BasicRatingString" xml:space="preserve">
-    <value>মূল্যায়ন, %2 এর মধ্যে %1</value>
-    <comment>English example: Rating, 1.0 of 5.</comment>
-  </data>
-  <data name="CommunityRatingString" xml:space="preserve">
-    <value>সম্প্রদায়ের মূল্যায়ন, %2 এর মধ্যে %1</value>
-    <comment>English example: Community Rating, 3.3 of 6.</comment>
-  </data>
-  <data name="RatingUnset" xml:space="preserve">
-    <value>মূল্যায়ন অনির্ধারণ</value>
-    <comment>This text is used to show the number of stars none are selected.</comment>
-  </data>
-  <data name="RatingLocalizedControlType" xml:space="preserve">
-    <value>স্লাইডার মূল্যায়ণ করুন</value>
-    <comment>A simple description of the control for UIA</comment>
-  </data>
-</root>
\ No newline at end of file
diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/Strings/ha-Latn-NG/Resources.resw b/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/Strings/ha-Latn-NG/Resources.resw
deleted file mode 100644
index 1af7de150c99..000000000000
--- a/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/Strings/ha-Latn-NG/Resources.resw
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file
diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/Strings/sw-KE/Resources.resw b/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/Strings/sw-KE/Resources.resw
deleted file mode 100644
index 1969f4e0d936..000000000000
--- a/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/Strings/sw-KE/Resources.resw
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="BasicRatingString" xml:space="preserve">
-    <value>Ukadiriaji, %1 of %2</value>
-    <comment>English example: Rating, 1.0 of 5.</comment>
-  </data>
-  <data name="CommunityRatingString" xml:space="preserve">
-    <value>Ukadiriaji wa Jumuiya, %1 kati ya %2</value>
-    <comment>English example: Community Rating, 3.3 of 6.</comment>
-  </data>
-  <data name="RatingUnset" xml:space="preserve">
-    <value>Kusetua Ukadiriaji</value>
-    <comment>This text is used to show the number of stars none are selected.</comment>
-  </data>
-  <data name="RatingLocalizedControlType" xml:space="preserve">
-    <value>Kitelezeshi cha Ukadiriaji</value>
-    <comment>A simple description of the control for UIA</comment>
-  </data>
-</root>
\ No newline at end of file
diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/Strings/uz-Latn-UZ/Resources.resw b/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/Strings/uz-Latn-UZ/Resources.resw
index 54ea0af8641d..6d6d5c232ee4 100644
--- a/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/Strings/uz-Latn-UZ/Resources.resw
+++ b/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/Strings/uz-Latn-UZ/Resources.resw
@@ -122,7 +122,7 @@
     <comment>English example: Rating, 1.0 of 5.</comment>
   </data>
   <data name="CommunityRatingString" xml:space="preserve">
-    <value>Uyushma reytingi, %1/%2</value>
+    <value>Hamjamiyat reytingi, %1/%2</value>
     <comment>English example: Community Rating, 3.3 of 6.</comment>
   </data>
   <data name="RatingUnset" xml:space="preserve">

From f16235737a554cd33cd7f948834a8853c1b31a9b Mon Sep 17 00:00:00 2001
From: Martin Zikmund <martin@zikmund.dev>
Date: Fri, 19 Nov 2021 21:48:08 +0100
Subject: [PATCH 2/2] chore: Update fluent theme resources for TabView

---
 .../themeresources_v1.xaml                    | 67 ++++++++++++-------
 .../themeresources_v2.xaml                    | 14 +++-
 .../RatingControl/RatingControl.Header.cs     | 20 ++----
 3 files changed, 60 insertions(+), 41 deletions(-)

diff --git a/src/Uno.UI.FluentTheme.v1/themeresources_v1.xaml b/src/Uno.UI.FluentTheme.v1/themeresources_v1.xaml
index 5a37c7e96a08..5869865cb0d6 100644
--- a/src/Uno.UI.FluentTheme.v1/themeresources_v1.xaml
+++ b/src/Uno.UI.FluentTheme.v1/themeresources_v1.xaml
@@ -19383,6 +19383,21 @@
       </Setter.Value>
     </Setter>
   </Style>
+  <Thickness x:Key="TabViewHeaderPadding">8,8,4,0</Thickness>
+  <Thickness x:Key="TabViewItemHeaderPadding">12,8,10,8</Thickness>
+  <x:Double x:Key="TabViewItemMaxWidth">240</x:Double>
+  <x:Double x:Key="TabViewItemMinWidth">100</x:Double>
+  <x:Double x:Key="TabViewItemHeaderFontSize">12</x:Double>
+  <x:Double x:Key="TabViewItemHeaderIconSize">16</x:Double>
+  <Thickness x:Key="TabViewItemHeaderIconMargin">0,0,10,0</Thickness>
+  <x:Double x:Key="TabViewItemHeaderCloseButtonSize">16</x:Double>
+  <x:Double x:Key="TabViewItemHeaderCloseFontSize">12</x:Double>
+  <Thickness x:Key="TabViewItemHeaderCloseMargin">10,0,0,0</Thickness>
+  <x:Double x:Key="TabViewItemScrollButtonWidth">29</x:Double>
+  <x:Double x:Key="TabViewItemScrollButtonHeight">29</x:Double>
+  <Thickness x:Key="TabViewItemScrollButtonPadding">6,4,10,5</Thickness>
+  <x:Double x:Key="TabViewShadowDepth">16</x:Double>
+  <Thickness x:Key="TabViewItemSeparatorMargin">0,6,0,6</Thickness>
   <Style TargetType="controls:TabView" BasedOn="{StaticResource DefaultTabViewStyle}" />
   <Style x:Key="DefaultTabViewStyle" TargetType="controls:TabView">
     <Setter Property="VerticalAlignment" Value="Top" />
@@ -19407,7 +19422,7 @@
               </Grid.ColumnDefinitions>
               <ContentPresenter Grid.Column="0" x:Name="LeftContentPresenter" Content="{TemplateBinding TabStripHeader}" ContentTemplate="{TemplateBinding TabStripHeaderTemplate}" />
               <Grid x:Name="ShadowReceiver" Grid.ColumnSpan="4" />
-              <primitives:TabViewListView Grid.Column="1" x:Name="TabListView" CanReorderItems="{TemplateBinding CanReorderTabs}" CanDragItems="{TemplateBinding CanDragTabs}" AllowDrop="{TemplateBinding AllowDropTabs}" ItemsSource="{TemplateBinding TabItemsSource}" ItemTemplate="{TemplateBinding TabItemTemplate}" ItemTemplateSelector="{TemplateBinding TabItemTemplateSelector}" />
+              <primitives:TabViewListView Grid.Column="1" x:Name="TabListView" Padding="{TemplateBinding Padding}" CanReorderItems="{TemplateBinding CanReorderTabs}" CanDragItems="{TemplateBinding CanDragTabs}" AllowDrop="{TemplateBinding AllowDropTabs}" ItemsSource="{TemplateBinding TabItemsSource}" ItemTemplate="{TemplateBinding TabItemTemplate}" ItemTemplateSelector="{TemplateBinding TabItemTemplateSelector}" />
               <Button Grid.Column="2" x:Name="AddButton" Content="&#xE710;" VerticalAlignment="Stretch" IsTextScaleFactorEnabled="False" Command="{TemplateBinding AddTabButtonCommand}" CommandParameter="{TemplateBinding AddTabButtonCommandParameter}" Visibility="{Binding IsAddTabButtonVisible, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource TabViewButtonStyle}" HighContrastAdjustment="None" />
               <ContentPresenter Grid.Column="3" x:Name="RightContentPresenter" HorizontalAlignment="Stretch" Content="{TemplateBinding TabStripFooter}" ContentTemplate="{TemplateBinding TabStripFooterTemplate}" />
             </Grid>
@@ -19421,7 +19436,6 @@
   </Style>
   <Style TargetType="primitives:TabViewListView">
     <Setter Property="VerticalAlignment" Value="Top" />
-    <Setter Property="Padding" Value="{ThemeResource TabViewHeaderPadding}" />
     <Setter Property="IsTabStop" Value="False" />
     <Setter Property="TabNavigation" Value="Once" />
     <Setter Property="IsSwipeEnabled" Value="False" />
@@ -19479,10 +19493,10 @@
                 <ColumnDefinition Width="Auto" />
               </Grid.ColumnDefinitions>
               <RepeatButton x:Name="ScrollDecreaseButton" AutomationProperties.AccessibilityView="Raw" VerticalAlignment="Bottom" Width="{ThemeResource TabViewItemScrollButtonWidth}" Height="{ThemeResource TabViewItemScrollButtonHeight}" Padding="{ThemeResource TabViewItemScrollButtonPadding}" Background="{ThemeResource TabViewScrollButtonBackground}" BorderThickness="1" Delay="50" FontFamily="{ThemeResource SymbolThemeFontFamily}" Interval="100" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" HighContrastAdjustment="None" Content="&#xE76B;" />
-              <!-- TODO: Uno specific: Use Style="{StaticResource RepeatButtonRevealStyle}" (issue #4719) -->
+              <!-- TODO:MZ Use Style="{StaticResource RepeatButtonRevealStyle}" -->
               <ScrollContentPresenter x:Name="ScrollContentPresenter" Grid.Column="1" Padding="1,0,0,0" contract4Present:TabFocusNavigation="Once" />
               <RepeatButton x:Name="ScrollIncreaseButton" AutomationProperties.AccessibilityView="Raw" Grid.Column="2" VerticalAlignment="Bottom" HorizontalAlignment="Center" Width="{ThemeResource TabViewItemScrollButtonWidth}" Height="{ThemeResource TabViewItemScrollButtonHeight}" Padding="{ThemeResource TabViewItemScrollButtonPadding}" Background="{ThemeResource TabViewScrollButtonBackground}" BorderThickness="1" Delay="50" FontFamily="{ThemeResource SymbolThemeFontFamily}" Interval="100" HighContrastAdjustment="None" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Content="&#xE76C;" />
-              <!-- TODO: Uno specific: Use Style="{StaticResource RepeatButtonRevealStyle}" (issue #4719) -->
+              <!-- TODO:MZ Use Style="{StaticResource RepeatButtonRevealStyle}" -->
             </Grid>
           </Border>
         </ControlTemplate>
@@ -19543,7 +19557,7 @@
   <Style x:Name="TabViewButtonStyle" TargetType="Button">
     <Setter Property="Background" Value="{ThemeResource TabViewButtonBackground}" />
     <Setter Property="Foreground" Value="{ThemeResource TabViewButtonForeground}" />
-    <contract7Present:Setter Property="CornerRadius" Value="4,4,0,0" />
+    <Setter Property="CornerRadius" Value="4,4,0,0" />
     <!--TODO: Uno enable when #4826 is fixed ="{Binding Source={ThemeResource OverlayCornerRadius}, Converter={StaticResource TopCornerRadiusFilterConverter}}"/>-->
     <Setter Property="FontSize" Value="11" />
     <Setter Property="FontFamily" Value="{ThemeResource SymbolThemeFontFamily}" />
@@ -19601,6 +19615,7 @@
     </Setter>
   </Style>
   <Style TargetType="controls:TabViewItem">
+    <Setter Property="Background" Value="{ThemeResource TabViewItemHeaderBackground}" />
     <Setter Property="HorizontalContentAlignment" Value="Left" />
     <!-- TODO: Uno specific: This is a temporary workaround for TabView items stretching vertically
 		Can be removed when #1133 is fixed.-->
@@ -19648,7 +19663,9 @@
                     <Setter Target="CloseButton.Background" Value="{ThemeResource TabViewItemHeaderSelectedCloseButtonBackground}" />
                     <Setter Target="CloseButton.Foreground" Value="{ThemeResource TabViewItemHeaderSelectedCloseButtonForeground}" />
                     <Setter Target="LeftRadiusRender.Visibility" Value="Visible" />
+                    <Setter Target="LeftRadiusRender.Fill" Value="{ThemeResource TabViewItemHeaderBackgroundSelected}" />
                     <Setter Target="RightRadiusRender.Visibility" Value="Visible" />
+                    <Setter Target="RightRadiusRender.Fill" Value="{ThemeResource TabViewItemHeaderBackgroundSelected}" />
                     <Setter Target="LayoutRoot.Background" Value="Transparent" />
                   </VisualState.Setters>
                 </VisualState>
@@ -19661,7 +19678,9 @@
                     <Setter Target="CloseButton.Foreground" Value="{ThemeResource TabViewItemHeaderSelectedCloseButtonForeground}" />
                     <Setter Target="LayoutRoot.Background" Value="Transparent" />
                     <Setter Target="LeftRadiusRender.Visibility" Value="Visible" />
+                    <Setter Target="LeftRadiusRender.Fill" Value="{ThemeResource TabViewItemHeaderBackgroundSelected}" />
                     <Setter Target="RightRadiusRender.Visibility" Value="Visible" />
+                    <Setter Target="RightRadiusRender.Fill" Value="{ThemeResource TabViewItemHeaderBackgroundSelected}" />
                   </VisualState.Setters>
                 </VisualState>
                 <VisualState x:Name="PressedSelected">
@@ -19673,7 +19692,9 @@
                     <Setter Target="CloseButton.Foreground" Value="{ThemeResource TabViewItemHeaderSelectedCloseButtonForeground}" />
                     <Setter Target="LayoutRoot.Background" Value="Transparent" />
                     <Setter Target="LeftRadiusRender.Visibility" Value="Visible" />
+                    <Setter Target="LeftRadiusRender.Fill" Value="{ThemeResource TabViewItemHeaderBackgroundSelected}" />
                     <Setter Target="RightRadiusRender.Visibility" Value="Visible" />
+                    <Setter Target="RightRadiusRender.Fill" Value="{ThemeResource TabViewItemHeaderBackgroundSelected}" />
                   </VisualState.Setters>
                 </VisualState>
               </VisualStateGroup>
@@ -19785,11 +19806,20 @@
                   </VisualState.Setters>
                 </VisualState>
               </VisualStateGroup>
+              <VisualStateGroup>
+                <VisualState x:Name="ForegroundNotSet" />
+                <VisualState x:Name="ForegroundSet">
+                  <VisualState.Setters>
+                    <Setter Target="IconControl.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Foreground}" />
+                    <Setter Target="ContentPresenter.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Foreground}" />
+                  </VisualState.Setters>
+                </VisualState>
+              </VisualStateGroup>
             </VisualStateManager.VisualStateGroups>
-            <Path x:Name="LeftRadiusRender" x:Load="False" Grid.Column="0" Visibility="Collapsed" VerticalAlignment="Bottom" Height="{Binding Source={ThemeResource OverlayCornerRadius}, Path=BottomLeft}" Margin="{Binding Source={ThemeResource OverlayCornerRadius}, Converter={StaticResource TabViewLeftInsetCornerConverter}}" Stretch="Uniform" Fill="{ThemeResource TabViewItemHeaderBackgroundSelected}" Data="M4 0 L4 4 L0 4 A4,4 90 0 0 4 0 Z" />
-            <Path x:Name="RightRadiusRender" x:Load="False" Grid.Column="2" Visibility="Collapsed" VerticalAlignment="Bottom" Height="{Binding Source={ThemeResource OverlayCornerRadius}, Path=BottomRight}" Margin="{Binding Source={ThemeResource OverlayCornerRadius}, Converter={StaticResource TabViewRightInsetCornerConverter}}" Stretch="Uniform" Fill="{ThemeResource TabViewItemHeaderBackgroundSelected}" Data="M0 0 L0 4 L4 4 A4 4 90 0 1 0 0 Z" />
+            <Path x:Name="LeftRadiusRender" x:Load="False" Grid.Column="0" Visibility="Collapsed" VerticalAlignment="Bottom" Height="{Binding Source={ThemeResource OverlayCornerRadius}, Path=BottomLeft}" Margin="{Binding Source={ThemeResource OverlayCornerRadius},&#xD;&#xA;                                Converter={StaticResource TabViewLeftInsetCornerConverter}}" Stretch="Uniform" Fill="{ThemeResource TabViewItemHeaderBackgroundSelected}" Data="M4 0 L4 4 L0 4 A4,4 90 0 0 4 0 Z" />
+            <Path x:Name="RightRadiusRender" x:Load="False" Grid.Column="2" Visibility="Collapsed" VerticalAlignment="Bottom" Height="{Binding Source={ThemeResource OverlayCornerRadius}, Path=BottomRight}" Margin="{Binding Source={ThemeResource OverlayCornerRadius},&#xD;&#xA;                                Converter={StaticResource TabViewRightInsetCornerConverter}}" Stretch="Uniform" Fill="{ThemeResource TabViewItemHeaderBackgroundSelected}" Data="M0 0 L0 4 L4 4 A4 4 90 0 1 0 0 Z" />
             <Border x:Name="TabSeparator" HorizontalAlignment="Right" Width="1" Grid.Column="1" BorderBrush="{ThemeResource TabViewItemSeparator}" BorderThickness="1" Margin="{ThemeResource TabViewItemSeparatorMargin}" />
-            <Grid x:Name="TabContainer" Grid.Column="1" Background="{ThemeResource TabViewItemHeaderBackground}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Control.IsTemplateFocusTarget="True" Padding="{ThemeResource TabViewItemHeaderPadding}" CornerRadius="{Binding Source={ThemeResource OverlayCornerRadius}, Converter={StaticResource TopCornerRadiusFilterConverter}}" FocusVisualMargin="{TemplateBinding FocusVisualMargin}">
+            <Grid x:Name="TabContainer" Grid.Column="1" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Control.IsTemplateFocusTarget="True" Padding="{ThemeResource TabViewItemHeaderPadding}" CornerRadius="{Binding Source={ThemeResource OverlayCornerRadius}, Converter={StaticResource TopCornerRadiusFilterConverter}}" FocusVisualMargin="{TemplateBinding FocusVisualMargin}">
               <Grid.ColumnDefinitions>
                 <ColumnDefinition x:Name="IconColumn" Width="Auto" />
                 <ColumnDefinition Width="*" />
@@ -19798,7 +19828,11 @@
               <Viewbox x:Name="IconBox" MaxWidth="{ThemeResource TabViewItemHeaderIconSize}" MaxHeight="{ThemeResource TabViewItemHeaderIconSize}" Margin="{ThemeResource TabViewItemHeaderIconMargin}">
                 <ContentControl x:Name="IconControl" Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TabViewTemplateSettings.IconElement}" IsTabStop="False" Foreground="{ThemeResource TabViewItemIconForeground}" HighContrastAdjustment="None" />
               </Viewbox>
-              <ContentPresenter x:Name="ContentPresenter" Grid.Column="1" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Header}" ContentTemplate="{TemplateBinding HeaderTemplate}" ContentTransitions="{TemplateBinding ContentTransitions}" FontWeight="{TemplateBinding FontWeight}" FontSize="{ThemeResource TabViewItemHeaderFontSize}" Foreground="{ThemeResource TabViewItemHeaderForeground}" OpticalMarginAlignment="TrimSideBearings" HighContrastAdjustment="None" />
+              <!-- If we template bind the ContentPresenter's Content property to the TabViewItem.Header property
+                                 we unfortunately run into the following issue if the header is [null] or empty:
+                                 The TabViewItem.Content property will be implictly bound to the Content property of the ContentPresenter.
+                                 To prevent this, we explicitly set a default empty content here and update the content in code behind. -->
+              <ContentPresenter x:Name="ContentPresenter" Grid.Column="1" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="" ContentTemplate="{TemplateBinding HeaderTemplate}" ContentTransitions="{TemplateBinding ContentTransitions}" FontWeight="{TemplateBinding FontWeight}" FontSize="{ThemeResource TabViewItemHeaderFontSize}" Foreground="{ThemeResource TabViewItemHeaderForeground}" OpticalMarginAlignment="TrimSideBearings" HighContrastAdjustment="None" />
               <Button x:Name="CloseButton" Grid.Column="2" Width="{ThemeResource TabViewItemHeaderCloseButtonSize}" Height="{ThemeResource TabViewItemHeaderCloseButtonSize}" FontSize="{ThemeResource TabViewItemHeaderCloseFontSize}" Margin="{ThemeResource TabViewItemHeaderCloseMargin}" Content="&#xE711;" IsTextScaleFactorEnabled="False" IsTabStop="False" Background="{ThemeResource TabViewItemHeaderCloseButtonBackground}" Foreground="{ThemeResource TabViewItemHeaderCloseButtonForeground}" Style="{StaticResource TabViewCloseButtonStyle}" HighContrastAdjustment="None" />
             </Grid>
           </Grid>
@@ -19806,21 +19840,6 @@
       </Setter.Value>
     </Setter>
   </Style>
-  <Thickness x:Key="TabViewHeaderPadding">8,8,4,0</Thickness>
-  <Thickness x:Key="TabViewItemHeaderPadding">12,8,10,8</Thickness>
-  <x:Double x:Key="TabViewItemMaxWidth">240</x:Double>
-  <x:Double x:Key="TabViewItemMinWidth">100</x:Double>
-  <x:Double x:Key="TabViewItemHeaderFontSize">12</x:Double>
-  <x:Double x:Key="TabViewItemHeaderIconSize">16</x:Double>
-  <Thickness x:Key="TabViewItemHeaderIconMargin">0,0,10,0</Thickness>
-  <x:Double x:Key="TabViewItemHeaderCloseButtonSize">16</x:Double>
-  <x:Double x:Key="TabViewItemHeaderCloseFontSize">12</x:Double>
-  <Thickness x:Key="TabViewItemHeaderCloseMargin">10,0,0,0</Thickness>
-  <x:Double x:Key="TabViewItemScrollButtonWidth">29</x:Double>
-  <x:Double x:Key="TabViewItemScrollButtonHeight">29</x:Double>
-  <Thickness x:Key="TabViewItemScrollButtonPadding">6,4,10,5</Thickness>
-  <x:Double x:Key="TabViewShadowDepth">16</x:Double>
-  <Thickness x:Key="TabViewItemSeparatorMargin">0,6,0,6</Thickness>
   <Thickness x:Key="TimePickerTopHeaderMargin">0,0,0,4</Thickness>
   <x:Double x:Key="TimePickerFlyoutPresenterHighlightHeight">40</x:Double>
   <x:Double x:Key="TimePickerFlyoutPresenterAcceptDismissHostGridHeight">41</x:Double>
diff --git a/src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml b/src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml
index 404f59f8badf..a4c7bb93923e 100644
--- a/src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml
+++ b/src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml
@@ -22598,7 +22598,7 @@
                 <ColumnDefinition Width="Auto" x:Name="AddButtonColumn" />
                 <ColumnDefinition Width="*" x:Name="RightContentColumn" />
               </Grid.ColumnDefinitions>
-              <Border BorderBrush="{ThemeResource TabViewBorderBrush}" BorderThickness="1" Height="1" Grid.Column="1" Grid.ColumnSpan="2" VerticalAlignment="Bottom" />
+              <Border BorderBrush="{ThemeResource TabViewBorderBrush}" BorderThickness="1" Height="1" Grid.ColumnSpan="4" VerticalAlignment="Bottom" />
               <ContentPresenter Grid.Column="0" x:Name="LeftContentPresenter" Content="{TemplateBinding TabStripHeader}" ContentTemplate="{TemplateBinding TabStripHeaderTemplate}" />
               <primitives:TabViewListView Grid.Column="1" x:Name="TabListView" Padding="{TemplateBinding Padding}" CanReorderItems="{TemplateBinding CanReorderTabs}" CanDragItems="{TemplateBinding CanDragTabs}" AllowDrop="{TemplateBinding AllowDropTabs}" ItemsSource="{TemplateBinding TabItemsSource}" ItemTemplate="{TemplateBinding TabItemTemplate}" ItemTemplateSelector="{TemplateBinding TabItemTemplateSelector}" />
               <Border Visibility="{Binding IsAddTabButtonVisible, RelativeSource={RelativeSource TemplatedParent}}" Grid.Column="2" Padding="{ThemeResource TabViewItemAddButtonContainerPadding}" VerticalAlignment="Bottom">
@@ -22783,6 +22783,7 @@
     </Setter>
   </Style>
   <Style TargetType="controls:TabViewItem">
+    <Setter Property="Background" Value="{ThemeResource TabViewItemHeaderBackground}" />
     <Setter Property="HorizontalContentAlignment" Value="Left" />
     <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
     <Setter Property="MinHeight" Value="{ThemeResource TabViewItemMinHeight}" />
@@ -22996,13 +22997,22 @@
                   </VisualState.Setters>
                 </VisualState>
               </VisualStateGroup>
+              <VisualStateGroup>
+                <VisualState x:Name="ForegroundNotSet" />
+                <VisualState x:Name="ForegroundSet">
+                  <VisualState.Setters>
+                    <Setter Target="IconControl.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Foreground}" />
+                    <Setter Target="ContentPresenter.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Foreground}" />
+                  </VisualState.Setters>
+                </VisualState>
+              </VisualStateGroup>
             </VisualStateManager.VisualStateGroups>
             <Path x:Name="LeftRadiusRenderArc" x:Load="False" Fill="{ThemeResource CardStrokeColorDefault}" VerticalAlignment="Bottom" Visibility="Collapsed" Margin="-4,0,0,0" Height="4" Width="4" Data="M4 0C4 1.19469 3.47624 2.26706 2.64582 3H0C1.65685 3 3 1.65685 3 0H4Z" />
             <Path x:Name="LeftRadiusRenderTriangle" x:Load="False" Fill="{ThemeResource TabViewItemHeaderBackgroundSelected}" VerticalAlignment="Bottom" Margin="-4,0,0,0" Visibility="Collapsed" Data="M0 4H4V0C4 2.20914 2.20914 4 0 4Z" />
             <Path x:Name="RightRadiusRenderArc" x:Load="False" Grid.Column="2" Visibility="Collapsed" Fill="{ThemeResource CardStrokeColorDefault}" VerticalAlignment="Bottom" Margin="0,0,-4,0" Height="4" Width="4" Data="M0 0C0 1.19469 0.523755 2.26706 1.35418 3H4C2.34315 3 1 1.65685 1 0H0Z" />
             <Path x:Name="RightRadiusRenderTriangle" x:Load="False" Grid.Column="2" Visibility="Collapsed" Fill="{ThemeResource TabViewItemHeaderBackgroundSelected}" VerticalAlignment="Bottom" Margin="0,0,-4,0" Data="M4 4H0V0C0 2.20914 1.79086 4 4 4Z" />
             <Border x:Name="TabSeparator" HorizontalAlignment="Right" Width="1" Grid.Column="1" BorderBrush="{ThemeResource TabViewItemSeparator}" BorderThickness="1" Margin="{ThemeResource TabViewItemSeparatorMargin}" />
-            <Grid x:Name="TabContainer" Grid.Column="1" Background="{ThemeResource TabViewItemHeaderBackground}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Control.IsTemplateFocusTarget="True" Padding="{ThemeResource TabViewItemHeaderPadding}" contract7Present:CornerRadius="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CornerRadius, Converter={StaticResource TopCornerRadiusFilterConverter}}" contract7NotPresent:CornerRadius="{Binding Source={ThemeResource OverlayCornerRadius}, Converter={StaticResource TopCornerRadiusFilterConverter}}" FocusVisualMargin="{TemplateBinding FocusVisualMargin}">
+            <Grid x:Name="TabContainer" Grid.Column="1" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Control.IsTemplateFocusTarget="True" Padding="{ThemeResource TabViewItemHeaderPadding}" contract7Present:CornerRadius="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CornerRadius, Converter={StaticResource TopCornerRadiusFilterConverter}}" contract7NotPresent:CornerRadius="{Binding Source={ThemeResource OverlayCornerRadius}, Converter={StaticResource TopCornerRadiusFilterConverter}}" FocusVisualMargin="{TemplateBinding FocusVisualMargin}">
               <Grid.ColumnDefinitions>
                 <ColumnDefinition x:Name="IconColumn" Width="Auto" />
                 <ColumnDefinition Width="*" />
diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/RatingControl.Header.cs b/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/RatingControl.Header.cs
index 5b00c784189b..4c97a7272c25 100644
--- a/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/RatingControl.Header.cs
+++ b/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/RatingControl.Header.cs
@@ -23,12 +23,12 @@ private bool IsItemInfoPresentAndImageInfo()
 	}
 
 	// Private members
-	private TextBlock m_captionTextBlock = null;
+	private TextBlock? m_captionTextBlock = null;
 
-	private CompositionPropertySet m_sharedPointerPropertySet = null;
+	private CompositionPropertySet? m_sharedPointerPropertySet = null;
 
-	private StackPanel m_backgroundStackPanel = null;
-	private StackPanel m_foregroundStackPanel = null;
+	private StackPanel? m_backgroundStackPanel = null;
+	private StackPanel? m_foregroundStackPanel = null;
 
 	private bool m_isPointerOver = false;
 	private bool m_isPointerDown = false;
@@ -42,17 +42,7 @@ private bool IsItemInfoPresentAndImageInfo()
 	private bool m_disengagedWithA = false;
 	private bool m_shouldDiscardValue = true;
 
-	private readonly SerialDisposable m_pointerCancelledToken = new();
-	private readonly SerialDisposable m_pointerCaptureLostToken = new();
-	private readonly SerialDisposable m_pointerMovedToken = new();
-	private readonly SerialDisposable m_pointerEnteredToken = new();
-	private readonly SerialDisposable m_pointerExitedToken = new();
-	private readonly SerialDisposable m_pointerPressedToken = new();
-	private readonly SerialDisposable m_pointerReleasedToken = new();
-	private readonly SerialDisposable m_captionSizeChangedToken = new();
 	private long m_fontFamilyChangedToken;
 
-	private readonly SerialDisposable m_textScaleChangedRevoker = new();
-
-	private DispatcherHelper m_dispatcherHelper = null;
+	private DispatcherHelper? m_dispatcherHelper = null;
 }