From 3195d5171952c8633eb667ce9134fafbb9c38ef8 Mon Sep 17 00:00:00 2001
From: "Andy (Steve) De George" <67293991+adegeo@users.noreply.github.com>
Date: Tue, 15 Jun 2021 07:51:36 -0700
Subject: [PATCH 1/2] Update scrollviewer.xaml (#1086)

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

diff --git a/dotnet-desktop-guide/samples/snippets/csharp/VS_Snippets_Wpf/ControlTemplateExamples/CS/resources/scrollviewer.xaml b/dotnet-desktop-guide/samples/snippets/csharp/VS_Snippets_Wpf/ControlTemplateExamples/CS/resources/scrollviewer.xaml
index abcf4b7..4813160 100644
--- a/dotnet-desktop-guide/samples/snippets/csharp/VS_Snippets_Wpf/ControlTemplateExamples/CS/resources/scrollviewer.xaml
+++ b/dotnet-desktop-guide/samples/snippets/csharp/VS_Snippets_Wpf/ControlTemplateExamples/CS/resources/scrollviewer.xaml
@@ -23,7 +23,7 @@
               <Border.BorderBrush>
                 <SolidColorBrush Color="{DynamicResource BorderMediumColor}" />
               </Border.BorderBrush>
-              <ScrollContentPresenter />
+              <ScrollContentPresenter CanContentScroll="{TemplateBinding CanContentScroll}" />
             </Border>
             <ScrollBar x:Name="PART_VerticalScrollBar"
                        Value="{TemplateBinding VerticalOffset}"
@@ -45,4 +45,4 @@
     </Setter>
   </Style>
 <!--</SnippetScrollViewer>-->
-</ResourceDictionary>
\ No newline at end of file
+</ResourceDictionary>

From 50c2dfbd42982b38c8ab93eececac72a60de65ac Mon Sep 17 00:00:00 2001
From: "Andy (Steve) De George" <67293991+adegeo@users.noreply.github.com>
Date: Tue, 15 Jun 2021 07:53:48 -0700
Subject: [PATCH 2/2] Update dotnet-versionsweeper.json (#1093)

---
 dotnet-versionsweeper.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dotnet-versionsweeper.json b/dotnet-versionsweeper.json
index 9a99b5e..ed938dc 100644
--- a/dotnet-versionsweeper.json
+++ b/dotnet-versionsweeper.json
@@ -1,5 +1,6 @@
 {
     "ignore":[
-        "dotnet-desktop-guide/samples/**/*.*"
+        "dotnet-desktop-guide/samples/**/*.*",
+        "dotnet-desktop-guide/framework/**/*.*"
     ]
 }