Update Project to Build with latest Uno package

.github/ISSUE_TEMPLATE/bug_report.md

@@ -2,7 +2,7 @@
 name: Bug report
 about: Create a report to help us fix something that isn't working as expected
 title: ''
-labels: bug
+labels: "bug :bug:"
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/documentation.md

@@ -2,7 +2,7 @@
 name: Documentation
 about: I have a documentation suggestion or question
 title: "[Docs]"
-labels: documentation
+labels: "documentation :page_with_curl:"
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/feature_request.md

@@ -2,7 +2,7 @@
 name: Feature request
 about: I have a new idea or improvement for the toolkit
 title: "[Feature]"
-labels: feature request
+labels: feature request 📬
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/question.md

@@ -2,7 +2,7 @@
 name: Question
 about: I have a question about how to use something in the toolkit.
 title: "[Question]"
-labels: question
+labels: "question :grey_question:"
 assignees: ''
 
 ---

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,40 @@
+Fixes #
+
+<!-- Link to relevant issue (for ex: #1234) which will automatically close the issue once the PR is merged -->
+
+## PR Type
+
+What kind of change does this PR introduce?
+
+<!-- Please uncomment one ore more that apply to this PR -->
+
+<!-- - Bugfix -->
+<!-- - Feature -->
+<!-- - Code style update (formatting) -->
+<!-- - Refactoring (no functional changes, no api changes) -->
+<!-- - Build or CI related changes -->
+<!-- - Documentation content changes -->
+<!-- - Sample app changes -->
+<!-- - Other... Please describe: -->
+
+## What is the current behavior?
+
+<!-- Please describe the current behavior that you are modifying, or link to a relevant issue. -->
+
+## What is the new behavior?
+
+## PR Checklist
+
+Please check if your PR fulfills the following requirements:
+
+- [ ] Tested code with current [supported SDKs](https://github.com/windows-toolkit/Graph-Controls/blob/main/README.md)
+- [ ] Sample in sample app has been added / updated (for bug fixes / features)
+  - [ ] Icon has been created (if new sample) following the [Thumbnail Style Guide and templates](https://github.com/windows-toolkit/WindowsCommunityToolkit-design-assets)
+- [ ] Tests for the changes have been added (for bug fixes / features) (if applicable)
+- [ ] Header has been added to all new source files (run _build/UpdateHeaders.bat_)
+- [ ] Contains **NO** breaking changes
+
+<!-- If this PR contains a breaking change, please describe the impact and migration path for existing applications below.
+     Please note that breaking changes are likely to be rejected -->
+
+## Other information

Directory.Build.props

@@ -13,14 +13,15 @@
     <DefaultLanguage>en-US</DefaultLanguage>
 
     <!--<TargetFrameworksOverride>xamarinios10</TargetFrameworksOverride>-->
-    <TargetFrameworksOverride>uap10.0.16299;MonoAndroid80;xamarinios10;netstandard2.0</TargetFrameworksOverride>
+    <TargetFrameworksOverride>uap10.0.17763;MonoAndroid90;xamarinios10;netstandard2.0</TargetFrameworksOverride>
 
     <IsDesignProject>$(MSBuildProjectName.Contains('.Design'))</IsDesignProject>
     <IsTestProject>$(MSBuildProjectName.Contains('Test'))</IsTestProject>
     <IsUwpProject Condition="'$(IsDesignProject)' != 'true'">$(MSBuildProjectName.Contains('Uwp'))</IsUwpProject>
     <IsSampleProject>$(MSBuildProjectName.Contains('Sample'))</IsSampleProject>
+    <IsWpfProject>$(MSBuildProjectName.Contains('Wpf'))</IsWpfProject>
     <DefaultTargetPlatformVersion>17763</DefaultTargetPlatformVersion>
-    <DefaultTargetPlatformMinVersion>16299</DefaultTargetPlatformMinVersion>
+    <DefaultTargetPlatformMinVersion>17763</DefaultTargetPlatformMinVersion>
     <PackageOutputPath>$(MSBuildThisFileDirectory)bin\nupkg</PackageOutputPath>
   </PropertyGroup>
 
@@ -56,23 +57,23 @@
         <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
       </PropertyGroup>
       <ItemGroup>
-        <PackageReference Include="Microsoft.SourceLink.Vsts.Git" Version="1.0.0-beta-62925-02" PrivateAssets="All"/>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-62925-02" PrivateAssets="All"/>
+        <PackageReference Include="Microsoft.SourceLink.AzureRepos.Git" Version="1.0.0" PrivateAssets="All"/>
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
       </ItemGroup>
     </When>
   </Choose>
 
   <Choose>
-    <When Condition="'$(IsTestProject)' != 'true' and '$(IsSampleProject)' != 'true' and '$(IsDesignProject)' != 'true'">
+    <When Condition="'$(IsTestProject)' != 'true' and '$(IsSampleProject)' != 'true' and '$(IsDesignProject)' != 'true' and '$(IsWpfProject)' != 'true'">
       <ItemGroup>
         <!--<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="15.3.83" PrivateAssets="all" />-->
-        <!--<PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="all" />-->
+        <!--<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />-->
 
         <EmbeddedResource Include="**\*.rd.xml" />
         <Page Include="**\*.xaml" Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" SubType="Designer" Generator="MSBuild:Compile" />
         <Compile Update="**\*.xaml.cs" DependentUpon="%(Filename)" />
       </ItemGroup>
-      <PropertyGroup Condition="'$(Configuration)' == 'Release'">
+      <PropertyGroup Condition="'$(Configuration)' == 'Release' or '$(Configuration)' == 'CI'">
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
       </PropertyGroup>
     </When>
@@ -82,7 +83,7 @@
     <DefineConstants>$(DefineConstants);__WASM__</DefineConstants>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'MonoAndroid80' or '$(TargetFramework)' == 'xamarinios10' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'MonoAndroid90' or '$(TargetFramework)' == 'xamarinios10' ">
     <NoWarn>$(NoWarn);CS0649;CS0067;CS1998</NoWarn>
   </PropertyGroup>
 
@@ -95,7 +96,7 @@
   </PropertyGroup>
 
   <ItemGroup Condition="!$([MSBuild]::IsOsUnixLike())">
-    <PackageReference Include="Nerdbank.GitVersioning" Version=" 2.1.65" PrivateAssets="all" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.1.91" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
@@ -109,4 +110,4 @@
     <JavaSdkDirectory Condition="'$(JavaSdkDirectory)'=='' and '$(JAVA_HOME_8_X64)'!=''">$(JAVA_HOME_8_X64)</JavaSdkDirectory>
   </PropertyGroup>
 
-</Project>
+</Project>

Microsoft.Toolkit.Graph.Controls/Controls/GraphPresenter/GraphPresenter.cs

@@ -0,0 +1,113 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// 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 System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using Microsoft.Graph;
+using Microsoft.Toolkit.Uwp.Helpers;
+using Newtonsoft.Json.Linq;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+
+namespace Microsoft.Toolkit.Graph.Controls
+{
+    /// <summary>
+    /// Specialized <see cref="ContentPresenter"/> to fetch and display data from the Microsoft Graph.
+    /// </summary>
+    public partial class GraphPresenter : ContentPresenter
+    {
+        /// <summary>
+        /// Gets or sets a <see cref="IBaseRequestBuilder"/> to be used to make a request to the graph. The results will be automatically populated to the <see cref="ContentPresenter.Content"/> property. Use a <see cref="ContentPresenter.ContentTemplate"/> to change the presentation of the data.
+        /// </summary>
+        public IBaseRequestBuilder RequestBuilder
+        {
+            get { return (IBaseRequestBuilder)GetValue(RequestBuilderProperty); }
+            set { SetValue(RequestBuilderProperty, value); }
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="RequestBuilder"/> dependency property.
+        /// </summary>
+        /// <returns>
+        /// The identifier for the <see cref="RequestBuilder"/> dependency property.
+        /// </returns>
+        public static readonly DependencyProperty RequestBuilderProperty =
+            DependencyProperty.Register(nameof(RequestBuilder), typeof(IBaseRequestBuilder), typeof(GraphPresenter), new PropertyMetadata(null));
+
+        /// <summary>
+        /// Gets or sets the <see cref="Type"/> of item returned by the <see cref="RequestBuilder"/>.
+        /// Set to the base item type and use the <see cref="IsCollection"/> property to indicate if a collection is expected back.
+        /// </summary>
+        public Type ResponseType { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the returned data from the <see cref="RequestBuilder"/> is a collection.
+        /// </summary>
+        public bool IsCollection { get; set; }
+
+        /// <summary>
+        /// Gets or sets list of <see cref="QueryOption"/> representing <see cref="Microsoft.Graph.QueryOption"/> values to pass into the request built by <see cref="RequestBuilder"/>.
+        /// </summary>
+        public List<QueryOption> QueryOptions { get; set; } = new List<QueryOption>();
+
+        /// <summary>
+        /// Gets or sets a string to indicate a sorting order for the <see cref="RequestBuilder"/>. This is a helper to add this specific request option to the <see cref="QueryOptions"/>.
+        /// </summary>
+        public string OrderBy { get; set; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GraphPresenter"/> class.
+        /// </summary>
+        public GraphPresenter()
+        {
+            Loaded += GraphPresenter_Loaded;
+        }
+
+        private async void GraphPresenter_Loaded(object sender, RoutedEventArgs e)
+        {
+            // Note: some interfaces from the Graph SDK don't implement IBaseRequestBuilder properly, see https://github.com/microsoftgraph/msgraph-sdk-dotnet/issues/722
+            if (RequestBuilder != null)
+            {
+                var request = new BaseRequest(
+                                        RequestBuilder.RequestUrl,
+                                        RequestBuilder.Client); // TODO: Do we need separate Options here?
+                request.Method = "GET";
+                request.QueryOptions = QueryOptions?.Select(option => option.ToQueryOption())?.ToList() ?? new List<Microsoft.Graph.QueryOption>();
+
+                // Handle Special QueryOptions
+                if (!string.IsNullOrWhiteSpace(OrderBy))
+                {
+                    request.QueryOptions.Add(new Microsoft.Graph.QueryOption("$orderby", OrderBy));
+                }
+
+                try
+                {
+                    var response = await request.SendAsync<object>(null, CancellationToken.None).ConfigureAwait(false) as JObject;
+
+                    //// TODO: Deal with paging?
+
+                    var values = response["value"];
+                    object data = null;
+
+                    if (IsCollection)
+                    {
+                        data = values.ToObject(Array.CreateInstance(ResponseType, 0).GetType());
+                    }
+                    else
+                    {
+                        data = values.ToObject(ResponseType);
+                    }
+
+                    _ = DispatcherHelper.ExecuteOnUIThreadAsync(() => Content = data);
+                }
+                catch
+                {
+                    // TODO: We should figure out what we want to do for Loading/Error states here.
+                }
+            }
+        }
+    }
+}

Microsoft.Toolkit.Graph.Controls/Controls/GraphPresenter/QueryOption.cs

@@ -0,0 +1,34 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// 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 System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Windows.UI.Xaml;
+
+namespace Microsoft.Toolkit.Graph.Controls
+{
+    /// <summary>
+    /// XAML Proxy for <see cref="Microsoft.Graph.QueryOption"/>.
+    /// </summary>
+    public partial class QueryOption : DependencyObject
+    {
+        /// <inheritdoc cref="Microsoft.Graph.Option.Name"/>
+        public string Name { get; set; }
+
+        /// <inheritdoc cref="Microsoft.Graph.Option.Value"/>
+        public string Value { get; set; }
+
+        /// <summary>
+        /// Constructs a <see cref="Microsoft.Graph.QueryOption"/> value representing this proxy.
+        /// </summary>
+        /// <returns><see cref="Microsoft.Graph.QueryOption"/> result.</returns>
+        public Microsoft.Graph.QueryOption ToQueryOption()
+        {
+            return new Microsoft.Graph.QueryOption(Name, Value);
+        }
+    }
+}

Microsoft.Toolkit.Graph.Controls/Controls/LoginButton/LoginButton.Events.cs

@@ -25,7 +25,7 @@ public partial class LoginButton
         /// <summary>
         /// The user canceled the login process or was unable to sign in.
         /// </summary>
-        public event EventHandler LoginFailed;
+        public event EventHandler<LoginFailedEventArgs> LoginFailed;
 
         /// <summary>
         /// The user started to logout - cancelable.

Microsoft.Toolkit.Graph.Controls/Controls/LoginButton/LoginButton.Properties.cs

@@ -46,6 +46,6 @@ public bool IsLoading
         /// The identifier for the <see cref="IsLoading"/> dependency property.
         /// </returns>
         public static readonly DependencyProperty IsLoadingProperty =
-            DependencyProperty.Register("IsLoading", typeof(bool), typeof(LoginButton), new PropertyMetadata(true));
+            DependencyProperty.Register(nameof(IsLoading), typeof(bool), typeof(LoginButton), new PropertyMetadata(true));
     }
 }