From 5b61eedeaf8d3985749af3667d27454a474badca Mon Sep 17 00:00:00 2001
From: "Andy (Steve) De George" <67293991+adegeo@users.noreply.github.com>
Date: Fri, 27 Aug 2021 18:51:42 -0700
Subject: [PATCH 1/4] Fix wrong type listed in opacity article (#1138)

* Update opacity-masks-overview.md

* Update dotnet-desktop-guide/framework/wpf/graphics-multimedia/opacity-masks-overview.md
---
 .../framework/wpf/graphics-multimedia/opacity-masks-overview.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dotnet-desktop-guide/framework/wpf/graphics-multimedia/opacity-masks-overview.md b/dotnet-desktop-guide/framework/wpf/graphics-multimedia/opacity-masks-overview.md
index 1caab0f..9a4182e 100644
--- a/dotnet-desktop-guide/framework/wpf/graphics-multimedia/opacity-masks-overview.md
+++ b/dotnet-desktop-guide/framework/wpf/graphics-multimedia/opacity-masks-overview.md
@@ -51,7 +51,7 @@ LinearGradientBrush opacity masking example
      ![Object with a DrawingBrush opacity mask](./media/wcpsdk-drawingbrushasopacitymask-single.jpg "wcpsdk_drawingbrushasopacitymask_single")  
 DrawingBrush opacity masking example  
   
- The gradient brushes (<xref:System.Windows.Media.LinearGradientBrush> and <xref:System.Windows.Media.RadialGradientBrush>) are particularly well-suited for use as an opacity mask. Because a <xref:System.Windows.Media.SolidColorBrush> fills an area with a uniform color, they make poor opacity masks; using a <xref:System.Windows.Media.SolidColorBrush> is equivalent to setting the element's or visual's <xref:System.Windows.UIElement.OpacityMask%2A> property.  
+ The gradient brushes (<xref:System.Windows.Media.LinearGradientBrush> and <xref:System.Windows.Media.RadialGradientBrush>) are particularly well-suited for use as an opacity mask. Because a <xref:System.Windows.Media.SolidColorBrush> fills an area with a uniform color, they make poor opacity masks; using a <xref:System.Windows.Media.SolidColorBrush> is equivalent to setting the element's or visual's <xref:System.Windows.UIElement.Opacity%2A> property.  
   
 <a name="creatingopacitymaskswithgradients"></a>
 ## Using a Gradient as an Opacity Mask  

From 483c3e81e6392f45a419ffab142834a01841d9b3 Mon Sep 17 00:00:00 2001
From: "Andy (Steve) De George" <67293991+adegeo@users.noreply.github.com>
Date: Fri, 27 Aug 2021 18:52:02 -0700
Subject: [PATCH 2/4] Update progressbar.xaml (#1139)

---
 .../ControlTemplateExamples/CS/resources/progressbar.xaml     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dotnet-desktop-guide/samples/snippets/csharp/VS_Snippets_Wpf/ControlTemplateExamples/CS/resources/progressbar.xaml b/dotnet-desktop-guide/samples/snippets/csharp/VS_Snippets_Wpf/ControlTemplateExamples/CS/resources/progressbar.xaml
index 14a8980..80dc239 100644
--- a/dotnet-desktop-guide/samples/snippets/csharp/VS_Snippets_Wpf/ControlTemplateExamples/CS/resources/progressbar.xaml
+++ b/dotnet-desktop-guide/samples/snippets/csharp/VS_Snippets_Wpf/ControlTemplateExamples/CS/resources/progressbar.xaml
@@ -65,7 +65,7 @@
                 <Rectangle x:Name="PART_GlowRect"
                            Width="100"
                            HorizontalAlignment="Left"
-                           Fill="{StaticResource ProgressBarIndicatorAnimatedFill}"
+                           Fill="{DynamicResource ProgressBarIndicatorAnimatedFill}"
                            Margin="-100,0,0,0" />
               </Grid>
             </Border>
@@ -97,4 +97,4 @@
     </Setter>
   </Style>
   <!--</SnippetProgressBar>-->
-</ResourceDictionary>
\ No newline at end of file
+</ResourceDictionary>

From 8c5835c2cc24cd298c04519dfb636fdab6c96e1a Mon Sep 17 00:00:00 2001
From: "Andy (Steve) De George" <67293991+adegeo@users.noreply.github.com>
Date: Fri, 27 Aug 2021 18:52:37 -0700
Subject: [PATCH 3/4] Update label.md (#1144)

---
 dotnet-desktop-guide/framework/wpf/controls/label.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dotnet-desktop-guide/framework/wpf/controls/label.md b/dotnet-desktop-guide/framework/wpf/controls/label.md
index 1d5449b..afa8eb9 100644
--- a/dotnet-desktop-guide/framework/wpf/controls/label.md
+++ b/dotnet-desktop-guide/framework/wpf/controls/label.md
@@ -14,7 +14,7 @@ ms.assetid: 241c1ce2-60f8-4613-a0ec-9b9bb25fb6af
   
  A <xref:System.Windows.Controls.Label> provides both functional and visual support for access keys. It is frequently used to enable quick keyboard access to controls such as a <xref:System.Windows.Controls.TextBox>. To assign a <xref:System.Windows.Controls.Label> to a <xref:System.Windows.Controls.Control>, set the <xref:System.Windows.Controls.Label.Target%2A?displayProperty=nameWithType> property to the control that should get focus when the user presses the access key.  
   
- The following image shows a <xref:System.Windows.Controls.Label> "Themes" that targets a <xref:System.Windows.Controls.ComboBox>.  When the user presses , the <xref:System.Windows.Controls.ComboBox> receives focus.  For more information, see [How to: Set the Target Property of a Label](/previous-versions/dotnet/netframework-3.5/ms752101(v=vs.90)).  
+ The following image shows a <xref:System.Windows.Controls.Label> "Theme" that targets a <xref:System.Windows.Controls.ComboBox>.  When the user presses <kbd>T</kbd>, the <xref:System.Windows.Controls.ComboBox> receives focus.  For more information, see [How to: Set the Target Property of a Label](/previous-versions/dotnet/netframework-3.5/ms752101(v=vs.90)).  
   
  ![Screenshot of Display Properties dialog showing labeled by usage.](./media/label/display-properties-labeled-by.png "LabeledBy")  
   

From 3c9b1e2758fa3d78358401bb53f0626217b97c86 Mon Sep 17 00:00:00 2001
From: "Andy (Steve) De George" <67293991+adegeo@users.noreply.github.com>
Date: Fri, 27 Aug 2021 18:53:54 -0700
Subject: [PATCH 4/4] Fix formatting in XAML file (#1148)

* Update Window1.xaml

* Update Window1.xaml
---
 .../ListViewCode/CSharp/Window1.xaml          | 130 ++++++++----------
 1 file changed, 58 insertions(+), 72 deletions(-)

diff --git a/dotnet-desktop-guide/samples/snippets/csharp/VS_Snippets_Wpf/ListViewCode/CSharp/Window1.xaml b/dotnet-desktop-guide/samples/snippets/csharp/VS_Snippets_Wpf/ListViewCode/CSharp/Window1.xaml
index edf3ff9..42c3345 100644
--- a/dotnet-desktop-guide/samples/snippets/csharp/VS_Snippets_Wpf/ListViewCode/CSharp/Window1.xaml
+++ b/dotnet-desktop-guide/samples/snippets/csharp/VS_Snippets_Wpf/ListViewCode/CSharp/Window1.xaml
@@ -1,87 +1,73 @@
-<Window x:Class="SDKSample.Window1"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    Loaded="OnLoad"
-    xmlns:ds="clr-namespace:SDKSample">
- 
-  <Window.Resources>
-    <ObjectDataProvider x:Key="EmployeeInfoDataSource"
-           ObjectType="{x:Type ds:myEmployees}"/>
-  </Window.Resources>
-  <Grid>
-    <Grid.RowDefinitions>
-      <RowDefinition Height="50"/>
-      <RowDefinition/>
-    </Grid.RowDefinitions>
-    <Grid.ColumnDefinitions>
-      <ColumnDefinition/>
-      <ColumnDefinition/>
-    </Grid.ColumnDefinitions>
-    <TextBlock Grid.Row="0" Grid.Column="0" FontSize="14"
-               HorizontalAlignment="Center">
-      ListView created with XAML
-    </TextBlock>
-    <StackPanel Grid.Row="1" Grid.Column="0" HorizontalAlignment="Center">
-      <!--<SnippetListViewEmployee>-->
+<Window x:Class="SDKSample.Window1"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Loaded="OnLoad"
+        xmlns:ds="clr-namespace:SDKSample">
 
-      <!--<SnippetItemsSource>-->
-      <ListView ItemsSource="{Binding Source=
-                             {StaticResource EmployeeInfoDataSource}}">
-        <!--</SnippetItemsSource>-->
+    <Window.Resources>
+        <ObjectDataProvider x:Key="EmployeeInfoDataSource" ObjectType="{x:Type ds:myEmployees}" />
+    </Window.Resources>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="50"/>
+            <RowDefinition/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition/>
+            <ColumnDefinition/>
+        </Grid.ColumnDefinitions>
+        <TextBlock Grid.Row="0" Grid.Column="0" FontSize="14" HorizontalAlignment="Center">
+            ListView created with XAML
+        </TextBlock>
+        <StackPanel Grid.Row="1" Grid.Column="0" HorizontalAlignment="Center">
+            <!--<SnippetListViewEmployee>-->
 
-        <!--<SnippetListViewView>-->
-        <ListView.View>
-          <!--<SnippetGridViewColumn>-->
+            <!--<SnippetItemsSource>-->
+            <ListView ItemsSource="{Binding Source={StaticResource EmployeeInfoDataSource}}">
+                <!--</SnippetItemsSource>-->
 
-          <!--<SnippetGridViewAllowsColumnReorderPart1>-->
-          <GridView AllowsColumnReorder="true"
-                    ColumnHeaderToolTip="Employee Information">
-            <!--</SnippetGridViewAllowsColumnReorderPart1>-->
+                <!--<SnippetListViewView>-->
+                <ListView.View>
+                    <!--<SnippetGridViewColumn>-->
 
-            <!--<SnippetGridViewColumnProperties>-->
-            <GridViewColumn DisplayMemberBinding=
-                                "{Binding Path=FirstName}" 
-                            Header="First Name" Width="100"/>
-            <!--</SnippetGridViewColumnProperties>-->
-              
-              <!--<SnippetHeaderContextMenu>-->
-                        <GridViewColumn DisplayMemberBinding=
-                                "{Binding Path=LastName}" 
-                            Width="100">
+                    <!--<SnippetGridViewAllowsColumnReorderPart1>-->
+                    <GridView AllowsColumnReorder="true" ColumnHeaderToolTip="Employee Information">
+                        <!--</SnippetGridViewAllowsColumnReorderPart1>-->
+
+                        <!--<SnippetGridViewColumnProperties>-->
+                        <GridViewColumn DisplayMemberBinding="{Binding Path=FirstName}" Header="First Name" Width="100"/>
+                        <!--</SnippetGridViewColumnProperties>-->
+
+                        <!--<SnippetHeaderContextMenu>-->
+                        <GridViewColumn DisplayMemberBinding="{Binding Path=LastName}" Width="100">
                             <GridViewColumnHeader>Last Name
                                 <GridViewColumnHeader.ContextMenu>
-                                <ContextMenu  MenuItem.Click="LastNameCM_Click"  
-                                              Name="LastNameCM">
-                                    <MenuItem Header="Ascending" />
-                                    <MenuItem Header="Descending" />
-                                </ContextMenu>
+                                    <ContextMenu MenuItem.Click="LastNameCM_Click" Name="LastNameCM">
+                                        <MenuItem Header="Ascending" />
+                                        <MenuItem Header="Descending" />
+                                    </ContextMenu>
                                 </GridViewColumnHeader.ContextMenu>
                             </GridViewColumnHeader>
                         </GridViewColumn>
-              <!--</SnippetHeaderContextMenu>-->
+                        <!--</SnippetHeaderContextMenu>-->
 
-                        <GridViewColumn DisplayMemberBinding=
-                                "{Binding Path=EmployeeNumber}" 
-                            Header="Employee No." Width="100"/>
-            <!--<SnippetGridViewAllowsColumnReorderPart2>-->
-          </GridView>
-          <!--</SnippetGridViewAllowsColumnReorderPart2>-->
+                        <GridViewColumn DisplayMemberBinding="{Binding Path=EmployeeNumber}" Header="Employee No." Width="100"/>
+                        <!--<SnippetGridViewAllowsColumnReorderPart2>-->
+                    </GridView>
+                    <!--</SnippetGridViewAllowsColumnReorderPart2>-->
 
-          <!--</SnippetGridViewColumn>-->
-        </ListView.View>
-        <!--</SnippetListViewView>-->
-      </ListView>
-      <!--</SnippetListViewEmployee>-->
+                    <!--</SnippetGridViewColumn>-->
+                </ListView.View>
+                <!--</SnippetListViewView>-->
+            </ListView>
+            <!--</SnippetListViewEmployee>-->
 
-    </StackPanel>
+        </StackPanel>
 
-    <TextBlock Grid.Row="0" Grid.Column="1" FontSize="14"
-               HorizontalAlignment="Center">
-      ListView created with Code
-    </TextBlock>
-    <StackPanel Grid.Row="1" Grid.Column="1"  Name="myStackPanel"
-                HorizontalAlignment="Center">
-    </StackPanel>
-  </Grid>
+        <TextBlock Grid.Row="0" Grid.Column="1" FontSize="14" HorizontalAlignment="Center">
+            ListView created with Code
+        </TextBlock>
+        <StackPanel Grid.Row="1" Grid.Column="1" Name="myStackPanel" HorizontalAlignment="Center">
+        </StackPanel>
+    </Grid>
 
 </Window>