Merge branch 'master' into bugfix/observablevalidator-errors

Author: michael-hawker

Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml.cs

@@ -517,7 +517,7 @@ private void UpdateXamlRender(string text)
 
                 if (CurrentSample.HasType)
                 {
-                    root = SamplePage?.FindDescendantByName("XamlRoot");
+                    root = SamplePage?.FindDescendant("XamlRoot");
 
                     if (root is Panel)
                     {

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AdaptiveGridView/AdaptiveGridViewPage.xaml.cs

@@ -27,7 +27,7 @@ public AdaptiveGridViewPage()
 
         public async void OnXamlRendered(FrameworkElement control)
         {
-            _adaptiveGridViewControl = control.FindDescendantByName("AdaptiveGridViewControl") as AdaptiveGridView;
+            _adaptiveGridViewControl = control.FindDescendant("AdaptiveGridViewControl") as AdaptiveGridView;
             if (_adaptiveGridViewControl != null)
             {
                 var allPhotos = await new Data.PhotosDataSource().GetItemsAsync();

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)
             {

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/CameraPreview/CameraPreviewPage.xaml.cs

@@ -54,14 +54,14 @@ public async void OnXamlRendered(FrameworkElement control)
                 _cameraPreviewControl.CameraHelper.FrameArrived += CameraPreviewControl_FrameArrived;
             }
 
-            _imageControl = control.FindDescendantByName("CurrentFrameImage") as Image;
+            _imageControl = control.FindDescendant("CurrentFrameImage") as Image;
             if (_imageControl != null)
             {
                 _softwareBitmapSource = new SoftwareBitmapSource();
                 _imageControl.Source = _softwareBitmapSource;
             }
 
-            _errorMessageText = control.FindDescendantByName("ErrorMessage") as TextBlock;
+            _errorMessageText = control.FindDescendant("ErrorMessage") as TextBlock;
 
             semaphoreSlim.Release();
         }

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Carousel/CarouselPage.xaml.cs

@@ -29,7 +29,7 @@ public CarouselPage()
 
         public async void OnXamlRendered(FrameworkElement control)
         {
-            carouselControl = control.FindDescendantByName("CarouselControl") as Carousel;
+            carouselControl = control.FindDescendant("CarouselControl") as Carousel;
             carouselControl.ItemsSource = await new Data.PhotosDataSource().GetItemsAsync();
         }
     }

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DataGrid/DataGridPage.xaml.cs

@@ -35,7 +35,7 @@ public async void OnXamlRendered(FrameworkElement control)
                 dataGrid.LoadingRowGroup -= DataGrid_LoadingRowGroup;
             }
 
-            dataGrid = control.FindDescendantByName("dataGrid") as DataGrid;
+            dataGrid = control.FindDescendant("dataGrid") as DataGrid;
             if (dataGrid != null)
             {
                 dataGrid.Sorting += DataGrid_Sorting;
@@ -54,7 +54,7 @@ public async void OnXamlRendered(FrameworkElement control)
                 groupButton.Click -= GroupButton_Click;
             }
 
-            groupButton = control.FindDescendantByName("groupButton") as AppBarButton;
+            groupButton = control.FindDescendant("groupButton") as AppBarButton;
             if (groupButton != null)
             {
                 groupButton.Click += GroupButton_Click;

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()

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)

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)
             {

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;
             }