Merge pull request #1336 from microsoft/scottj1s/version_info_dupe_wa…

…rning Update to WASDK 1.4 and related maintenance
microsoft · Aug 30, 2023 · a696058 · a696058
2 parents 3aa928b + 73c093d
commit a696058
Show file tree

Hide file tree

Showing 15 changed files with 284 additions and 383 deletions.
diff --git a/UITests/AxeHelper.cs b/UITests/AxeHelper.cs
@@ -41,8 +41,9 @@ public static void AssertNoAccessibilityErrors()
 			var testResult = AccessibilityScanner.Scan(null).WindowScanOutputs.SelectMany(output => output.Errors)
 				.Where(rule => rule.Rule.ID != RuleId.NameIsInformative)
 				.Where(rule => rule.Rule.ID != RuleId.NameExcludesControlType)
-				.Where(rule => rule.Rule.ID != RuleId.NameExcludesLocalizedControlType);
-			if (testResult.Any())
+				.Where(rule => rule.Rule.ID != RuleId.NameExcludesLocalizedControlType)
+				.Where(rule => rule.Rule.ID != RuleId.SiblingUniqueAndFocusable);
+            if (testResult.Any())
 			{
 				var mappedResult = testResult.Select(result => "Element " + result.Element.Properties["ControlType"] + " violated rule '" + result.Rule.Description + "'.");
 				Assert.Fail("Failed with the following accessibility errors \r\n" + string.Join("\r\n", mappedResult));

diff --git a/WinUIGallery/App.xaml.cs b/WinUIGallery/App.xaml.cs
@@ -37,8 +37,9 @@ sealed partial class App : Application
 
         public static string WinAppSdkDetails
         {
-            get => string.Format("Windows App SDK {0}.{1}.{2}{3}",
-                WASDK.Release.Major, WASDK.Release.Minor, WASDK.Release.Patch, WASDK.Release.FormattedVersionTag);
+            // TODO: restore patch number and version tag when WinAppSDK supports them both
+            get => string.Format("Windows App SDK {0}.{1}",
+                WASDK.Release.Major, WASDK.Release.Minor);
         }
 
         public static string WinAppSdkRuntimeDetails

diff --git a/WinUIGallery/ControlPages/MenuBarPage.xaml b/WinUIGallery/ControlPages/MenuBarPage.xaml
@@ -12,7 +12,7 @@
                               XamlSource="MenuBar\MenuBarSample1.txt">
             <StackPanel>
                 <TextBlock x:Name="SelectedOptionText" Text="" />
-                <MenuBar x:Name="Example1">
+                <MenuBar LayoutUpdated="MenuBar_LayoutUpdated"  x:Name="Example1">
                     <MenuBarItem Title="File">
                         <MenuFlyoutItem x:Name="o1" Text="New" Click="OnElementClicked"/>
                         <MenuFlyoutItem x:Name="o2" Text="Open" Click="OnElementClicked"/>
@@ -38,7 +38,7 @@
                               XamlSource="Menubar\MenuBarSample3.txt">
             <StackPanel>
                 <TextBlock x:Name="SelectedOptionText1" Text="" />
-                <MenuBar x:Name="Example2">
+                <MenuBar LayoutUpdated="MenuBar_LayoutUpdated" x:Name="Example2">
                     <MenuBarItem Title="File">
                         <MenuFlyoutItem x:Name ="t2" Text="New" Click="OnElementClicked">
                             <MenuFlyoutItem.KeyboardAccelerators>
@@ -101,7 +101,7 @@
                               XamlSource="MenuBar\MenuBarSample2.txt">
             <StackPanel>
                 <TextBlock x:Name="SelectedOptionText2" Text="" />
-                <MenuBar x:Name="Example3">
+                <MenuBar LayoutUpdated="MenuBar_LayoutUpdated" x:Name="Example3">
                     <MenuBarItem Title="File">
                         <MenuFlyoutSubItem Text="New">
                             <MenuFlyoutItem x:Name="z1" Text="Plain Text Document" Click="OnElementClicked"/>

diff --git a/WinUIGallery/ControlPages/MenuBarPage.xaml.cs b/WinUIGallery/ControlPages/MenuBarPage.xaml.cs
@@ -1,4 +1,5 @@
-using System;
+using AppUIBasics.Helper;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -38,6 +39,15 @@ private void OnElementClicked(object sender, Microsoft.UI.Xaml.RoutedEventArgs e
             {
                 SelectedOptionText2.Text = "You clicked: " + (sender as MenuFlyoutItem).Text;
             }
-        }
+        }
+
+        // Workaround for known issue with menu themes in WinAppSDK 1.4 (#8678, #8756)
+        private void MenuBar_LayoutUpdated(object sender, object e)
+        {
+            foreach (var popup in VisualTreeHelper.GetOpenPopupsForXamlRoot(this.XamlRoot))
+            {
+                popup.RequestedTheme = ThemeHelper.RootTheme;
+            }
+        }
     }
 }
