From 810100e65206df2ddd736b216969bca597283563 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Alarc=C3=B3n?= <ralarcon@microsoft.com>
Date: Thu, 22 Jun 2017 18:02:33 +0200
Subject: [PATCH 1/3] Workarround for issue #496

---
 templates/Pages/Grid.CodeBehind/Views/GridViewPage.xaml    | 3 ++-
 templates/Pages/Grid.CodeBehind/Views/GridViewPage.xaml.cs | 5 +++++
 templates/Pages/Grid/Views/GridViewPage.xaml               | 3 ++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/templates/Pages/Grid.CodeBehind/Views/GridViewPage.xaml b/templates/Pages/Grid.CodeBehind/Views/GridViewPage.xaml
index a65e330a41..e55c4a9c69 100644
--- a/templates/Pages/Grid.CodeBehind/Views/GridViewPage.xaml
+++ b/templates/Pages/Grid.CodeBehind/Views/GridViewPage.xaml
@@ -24,7 +24,8 @@
         <Grid
             Grid.Row="1" 
             Background="{ThemeResource SystemControlPageBackgroundChromeLowBrush}">
-            <tg:RadDataGrid ColumnDataOperationsMode="Flyout" x:Name="grid" ItemsSource="{x:Bind Source}" />
+            <!-- TODO: Moving from x:Bind to Binding as workarround for https://github.com/Microsoft/WindowsTemplateStudio/issues/496 -->
+            <tg:RadDataGrid ColumnDataOperationsMode="Flyout" x:Name="grid" ItemsSource="{Binding Source}" />
         </Grid>
     </Grid>
 </Page>
diff --git a/templates/Pages/Grid.CodeBehind/Views/GridViewPage.xaml.cs b/templates/Pages/Grid.CodeBehind/Views/GridViewPage.xaml.cs
index 6621c0eab4..1e5d67bfad 100644
--- a/templates/Pages/Grid.CodeBehind/Views/GridViewPage.xaml.cs
+++ b/templates/Pages/Grid.CodeBehind/Views/GridViewPage.xaml.cs
@@ -14,6 +14,11 @@ public sealed partial class GridViewPage : Page, System.ComponentModel.INotifyPr
         public GridViewPage()
         {
             InitializeComponent();
+            
+            // TODO: Moving from x:Bind to Binding as workarround for https://github.com/Microsoft/WindowsTemplateStudio/issues/496
+            // Once Telerik fix the root cause, we get back to x:Bind and remove the following line
+            DataContext = this;
+
         }
 
         public ObservableCollection<Order> Source
diff --git a/templates/Pages/Grid/Views/GridViewPage.xaml b/templates/Pages/Grid/Views/GridViewPage.xaml
index cbf9c27f88..e55c4a9c69 100644
--- a/templates/Pages/Grid/Views/GridViewPage.xaml
+++ b/templates/Pages/Grid/Views/GridViewPage.xaml
@@ -24,7 +24,8 @@
         <Grid
             Grid.Row="1" 
             Background="{ThemeResource SystemControlPageBackgroundChromeLowBrush}">
-            <tg:RadDataGrid ColumnDataOperationsMode="Flyout" x:Name="grid" ItemsSource="{x:Bind ViewModel.Source}" />
+            <!-- TODO: Moving from x:Bind to Binding as workarround for https://github.com/Microsoft/WindowsTemplateStudio/issues/496 -->
+            <tg:RadDataGrid ColumnDataOperationsMode="Flyout" x:Name="grid" ItemsSource="{Binding Source}" />
         </Grid>
     </Grid>
 </Page>

From b396c5bb606eb639df87117c73cc760432af2137 Mon Sep 17 00:00:00 2001
From: Clint Rutkas <clint@rutkas.com>
Date: Thu, 22 Jun 2017 09:05:28 -0700
Subject: [PATCH 2/3] Update GridViewPage.xaml.cs

---
 templates/Pages/Grid.CodeBehind/Views/GridViewPage.xaml.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/templates/Pages/Grid.CodeBehind/Views/GridViewPage.xaml.cs b/templates/Pages/Grid.CodeBehind/Views/GridViewPage.xaml.cs
index 1e5d67bfad..47111adadf 100644
--- a/templates/Pages/Grid.CodeBehind/Views/GridViewPage.xaml.cs
+++ b/templates/Pages/Grid.CodeBehind/Views/GridViewPage.xaml.cs
@@ -15,10 +15,9 @@ public GridViewPage()
         {
             InitializeComponent();
             
-            // TODO: Moving from x:Bind to Binding as workarround for https://github.com/Microsoft/WindowsTemplateStudio/issues/496
+            // TODO: Moving from x:Bind to Binding as workaround for https://github.com/Microsoft/WindowsTemplateStudio/issues/496
             // Once Telerik fix the root cause, we get back to x:Bind and remove the following line
             DataContext = this;
-
         }
 
         public ObservableCollection<Order> Source

From 9f7e6f1e704db26bd32b5e4d78c98dccf4950a90 Mon Sep 17 00:00:00 2001
From: Clint Rutkas <clint@rutkas.com>
Date: Thu, 22 Jun 2017 09:05:47 -0700
Subject: [PATCH 3/3] Update GridViewPage.xaml

---
 templates/Pages/Grid/Views/GridViewPage.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/Pages/Grid/Views/GridViewPage.xaml b/templates/Pages/Grid/Views/GridViewPage.xaml
index e55c4a9c69..6648320b12 100644
--- a/templates/Pages/Grid/Views/GridViewPage.xaml
+++ b/templates/Pages/Grid/Views/GridViewPage.xaml
@@ -24,7 +24,7 @@
         <Grid
             Grid.Row="1" 
             Background="{ThemeResource SystemControlPageBackgroundChromeLowBrush}">
-            <!-- TODO: Moving from x:Bind to Binding as workarround for https://github.com/Microsoft/WindowsTemplateStudio/issues/496 -->
+            <!-- TODO: Moving from x:Bind to Binding as workaround for https://github.com/Microsoft/WindowsTemplateStudio/issues/496 -->
             <tg:RadDataGrid ColumnDataOperationsMode="Flyout" x:Name="grid" ItemsSource="{Binding Source}" />
         </Grid>
     </Grid>