From edd407d60b604f19535d72e2e616b42a841ad922 Mon Sep 17 00:00:00 2001
From: michael-hawker <michael.hawker@outlook.com>
Date: Mon, 21 Oct 2019 00:47:27 -0700
Subject: [PATCH 1/7] Move needed graph Dependencies to Microsoft.Toolkit and
 Microsoft.Toolkit.Uwp.UI

FileSize String Extension and Converter
Centralize Usage in other places from OneDrive and SharePoint
---
 .../Services/OneDrive/OneDriveStorageItem.cs  |  31 +---
 .../SharePointFileList/FileSizeConverter.cs   |  24 ---
 .../SharePointFileList/Int64Extensions.cs     |  49 -----
 .../SharePointFileList.xaml                   |   5 +-
 .../FileSizeToFriendlyStringConverter.cs      |  33 ++++
 .../Extensions/StringExtensions.cs            |  39 +++-
 .../Helpers/NotifyTaskCompletion.cs           | 174 ++++++++++++++++++
 7 files changed, 250 insertions(+), 105 deletions(-)
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Graph/SharePointFileList/FileSizeConverter.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Graph/SharePointFileList/Int64Extensions.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI/Converters/FileSizeToFriendlyStringConverter.cs
 create mode 100644 Microsoft.Toolkit/Helpers/NotifyTaskCompletion.cs

diff --git a/Microsoft.Toolkit.Services/Services/OneDrive/OneDriveStorageItem.cs b/Microsoft.Toolkit.Services/Services/OneDrive/OneDriveStorageItem.cs
index 1c4ce9760c9..f8a70aabead 100644
--- a/Microsoft.Toolkit.Services/Services/OneDrive/OneDriveStorageItem.cs
+++ b/Microsoft.Toolkit.Services/Services/OneDrive/OneDriveStorageItem.cs
@@ -8,6 +8,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Graph;
+using Microsoft.Toolkit.Extensions;
 using Newtonsoft.Json;
 
 namespace Microsoft.Toolkit.Services.OneDrive