diff --git a/WinUIGallery/ControlPages/MenuFlyoutPage.xaml b/WinUIGallery/ControlPages/MenuFlyoutPage.xaml
@@ -1,4 +1,4 @@
-<!--
+<!--
 //*********************************************************
 //
 // Copyright (c) Microsoft. All rights reserved.
@@ -19,7 +19,7 @@
             <StackPanel x:Name="Control1" Orientation="Horizontal">
                 <AppBarButton Icon="Sort" IsCompact="True" ToolTipService.ToolTip="Sort" AutomationProperties.Name="Sort">
                     <Button.Flyout>
-                        <MenuFlyout>
+                        <MenuFlyout Opened="MenuFlyout_Opened">
                             <MenuFlyoutItem Text="By rating" Click="MenuFlyoutItem_Click" Tag="rating" />
                             <MenuFlyoutItem Text="By match" Click="MenuFlyoutItem_Click" Tag="match" />
                             <MenuFlyoutItem Text="By distance" Click="MenuFlyoutItem_Click" Tag="distance" />
@@ -46,7 +46,7 @@
                 HeaderText="A MenuFlyout with ToggleMenuFlyoutItems and MenuFlyoutSeparator.">
             <Button x:Name="Control2" Content="Options">
                 <Button.Flyout>
-                    <MenuFlyout>
+                    <MenuFlyout  Opened="MenuFlyout_Opened">
                         <MenuFlyoutItem Text="Reset" />
                         <MenuFlyoutSeparator />
                         <ToggleMenuFlyoutItem x:Name="RepeatToggleMenuFlyoutItem" Text="Repeat" IsChecked="True" />
@@ -76,7 +76,7 @@
         <local:ControlExample x:Name="Example3" HeaderText="A MenuFlyout with cascading menus.">
             <Button x:Name="Control3" Content="File Options">
                 <Button.Flyout>
-                    <MenuFlyout>
+                    <MenuFlyout  Opened="MenuFlyout_Opened">
                         <MenuFlyoutItem Text="Open" />
                         <MenuFlyoutSubItem Text="Send to">
                             <MenuFlyoutItem Text="Bluetooth" />
@@ -115,7 +115,7 @@
                 HeaderText="A MenuFlyout with icons.">
             <Button x:Name="Control4" Content="Edit Options">
                 <Button.Flyout>
-                    <MenuFlyout>
+                    <MenuFlyout  Opened="MenuFlyout_Opened">
                         <MenuFlyoutItem Text="Share">
                             <MenuFlyoutItem.Icon>
                                 <FontIcon Glyph="&#xE72D;" />
@@ -154,7 +154,7 @@
                 HeaderText="A MenuFlyout with icons and Keyboard Accelerators." FontFamily="Segoe UI" Loaded="Example5_Loaded">
             <Button x:Name="Control5" Content="Edit Options">
                 <Button.Flyout>
-                    <MenuFlyout>
+                    <MenuFlyout  Opened="MenuFlyout_Opened">
                         <MenuFlyoutItem Text="Share">
                             <MenuFlyoutItem.Icon>
                                 <FontIcon Glyph="&#xE72D;" />

diff --git a/WinUIGallery/ControlPages/MenuFlyoutPage.xaml.cs b/WinUIGallery/ControlPages/MenuFlyoutPage.xaml.cs
@@ -1,4 +1,4 @@
-//*********************************************************
+//*********************************************************
 //
 // Copyright (c) Microsoft. All rights reserved.
 // THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF
@@ -7,10 +7,12 @@
 // PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.
 //
 //*********************************************************
