Updated leftover references in the codebase

Sergio0694 · Sergio0694 · commit b50f3ed2a24a · 2021-02-22T20:45:12.000+01:00
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/BladeView/BladePage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/BladeView/BladePage.xaml.cs
@@ -25,8 +25,8 @@ public BladePage()
 
         public void OnXamlRendered(FrameworkElement control)
         {
-            bladeView = control.FindChildByName("BladeView") as BladeView;
-            addBlade = control.FindChildByName("AddBlade") as Button;
+            bladeView = control.FindChild("BladeView") as BladeView;
+            addBlade = control.FindChild("AddBlade") as Button;
 
             if (addBlade != null)
             {
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DockPanel/DockPanelPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DockPanel/DockPanelPage.xaml.cs
@@ -9,7 +9,6 @@
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Navigation;
 
 namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
 {
@@ -29,7 +28,7 @@ public DockPanelPage()
 
         public void OnXamlRendered(FrameworkElement control)
         {
-            _sampleDockPanel = control.FindChildByName("SampleDockPanel") as DockPanel;
+            _sampleDockPanel = control.FindChild("SampleDockPanel") as DockPanel;
         }
 
         private void Load()
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/FadeHeader/FadeHeaderBehaviorPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/FadeHeader/FadeHeaderBehaviorPage.xaml.cs
@@ -26,7 +26,7 @@ public FadeHeaderBehaviorPage()
 
         public void OnXamlRendered(FrameworkElement control)
         {
-            myListView = control.FindChildByName("MyListView") as ListView;
+            myListView = control.FindChild("MyListView") as ListView;
 
             // Load the ListView with Sample Data
             if (myListView != null)
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/GazeInteraction/GazeInteractionPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/GazeInteraction/GazeInteractionPage.xaml.cs
@@ -2,13 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
 using Microsoft.Toolkit.Uwp.Input.GazeInteraction;
 using Microsoft.Toolkit.Uwp.UI.Extensions;
 using Windows.UI.Core;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Shapes;
 
 namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
 {
@@ -33,7 +31,7 @@ public void OnXamlRendered(FrameworkElement control)
 
             WarnUserToPlugInDevice();
 
-            var buttonControl = control.FindChildByName("TargetButton") as Button;
+            var buttonControl = control.FindChild("TargetButton") as Button;
 
             if (buttonControl != null)
             {
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/GazeTracing/GazeTracingPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/GazeTracing/GazeTracingPage.xaml.cs
@@ -42,7 +42,7 @@ public GazeTracingPage()
 
         public void OnXamlRendered(FrameworkElement control)
         {
-            if (control.FindChildByName("Points") is ItemsControl itemsControl)
+            if (control.FindChild("Points") is ItemsControl itemsControl)
             {
                 itemsControl.ItemsSource = GazeHistory;
             }
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedItemsControl/HeaderedItemsControlPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedItemsControl/HeaderedItemsControlPage.xaml.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Collections.Generic;
+using System.Linq;
 using Microsoft.Toolkit.Uwp.UI.Controls;
 using Microsoft.Toolkit.Uwp.UI.Extensions;
 using Windows.UI.Xaml;
@@ -26,7 +27,7 @@ public HeaderedItemsControlPage()
 
         public void OnXamlRendered(FrameworkElement element)
         {
-            foreach (var control in element.FindChildren<HeaderedItemsControl>())
+            foreach (var control in element.FindChildren().OfType<HeaderedItemsControl>())
             {
                 control.DataContext = this;
             }
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ImageCache/ImageCachePage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ImageCache/ImageCachePage.xaml.cs
@@ -29,7 +29,7 @@ public ImageCachePage()
 
         public void OnXamlRendered(FrameworkElement control)
         {
-            photoList = control.FindChildByName("PhotoList") as ListView;
+            photoList = control.FindChild("PhotoList") as ListView;
         }
 
         private async void Load()
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ImageCropper/ImageCropperPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ImageCropper/ImageCropperPage.xaml.cs
@@ -4,12 +4,9 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
-using System.Runtime.InteropServices.WindowsRuntime;
 using System.Threading.Tasks;
 using Microsoft.Toolkit.Uwp.UI.Controls;
 using Microsoft.Toolkit.Uwp.UI.Extensions;
-using Windows.Graphics.Imaging;
 using Windows.Storage;
 using Windows.Storage.Pickers;
 using Windows.UI.Xaml;
@@ -35,7 +32,7 @@ public ImageCropperPage()
 
         public async void OnXamlRendered(FrameworkElement control)
         {
-            _imageCropper = control.FindChildByName("ImageCropper") as ImageCropper;
+            _imageCropper = control.FindChild("ImageCropper") as ImageCropper;
             if (_imageCropper != null)
             {
                 var file = await StorageFile.GetFileFromApplicationUriAsync(new Uri("ms-appx:///Assets/Photos/Owl.jpg"));
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ImageEx/ImageExPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ImageEx/ImageExPage.xaml.cs
@@ -32,9 +32,9 @@ public ImageExPage()
         public void OnXamlRendered(FrameworkElement control)
         {
             // Need to use logical tree here as scrollviewer hasn't initialized yet even with dispatch.
-            container = control.FindChildByName("Container") as StackPanel;
+            container = control.FindChild("Container") as StackPanel;
             resources = control.Resources;
-            lazyLoadingControlHost = control.FindChildByName("LazyLoadingControlHost") as Border;
+            lazyLoadingControlHost = control.FindChild("LazyLoadingControlHost") as Border;
         }
 
         private async void Load()
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Implicit Animations/ImplicitAnimationsPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Implicit Animations/ImplicitAnimationsPage.xaml.cs
@@ -27,7 +27,7 @@ public ImplicitAnimationsPage()
 
         public void OnXamlRendered(FrameworkElement control)
         {
-            _element = control.FindChildByName("Element");
+            _element = control.FindChild("Element");
         }
 
         private void Load()
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationPage.xaml.cs
@@ -35,14 +35,14 @@ public void OnXamlRendered(FrameworkElement control)
         {
             NotificationDuration = 0;
 
-            _exampleInAppNotification = control.FindChildByName("ExampleInAppNotification") as InAppNotification;
+            _exampleInAppNotification = control.FindChild("ExampleInAppNotification") as InAppNotification;
             _defaultInAppNotificationControlTemplate = _exampleInAppNotification?.Template;
-            _exampleCustomInAppNotification = control.FindChildByName("ExampleCustomInAppNotification") as InAppNotification;
+            _exampleCustomInAppNotification = control.FindChild("ExampleCustomInAppNotification") as InAppNotification;
             _customInAppNotificationControlTemplate = _exampleCustomInAppNotification?.Template;
-            _exampleVSCodeInAppNotification = control.FindChildByName("ExampleVSCodeInAppNotification") as InAppNotification;
+            _exampleVSCodeInAppNotification = control.FindChild("ExampleVSCodeInAppNotification") as InAppNotification;
             _resources = control.Resources;
 
-            var notificationDurationTextBox = control.FindChildByName("NotificationDurationTextBox") as TextBox;
+            var notificationDurationTextBox = control.FindChild("NotificationDurationTextBox") as TextBox;
             if (notificationDurationTextBox != null)
             {
                 notificationDurationTextBox.TextChanged += NotificationDurationTextBox_TextChanged;
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InfiniteCanvas/InfiniteCanvasPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InfiniteCanvas/InfiniteCanvasPage.xaml.cs
@@ -29,7 +29,7 @@ public InfiniteCanvasPage()
 
         public void OnXamlRendered(FrameworkElement control)
         {
-            _infiniteCanvas = control.FindChildByName("canvas") as InfiniteCanvas;
+            _infiniteCanvas = control.FindChild("canvas") as InfiniteCanvas;
         }
 
         private void Load()
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ItemsReorderAnimation/ItemsReorderAnimationPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ItemsReorderAnimation/ItemsReorderAnimationPage.xaml.cs
@@ -19,7 +19,7 @@ public ItemsReorderAnimationPage()
 
         public async void OnXamlRendered(FrameworkElement control)
         {
-            imageView = control.FindChildByName("ImageView") as GridView;
+            imageView = control.FindChild("ImageView") as GridView;
 
             if (imageView != null)
             {
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListViewExtensions/ListViewExtensionsPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListViewExtensions/ListViewExtensionsPage.xaml.cs
@@ -24,7 +24,7 @@ public ListViewExtensionsPage()
 
         public async void OnXamlRendered(FrameworkElement control)
         {
-            var sampleListView = control.FindChildByName("SampleListView") as ListView;
+            var sampleListView = control.FindChild("SampleListView") as ListView;
 
             if (sampleListView != null)
             {
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml.cs
@@ -25,10 +25,10 @@ public LoadingPage()
         public async void OnXamlRendered(FrameworkElement control)
         {
             loadingControl = control.FindDescendant("LoadingControl") as Loading;
-            loadingContentControl = control.FindChildByName("LoadingContentControl") as ContentControl;
+            loadingContentControl = control.FindChild("LoadingContentControl") as ContentControl;
             resources = control.Resources;
 
-            if (control.FindChildByName("AdaptiveGridViewControl") is AdaptiveGridView gridView)
+            if (control.FindChild("AdaptiveGridViewControl") is AdaptiveGridView gridView)
             {
                 gridView.ItemsSource = await new Data.PhotosDataSource().GetItemsAsync();
             }
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MarkdownTextBlock/MarkdownTextBlockPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MarkdownTextBlock/MarkdownTextBlockPage.xaml.cs
@@ -31,9 +31,9 @@ public MarkdownTextBlockPage()
 
         public void OnXamlRendered(FrameworkElement control)
         {
-            unformattedText = control.FindChildByName("UnformattedText") as TextBox;
+            unformattedText = control.FindChild("UnformattedText") as TextBox;
 
-            markdownText = control.FindChildByName("MarkdownText") as MarkdownTextBlock;
+            markdownText = control.FindChild("MarkdownText") as MarkdownTextBlock;
 
             if (markdownText != null)
             {
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Menu/MenuPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Menu/MenuPage.xaml.cs
@@ -22,7 +22,7 @@ public MenuPage()
 
         public void OnXamlRendered(FrameworkElement control)
         {
-            fileMenu = control.FindChildByName("FileMenu") as MenuItem;
+            fileMenu = control.FindChild("FileMenu") as MenuItem;
         }
         #pragma warning restore CS0618 // Type or member is obsolete
 
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/OrbitView/OrbitViewPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/OrbitView/OrbitViewPage.xaml.cs
@@ -28,13 +28,13 @@ public OrbitViewPage()
 
         public void OnXamlRendered(FrameworkElement control)
         {
-            var people = control.FindChildByName("People") as OrbitView;
+            var people = control.FindChild("People") as OrbitView;
             if (people != null)
             {
                 people.ItemClick += People_ItemClick;
             }
 
-            var devices = control.FindChildByName("Devices") as OrbitView;
+            var devices = control.FindChild("Devices") as OrbitView;
             if (devices != null)
             {
                 devices.ItemsSource = DeviceList;
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/PrintHelper/PrintHelperPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/PrintHelper/PrintHelperPage.xaml.cs
@@ -10,7 +10,6 @@
 using Windows.UI.Popups;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Navigation;
 
 namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
 {
@@ -40,7 +39,7 @@ public PrintHelperPage()
 
         public void OnXamlRendered(FrameworkElement control)
         {
-            var listView = control.FindChildByName("PrintSampleListView") as ListView;
+            var listView = control.FindChild("PrintSampleListView") as ListView;
             if (listView == null)
             {
                 customPrintTemplate = null;
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RotatorTile/RotatorTilePage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RotatorTile/RotatorTilePage.xaml.cs
@@ -22,28 +22,28 @@ public RotatorTilePage()
 
         public void OnXamlRendered(FrameworkElement control)
         {
-            var tile1 = control.FindChildByName("Tile1") as RotatorTile;
+            var tile1 = control.FindChild("Tile1") as RotatorTile;
 
             if (tile1 != null)
             {
                 tile1.ItemsSource = _pictures;
             }
 
-            var tile2 = control.FindChildByName("Tile2") as RotatorTile;
+            var tile2 = control.FindChild("Tile2") as RotatorTile;
 
             if (tile2 != null)
             {
                 tile2.ItemsSource = _pictures;
             }
 
-            var tile3 = control.FindChildByName("Tile3") as RotatorTile;
+            var tile3 = control.FindChild("Tile3") as RotatorTile;
 
             if (tile3 != null)
             {
                 tile3.ItemsSource = _pictures;
             }
 
-            var tile4 = control.FindChildByName("Tile4") as RotatorTile;
+            var tile4 = control.FindChild("Tile4") as RotatorTile;
 
             if (tile4 != null)
             {
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ScrollHeader/ScrollHeaderPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ScrollHeader/ScrollHeaderPage.xaml.cs
@@ -22,7 +22,7 @@ public ScrollHeaderPage()
 
         public void OnXamlRendered(FrameworkElement control)
         {
-            var listView = control.FindChildByName("listView") as ListView;
+            var listView = control.FindChild("listView") as ListView;
             if (listView != null)
             {
                 listView.ItemsSource = _items;
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ScrollViewerExtensions/ScrollViewerExtensionsPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ScrollViewerExtensions/ScrollViewerExtensionsPage.xaml.cs
@@ -30,12 +30,12 @@ public ScrollViewerExtensionsPage()
 
         public void OnXamlRendered(FrameworkElement control)
         {
-            var listView = control.FindChildByName("listView") as ListView;
+            var listView = control.FindChild("listView") as ListView;
             if (listView != null)
             {
                 listView.ItemsSource = _items;
 
-                var shapesPanel = control.FindChildByName("shapesPanel") as StackPanel;
+                var shapesPanel = control.FindChild("shapesPanel") as StackPanel;
                 if (shapesPanel != null)
                 {
                     var listScrollViewer = listView.FindDescendant<ScrollViewer>();
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredPanel/StaggeredPanelPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredPanel/StaggeredPanelPage.xaml.cs
@@ -21,7 +21,7 @@ public StaggeredPanelPage()
 
         public async void OnXamlRendered(FrameworkElement control)
         {
-            var gridView = control.FindChildByName("GridView") as ItemsControl;
+            var gridView = control.FindChild("GridView") as ItemsControl;
 
             if (gridView == null)
             {
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextBoxMask/TextBoxMaskPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextBoxMask/TextBoxMaskPage.xaml.cs
@@ -23,7 +23,7 @@ public TextBoxMaskPage()
 
         public void OnXamlRendered(FrameworkElement control)
         {
-            alphaTextBox = control.FindChildByName("AlphaTextBox") as TextBox;
+            alphaTextBox = control.FindChild("AlphaTextBox") as TextBox;
         }
 
         private void Load()
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarPage.xaml.cs
@@ -28,14 +28,14 @@ public TextToolbarPage()
 
         public void OnXamlRendered(FrameworkElement control)
         {
-            _toolbar = control.FindChildByName("Toolbar") as TextToolbar;
+            _toolbar = control.FindChild("Toolbar") as TextToolbar;
 
-            if (control.FindChildByName("EditZone") is RichEditBox editZone)
+            if (control.FindChild("EditZone") is RichEditBox editZone)
             {
                 editZone.TextChanged += EditZone_TextChanged;
             }
 
-            if (control.FindChildByName("Previewer") is MarkdownTextBlock previewer)
+            if (control.FindChild("Previewer") is MarkdownTextBlock previewer)
             {
                 _previewer = previewer;
                 _previewer.LinkClicked += Previewer_LinkClicked;
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TokenizingTextBox/TokenizingTextBoxPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TokenizingTextBox/TokenizingTextBoxPage.xaml.cs
@@ -123,7 +123,7 @@ public void OnXamlRendered(FrameworkElement control)
                 _ttb.TokenItemAdding -= TokenItemCreating;
             }
 
-            if (control.FindChildByName("TokenBox") is TokenizingTextBox ttb)
+            if (control.FindChild("TokenBox") is TokenizingTextBox ttb)
             {
                 _ttb = ttb;
                 _ttb.TokenItemAdded += TokenItemAdded;
@@ -147,7 +147,7 @@ public void OnXamlRendered(FrameworkElement control)
                 _ttbEmail.PreviewKeyDown -= EmailPreviewKeyDown;
             }
 
-            if (control.FindChildByName("TokenBoxEmail") is TokenizingTextBox ttbEmail)
+            if (control.FindChild("TokenBoxEmail") is TokenizingTextBox ttbEmail)
             {
                 _ttbEmail = ttbEmail;
 
@@ -168,7 +168,7 @@ public void OnXamlRendered(FrameworkElement control)
                 _ttbEmailSuggestions.PreviewKeyDown -= EmailList_PreviewKeyDown;
             }
 
-            if (control.FindChildByName("EmailList") is ListView ttbList)
+            if (control.FindChild("EmailList") is ListView ttbList)
             {
                 _ttbEmailSuggestions = ttbList;
 
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ViewportBehavior/ViewportBehaviorPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ViewportBehavior/ViewportBehaviorPage.xaml.cs
@@ -35,13 +35,13 @@ public ViewportBehaviorPage()
 
         public void OnXamlRendered(FrameworkElement control)
         {
-            if (control.FindChildByName("EffectElement") is Image effectElement)
+            if (control.FindChild("EffectElement") is Image effectElement)
             {
                 _effectElement = effectElement;
                 ////TODO: _effectElement.Blur(value: 10, duration: 0).Start();
             }
 
-            if (control.FindChildByName("EffectElementHost") is FrameworkElement effectElementHost)
+            if (control.FindChild("EffectElementHost") is FrameworkElement effectElementHost)
             {
                 var behaviors = Interaction.GetBehaviors(effectElementHost);
                 var viewportBehavior = behaviors.OfType<ViewportBehavior>().FirstOrDefault();
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanelPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanelPage.xaml.cs
@@ -29,7 +29,7 @@ public WrapPanelPage()
 
         public void OnXamlRendered(FrameworkElement control)
         {
-            _itemControl = control.FindChildByName("WrapPanelContainer") as ListView;
+            _itemControl = control.FindChild("WrapPanelContainer") as ListView;
 
             if (_itemControl != null)
             {
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/ScrollViewer/ScrollViewerExtensions.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/ScrollViewer/ScrollViewerExtensions.cs

Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,8 @@ public BladePage()`
`25`	`25`
`26`	`26`	`public void OnXamlRendered(FrameworkElement control)`
`27`	`27`	`{`
`28`		`- bladeView = control.FindChildByName("BladeView") as BladeView;`
`29`		`- addBlade = control.FindChildByName("AddBlade") as Button;`
	`28`	`+ bladeView = control.FindChild("BladeView") as BladeView;`
	`29`	`+ addBlade = control.FindChild("AddBlade") as Button;`
`30`	`30`
`31`	`31`	`if (addBlade != null)`
`32`	`32`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`	`using Windows.UI.Xaml;`
`10`	`10`	`using Windows.UI.Xaml.Controls;`
`11`	`11`	`using Windows.UI.Xaml.Media;`
`12`		`-using Windows.UI.Xaml.Navigation;`
`13`	`12`
`14`	`13`	`namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages`
`15`	`14`	`{`
`@@ -29,7 +28,7 @@ public DockPanelPage()`
`29`	`28`
`30`	`29`	`public void OnXamlRendered(FrameworkElement control)`
`31`	`30`	`{`
`32`		`- _sampleDockPanel = control.FindChildByName("SampleDockPanel") as DockPanel;`
	`31`	`+ _sampleDockPanel = control.FindChild("SampleDockPanel") as DockPanel;`
`33`	`32`	`}`
`34`	`33`
`35`	`34`	`private void Load()`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public FadeHeaderBehaviorPage()`
`26`	`26`
`27`	`27`	`public void OnXamlRendered(FrameworkElement control)`
`28`	`28`	`{`
`29`		`- myListView = control.FindChildByName("MyListView") as ListView;`
	`29`	`+ myListView = control.FindChild("MyListView") as ListView;`
`30`	`30`
`31`	`31`	`// Load the ListView with Sample Data`
`32`	`32`	`if (myListView != null)`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public GazeTracingPage()`
`42`	`42`
`43`	`43`	`public void OnXamlRendered(FrameworkElement control)`
`44`	`44`	`{`
`45`		`- if (control.FindChildByName("Points") is ItemsControl itemsControl)`
	`45`	`+ if (control.FindChild("Points") is ItemsControl itemsControl)`
`46`	`46`	`{`
`47`	`47`	`itemsControl.ItemsSource = GazeHistory;`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`// See the LICENSE file in the project root for more information.`
`4`	`4`
`5`	`5`	`using System.Collections.Generic;`
	`6`	`+using System.Linq;`
`6`	`7`	`using Microsoft.Toolkit.Uwp.UI.Controls;`
`7`	`8`	`using Microsoft.Toolkit.Uwp.UI.Extensions;`
`8`	`9`	`using Windows.UI.Xaml;`
`@@ -26,7 +27,7 @@ public HeaderedItemsControlPage()`
`26`	`27`
`27`	`28`	`public void OnXamlRendered(FrameworkElement element)`
`28`	`29`	`{`
`29`		`- foreach (var control in element.FindChildren<HeaderedItemsControl>())`
	`30`	`+ foreach (var control in element.FindChildren().OfType<HeaderedItemsControl>())`
`30`	`31`	`{`
`31`	`32`	`control.DataContext = this;`
`32`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public ImageCachePage()`
`29`	`29`
`30`	`30`	`public void OnXamlRendered(FrameworkElement control)`
`31`	`31`	`{`
`32`		`- photoList = control.FindChildByName("PhotoList") as ListView;`
	`32`	`+ photoList = control.FindChild("PhotoList") as ListView;`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`private async void Load()`
Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,9 @@ public ImageExPage()`
`32`	`32`	`public void OnXamlRendered(FrameworkElement control)`
`33`	`33`	`{`
`34`	`34`	`// Need to use logical tree here as scrollviewer hasn't initialized yet even with dispatch.`
`35`		`- container = control.FindChildByName("Container") as StackPanel;`
	`35`	`+ container = control.FindChild("Container") as StackPanel;`
`36`	`36`	`resources = control.Resources;`
`37`		`- lazyLoadingControlHost = control.FindChildByName("LazyLoadingControlHost") as Border;`
	`37`	`+ lazyLoadingControlHost = control.FindChild("LazyLoadingControlHost") as Border;`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`private async void Load()`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public ImplicitAnimationsPage()`
`27`	`27`
`28`	`28`	`public void OnXamlRendered(FrameworkElement control)`
`29`	`29`	`{`
`30`		`- _element = control.FindChildByName("Element");`
	`30`	`+ _element = control.FindChild("Element");`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`private void Load()`