From fbf33448924dd5a1c8f06b9f4d4a12cb96cc818e Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Tue, 17 Nov 2020 14:50:01 -0800
Subject: [PATCH 1/3] Update NuGet versions and move to 7.0.0-preview4

---
 Directory.Build.props                                     | 4 ++--
 .../Controls/GraphPresenter/GraphPresenter.cs             | 4 ++--
 .../Microsoft.Toolkit.Graph.Controls.csproj               | 6 +++---
 Microsoft.Toolkit.Graph/Microsoft.Toolkit.Graph.csproj    | 8 ++++----
 Microsoft.Toolkit.Graph/Providers/ProviderManager.cs      | 3 ---
 SampleTest/SampleTest.csproj                              | 4 ++--
 .../UWP-XamlApplication/UWP-XamlApplication.csproj        | 2 +-
 .../WPF-Packaged-App/WPF-Packaged-App.wapproj             | 2 +-
 8 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 119e486..7677667 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -16,8 +16,8 @@
     <IsUwpProject Condition="'$(IsDesignProject)' != 'true'">$(MSBuildProjectName.Contains('Uwp'))</IsUwpProject>
     <IsSampleProject>$(MSBuildProjectName.Contains('Sample'))</IsSampleProject>
     <IsWpfProject>$(MSBuildProjectName.Contains('Wpf'))</IsWpfProject>
-    <DefaultTargetPlatformVersion>17763</DefaultTargetPlatformVersion>
-    <DefaultTargetPlatformMinVersion>16299</DefaultTargetPlatformMinVersion>
+    <DefaultTargetPlatformVersion>19041</DefaultTargetPlatformVersion>
+    <DefaultTargetPlatformMinVersion>17763</DefaultTargetPlatformMinVersion>
     <PackageOutputPath>$(MSBuildThisFileDirectory)bin\nupkg</PackageOutputPath>
   </PropertyGroup>
 
diff --git a/Microsoft.Toolkit.Graph.Controls/Controls/GraphPresenter/GraphPresenter.cs b/Microsoft.Toolkit.Graph.Controls/Controls/GraphPresenter/GraphPresenter.cs
index 772c85e..91cb6a5 100644
--- a/Microsoft.Toolkit.Graph.Controls/Controls/GraphPresenter/GraphPresenter.cs
+++ b/Microsoft.Toolkit.Graph.Controls/Controls/GraphPresenter/GraphPresenter.cs
@@ -7,7 +7,7 @@
 using System.Linq;
 using System.Threading;
 using Microsoft.Graph;
-using Microsoft.Toolkit.Uwp.Helpers;
+using Microsoft.Toolkit.Uwp.Extensions;
 using Newtonsoft.Json.Linq;
 using Windows.System;
 using Windows.UI.Xaml;
@@ -104,7 +104,7 @@ private async void GraphPresenter_Loaded(object sender, RoutedEventArgs e)
                         data = values.ToObject(ResponseType);
                     }
 
