[release/9.0] Change key of ContextMenu from DefaultContextMenu to DefaultContextMenuStyle (#9630)

* Change key of ContextMenu from DefaultContextMenu to DefaultContextMenuStyle

* reverting values of PasswordChar in the combined fluent dictionaries

---------

Co-authored-by: Sia Gupta <[email protected]>

Author: github-actions[bot]

src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/ContextMenu.xaml

@@ -9,7 +9,7 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <Style x:Key="DefaultContextMenu" TargetType="{x:Type ContextMenu}">
+    <Style x:Key="DefaultContextMenuStyle" TargetType="{x:Type ContextMenu}">
         <Setter Property="TextElement.Foreground" Value="{DynamicResource ContextMenuForeground}" />
         <Setter Property="Foreground" Value="{DynamicResource ContextMenuForeground}" />
         <Setter Property="Background" Value="{DynamicResource ContextMenuBackground}" />
@@ -66,6 +66,6 @@
         </Setter>
     </Style>
 
-    <Style BasedOn="{StaticResource DefaultContextMenu}" TargetType="{x:Type ContextMenu}" />
+    <Style BasedOn="{StaticResource DefaultContextMenuStyle}" TargetType="{x:Type ContextMenu}" />
 
 </ResourceDictionary>

src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.Dark.xaml

@@ -1436,7 +1436,7 @@
   </Style>
   <Style BasedOn="{StaticResource DefaultComboBoxItemStyle}" TargetType="{x:Type ComboBoxItem}" />
   <Style BasedOn="{StaticResource DefaultComboBoxStyle}" TargetType="{x:Type ComboBox}" />
-  <Style x:Key="DefaultContextMenu" TargetType="{x:Type ContextMenu}">
+  <Style x:Key="DefaultContextMenuStyle" TargetType="{x:Type ContextMenu}">
     <Setter Property="TextElement.Foreground" Value="{DynamicResource ContextMenuForeground}" />
     <Setter Property="Foreground" Value="{DynamicResource ContextMenuForeground}" />
     <Setter Property="Background" Value="{DynamicResource ContextMenuBackground}" />
@@ -1477,7 +1477,7 @@
       </Setter.Value>
     </Setter>
   </Style>
-  <Style BasedOn="{StaticResource DefaultContextMenu}" TargetType="{x:Type ContextMenu}" />
+  <Style BasedOn="{StaticResource DefaultContextMenuStyle}" TargetType="{x:Type ContextMenu}" />
   <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
   <system:Double x:Key="DefaultDataGridFontSize">14</system:Double>
   <Color x:Key="DisabledControlLightColor">#FFE8EDF9</Color>

src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.HC.xaml

@@ -1408,7 +1408,7 @@
   </Style>
   <Style BasedOn="{StaticResource DefaultComboBoxItemStyle}" TargetType="{x:Type ComboBoxItem}" />
   <Style BasedOn="{StaticResource DefaultComboBoxStyle}" TargetType="{x:Type ComboBox}" />
-  <Style x:Key="DefaultContextMenu" TargetType="{x:Type ContextMenu}">
+  <Style x:Key="DefaultContextMenuStyle" TargetType="{x:Type ContextMenu}">
     <Setter Property="TextElement.Foreground" Value="{DynamicResource ContextMenuForeground}" />
     <Setter Property="Foreground" Value="{DynamicResource ContextMenuForeground}" />
     <Setter Property="Background" Value="{DynamicResource ContextMenuBackground}" />
@@ -1449,7 +1449,7 @@
       </Setter.Value>
     </Setter>
   </Style>
-  <Style BasedOn="{StaticResource DefaultContextMenu}" TargetType="{x:Type ContextMenu}" />
+  <Style BasedOn="{StaticResource DefaultContextMenuStyle}" TargetType="{x:Type ContextMenu}" />
   <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
   <system:Double x:Key="DefaultDataGridFontSize">14</system:Double>
   <Color x:Key="DisabledControlLightColor">#FFE8EDF9</Color>

src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.Light.xaml

@@ -1431,7 +1431,7 @@
   </Style>
   <Style BasedOn="{StaticResource DefaultComboBoxItemStyle}" TargetType="{x:Type ComboBoxItem}" />
   <Style BasedOn="{StaticResource DefaultComboBoxStyle}" TargetType="{x:Type ComboBox}" />
-  <Style x:Key="DefaultContextMenu" TargetType="{x:Type ContextMenu}">
+  <Style x:Key="DefaultContextMenuStyle" TargetType="{x:Type ContextMenu}">
     <Setter Property="TextElement.Foreground" Value="{DynamicResource ContextMenuForeground}" />
     <Setter Property="Foreground" Value="{DynamicResource ContextMenuForeground}" />
     <Setter Property="Background" Value="{DynamicResource ContextMenuBackground}" />
@@ -1472,7 +1472,7 @@
       </Setter.Value>
     </Setter>
   </Style>
-  <Style BasedOn="{StaticResource DefaultContextMenu}" TargetType="{x:Type ContextMenu}" />
+  <Style BasedOn="{StaticResource DefaultContextMenuStyle}" TargetType="{x:Type ContextMenu}" />
   <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
   <system:Double x:Key="DefaultDataGridFontSize">14</system:Double>
   <Color x:Key="DisabledControlLightColor">#FFE8EDF9</Color>