[Windows][ Add correct menu bar item foreground resource override (#2…

…6413)

* Add correct menu bar item foreground resource override

* Fix screenshot validation

* Add ref image

---------

Co-authored-by: Mike Corsaro <mikecorsaro@microsoft.com>

src/Controls/tests/TestCases.HostApp/Issues/XFIssue/ShellMenuBarItems.cs

@@ -0,0 +1,48 @@
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.None, 0, "Shell MenuBarItems Test",
+	PlatformAffected.WinRT)]
+public class ShellMenuBarItems : TestShell
+{
+	protected override void Init()
+	{
+		var menuBarItem = new MenuBarItem()
+		{
+			Text = "Title 1"
+		};
+
+		var menuBarItem2 = new MenuBarItem()
+		{
+			Text = "Title 2"
+		};
+
+		menuBarItem.Add(new MenuFlyoutItem()
+		{
+			Text = "Item 1"
+		});
+		menuBarItem.Add(new MenuFlyoutItem()
+		{
+			Text = "Item 2"
+		});
+		menuBarItem.Add(new MenuFlyoutItem()
+		{
+			Text = "Item 3"
+		});
+
+		var contentPage = new ContentPage()
+		{
+			Content = new Label() { Text = "Shell MenuBarItems Test" }
+		};
+
+		contentPage.MenuBarItems.Add(menuBarItem);
+		contentPage.MenuBarItems.Add(menuBarItem2);
+
+		AddContentPage(contentPage);
+
+		FlyoutBehavior = FlyoutBehavior.Disabled;
+
+		// Set menu bar and menu bar item foreground color
+		SetBackgroundColor(this, Colors.Purple);
+		SetTitleColor(this, Colors.White);
+	}
+}

src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/ShellMenuIBarItemsTest.cs

@@ -0,0 +1,26 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.TestCases.Tests.Issues
+{
+#if WINDOWS
+	public class ShellMenuIBarItemsTest : _IssuesUITest
+	{
+		public ShellMenuIBarItemsTest(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Shell MenuBarItems Test";
+
+		[Test]
+		[Category(UITestCategories.Shell)]
+		public void SettingMenuBarItemColorsWork()
+		{
+			Task.Delay(millisecondsDelay: 100).Wait();
+
+			VerifyScreenshot("VerifyMenuBarItemColorsWork");
+		}
+	}
+#endif
+}

src/Core/src/Platform/Windows/MauiToolbar.xaml.cs

@@ -200,21 +200,18 @@ void UpdateMenuBarForeground()
 			if (_menuBar is null)
 				return;
 
-			// MenuBarItems currently don't respect the Foreground property due to https://github.com/microsoft/microsoft-ui-xaml/issues/7070
-			// Work around this by setting the Button's colors in the MenuBar's ResourceDictionary
-
 			ResourceDictionary dictionary = _menuBar.Resources;
 			WBrush? menuForegroundBrush = _menuBarForeground;
 			if (menuForegroundBrush is null)
 			{
-				dictionary.Remove("ButtonForeground");
+				dictionary.Remove("MenuBarItemForeground");
 				dictionary.Remove("ButtonForegroundPointerOver");
 				dictionary.Remove("ButtonForegroundPressed");
 				dictionary.Remove("ButtonForegroundDisabled");
 			}
 			else
 			{
-				dictionary["ButtonForeground"] = menuForegroundBrush;
+				dictionary["MenuBarItemForeground"] = menuForegroundBrush;
 				dictionary["ButtonForegroundPointerOver"] = menuForegroundBrush;
 				dictionary["ButtonForegroundPressed"] = menuForegroundBrush;
 				dictionary["ButtonForegroundDisabled"] = menuForegroundBrush;