-                    _ = DispatcherQueueHelper.ExecuteOnUIThreadAsync(dispatcherQueue, () => Content = data);
+                    _ = dispatcherQueue.EnqueueAsync(() => Content = data);
                 }
                 catch
                 {
diff --git a/Microsoft.Toolkit.Graph.Controls/Microsoft.Toolkit.Graph.Controls.csproj b/Microsoft.Toolkit.Graph.Controls/Microsoft.Toolkit.Graph.Controls.csproj
index 1449ef9..7174287 100644
--- a/Microsoft.Toolkit.Graph.Controls/Microsoft.Toolkit.Graph.Controls.csproj
+++ b/Microsoft.Toolkit.Graph.Controls/Microsoft.Toolkit.Graph.Controls.csproj
@@ -25,8 +25,8 @@
   </ItemGroup> 
 
 	<ItemGroup>
-    <PackageReference Include="Microsoft.Toolkit.Uwp.UI" Version="7.0.0-preview2" />
-    <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls" Version="7.0.0-preview2" />
+    <PackageReference Include="Microsoft.Toolkit.Uwp.UI" Version="7.0.0-preview4" />
+    <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls" Version="7.0.0-preview4" />
     <ProjectReference Include="..\Microsoft.Toolkit.Graph\Microsoft.Toolkit.Graph.csproj" />
   </ItemGroup>
  
@@ -35,7 +35,7 @@
   </ItemGroup>
  
   <ItemGroup>
-    <PackageReference Include="Microsoft.Graph.Beta" Version="0.21.0-preview" />
+    <PackageReference Include="Microsoft.Graph.Beta" Version="0.32.0-preview" />
     <PackageReference Include="Microsoft.Graph.Auth" Version="1.0.0-preview.5" />
   </ItemGroup>
  
diff --git a/Microsoft.Toolkit.Graph/Microsoft.Toolkit.Graph.csproj b/Microsoft.Toolkit.Graph/Microsoft.Toolkit.Graph.csproj
index f119fed..6d265f3 100644
--- a/Microsoft.Toolkit.Graph/Microsoft.Toolkit.Graph.csproj
+++ b/Microsoft.Toolkit.Graph/Microsoft.Toolkit.Graph.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="MSBuild.Sdk.Extras">
 
   <PropertyGroup>
-    <TargetFrameworks>uap10.0.16299;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>uap10.0.17763;netstandard2.0</TargetFrameworks>
     <Title>Windows Community Toolkit .NET Standard Graph Services</Title>
     <Description>
       This package includes .NET Standard code helpers such as:
@@ -16,13 +16,13 @@
     <Platforms>AnyCPU;ARM;ARM64;x64;x86</Platforms>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0.16299'">
+  <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0.17763'">
     <DefineConstants Condition="'$(DisableImplicitFrameworkDefines)' != 'true'">$(DefineConstants);WINRT</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Graph.Beta" Version="0.21.0-preview" />
+    <PackageReference Include="Microsoft.Graph.Beta" Version="0.32.0-preview" />
     <PackageReference Include="Microsoft.Graph.Auth" Version="1.0.0-preview.5" />
-    <PackageReference Include="Microsoft.Toolkit" Version="7.0.0-preview2" />
+    <PackageReference Include="Microsoft.Toolkit" Version="7.0.0-preview4" />
   </ItemGroup>
 </Project>
diff --git a/Microsoft.Toolkit.Graph/Providers/ProviderManager.cs b/Microsoft.Toolkit.Graph/Providers/ProviderManager.cs
index f585ef5..e417de0 100644
--- a/Microsoft.Toolkit.Graph/Providers/ProviderManager.cs
+++ b/Microsoft.Toolkit.Graph/Providers/ProviderManager.cs
@@ -4,9 +4,6 @@
 
 using System;
 using System.ComponentModel;
-using Microsoft.Graph;
-using Microsoft.Identity.Client;
-using Microsoft.Toolkit.Helpers;
 
 namespace Microsoft.Toolkit.Graph.Providers
 {
diff --git a/SampleTest/SampleTest.csproj b/SampleTest/SampleTest.csproj
index 4a1c7d9..1a0f4a0 100644
--- a/SampleTest/SampleTest.csproj
+++ b/SampleTest/SampleTest.csproj
@@ -11,8 +11,8 @@
     <AssemblyName>SampleTest</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.18362.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.19041.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
diff --git a/Samples/XAML Islands/UWP-XamlApplication/UWP-XamlApplication.csproj b/Samples/XAML Islands/UWP-XamlApplication/UWP-XamlApplication.csproj
index 0cb286f..b99b1ec 100644
--- a/Samples/XAML Islands/UWP-XamlApplication/UWP-XamlApplication.csproj	
+++ b/Samples/XAML Islands/UWP-XamlApplication/UWP-XamlApplication.csproj	
@@ -11,7 +11,7 @@
     <AssemblyName>UWP-XamlApplication</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.18362.0</TargetPlatformVersion>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.19041.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
diff --git a/Samples/XAML Islands/WPF-Packaged-App/WPF-Packaged-App.wapproj b/Samples/XAML Islands/WPF-Packaged-App/WPF-Packaged-App.wapproj
index a9f5fe7..b6fed9f 100644
--- a/Samples/XAML Islands/WPF-Packaged-App/WPF-Packaged-App.wapproj	
+++ b/Samples/XAML Islands/WPF-Packaged-App/WPF-Packaged-App.wapproj	
@@ -51,7 +51,7 @@
   <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
   <PropertyGroup>
     <ProjectGuid>fe713229-aee5-489a-9251-c346a82c1ac3</ProjectGuid>
-    <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
+    <TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
     <DefaultLanguage>en-US</DefaultLanguage>
     <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>

From 63d5cef661eb8b88e6a334b05dd6cffc053b95d6 Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Tue, 17 Nov 2020 14:54:49 -0800
Subject: [PATCH 2/3] Apply XAML Styler

---
 .../Controls/LoginButton/LoginButton.xaml     |  38 +--
 .../Controls/PeoplePicker/PeoplePicker.xaml   |  31 ++-
 .../Controls/PersonView/PersonView.xaml       |  89 +++----
 SampleTest/App.xaml                           |  11 +-
 SampleTest/MainPage.xaml                      | 238 ++++++++++--------
 .../XAML Islands/UWP-XamlApplication/App.xaml |  13 +-
 .../UWP-XamlApplication/SamplePage.xaml       |  37 +--
 .../WPF-Core-GraphApp/MainWindow.xaml         |  24 +-
 8 files changed, 267 insertions(+), 214 deletions(-)

diff --git a/Microsoft.Toolkit.Graph.Controls/Controls/LoginButton/LoginButton.xaml b/Microsoft.Toolkit.Graph.Controls/Controls/LoginButton/LoginButton.xaml
index 2017d88..db1ad64 100644
--- a/Microsoft.Toolkit.Graph.Controls/Controls/LoginButton/LoginButton.xaml
+++ b/Microsoft.Toolkit.Graph.Controls/Controls/LoginButton/LoginButton.xaml
@@ -1,22 +1,23 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Microsoft.Toolkit.Graph.Controls"
-    xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"
-    xmlns:graphconverters="using:Microsoft.Toolkit.Graph.Converters">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"
+                    xmlns:graphconverters="using:Microsoft.Toolkit.Graph.Converters"
+                    xmlns:local="using:Microsoft.Toolkit.Graph.Controls">
 
-    <converters:BoolNegationConverter x:Key="InverseBoolConverter"/>
-    <converters:EmptyObjectToObjectConverter x:Key="InverseNullToVisibilityConverter" EmptyValue="Visible" NotEmptyValue="Collapsed"/>
-    <graphconverters:UserToPersonConverter x:Key="UserToPersonConverter"/>
+    <converters:BoolNegationConverter x:Key="InverseBoolConverter" />
+    <converters:EmptyObjectToObjectConverter x:Key="InverseNullToVisibilityConverter"
+                                             EmptyValue="Visible"
+                                             NotEmptyValue="Collapsed" />
+    <graphconverters:UserToPersonConverter x:Key="UserToPersonConverter" />
 
     <Style TargetType="local:LoginButton">
         <Setter Property="Padding" Value="4" />
-        <Setter Property="HorizontalAlignment" Value="Left"/>
-        <Setter Property="VerticalAlignment" Value="Top"/>
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="VerticalAlignment" Value="Top" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="local:LoginButton">
-                    <!-- TODO: In Future Use DropDownButton -->
+                    <!--  TODO: In Future Use DropDownButton  -->
                     <Button x:Name="PART_LoginButton"
                             Margin="{TemplateBinding Padding}"
                             Background="{TemplateBinding Background}"
@@ -24,14 +25,19 @@
                             BorderThickness="{TemplateBinding BorderThickness}"
                             IsEnabled="{Binding IsLoading, Converter={StaticResource InverseBoolConverter}, RelativeSource={RelativeSource TemplatedParent}}">
                         <StackPanel Orientation="Horizontal">
-                            <local:PersonView PersonDetails="{Binding UserDetails, Converter={StaticResource UserToPersonConverter}, RelativeSource={RelativeSource TemplatedParent}}" ShowName="True"/>
-                            <TextBlock Visibility="{Binding UserDetails, Converter={StaticResource InverseNullToVisibilityConverter}, RelativeSource={RelativeSource TemplatedParent}}"
-                                       VerticalAlignment="Center">Sign In</TextBlock>
+                            <local:PersonView PersonDetails="{Binding UserDetails, Converter={StaticResource UserToPersonConverter}, RelativeSource={RelativeSource TemplatedParent}}"
+                                              ShowName="True" />
+                            <TextBlock VerticalAlignment="Center"
+                                       Visibility="{Binding UserDetails, Converter={StaticResource InverseNullToVisibilityConverter}, RelativeSource={RelativeSource TemplatedParent}}">
+                                Sign In
+                            </TextBlock>
                         </StackPanel>
                         <FlyoutBase.AttachedFlyout>
                             <Flyout>
                                 <StackPanel>
-                                    <local:PersonView PersonDetails="{Binding UserDetails, Converter={StaticResource UserToPersonConverter}, RelativeSource={RelativeSource TemplatedParent}}" ShowName="True" ShowEmail="True"/>
+                                    <local:PersonView PersonDetails="{Binding UserDetails, Converter={StaticResource UserToPersonConverter}, RelativeSource={RelativeSource TemplatedParent}}"
+                                                      ShowEmail="True"
+                                                      ShowName="True" />
                                     <HyperlinkButton x:Name="PART_SignOutButton">Sign Out</HyperlinkButton>
                                 </StackPanel>
                             </Flyout>
diff --git a/Microsoft.Toolkit.Graph.Controls/Controls/PeoplePicker/PeoplePicker.xaml b/Microsoft.Toolkit.Graph.Controls/Controls/PeoplePicker/PeoplePicker.xaml
index 7b87816..e3b1267 100644
--- a/Microsoft.Toolkit.Graph.Controls/Controls/PeoplePicker/PeoplePicker.xaml
+++ b/Microsoft.Toolkit.Graph.Controls/Controls/PeoplePicker/PeoplePicker.xaml
@@ -1,34 +1,39 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Microsoft.Toolkit.Graph.Controls"
-    xmlns:ex="using:Microsoft.Toolkit.Uwp.UI.Extensions">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:ex="using:Microsoft.Toolkit.Uwp.UI.Extensions"
+                    xmlns:local="using:Microsoft.Toolkit.Graph.Controls">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
-    <Style TargetType="local:PeoplePicker" BasedOn="{StaticResource DefaultPeoplePickerStyle}"/>
+    <Style BasedOn="{StaticResource DefaultPeoplePickerStyle}"
+           TargetType="local:PeoplePicker" />
 
-    <Style x:Key="DefaultPeoplePickerStyle" TargetType="local:PeoplePicker" BasedOn="{StaticResource DefaultTokenizingTextBoxStyle}">
+    <Style x:Key="DefaultPeoplePickerStyle"
+           BasedOn="{StaticResource DefaultTokenizingTextBoxStyle}"
+           TargetType="local:PeoplePicker">
         <Setter Property="QueryIcon">
             <Setter.Value>
-                <SymbolIconSource Symbol="Find"/>
+                <SymbolIconSource Symbol="Find" />
             </Setter.Value>
         </Setter>
-        <Setter Property="PlaceholderText" Value="Start typing a name"/>
-        <Setter Property="TextMemberPath" Value="DisplayName"/>
-        <Setter Property="TokenDelimiter" Value=","/>
+        <Setter Property="PlaceholderText" Value="Start typing a name" />
+        <Setter Property="TextMemberPath" Value="DisplayName" />
+        <Setter Property="TokenDelimiter" Value="," />
         <Setter Property="SuggestedItemTemplate">
             <Setter.Value>
                 <DataTemplate>
-                    <local:PersonView PersonDetails="{Binding}" ShowName="True" ShowEmail="True"/>
+                    <local:PersonView PersonDetails="{Binding}"
+                                      ShowEmail="True"
+                                      ShowName="True" />
                 </DataTemplate>
             </Setter.Value>
         </Setter>
         <Setter Property="TokenItemTemplate">
             <Setter.Value>
                 <DataTemplate>
-                    <local:PersonView PersonDetails="{Binding}" ShowName="True"/>
+                    <local:PersonView PersonDetails="{Binding}"
+                                      ShowName="True" />
                 </DataTemplate>
             </Setter.Value>
         </Setter>
diff --git a/Microsoft.Toolkit.Graph.Controls/Controls/PersonView/PersonView.xaml b/Microsoft.Toolkit.Graph.Controls/Controls/PersonView/PersonView.xaml
index 1b2688c..c1caa12 100644
--- a/Microsoft.Toolkit.Graph.Controls/Controls/PersonView/PersonView.xaml
+++ b/Microsoft.Toolkit.Graph.Controls/Controls/PersonView/PersonView.xaml
@@ -1,67 +1,72 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Microsoft.Toolkit.Graph.Controls"
-    xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"
+                    xmlns:local="using:Microsoft.Toolkit.Graph.Controls">
 
-    <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter"/>
-    <converters:EmptyObjectToObjectConverter x:Key="NullToVisibilityConverter" EmptyValue="Collapsed" NotEmptyValue="Visible"/>
-    <converters:EmptyObjectToObjectConverter x:Key="InverseNullToVisibilityConverter" EmptyValue="Visible" NotEmptyValue="Collapsed"/>
-    <converters:BoolToObjectConverter x:Key="BoolToSizeConverter" FalseValue="24" TrueValue="48"/>
+    <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
+    <converters:EmptyObjectToObjectConverter x:Key="NullToVisibilityConverter"
+                                             EmptyValue="Collapsed"
+                                             NotEmptyValue="Visible" />
+    <converters:EmptyObjectToObjectConverter x:Key="InverseNullToVisibilityConverter"
+                                             EmptyValue="Visible"
+                                             NotEmptyValue="Collapsed" />
+    <converters:BoolToObjectConverter x:Key="BoolToSizeConverter"
+                                      FalseValue="24"
+                                      TrueValue="48" />
 
     <x:String x:Key="PersonViewDefaultImageSource">ms-appx:///Microsoft.Toolkit.Graph.Controls/Assets/person.png</x:String>
 
     <Style TargetType="local:PersonView">
         <Setter Property="Padding" Value="4,4,0,4" />
-        <Setter Property="HorizontalAlignment" Value="Left"/>
-        <Setter Property="VerticalAlignment" Value="Top"/>
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="VerticalAlignment" Value="Top" />
         <Setter Property="UserPhoto">
             <Setter.Value>
-                <BitmapImage UriSource="{StaticResource PersonViewDefaultImageSource}"/>
+                <BitmapImage UriSource="{StaticResource PersonViewDefaultImageSource}" />
             </Setter.Value>
         </Setter>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="local:PersonView">
-                    <Grid
-                        Margin="{TemplateBinding Padding}"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        Height="{Binding IsLargeImage, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToSizeConverter}}">
+                    <Grid Height="{Binding IsLargeImage, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToSizeConverter}}"
+                          Margin="{TemplateBinding Padding}"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}">
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="{Binding IsLargeImage, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToSizeConverter}}"/>
-                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="{Binding IsLargeImage, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToSizeConverter}}" />
+                            <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
-                        <Ellipse VerticalAlignment="Stretch" 
-                                 HorizontalAlignment="Stretch"
-                                 Visibility="{Binding UserPhoto, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource NullToVisibilityConverter}}"
-                                 ToolTipService.ToolTip="{Binding PersonDetails.DisplayName, RelativeSource={RelativeSource TemplatedParent}}">
+                        <Ellipse HorizontalAlignment="Stretch"
+                                 VerticalAlignment="Stretch"
+                                 ToolTipService.ToolTip="{Binding PersonDetails.DisplayName, RelativeSource={RelativeSource TemplatedParent}}"
+                                 Visibility="{Binding UserPhoto, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource NullToVisibilityConverter}}">
                             <Ellipse.Fill>
                                 <ImageBrush ImageSource="{Binding UserPhoto, RelativeSource={RelativeSource TemplatedParent}}"
-                                            Stretch="UniformToFill"/>
+                                            Stretch="UniformToFill" />
                             </Ellipse.Fill>
                         </Ellipse>
-                        <Grid Visibility="{Binding UserPhoto, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseNullToVisibilityConverter}}"
-                              ToolTipService.ToolTip="{Binding PersonDetails.DisplayName, RelativeSource={RelativeSource TemplatedParent}}">
-                            <Ellipse VerticalAlignment="Stretch"
-                                     HorizontalAlignment="Stretch"
-                                     Fill="DarkMagenta"/>
-                            <TextBlock Foreground="White" 
-                                       VerticalAlignment="Center"
+                        <Grid ToolTipService.ToolTip="{Binding PersonDetails.DisplayName, RelativeSource={RelativeSource TemplatedParent}}"
+                              Visibility="{Binding UserPhoto, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseNullToVisibilityConverter}}">
+                            <Ellipse HorizontalAlignment="Stretch"
+                                     VerticalAlignment="Stretch"
+                                     Fill="DarkMagenta" />
+                            <TextBlock Margin="0,-2,0,0"
                                        HorizontalAlignment="Center"
-                                       Margin="0,-2,0,0"
-                                       Text="{Binding Initials, RelativeSource={RelativeSource TemplatedParent}}"/>
+                                       VerticalAlignment="Center"
+                                       Foreground="White"
+                                       Text="{Binding Initials, RelativeSource={RelativeSource TemplatedParent}}" />
                         </Grid>
-                        <StackPanel VerticalAlignment="Center" Grid.Column="2">
-                            <TextBlock Visibility="{Binding ShowName, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}" 
-                                       Text="{Binding PersonDetails.DisplayName, RelativeSource={RelativeSource TemplatedParent}}" 
-                                       Margin="4,-2,2,0"
-                                       FontWeight="SemiBold"/>
-                            <TextBlock Visibility="{Binding ShowEmail, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}" 
+                        <StackPanel Grid.Column="2"
+                                    VerticalAlignment="Center">
+                            <TextBlock Margin="4,-2,2,0"
+                                       FontWeight="SemiBold"
+                                       Text="{Binding PersonDetails.DisplayName, RelativeSource={RelativeSource TemplatedParent}}"
+                                       Visibility="{Binding ShowName, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}" />
+                            <TextBlock Margin="4,0,2,0"
+                                       FontSize="12"
                                        Text="{Binding PersonDetails.EmailAddresses[0].Address, RelativeSource={RelativeSource TemplatedParent}}"
-                                       Margin="4,0,2,0"
-                                       FontSize="12"/>
+                                       Visibility="{Binding ShowEmail, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}" />
                         </StackPanel>
                     </Grid>
                 </ControlTemplate>
diff --git a/SampleTest/App.xaml b/SampleTest/App.xaml
index 9c1a20e..ea9689d 100644
--- a/SampleTest/App.xaml
+++ b/SampleTest/App.xaml
@@ -1,7 +1,4 @@
-<Application
-    x:Class="SampleTest.App"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:SampleTest">
-
-</Application>
+<Application x:Class="SampleTest.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="using:SampleTest" />
diff --git a/SampleTest/MainPage.xaml b/SampleTest/MainPage.xaml
index 7d832c9..272dfa1 100644
--- a/SampleTest/MainPage.xaml
+++ b/SampleTest/MainPage.xaml
@@ -1,42 +1,41 @@
-<Page
-    x:Class="SampleTest.MainPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:local="using:SampleTest"
-    xmlns:wgt="using:Microsoft.Toolkit.Graph.Controls"
-    xmlns:graph="using:Microsoft.Graph"
-    xmlns:global="using:System.Globalization"
-    xmlns:Interactivity="using:Microsoft.Xaml.Interactivity"
-    xmlns:providers="using:Microsoft.Toolkit.Graph.Providers"
-    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
-    xmlns:ex="using:Microsoft.Toolkit.Extensions"
-    mc:Ignorable="d"
-    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
-    xmlns:controlsKeepThis="using:Microsoft.Toolkit.Uwp.UI.Controls"><!-- Workaround for https://github.com/microsoft/microsoft-ui-xaml/issues/1286 -->
-    <!-- 
-        Initialize Graph Provider On Page Load 
-    
+<Page x:Class="SampleTest.MainPage"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:Interactivity="using:Microsoft.Xaml.Interactivity"
+      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:ex="using:Microsoft.Toolkit.Extensions"
+      xmlns:global="using:System.Globalization"
+      xmlns:graph="using:Microsoft.Graph"
+      xmlns:local="using:SampleTest"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      xmlns:providers="using:Microsoft.Toolkit.Graph.Providers"
+      xmlns:wgt="using:Microsoft.Toolkit.Graph.Controls"
+      Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
+      mc:Ignorable="d">
+    <!--
+        Initialize Graph Provider On Page Load
+        
         Register Client Id: https://docs.microsoft.com/en-us/azure/active-directory/develop/quickstart-register-app
         
-        After finishing the initial registration page, you will also need to add an additional redirect URI. 
+        After finishing the initial registration page, you will also need to add an additional redirect URI.
         Click on "Add a Redirect URI" and check the https://login.microsoftonline.com/common/oauth2/nativeclient checkbox on that page. Then click "Save".
     -->
     <Interactivity:Interaction.Behaviors>
         <!--<providers:InteractiveProviderBehavior ClientId="YOUR_CLIENT_ID_HERE" Scopes="User.Read,User.ReadBasic.All,People.Read,Calendars.Read,Mail.Read,Group.Read.All,ChannelMessage.Read.All"/>-->
-        <providers:MockProviderBehavior/>
+        <providers:MockProviderBehavior />
     </Interactivity:Interaction.Behaviors>
 
     <Pivot>
         <Pivot.ItemContainerStyle>
             <Style TargetType="PivotItem">
-                <Setter Property="Margin" Value="8,8,8,0"/>
+                <Setter Property="Margin" Value="8,8,8,0" />
             </Style>
         </Pivot.ItemContainerStyle>
         <PivotItem Header="LoginButton">
             <StackPanel>
-                <wgt:LoginButton VerticalAlignment="Top" HorizontalAlignment="Left"/>
+                <wgt:LoginButton HorizontalAlignment="Left"
+                                 VerticalAlignment="Top" />
                 <TextBlock TextWrapping="WrapWholeWords">
                     The `LoginButton` above allows your user and application to easily connect to the Microsoft Graph. They can then also easily logout from the drop-down menu.
                 </TextBlock>
@@ -44,16 +43,20 @@
         </PivotItem>
         <PivotItem Header="PeoplePicker">
             <StackPanel>
-                <TextBlock TextWrapping="WrapWholeWords" Margin="0,0,0,16">
+                <TextBlock Margin="0,0,0,16"
+                           TextWrapping="WrapWholeWords">
                     The `PeoplePicker` lets a logged in user easily search for familiar people they interact with or contacts. Great for emails or messages.
                 </TextBlock>
-                <wgt:PeoplePicker x:Name="PeopleChooser"/>
-                <TextBlock Margin="0,8,0,0" FontWeight="Bold">Picked People:</TextBlock>
-                <ItemsControl ItemsSource="{x:Bind PeopleChooser.ItemsSource}"
-                              Margin="8,0,0,0">
+                <wgt:PeoplePicker x:Name="PeopleChooser" />
+                <TextBlock Margin="0,8,0,0"
+                           FontWeight="Bold">
+                    Picked People:
+                </TextBlock>
+                <ItemsControl Margin="8,0,0,0"
+                              ItemsSource="{x:Bind PeopleChooser.ItemsSource}">
                     <ItemsControl.ItemTemplate>
                         <DataTemplate x:DataType="graph:Person">
-                            <TextBlock Text="{x:Bind DisplayName}"/>
+                            <TextBlock Text="{x:Bind DisplayName}" />
                         </DataTemplate>
                     </ItemsControl.ItemTemplate>
                 </ItemsControl>
@@ -62,8 +65,8 @@
         <PivotItem Header="GraphPresenter">
             <Grid>
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto"/>
-                    <RowDefinition Height="*"/>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="*" />
                 </Grid.RowDefinitions>
                 <TextBlock TextWrapping="WrapWholeWords">
                     The `GraphPresenter` is a unique control in the library which makes it easier for a developer to make any graph call and configure a nice display template in XAML. This opens up a world of possibilities for many uses outside of any other control available within this library. You can see a few examples of what's possible below.
@@ -71,54 +74,62 @@
                 <Pivot Grid.Row="1">
                     <Pivot.ItemContainerStyle>
                         <Style TargetType="PivotItem">
-                            <Setter Property="Margin" Value="8,8,8,0"/>
+                            <Setter Property="Margin" Value="8,8,8,0" />
                         </Style>
                     </Pivot.ItemContainerStyle>
                     <PivotItem Header="CalendarView">
                         <Grid>
                             <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="*"/>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="*" />
                             </Grid.RowDefinitions>
                             <StackPanel>
                                 <TextBlock>The following example shows the `Me.CalendarView` API.</TextBlock>
-                                <TextBlock Margin="0,8,0,0" FontWeight="Bold">My Upcoming Calendar Events:</TextBlock>
+                                <TextBlock Margin="0,8,0,0"
+                                           FontWeight="Bold">
+                                    My Upcoming Calendar Events:
+                                </TextBlock>
                             </StackPanel>
                             <wgt:GraphPresenter Grid.Row="1"
-                                    RequestBuilder="{x:Bind providers:ProviderManager.Instance.GlobalProvider.Graph.Me.CalendarView, Mode=OneWay}"
-                                    OrderBy="start/dateTime"
-                                    ResponseType="graph:Event"
-                                    IsCollection="True">
+                                                IsCollection="True"
+                                                OrderBy="start/dateTime"
+                                                RequestBuilder="{x:Bind providers:ProviderManager.Instance.GlobalProvider.Graph.Me.CalendarView, Mode=OneWay}"
+                                                ResponseType="graph:Event">
                                 <wgt:GraphPresenter.QueryOptions>
-                                    <!-- Need to create separate Properties as multiple functions not supported in x:Bind see https://github.com/microsoft/microsoft-ui-xaml/issues/2407 -->
-                                    <wgt:QueryOption Name="startDateTime" Value="{x:Bind Today.ToString('o', global:CultureInfo.InvariantCulture)}"/>
-                                    <wgt:QueryOption Name="endDateTime" Value="{x:Bind ThreeDaysFromNow.ToString('o', global:CultureInfo.InvariantCulture)}"/>
+                                    <!--  Need to create separate Properties as multiple functions not supported in x:Bind see https://github.com/microsoft/microsoft-ui-xaml/issues/2407  -->
+                                    <wgt:QueryOption Name="startDateTime"
+                                                     Value="{x:Bind Today.ToString('o', global:CultureInfo.InvariantCulture)}" />
+                                    <wgt:QueryOption Name="endDateTime"
+                                                     Value="{x:Bind ThreeDaysFromNow.ToString('o', global:CultureInfo.InvariantCulture)}" />
                                 </wgt:GraphPresenter.QueryOptions>
                                 <wgt:GraphPresenter.ContentTemplate>
                                     <DataTemplate>
-                                        <!-- Return result is a collection of Event's as we used 'IsCollection', so bind that first. -->
-                                        <ScrollViewer HorizontalScrollMode="Disabled" VerticalScrollBarVisibility="Auto">
+                                        <!--  Return result is a collection of Event's as we used 'IsCollection', so bind that first.  -->
+                                        <ScrollViewer HorizontalScrollMode="Disabled"
+                                                      VerticalScrollBarVisibility="Auto">
                                             <ItemsControl ItemsSource="{Binding}">
                                                 <ItemsControl.ItemTemplate>
                                                     <DataTemplate x:DataType="graph:Event">
                                                         <StackPanel>
-                                                            <TextBlock Text="{Binding Subject}" Style="{StaticResource TitleTextBlockStyle}"/>
+                                                            <TextBlock Style="{StaticResource TitleTextBlockStyle}"
+                                                                       Text="{Binding Subject}" />
                                                             <TextBlock FontWeight="Bold">
-                                                    <Run Text="{x:Bind local:MainPage.ToLocalTime(Start), Mode=OneWay}"/>
-                                                    <Run> - </Run>
-                                                    <Run Text="{x:Bind local:MainPage.ToLocalTime(End), Mode=OneWay}"/>
+                                                                <Run Text="{x:Bind local:MainPage.ToLocalTime(Start), Mode=OneWay}" />
+                                                                <Run>-</Run>
+                                                                <Run Text="{x:Bind local:MainPage.ToLocalTime(End), Mode=OneWay}" />
                                                             </TextBlock>
                                                             <TextBlock>
-                                                    <Run FontFamily="Segoe MDL2 Assets" Text="&#xE707;"/>
-                                                    <Run> </Run>
-                                                    <Run Text="{x:Bind Location.DisplayName, Mode=OneWay}"/>
+                                                                <Run FontFamily="Segoe MDL2 Assets"
+                                                                     Text="&#xE707;" />
+                                                                <Run />
+                                                                <Run Text="{x:Bind Location.DisplayName, Mode=OneWay}" />
                                                             </TextBlock>
                                                         </StackPanel>
                                                     </DataTemplate>
                                                 </ItemsControl.ItemTemplate>
                                                 <ItemsControl.ItemContainerStyle>
                                                     <Style TargetType="ContentPresenter">
-                                                        <Setter Property="Margin" Value="0,8,0,8"/>
+                                                        <Setter Property="Margin" Value="0,8,0,8" />
                                                     </Style>
                                                 </ItemsControl.ItemContainerStyle>
                                             </ItemsControl>
@@ -131,33 +142,42 @@
                     <PivotItem Header="(Mail) Messages">
                         <Grid>
                             <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="*"/>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="*" />
                             </Grid.RowDefinitions>
                             <StackPanel>
                                 <TextBlock>The following example shows the `Me.Messages` API for getting a user's inbox mail messages.</TextBlock>
-                                <TextBlock Margin="0,8,0,0" FontWeight="Bold">My Messages:</TextBlock>
+                                <TextBlock Margin="0,8,0,0"
+                                           FontWeight="Bold">
+                                    My Messages:
+                                </TextBlock>
                             </StackPanel>
                             <wgt:GraphPresenter Grid.Row="1"
-                                    RequestBuilder="{x:Bind providers:ProviderManager.Instance.GlobalProvider.Graph.Me.Messages, Mode=OneWay}"
-                                    ResponseType="graph:Message"
-                                    IsCollection="True">
+                                                IsCollection="True"
+                                                RequestBuilder="{x:Bind providers:ProviderManager.Instance.GlobalProvider.Graph.Me.Messages, Mode=OneWay}"
+                                                ResponseType="graph:Message">
                                 <wgt:GraphPresenter.ContentTemplate>
                                     <DataTemplate>
-                                        <ScrollViewer HorizontalScrollMode="Disabled" VerticalScrollBarVisibility="Auto">
+                                        <ScrollViewer HorizontalScrollMode="Disabled"
+                                                      VerticalScrollBarVisibility="Auto">
                                             <ItemsControl ItemsSource="{Binding}">
                                                 <ItemsControl.ItemTemplate>
                                                     <DataTemplate x:DataType="graph:Message">
                                                         <StackPanel>
-                                                            <wgt:PersonView PersonQuery="{x:Bind Sender.EmailAddress.Address}" ShowName="True" Margin="-4"/>
-                                                            <TextBlock Text="{x:Bind Subject}" Style="{StaticResource BaseTextBlockStyle}" Padding="0"/>
-                                                            <TextBlock Text="{x:Bind local:MainPage.RemoveWhitespace(BodyPreview)}" TextWrapping="WrapWholeWords"/>
+                                                            <wgt:PersonView Margin="-4"
+                                                                            PersonQuery="{x:Bind Sender.EmailAddress.Address}"
+                                                                            ShowName="True" />
+                                                            <TextBlock Padding="0"
+                                                                       Style="{StaticResource BaseTextBlockStyle}"
+                                                                       Text="{x:Bind Subject}" />
+                                                            <TextBlock Text="{x:Bind local:MainPage.RemoveWhitespace(BodyPreview)}"
+                                                                       TextWrapping="WrapWholeWords" />
                                                         </StackPanel>
                                                     </DataTemplate>
                                                 </ItemsControl.ItemTemplate>
                                                 <ItemsControl.ItemContainerStyle>
                                                     <Style TargetType="ContentPresenter">
-                                                        <Setter Property="Margin" Value="0,8,0,8"/>
+                                                        <Setter Property="Margin" Value="0,8,0,8" />
                                                     </Style>
                                                 </ItemsControl.ItemContainerStyle>
                                             </ItemsControl>
@@ -170,53 +190,64 @@
                     <PivotItem Header="Tasks">
                         <Grid>
                             <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="*"/>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="*" />
                             </Grid.RowDefinitions>
                             <StackPanel>
                                 <TextBlock>The following example shows the `Me.Planner.Tasks` API for getting a user's tasks.</TextBlock>
-                                <TextBlock Margin="0,8,0,0" FontWeight="Bold">My Tasks:</TextBlock>
+                                <TextBlock Margin="0,8,0,0"
+                                           FontWeight="Bold">
+                                    My Tasks:
+                                </TextBlock>
                             </StackPanel>
                             <wgt:GraphPresenter Grid.Row="1"
-                                    RequestBuilder="{x:Bind providers:ProviderManager.Instance.GlobalProvider.Graph.Me.Planner.Tasks, Mode=OneWay}"
-                                    ResponseType="graph:PlannerTask"
-                                    IsCollection="True">
+                                                IsCollection="True"
+                                                RequestBuilder="{x:Bind providers:ProviderManager.Instance.GlobalProvider.Graph.Me.Planner.Tasks, Mode=OneWay}"
+                                                ResponseType="graph:PlannerTask">
                                 <wgt:GraphPresenter.ContentTemplate>
                                     <DataTemplate>
-                                        <ScrollViewer HorizontalScrollMode="Disabled" VerticalScrollBarVisibility="Auto">
+                                        <ScrollViewer HorizontalScrollMode="Disabled"
+                                                      VerticalScrollBarVisibility="Auto">
                                             <ItemsControl ItemsSource="{Binding}">
                                                 <ItemsControl.ItemTemplate>
                                                     <DataTemplate x:DataType="graph:PlannerTask">
                                                         <Grid>
                                                             <Grid.ColumnDefinitions>
-                                                                <ColumnDefinition Width="Auto"/>
-                                                                <ColumnDefinition Width="*"/>
-                                                                <ColumnDefinition Width="Auto"/>
+                                                                <ColumnDefinition Width="Auto" />
+                                                                <ColumnDefinition Width="*" />
+                                                                <ColumnDefinition Width="Auto" />
                                                             </Grid.ColumnDefinitions>
                                                             <Grid.RowDefinitions>
-                                                                <RowDefinition/>
-                                                                <RowDefinition/>
-                                                                <RowDefinition/>
+                                                                <RowDefinition />
+                                                                <RowDefinition />
+                                                                <RowDefinition />
                                                             </Grid.RowDefinitions>
-                                                            <!-- We've disabled the checkbox as we're not going to make the call back to the graph to modify the item. -->
-                                                            <CheckBox IsEnabled="False" IsChecked="{x:Bind local:MainPage.IsTaskCompleted(PercentComplete), Mode=OneWay}"/>
-                                                            <TextBlock Text="{x:Bind Title, Mode=OneWay}" Grid.Column="1"/>
-                                                            <ItemsControl ItemsSource="{x:Bind Assignments, Mode=OneWay}" Grid.Column="1" Grid.Row="1">
+                                                            <!--  We've disabled the checkbox as we're not going to make the call back to the graph to modify the item.  -->
+                                                            <CheckBox IsChecked="{x:Bind local:MainPage.IsTaskCompleted(PercentComplete), Mode=OneWay}"
+                                                                      IsEnabled="False" />
+                                                            <TextBlock Grid.Column="1"
+                                                                       Text="{x:Bind Title, Mode=OneWay}" />
+                                                            <ItemsControl Grid.Row="1"
+                                                                          Grid.Column="1"
+                                                                          ItemsSource="{x:Bind Assignments, Mode=OneWay}">
                                                                 <ItemsControl.ItemTemplate>
                                                                     <DataTemplate>
-                                                                        <!-- We're getting a KVP from the PlannerAssignments type, the Key is the UserId string, we'll use that to look-up our user info. -->
-                                                                        <wgt:PersonView UserId="{Binding Key}" Margin="-4"/>
+                                                                        <!--  We're getting a KVP from the PlannerAssignments type, the Key is the UserId string, we'll use that to look-up our user info.  -->
+                                                                        <wgt:PersonView Margin="-4"
+                                                                                        UserId="{Binding Key}" />
                                                                     </DataTemplate>
                                                                 </ItemsControl.ItemTemplate>
                                                                 <ItemsControl.ItemsPanel>
                                                                     <ItemsPanelTemplate>
-                                                                        <StackPanel Orientation="Horizontal"/>
+                                                                        <StackPanel Orientation="Horizontal" />
                                                                     </ItemsPanelTemplate>
                                                                 </ItemsControl.ItemsPanel>
                                                             </ItemsControl>
-                                                            <TextBlock FontWeight="Bold" Grid.Column="2" Grid.Row="2">
-                                                                    <Run>Due </Run>
-                                                                    <Run Text="{x:Bind local:MainPage.ToLocalTime(DueDateTime), Mode=OneWay}" />
+                                                            <TextBlock Grid.Row="2"
+                                                                       Grid.Column="2"
+                                                                       FontWeight="Bold">
+                                                                <Run>Due</Run>
+                                                                <Run Text="{x:Bind local:MainPage.ToLocalTime(DueDateTime), Mode=OneWay}" />
                                                             </TextBlock>
 
                                                         </Grid>
@@ -224,7 +255,7 @@
                                                 </ItemsControl.ItemTemplate>
                                                 <ItemsControl.ItemContainerStyle>
                                                     <Style TargetType="ContentPresenter">
-                                                        <Setter Property="Margin" Value="0,8,0,8"/>
+                                                        <Setter Property="Margin" Value="0,8,0,8" />
                                                     </Style>
                                                 </ItemsControl.ItemContainerStyle>
                                             </ItemsControl>
@@ -237,36 +268,43 @@
                     <PivotItem Header="Teams Messages">
                         <Grid>
                             <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="*"/>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="*" />
                             </Grid.RowDefinitions>
                             <StackPanel>
                                 <TextBlock>The following example shows the beta `Teams/id/Channels/id/messages` API for getting a list of messages (without replies) from a Channel in Teams.</TextBlock>
-                                <TextBlock Margin="0,8,0,0" FontWeight="Bold">My Chat Messages:</TextBlock>
+                                <TextBlock Margin="0,8,0,0"
+                                           FontWeight="Bold">
+                                    My Chat Messages:
+                                </TextBlock>
                             </StackPanel>
                             <wgt:GraphPresenter Grid.Row="1"
-                                    RequestBuilder="{x:Bind local:MainPage.GetTeamsChannelMessagesBuilder('02bd9fd6-8f93-4758-87c3-1fb73740a315', '19:d0bba23c2fc8413991125a43a54cc30e@thread.skype'), Mode=OneWay}"
-                                    ResponseType="graph:ChatMessage"
-                                    IsCollection="True">
+                                                IsCollection="True"
+                                                RequestBuilder="{x:Bind local:MainPage.GetTeamsChannelMessagesBuilder('02bd9fd6-8f93-4758-87c3-1fb73740a315', '19:d0bba23c2fc8413991125a43a54cc30e@thread.skype'), Mode=OneWay}"
+                                                ResponseType="graph:ChatMessage">
                                 <wgt:GraphPresenter.ContentTemplate>
                                     <DataTemplate>
-                                        <ScrollViewer HorizontalScrollMode="Disabled" VerticalScrollBarVisibility="Auto">
+                                        <ScrollViewer HorizontalScrollMode="Disabled"
+                                                      VerticalScrollBarVisibility="Auto">
                                             <ItemsControl ItemsSource="{Binding}">
                                                 <ItemsControl.ItemTemplate>
                                                     <DataTemplate x:DataType="graph:ChatMessage">
                                                         <Grid>
                                                             <Grid.ColumnDefinitions>
-                                                                <ColumnDefinition Width="Auto"/>
-                                                                <ColumnDefinition Width="*"/>
+                                                                <ColumnDefinition Width="Auto" />
+                                                                <ColumnDefinition Width="*" />
                                                             </Grid.ColumnDefinitions>
-                                                            <wgt:PersonView UserId="{x:Bind From.User.Id, Mode=OneWay}" Margin="-4,-4,8,-4"/>
-                                                            <TextBlock Text="{x:Bind ex:StringExtensions.DecodeHtml(Body.Content), Mode=OneWay}" TextWrapping="WrapWholeWords" Grid.Column="1"/>
+                                                            <wgt:PersonView Margin="-4,-4,8,-4"
+                                                                            UserId="{x:Bind From.User.Id, Mode=OneWay}" />
+                                                            <TextBlock Grid.Column="1"
+                                                                       Text="{x:Bind ex:StringExtensions.DecodeHtml(Body.Content), Mode=OneWay}"
+                                                                       TextWrapping="WrapWholeWords" />
                                                         </Grid>
                                                     </DataTemplate>
                                                 </ItemsControl.ItemTemplate>
                                                 <ItemsControl.ItemContainerStyle>
                                                     <Style TargetType="ContentPresenter">
-                                                        <Setter Property="Margin" Value="0,8,0,8"/>
+                                                        <Setter Property="Margin" Value="0,8,0,8" />
                                                     </Style>
                                                 </ItemsControl.ItemContainerStyle>
                                             </ItemsControl>
diff --git a/Samples/XAML Islands/UWP-XamlApplication/App.xaml b/Samples/XAML Islands/UWP-XamlApplication/App.xaml
index 1498952..8d71d14 100644
--- a/Samples/XAML Islands/UWP-XamlApplication/App.xaml	
+++ b/Samples/XAML Islands/UWP-XamlApplication/App.xaml	
@@ -1,8 +1,5 @@
-<xaml:XamlApplication
-    x:Class="UWP_XamlApplication.App"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:xaml="using:Microsoft.Toolkit.Win32.UI.XamlHost"
-    xmlns:local="using:UWP_XamlApplication">
-
-</xaml:XamlApplication>
\ No newline at end of file
+<xaml:XamlApplication x:Class="UWP_XamlApplication.App"
+                      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                      xmlns:local="using:UWP_XamlApplication"
+                      xmlns:xaml="using:Microsoft.Toolkit.Win32.UI.XamlHost" />
\ No newline at end of file
diff --git a/Samples/XAML Islands/UWP-XamlApplication/SamplePage.xaml b/Samples/XAML Islands/UWP-XamlApplication/SamplePage.xaml
index 929d714..447c173 100644
--- a/Samples/XAML Islands/UWP-XamlApplication/SamplePage.xaml	
+++ b/Samples/XAML Islands/UWP-XamlApplication/SamplePage.xaml	
@@ -1,25 +1,28 @@
-<Page
-    x:Class="UWP_XamlApplication.SamplePage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:UWP_XamlApplication"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:wgt="using:Microsoft.Toolkit.Graph.Controls"
-    xmlns:graph="using:Microsoft.Graph"
-    mc:Ignorable="d"
-    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+<Page x:Class="UWP_XamlApplication.SamplePage"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:graph="using:Microsoft.Graph"
+      xmlns:local="using:UWP_XamlApplication"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      xmlns:wgt="using:Microsoft.Toolkit.Graph.Controls"
+      Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
+      mc:Ignorable="d">
 
     <Grid>
-        <wgt:LoginButton VerticalAlignment="Top" HorizontalAlignment="Right"/>
+        <wgt:LoginButton HorizontalAlignment="Right"
+                         VerticalAlignment="Top" />
         <StackPanel Margin="16,48">
-            <wgt:PeoplePicker x:Name="PeopleChooser"/>
-            <TextBlock Margin="0,8,0,0" FontWeight="Bold">Picked People:</TextBlock>
-            <ItemsControl ItemsSource="{x:Bind PeopleChooser.ItemsSource}"
-                          Margin="8,0,0,0">
+            <wgt:PeoplePicker x:Name="PeopleChooser" />
+            <TextBlock Margin="0,8,0,0"
+                       FontWeight="Bold">
+                Picked People:
+            </TextBlock>
+            <ItemsControl Margin="8,0,0,0"
+                          ItemsSource="{x:Bind PeopleChooser.ItemsSource}">
                 <ItemsControl.ItemTemplate>
                     <DataTemplate x:DataType="graph:Person">
-                        <TextBlock Text="{x:Bind DisplayName}"/>
+                        <TextBlock Text="{x:Bind DisplayName}" />
                     </DataTemplate>
                 </ItemsControl.ItemTemplate>
             </ItemsControl>
diff --git a/Samples/XAML Islands/WPF-Core-GraphApp/MainWindow.xaml b/Samples/XAML Islands/WPF-Core-GraphApp/MainWindow.xaml
index 3f5e649..073b839 100644
--- a/Samples/XAML Islands/WPF-Core-GraphApp/MainWindow.xaml	
+++ b/Samples/XAML Islands/WPF-Core-GraphApp/MainWindow.xaml	
@@ -1,30 +1,32 @@
 <Window x:Class="WPF_Core_GraphApp.MainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:local="clr-namespace:WPF_Core_GraphApp"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:providers="clr-namespace:Microsoft.Toolkit.Wpf.Graph.Providers;assembly=Microsoft.Toolkit.Wpf.Graph.Providers"
         xmlns:xi="clr-namespace:Microsoft.Toolkit.Wpf.UI.XamlHost;assembly=Microsoft.Toolkit.Wpf.UI.XamlHost"
-        xmlns:local="clr-namespace:WPF_Core_GraphApp"
-        mc:Ignorable="d"
-        xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors"
-        xmlns:providers="clr-namespace:Microsoft.Toolkit.Wpf.Graph.Providers;assembly=Microsoft.Toolkit.Wpf.Graph.Providers" 
-        Title="MainWindow" Height="450" Width="800">
+        Title="MainWindow"
+        Width="800"
+        Height="450"
+        mc:Ignorable="d">
     <!--
-        Initialize Graph Provider On Page Load 
-    
+        Initialize Graph Provider On Page Load
+        
         Register Client Id: https://docs.microsoft.com/en-us/azure/active-directory/develop/quickstart-register-app
         
-        After finishing the initial registration page, you will also need to add an additional redirect URI. 
+        After finishing the initial registration page, you will also need to add an additional redirect URI.
         Click on "Add a Redirect URI" for Public client/native for http://localhost on that page. Then click "Save".
-    
+        
         See MSAL docs about running on .NET Core: https://aka.ms/msal-net-os-browser
     -->
     <behaviors:Interaction.Behaviors>
         <!--<providers:InteractiveProviderBehavior ClientId="YOUR_CLIENT_ID_HERE" Scopes="User.Read,User.ReadBasic.All,People.Read"/>-->
-        <providers:MockProviderBehavior SignedIn="False"/>
+        <providers:MockProviderBehavior SignedIn="False" />
     </behaviors:Interaction.Behaviors>
 
     <Grid>
-        <xi:WindowsXamlHost InitialTypeName="UWP_XamlApplication.SamplePage"/>
+        <xi:WindowsXamlHost InitialTypeName="UWP_XamlApplication.SamplePage" />
     </Grid>
 </Window>

From 2c5ed2b385329149e8ce4ff0fdd6874a339aba77 Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Tue, 17 Nov 2020 15:06:34 -0800
Subject: [PATCH 3/3] Forgot update of TargetFramework to
 Microsoft.Toolkit.Graph.Controls package

---
 .../Microsoft.Toolkit.Graph.Controls.csproj                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Graph.Controls/Microsoft.Toolkit.Graph.Controls.csproj b/Microsoft.Toolkit.Graph.Controls/Microsoft.Toolkit.Graph.Controls.csproj
index 7174287..75cb0a1 100644
--- a/Microsoft.Toolkit.Graph.Controls/Microsoft.Toolkit.Graph.Controls.csproj
+++ b/Microsoft.Toolkit.Graph.Controls/Microsoft.Toolkit.Graph.Controls.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="MSBuild.Sdk.Extras">
 
   <PropertyGroup>
-    <TargetFramework>uap10.0.16299</TargetFramework>
+    <TargetFramework>uap10.0.17763</TargetFramework>
     <Title>Windows Community Toolkit Graph Controls</Title>
     <PackageId>Microsoft.Toolkit.Graph.Controls</PackageId>
     <Description>