@@ -69,35 +70,7 @@ public string FormattedFileSize
         {
             get
             {
-                var size = FileSize.HasValue ? FileSize.Value : 0;
-                if (size < 1024)
-                {
-                    return size.ToString("F0") + " bytes";
-                }
-                else if ((size >> 10) < 1024)
-                {
-                    return (size / (float)1024).ToString("F1") + " KB";
-                }
-                else if ((size >> 20) < 1024)
-                {
-                    return ((size >> 10) / (float)1024).ToString("F1") + " MB";
-                }
-                else if ((size >> 30) < 1024)
-                {
-                    return ((size >> 20) / (float)1024).ToString("F1") + " GB";
-                }
-                else if ((size >> 40) < 1024)
-                {
-                    return ((size >> 30) / (float)1024).ToString("F1") + " TB";
-                }
-                else if ((size >> 50) < 1024)
-                {
-                    return ((size >> 40) / (float)1024).ToString("F1") + " PB";
-                }
-                else
-                {
-                    return ((size >> 50) / (float)1024).ToString("F0") + " EB";
-                }
+                return FileSize.HasValue ? FileSize.Value.ToFileSizeString() : 0L.ToFileSizeString();
             }
         }
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Graph/SharePointFileList/FileSizeConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Graph/SharePointFileList/FileSizeConverter.cs
deleted file mode 100644
index 35f040ccd49..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Graph/SharePointFileList/FileSizeConverter.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-// 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 Microsoft.Toolkit.Extensions;
-using Windows.UI.Xaml.Data;
-
-namespace Microsoft.Toolkit.Uwp.UI.Controls.Graph
-{
-    internal class FileSizeConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            long size = (long)value;
-            return size.ToFileSizeString();
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Graph/SharePointFileList/Int64Extensions.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Graph/SharePointFileList/Int64Extensions.cs
deleted file mode 100644
index e18c3388a4a..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Graph/SharePointFileList/Int64Extensions.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-// 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.
-
-namespace Microsoft.Toolkit.Uwp.UI.Controls
-{
-    /// <summary>
-    /// All common long extensions should go here
-    /// </summary>
-    internal static class Int64Extensions
-    {
-        /// <summary>
-        /// Translate numeric file size to string format.
-        /// </summary>
-        /// <param name="size">file size in bytes.</param>
-        /// <returns>Returns file size string.</returns>
-        public static string ToFileSizeString(this long size)
-        {
-            if (size < 1024)
-            {
-                return size.ToString("F0") + " bytes";
-            }
-            else if ((size >> 10) < 1024)
-            {
-                return (size / (float)1024).ToString("F1") + " KB";
-            }
-            else if ((size >> 20) < 1024)
-            {
-                return ((size >> 10) / (float)1024).ToString("F1") + " MB";
-            }
-            else if ((size >> 30) < 1024)
-            {
-                return ((size >> 20) / (float)1024).ToString("F1") + " GB";
-            }
-            else if ((size >> 40) < 1024)
-            {
-                return ((size >> 30) / (float)1024).ToString("F1") + " TB";
-            }
-            else if ((size >> 50) < 1024)
-            {
-                return ((size >> 40) / (float)1024).ToString("F1") + " PB";
-            }
-            else
-            {
-                return ((size >> 50) / (float)1024).ToString("F0") + " EB";
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Graph/SharePointFileList/SharePointFileList.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Graph/SharePointFileList/SharePointFileList.xaml
index 2d03f48896e..5a829c0ba79 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Graph/SharePointFileList/SharePointFileList.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Graph/SharePointFileList/SharePointFileList.xaml
@@ -1,10 +1,11 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Microsoft.Toolkit.Uwp.UI.Controls.Graph">
+    xmlns:local="using:Microsoft.Toolkit.Uwp.UI.Controls.Graph"
+    xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters">
 
     <local:DriveItemIconConverter x:Key="DriveItemIconConverter" />
-    <local:FileSizeConverter x:Key="FileSizeConverter" />
+    <converters:FileSizeToFriendlyStringConverter x:Key="FileSizeConverter" />
 
     <Style x:Name="MetaLabel" TargetType="TextBlock">
         <Setter Property="FontWeight" Value="Bold" />
diff --git a/Microsoft.Toolkit.Uwp.UI/Converters/FileSizeToFriendlyStringConverter.cs b/Microsoft.Toolkit.Uwp.UI/Converters/FileSizeToFriendlyStringConverter.cs
new file mode 100644
index 00000000000..f95dfedd3c7
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI/Converters/FileSizeToFriendlyStringConverter.cs
@@ -0,0 +1,33 @@
+// 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 Microsoft.Toolkit.Extensions;
+using Windows.UI.Xaml.Data;
+
+namespace Microsoft.Toolkit.Uwp.UI.Converters
+{
+    /// <summary>
+    /// Converts a file size in bytes to a more human-readable friendly format using <see cref="Microsoft.Toolkit.Extensions.StringExtensions.ToFileSizeString(long)"/>
+    /// </summary>
+    public class FileSizeToFriendlyStringConverter : IValueConverter
+    {
+        /// <inheritdoc/>
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            if (value is long size)
+            {
+                return size.ToFileSizeString();
+            }
+
+            return string.Empty;
+        }
+
+        /// <inheritdoc/>
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit/Extensions/StringExtensions.cs b/Microsoft.Toolkit/Extensions/StringExtensions.cs
index eda5c858d56..d64818130ce 100644
--- a/Microsoft.Toolkit/Extensions/StringExtensions.cs
+++ b/Microsoft.Toolkit/Extensions/StringExtensions.cs
@@ -9,7 +9,7 @@
 namespace Microsoft.Toolkit.Extensions
 {
     /// <summary>
-    /// Helpers for working with strings.
+    /// Helpers for working with strings and string representations.
     /// </summary>
     public static class StringExtensions
     {
@@ -195,5 +195,42 @@ public static string Truncate(this string value, int length, bool ellipsis)
 
             return value ?? string.Empty;
         }
+
+        /// <summary>
+        /// Translate numeric file size in bytes to a human-readable shorter string format.
+        /// </summary>
+        /// <param name="size">file size in bytes.</param>
+        /// <returns>Returns file size short string.</returns>
+        public static string ToFileSizeString(this long size)
+        {
+            if (size < 1024)
+            {
+                return size.ToString("F0") + " bytes";
+            }
+            else if ((size >> 10) < 1024)
+            {
+                return (size / (float)1024).ToString("F1") + " KB";
+            }
+            else if ((size >> 20) < 1024)
+            {
+                return ((size >> 10) / (float)1024).ToString("F1") + " MB";
+            }
+            else if ((size >> 30) < 1024)
+            {
+                return ((size >> 20) / (float)1024).ToString("F1") + " GB";
+            }
+            else if ((size >> 40) < 1024)
+            {
+                return ((size >> 30) / (float)1024).ToString("F1") + " TB";
+            }
+            else if ((size >> 50) < 1024)
+            {
+                return ((size >> 40) / (float)1024).ToString("F1") + " PB";
+            }
+            else
+            {
+                return ((size >> 50) / (float)1024).ToString("F0") + " EB";
+            }
+        }
     }
 }
diff --git a/Microsoft.Toolkit/Helpers/NotifyTaskCompletion.cs b/Microsoft.Toolkit/Helpers/NotifyTaskCompletion.cs
new file mode 100644
index 00000000000..56b92b02998
--- /dev/null
+++ b/Microsoft.Toolkit/Helpers/NotifyTaskCompletion.cs
@@ -0,0 +1,174 @@
+// 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.ComponentModel;
+using System.Threading.Tasks;
+
+namespace Microsoft.Toolkit.Helpers
+{
+    /// <summary>
+    /// Helper class to wrap around a Task to provide more information usable for UI databinding scenarios. As discussed in MSDN Magazine: https://msdn.microsoft.com/magazine/dn605875.
+    /// </summary>
+    /// <typeparam name="TResult">Type of result returned by task.</typeparam>
+    public sealed class NotifyTaskCompletion<TResult> : INotifyPropertyChanged
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NotifyTaskCompletion{TResult}"/> class.
+        /// </summary>
+        /// <param name="task">Task to wait on.</param>
+        public NotifyTaskCompletion(Task<TResult> task)
+        {
+            Task = task;
+            if (!task.IsCompleted)
+            {
+                TaskCompletion = WatchTaskAsync(task);
+            }
+        }
+
+        private async Task WatchTaskAsync(Task task)
+        {
+            try
+            {
+                await task;
+            }
+            catch
+            {
+            }
+
+            if (PropertyChanged == null)
+            {
+                return;
+            }
+
+            PropertyChanged.Invoke(this, new PropertyChangedEventArgs(nameof(Status)));
+            PropertyChanged.Invoke(this, new PropertyChangedEventArgs(nameof(IsCompleted)));
+            PropertyChanged.Invoke(this, new PropertyChangedEventArgs(nameof(IsNotCompleted)));
+
+            if (task.IsCanceled)
+            {
+                PropertyChanged.Invoke(this, new PropertyChangedEventArgs(nameof(IsCanceled)));
+            }
+            else if (task.IsFaulted)
+            {
+                PropertyChanged.Invoke(this, new PropertyChangedEventArgs(nameof(IsFaulted)));
+                PropertyChanged.Invoke(this, new PropertyChangedEventArgs(nameof(Exception)));
+                PropertyChanged.Invoke(this, new PropertyChangedEventArgs(nameof(InnerException)));
+                PropertyChanged.Invoke(this, new PropertyChangedEventArgs(nameof(ErrorMessage)));
+            }
+            else
+            {
+                PropertyChanged.Invoke(this, new PropertyChangedEventArgs(nameof(IsSuccessfullyCompleted)));
+                PropertyChanged.Invoke(this, new PropertyChangedEventArgs(nameof(Result)));
+            }
+        }
+
+        /// <summary>
+        /// Gets the task that is being waited on.
+        /// </summary>
+        public Task<TResult> Task { get; private set; }
+
+        /// <summary>
+        /// Gets the task wrapper task.
+        /// </summary>
+        public Task TaskCompletion { get; private set; }
+
+        /// <summary>
+        /// Gets the result of the given task.
+        /// </summary>
+        public TResult Result
+        {
+            get
+            {
+                return (Task.Status == TaskStatus.RanToCompletion) ?
+                    Task.Result :
+                    default(TResult);
+            }
+        }
+
+        /// <summary>
+        /// Gets the status of the task.
+        /// </summary>
+        public TaskStatus Status
+        {
+            get { return Task.Status; }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the task is completed.
+        /// </summary>
+        public bool IsCompleted
+        {
+            get { return Task.IsCompleted; }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the task is not completed.
+        /// </summary>
+        public bool IsNotCompleted { get { return !Task.IsCompleted; } }
+
+        /// <summary>
+        /// Gets a value indicating whether the task was successfully completed.
+        /// </summary>
+        public bool IsSuccessfullyCompleted
+        {
+            get
+            {
+                return Task.Status == TaskStatus.RanToCompletion;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the task was cancelled.
+        /// </summary>
+        public bool IsCanceled
+        {
+            get { return Task.IsCanceled; }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether there was an error with the task.
+        /// </summary>
+        public bool IsFaulted
+        {
+            get { return Task.IsFaulted; }
+        }
+
+        /// <summary>
+        /// Gets the exception which occured on the task (if one occurred).
+        /// </summary>
+        public AggregateException Exception { get { return Task.Exception; } }
+
+        /// <summary>
+        /// Gets the inner exception of the task.
+        /// </summary>
+        public Exception InnerException
+        {
+            get
+            {
+                return (Exception == null) ?
+                    null :
+                    Exception.InnerException;
+            }
+        }
+
+        /// <summary>
+        /// Gets the error message of the task.
+        /// </summary>
+        public string ErrorMessage
+        {
+            get
+            {
+                return (InnerException == null) ?
+                    null :
+                    InnerException.Message;
+            }
+        }
+
+        /// <summary>
+        /// PropertyChanged event.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+    }
+}
\ No newline at end of file

From e69a8adf08c6bbb3814acd6fb097e1f6126a08c4 Mon Sep 17 00:00:00 2001
From: michael-hawker <michael.hawker@outlook.com>
Date: Mon, 21 Oct 2019 00:48:00 -0700
Subject: [PATCH 2/7] Mark older Graph Controls Deprecated being replaced by
 new Graph Controls

---
 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json  | 8 ++++++++
 .../AadLogin/AadLogin.cs                                  | 1 +
 .../PeoplePicker/PeoplePicker.cs                          | 1 +
 .../PlannerTaskList/PlannerTaskList.cs                    | 1 +
 .../ProfileCard/ProfileCard.cs                            | 1 +
 5 files changed, 12 insertions(+)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
index 9596ad320a7..68285838eab 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
@@ -367,6 +367,8 @@
         "CodeFile": "AadLoginCode.bind",
         "XamlCodeFile": "AadLoginXaml.bind",
         "Icon": "/SamplePages/AadLogin/AadLogin.png",
+        "BadgeUpdateVersionRequired": "DEPRECATED",
+        "DeprecatedWarning": "The AadLogin control has been replaced with the LoginButton control and will be removed in a future update.",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/graph/AadLogin.md"
       },
       {
@@ -377,6 +379,8 @@
         "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls.Graph/ProfileCard",
         "XamlCodeFile": "ProfileCardXaml.bind",
         "Icon": "/SamplePages/ProfileCard/ProfileCard.png",
+        "BadgeUpdateVersionRequired": "DEPRECATED",
+        "DeprecatedWarning": "The ProfileCard control has been replaced with the PersonView control and will be removed in a future update.",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/graph/ProfileCard.md"
       },
       {
@@ -387,6 +391,8 @@
         "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls.Graph/PeoplePicker",
         "XamlCodeFile": "PeoplePickerXaml.bind",
         "Icon": "/SamplePages/PeoplePicker/PeoplePicker.png",
+        "BadgeUpdateVersionRequired": "DEPRECATED",
+        "DeprecatedWarning": "The PeoplePicker control has been replaced with the new PeoplePicker control in Microsoft.Toolkit.Graph.Controls and will be removed in a future update.",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/graph/PeoplePicker.md"
       },
       {
@@ -417,6 +423,8 @@
         "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls.Graph/PlannerTaskList",
         "XamlCodeFile": "PlannerTaskListXaml.bind",
         "Icon": "/SamplePages/PlannerTaskList/PlannerTaskList.png",
+        "BadgeUpdateVersionRequired": "DEPRECATED",
+        "DeprecatedWarning": "The PlannerTaskList control will be replaced with a new Task control and will be removed in a future update.",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/graph/PlannerTaskList.md"
       },
       {
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Graph/AadLogin/AadLogin.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Graph/AadLogin/AadLogin.cs
index 4fe38ba56e1..25688c2ac68 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Graph/AadLogin/AadLogin.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Graph/AadLogin/AadLogin.cs
@@ -15,6 +15,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Graph
     /// <summary>
     /// The AAD Login Control leverages MSAL libraries to support basic AAD sign-in processes for Microsoft Graph and beyond.
     /// </summary>
+    [Obsolete("This control will be removed in a future release of the toolkit. Please use the new Graph controls at https://aka.ms/wgt")]
     [TemplatePart(Name = "RootGrid", Type = typeof(Grid))]
     [TemplatePart(Name = "ContentPresenter", Type = typeof(ContentPresenter))]
     public partial class AadLogin : Button
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Graph/PeoplePicker/PeoplePicker.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Graph/PeoplePicker/PeoplePicker.cs
index 2d6bb554d1f..142e59d696d 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Graph/PeoplePicker/PeoplePicker.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Graph/PeoplePicker/PeoplePicker.cs
@@ -19,6 +19,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Graph
     /// <summary>
     /// The PeoplePicker Control is a simple control that allows for selection of one or more users from an organizational AD.
     /// </summary>
+    [Obsolete("This control will be removed in a future release of the toolkit. Please use the new Graph controls at https://aka.ms/wgt")]
     [TemplatePart(Name = SearchBoxPartName, Type = typeof(TextBox))]
     [TemplatePart(Name = InternalSearchBoxTextBoxPartName, Type = typeof(TextBox))]
     [TemplatePart(Name = SearchResultListBoxPartName, Type = typeof(ListBox))]
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Graph/PlannerTaskList/PlannerTaskList.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Graph/PlannerTaskList/PlannerTaskList.cs
index b5f4cd3bb5c..5e5a8770b73 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Graph/PlannerTaskList/PlannerTaskList.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Graph/PlannerTaskList/PlannerTaskList.cs
@@ -19,6 +19,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Graph
     /// <summary>
     /// The PlannerTaskList Control displays a simple list of Planner tasks.
     /// </summary>
+    [Obsolete("This control will be removed in a future release of the toolkit. Please use the new Graph controls at https://aka.ms/wgt")]
     [TemplatePart(Name = ControlTasks, Type = typeof(ListView))]
     [TemplatePart(Name = ControlInput, Type = typeof(TextBox))]
     [TemplatePart(Name = ControlAdd, Type = typeof(Button))]
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Graph/ProfileCard/ProfileCard.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Graph/ProfileCard/ProfileCard.cs
index 725fcdea44f..7058336bba3 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Graph/ProfileCard/ProfileCard.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Graph/ProfileCard/ProfileCard.cs
@@ -15,6 +15,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Graph
     /// <summary>
     /// The Profile Card control is a simple way to display a user in multiple different formats and mixes of name/image/e-mail.
     /// </summary>
+    [Obsolete("This control will be removed in a future release of the toolkit. Please use the new Graph controls at https://aka.ms/wgt")]
     public partial class ProfileCard : Control
     {
         private static readonly BitmapImage PersonPhoto = new BitmapImage(new Uri("ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Graph/Assets/person.png"));

From a452da07bc10bf68a596d5c8d24dba9b7ac4c1b8 Mon Sep 17 00:00:00 2001
From: michael-hawker <michael.hawker@outlook.com>
Date: Mon, 21 Oct 2019 12:46:13 -0700
Subject: [PATCH 3/7] Clean-up warnings by modernizing syntax

---
 .../Helpers/NotifyTaskCompletion.cs           | 52 ++++---------------
 1 file changed, 9 insertions(+), 43 deletions(-)

diff --git a/Microsoft.Toolkit/Helpers/NotifyTaskCompletion.cs b/Microsoft.Toolkit/Helpers/NotifyTaskCompletion.cs
index 56b92b02998..f874a3bcc57 100644
--- a/Microsoft.Toolkit/Helpers/NotifyTaskCompletion.cs
+++ b/Microsoft.Toolkit/Helpers/NotifyTaskCompletion.cs
@@ -90,81 +90,47 @@ public TResult Result
         /// <summary>
         /// Gets the status of the task.
         /// </summary>
-        public TaskStatus Status
-        {
-            get { return Task.Status; }
-        }
+        public TaskStatus Status => Task.Status;
 
         /// <summary>
         /// Gets a value indicating whether the task is completed.
         /// </summary>
-        public bool IsCompleted
-        {
-            get { return Task.IsCompleted; }
-        }
+        public bool IsCompleted => Task.IsCompleted;
 
         /// <summary>
         /// Gets a value indicating whether the task is not completed.
         /// </summary>
-        public bool IsNotCompleted { get { return !Task.IsCompleted; } }
+        public bool IsNotCompleted => !Task.IsCompleted;
 
         /// <summary>
         /// Gets a value indicating whether the task was successfully completed.
         /// </summary>
-        public bool IsSuccessfullyCompleted
-        {
-            get
-            {
-                return Task.Status == TaskStatus.RanToCompletion;
-            }
-        }
+        public bool IsSuccessfullyCompleted => Task.Status == TaskStatus.RanToCompletion;
 
         /// <summary>
         /// Gets a value indicating whether the task was cancelled.
         /// </summary>
-        public bool IsCanceled
-        {
-            get { return Task.IsCanceled; }
-        }
+        public bool IsCanceled => Task.IsCanceled;
 
         /// <summary>
         /// Gets a value indicating whether there was an error with the task.
         /// </summary>
-        public bool IsFaulted
-        {
-            get { return Task.IsFaulted; }
-        }
+        public bool IsFaulted => Task.IsFaulted;
 
         /// <summary>
         /// Gets the exception which occured on the task (if one occurred).
         /// </summary>
-        public AggregateException Exception { get { return Task.Exception; } }
+        public AggregateException Exception => Task.Exception;
 
         /// <summary>
         /// Gets the inner exception of the task.
         /// </summary>
-        public Exception InnerException
-        {
-            get
-            {
-                return (Exception == null) ?
-                    null :
-                    Exception.InnerException;
-            }
-        }
+        public Exception InnerException => Exception?.InnerException;
 
         /// <summary>
         /// Gets the error message of the task.
         /// </summary>
-        public string ErrorMessage
-        {
-            get
-            {
-                return (InnerException == null) ?
-                    null :
-                    InnerException.Message;
-            }
-        }
+        public string ErrorMessage => InnerException?.Message;
 
         /// <summary>
         /// PropertyChanged event.

From 4e1c0b0e3cfec28e4a86a74b33f37d0d7ddd5fc0 Mon Sep 17 00:00:00 2001
From: "Michael Hawker MSFT (XAML Llama)" <michael.hawker@outlook.com>
Date: Tue, 22 Oct 2019 17:46:55 -0700
Subject: [PATCH 4/7] Grab Exception Message if no InnerException

---
 Microsoft.Toolkit/Helpers/NotifyTaskCompletion.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit/Helpers/NotifyTaskCompletion.cs b/Microsoft.Toolkit/Helpers/NotifyTaskCompletion.cs
index f874a3bcc57..2b55ad349ce 100644
--- a/Microsoft.Toolkit/Helpers/NotifyTaskCompletion.cs
+++ b/Microsoft.Toolkit/Helpers/NotifyTaskCompletion.cs
@@ -130,11 +130,11 @@ public TResult Result
         /// <summary>
         /// Gets the error message of the task.
         /// </summary>
-        public string ErrorMessage => InnerException?.Message;
+        public string ErrorMessage => InnerException?.Message ?? Exception.Message;
 
         /// <summary>
         /// PropertyChanged event.
         /// </summary>
         public event PropertyChangedEventHandler PropertyChanged;
     }
-}
\ No newline at end of file
+}

From 027c5656f7bf994491a5ba159edf318428e9d6ca Mon Sep 17 00:00:00 2001
From: michael-hawker <michael.hawker@outlook.com>
Date: Thu, 24 Oct 2019 15:24:48 -0700
Subject: [PATCH 5/7] Move ToFileSizeString to new Convert static class.

---
 .../Services/OneDrive/OneDriveStorageItem.cs  |  2 +-
 .../FileSizeToFriendlyStringConverter.cs      |  5 +-
 Microsoft.Toolkit/Convert.cs                  | 49 +++++++++++++++++++
 .../Extensions/StringExtensions.cs            | 39 +--------------
 4 files changed, 54 insertions(+), 41 deletions(-)
 create mode 100644 Microsoft.Toolkit/Convert.cs

diff --git a/Microsoft.Toolkit.Services/Services/OneDrive/OneDriveStorageItem.cs b/Microsoft.Toolkit.Services/Services/OneDrive/OneDriveStorageItem.cs
index f8a70aabead..dd8d9af2bcf 100644
--- a/Microsoft.Toolkit.Services/Services/OneDrive/OneDriveStorageItem.cs
+++ b/Microsoft.Toolkit.Services/Services/OneDrive/OneDriveStorageItem.cs
@@ -70,7 +70,7 @@ public string FormattedFileSize
         {
             get
             {
-                return FileSize.HasValue ? FileSize.Value.ToFileSizeString() : 0L.ToFileSizeString();
+                return FileSize.HasValue ? Convert.ToFileSizeString(FileSize.Value) : Convert.ToFileSizeString(0L);
             }
         }
 
diff --git a/Microsoft.Toolkit.Uwp.UI/Converters/FileSizeToFriendlyStringConverter.cs b/Microsoft.Toolkit.Uwp.UI/Converters/FileSizeToFriendlyStringConverter.cs
index f95dfedd3c7..45e7dad5726 100644
--- a/Microsoft.Toolkit.Uwp.UI/Converters/FileSizeToFriendlyStringConverter.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Converters/FileSizeToFriendlyStringConverter.cs
@@ -3,13 +3,12 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using Microsoft.Toolkit.Extensions;
 using Windows.UI.Xaml.Data;
 
 namespace Microsoft.Toolkit.Uwp.UI.Converters
 {
     /// <summary>
-    /// Converts a file size in bytes to a more human-readable friendly format using <see cref="Microsoft.Toolkit.Extensions.StringExtensions.ToFileSizeString(long)"/>
+    /// Converts a file size in bytes to a more human-readable friendly format using <see cref="Toolkit.Convert.ToFileSizeString(long)"/>
     /// </summary>
     public class FileSizeToFriendlyStringConverter : IValueConverter
     {
@@ -18,7 +17,7 @@ public object Convert(object value, Type targetType, object parameter, string la
         {
             if (value is long size)
             {
-                return size.ToFileSizeString();
+                return Toolkit.Convert.ToFileSizeString(size);
             }
 
             return string.Empty;
diff --git a/Microsoft.Toolkit/Convert.cs b/Microsoft.Toolkit/Convert.cs
new file mode 100644
index 00000000000..d76356f7a26
--- /dev/null
+++ b/Microsoft.Toolkit/Convert.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Microsoft.Toolkit
+{
+    /// <summary>
+    /// Set of helpers to convert between data types and notations.
+    /// </summary>
+    public static class Convert
+    {
+        /// <summary>
+        /// Translate numeric file size in bytes to a human-readable shorter string format.
+        /// </summary>
+        /// <param name="size">File size in bytes.</param>
+        /// <returns>Returns file size short string.</returns>
+        public static string ToFileSizeString(long size)
+        {
+            if (size < 1024)
+            {
+                return size.ToString("F0") + " bytes";
+            }
+            else if ((size >> 10) < 1024)
+            {
+                return (size / (float)1024).ToString("F1") + " KB";
+            }
+            else if ((size >> 20) < 1024)
+            {
+                return ((size >> 10) / (float)1024).ToString("F1") + " MB";
+            }
+            else if ((size >> 30) < 1024)
+            {
+                return ((size >> 20) / (float)1024).ToString("F1") + " GB";
+            }
+            else if ((size >> 40) < 1024)
+            {
+                return ((size >> 30) / (float)1024).ToString("F1") + " TB";
+            }
+            else if ((size >> 50) < 1024)
+            {
+                return ((size >> 40) / (float)1024).ToString("F1") + " PB";
+            }
+            else
+            {
+                return ((size >> 50) / (float)1024).ToString("F0") + " EB";
+            }
+        }
+    }
+}
diff --git a/Microsoft.Toolkit/Extensions/StringExtensions.cs b/Microsoft.Toolkit/Extensions/StringExtensions.cs
index d64818130ce..6a979bf0c80 100644
--- a/Microsoft.Toolkit/Extensions/StringExtensions.cs
+++ b/Microsoft.Toolkit/Extensions/StringExtensions.cs
@@ -2,6 +2,7 @@
 // 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.Globalization;
 using System.Net;
 using System.Text.RegularExpressions;
@@ -104,6 +105,7 @@ public static bool IsCharacterString(this string str)
         /// </summary>
         /// <param name="value">The object to convert.</param>
         /// <returns>String representation of the object.</returns>
+        [Obsolete("Use value?.ToString() instead. This will be removed in the next release of the toolkit.")]
         public static string ToSafeString(this object value)
         {
             return value?.ToString();
@@ -195,42 +197,5 @@ public static string Truncate(this string value, int length, bool ellipsis)
 
             return value ?? string.Empty;
         }
-
-        /// <summary>
-        /// Translate numeric file size in bytes to a human-readable shorter string format.
-        /// </summary>
-        /// <param name="size">file size in bytes.</param>
-        /// <returns>Returns file size short string.</returns>
-        public static string ToFileSizeString(this long size)
-        {
-            if (size < 1024)
-            {
-                return size.ToString("F0") + " bytes";
-            }
-            else if ((size >> 10) < 1024)
-            {
-                return (size / (float)1024).ToString("F1") + " KB";
-            }
-            else if ((size >> 20) < 1024)
-            {
-                return ((size >> 10) / (float)1024).ToString("F1") + " MB";
-            }
-            else if ((size >> 30) < 1024)
-            {
-                return ((size >> 20) / (float)1024).ToString("F1") + " GB";
-            }
-            else if ((size >> 40) < 1024)
-            {
-                return ((size >> 30) / (float)1024).ToString("F1") + " TB";
-            }
-            else if ((size >> 50) < 1024)
-            {
-                return ((size >> 40) / (float)1024).ToString("F1") + " PB";
-            }
-            else
-            {
-                return ((size >> 50) / (float)1024).ToString("F0") + " EB";
-            }
-        }
     }
 }

From 3ace37ee1bbc424552e36b2eb403e314b949b9d6 Mon Sep 17 00:00:00 2001
From: michael-hawker <michael.hawker@outlook.com>
Date: Thu, 24 Oct 2019 18:45:12 -0700
Subject: [PATCH 6/7] Add Missing Header

---
 Microsoft.Toolkit/Convert.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit/Convert.cs b/Microsoft.Toolkit/Convert.cs
index d76356f7a26..2cbd785efcf 100644
--- a/Microsoft.Toolkit/Convert.cs
+++ b/Microsoft.Toolkit/Convert.cs
@@ -1,4 +1,8 @@
-using System;
+// 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.Text;
 

From 245187e9406415fb178cce1824b49684681c2329 Mon Sep 17 00:00:00 2001
From: michael-hawker <michael.hawker@outlook.com>
Date: Thu, 24 Oct 2019 21:11:46 -0700
Subject: [PATCH 7/7] Rename Convert to Converters to not clash with system
 one.

---
 .../Services/OneDrive/OneDriveStorageItem.cs                  | 2 +-
 .../Converters/FileSizeToFriendlyStringConverter.cs           | 4 ++--
 Microsoft.Toolkit/{Convert.cs => Converters.cs}               | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename Microsoft.Toolkit/{Convert.cs => Converters.cs} (97%)

diff --git a/Microsoft.Toolkit.Services/Services/OneDrive/OneDriveStorageItem.cs b/Microsoft.Toolkit.Services/Services/OneDrive/OneDriveStorageItem.cs
index dd8d9af2bcf..765c2f225c4 100644
--- a/Microsoft.Toolkit.Services/Services/OneDrive/OneDriveStorageItem.cs
+++ b/Microsoft.Toolkit.Services/Services/OneDrive/OneDriveStorageItem.cs
@@ -70,7 +70,7 @@ public string FormattedFileSize
         {
             get
             {
-                return FileSize.HasValue ? Convert.ToFileSizeString(FileSize.Value) : Convert.ToFileSizeString(0L);
+                return FileSize.HasValue ? Converters.ToFileSizeString(FileSize.Value) : Converters.ToFileSizeString(0L);
             }
         }
 
diff --git a/Microsoft.Toolkit.Uwp.UI/Converters/FileSizeToFriendlyStringConverter.cs b/Microsoft.Toolkit.Uwp.UI/Converters/FileSizeToFriendlyStringConverter.cs
index 45e7dad5726..edda9f87432 100644
--- a/Microsoft.Toolkit.Uwp.UI/Converters/FileSizeToFriendlyStringConverter.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Converters/FileSizeToFriendlyStringConverter.cs
@@ -8,7 +8,7 @@
 namespace Microsoft.Toolkit.Uwp.UI.Converters
 {
     /// <summary>
-    /// Converts a file size in bytes to a more human-readable friendly format using <see cref="Toolkit.Convert.ToFileSizeString(long)"/>
+    /// Converts a file size in bytes to a more human-readable friendly format using <see cref="Toolkit.Converters.ToFileSizeString(long)"/>
     /// </summary>
     public class FileSizeToFriendlyStringConverter : IValueConverter
     {
@@ -17,7 +17,7 @@ public object Convert(object value, Type targetType, object parameter, string la
         {
             if (value is long size)
             {
-                return Toolkit.Convert.ToFileSizeString(size);
+                return Toolkit.Converters.ToFileSizeString(size);
             }
 
             return string.Empty;
diff --git a/Microsoft.Toolkit/Convert.cs b/Microsoft.Toolkit/Converters.cs
similarity index 97%
rename from Microsoft.Toolkit/Convert.cs
rename to Microsoft.Toolkit/Converters.cs
index 2cbd785efcf..a7a2ef509ad 100644
--- a/Microsoft.Toolkit/Convert.cs
+++ b/Microsoft.Toolkit/Converters.cs
@@ -11,7 +11,7 @@ namespace Microsoft.Toolkit
     /// <summary>
     /// Set of helpers to convert between data types and notations.
     /// </summary>
-    public static class Convert
+    public static class Converters
     {
         /// <summary>
         /// Translate numeric file size in bytes to a human-readable shorter string format.