+using AppUIBasics.Helper;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Controls.Primitives;
 using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
 
 namespace AppUIBasics.ControlPages
 {
@@ -45,6 +47,15 @@ private void MenuFlyoutItem_Click(object sender, RoutedEventArgs e)
         private void Example5_Loaded(object sender, RoutedEventArgs e)
         {
 
-        }
+        }
+
+        // Workaround for known issue with menu themes in WinAppSDK 1.4 (#8678, #8756)
+        private void MenuFlyout_Opened(object sender, object e)
+        {
+            foreach (var popup in VisualTreeHelper.GetOpenPopupsForXamlRoot(this.XamlRoot))
+            {
+                popup.RequestedTheme = ThemeHelper.RootTheme;
+            }
+        }
     }
 }
diff --git a/WinUIGallery/Properties/PublishProfiles/win10-arm64-unpackaged.pubxml b/WinUIGallery/Properties/PublishProfiles/win10-arm64-unpackaged.pubxml
@@ -9,8 +9,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <RuntimeIdentifier>win10-arm64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>
-    <PublishReadyToRun>False</PublishReadyToRun>
     <PublishAppxPackage>False</PublishAppxPackage>
-    <PublishTrimmed>True</PublishTrimmed>
+    <PublishReadyToRun>$(Optimized)</PublishReadyToRun>
+    <PublishTrimmed>$(Optimized)</PublishTrimmed>
   </PropertyGroup>
 </Project>
diff --git a/WinUIGallery/Properties/PublishProfiles/win10-arm64.pubxml b/WinUIGallery/Properties/PublishProfiles/win10-arm64.pubxml
@@ -9,8 +9,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <RuntimeIdentifier>win10-arm64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>
-    <PublishReadyToRun>False</PublishReadyToRun>
     <PublishAppxPackage>True</PublishAppxPackage>
-    <PublishTrimmed>True</PublishTrimmed>
+    <PublishReadyToRun>$(Optimized)</PublishReadyToRun>
+    <PublishTrimmed>$(Optimized)</PublishTrimmed>
   </PropertyGroup>
 </Project>
diff --git a/WinUIGallery/Properties/PublishProfiles/win10-x64-unpackaged.pubxml b/WinUIGallery/Properties/PublishProfiles/win10-x64-unpackaged.pubxml
@@ -9,8 +9,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>
-    <PublishReadyToRun>False</PublishReadyToRun>
     <PublishAppxPackage>False</PublishAppxPackage>
-    <PublishTrimmed>True</PublishTrimmed>
+    <PublishReadyToRun>$(Optimized)</PublishReadyToRun>
+    <PublishTrimmed>$(Optimized)</PublishTrimmed>
   </PropertyGroup>
 </Project>
diff --git a/WinUIGallery/Properties/PublishProfiles/win10-x64.pubxml b/WinUIGallery/Properties/PublishProfiles/win10-x64.pubxml
@@ -9,8 +9,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>
-    <PublishReadyToRun>False</PublishReadyToRun>
     <PublishAppxPackage>True</PublishAppxPackage>
-    <PublishTrimmed>True</PublishTrimmed>
+    <PublishReadyToRun>$(Optimized)</PublishReadyToRun>
+    <PublishTrimmed>$(Optimized)</PublishTrimmed>
   </PropertyGroup>
 </Project>
diff --git a/WinUIGallery/Properties/PublishProfiles/win10-x86-unpackaged.pubxml b/WinUIGallery/Properties/PublishProfiles/win10-x86-unpackaged.pubxml
@@ -9,8 +9,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <RuntimeIdentifier>win10-x86</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>
-    <PublishReadyToRun>False</PublishReadyToRun>
     <PublishAppxPackage>False</PublishAppxPackage>
-    <PublishTrimmed>True</PublishTrimmed>
+    <PublishReadyToRun>$(Optimized)</PublishReadyToRun>
+    <PublishTrimmed>$(Optimized)</PublishTrimmed>
   </PropertyGroup>
 </Project>
diff --git a/WinUIGallery/Properties/PublishProfiles/win10-x86.pubxml b/WinUIGallery/Properties/PublishProfiles/win10-x86.pubxml
@@ -9,8 +9,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <RuntimeIdentifier>win10-x86</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>
-    <PublishReadyToRun>False</PublishReadyToRun>
     <PublishAppxPackage>True</PublishAppxPackage>
-    <PublishTrimmed>True</PublishTrimmed>
+    <PublishReadyToRun>$(Optimized)</PublishReadyToRun>
+    <PublishTrimmed>$(Optimized)</PublishTrimmed>
   </PropertyGroup>
 </Project>
diff --git a/WinUIGallery/WinUIGallery.DesktopWap.Package.wapproj b/WinUIGallery/WinUIGallery.DesktopWap.Package.wapproj